Merge pull request #61 from HPCNow/main

froster v0.12.18

Author: victormachadoperez

Diff for: .github/workflows/test-froster-config.yml

@@ -18,10 +18,15 @@ jobs:
         with:
           python-version: '3.10'
 
-      - name: Install dependencies
-        run: |  
-          python -m pip install --upgrade pip
-          pip install .
+      - name: Create and activate virtual environment
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+
+      - name: Install froster
+        env:
+          LOCAL_INSTALL: true
+        run: ./install.sh
 
       - name: Run unittests
         env:

Diff for: froster/froster.py

@@ -472,8 +472,8 @@ def set_aws(self, aws: 'AWSBoto'):
             # Ask user to enter the path to a aws credentials directory
 
             default_aws_dir = os.path.join(self.home_dir, '.aws')
-            if not os.path.exists(os.path.join(self.home_dir, '.aws')):
-                os.makedirs(self.aws_dir, exist_ok=True, mode=0o775)
+            if not os.path.exists(default_aws_dir):
+                os.makedirs(default_aws_dir, exist_ok=True, mode=0o775)
 
             aws_dir_question = [
                 inquirer.Path(

Diff for: install.sh

@@ -229,7 +229,7 @@ install_froster() {
 
     if [ "$LOCAL_INSTALL" = "true" ]; then
         echo "  Installing from the current directory"
-        pipx install . >/dev/null 2>&1 &
+        pip install . >/dev/null 2>&1 &
         spinner $!
     else 
         echo "  Installing from PyPi package repository"
@@ -283,16 +283,9 @@ install_pwalk() {
 
     # Move pwalk to froster's binaries folder
     echo "    Moving pwalk to froster's binaries folder"
-    if [ -d "${XDG_DATA_HOME}/pipx" ]; then
-        mv ${pwalk_path}/pwalk ${XDG_DATA_HOME}/pipx/venvs/froster/bin/pwalk >/dev/null 2>&1
-    elif [ -d "${HOME}/.local/pipx" ]; then
-        mv ${pwalk_path}/pwalk ${HOME}/.local/pipx/venvs/froster/bin/pwalk >/dev/null 2>&1
-    elif [ -v PIPX_HOME ]; then
-        mv ${pwalk_path}/pwalk ${PIPX_HOME}/venvs/froster/bin/pwalk >/dev/null 2>&1
-    else
-        echo "Error: pipx installation path not found."
-        exit 1
-    fi
+    froster_path=$(which froster)
+    froster_dir=$(dirname ${froster_path})
+    mv ${pwalk_path}/pwalk ${froster_dir}/pwalk >/dev/null 2>&1
 
     # Delete downloaded pwalk files
     echo "    Cleaning up pwalk installation files"
@@ -337,16 +330,10 @@ install_rclone() {
 
     # Move rclone to froster's binaries folder
     echo "    Moving rclone to froster's binaries folder"
-    if [ -d "${XDG_DATA_HOME}/pipx" ]; then
-        mv rclone-v*/rclone ${XDG_DATA_HOME}/pipx/venvs/froster/bin/rclone >/dev/null 2>&1
-    elif [ -d "${HOME}/.local/pipx" ]; then
-        mv rclone-v*/rclone ${HOME}/.local/pipx/venvs/froster/bin/rclone >/dev/null 2>&1
-    elif [ -v PIPX_HOME ]; then
-        mv rclone-v*/rclone ${PIPX_HOME}/venvs/froster/bin/rclone >/dev/null 2>&1
-    else
-        echo "Error: pipx installation path not found."
-        exit 1
-    fi
+    froster_path=$(which froster)
+    froster_dir=$(dirname ${froster_path})
+    mv rclone-v*/rclone ${froster_dir}/rclone >/dev/null 2>&1
+  
 
     # Remove the downloaded zip file
     echo "    Cleaning up rclone installation files"
@@ -378,11 +365,11 @@ install_pwalk
 install_rclone
 
 # Get the installed froster version
-version=$(pipx runpip froster show froster | grep Version | awk '{print $2}')
+version=$(froster -v | awk '{print $2}')
 
 # Print success message
 echo
-echo "froster v$version has been successfully installed!"
+echo "froster $version has been successfully installed!"
 
 # Print post-installation instructions
 echo

Diff for: pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "froster"
-version = "0.12.17"
+version = "0.12.18"
 description = "Froster is a tool for easy data transfer between local file systems and AWS S3 storage."
 authors = ["Victor Machado <[email protected]>"]
 readme = "README.md"

Diff for: tests/test_config.py

@@ -1233,7 +1233,7 @@ def test_set_s3_select_bucket(self, mock_print, mock_list, mock_text):
 
 if __name__ == '__main__':
 
-    if True:
+    if False:
         unittest.main(verbosity=2)
     else:
         suite = unittest.TestSuite()
@@ -1254,7 +1254,7 @@ def test_set_s3_select_bucket(self, mock_print, mock_list, mock_text):
         # suite.addTest(TestConfigAWS('test_set_aws'))
         # suite.addTest(TestConfigShared('test_set_shared'))
         # suite.addTest(TestConfigNIH('test_set_nih'))
-        # suite.addTest(TestConfigS3('test_set_s3'))
+        suite.addTest(TestConfigS3('test_set_s3'))
 
         runner = unittest.TextTestRunner(verbosity=2)
         runner.run(suite)