pygitgo 1.3.0__tar.gz → 1.5.0__tar.gz

{pygitgo-1.3.0/src/pygitgo.egg-info → pygitgo-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitgo
-Version: 1.3.0
+Version: 1.5.0
 Summary: GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management.
 Author: Huerte
 License: GPL-3.0-or-later
@@ -16,6 +16,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: yaspin>=3.0
+Requires-Dist: pick>=2.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.10; extra == "dev"
@@ -182,6 +183,7 @@ Stages all changes, commits, and pushes in one command.
 ```bash
 gitgo push [branch] [message]
 gitgo push -n [branch] [message]   # create new branch first
+gitgo push -s [branch] [message]   # interactively select files to stage
 ```
 
 > [!TIP]
@@ -190,9 +192,19 @@ gitgo push -n [branch] [message]   # create new branch first
 | Flag | Description |
 |------|-------------|
 | `-n`, `--new` | Create a new branch before pushing |
+| `-s`, `--select` | Interactively select which files you want to include in this push |
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.5.0}/README.md

@@ -159,6 +159,7 @@ Stages all changes, commits, and pushes in one command.
 ```bash
 gitgo push [branch] [message]
 gitgo push -n [branch] [message]   # create new branch first
+gitgo push -s [branch] [message]   # interactively select files to stage
 ```
 
 > [!TIP]
@@ -167,9 +168,19 @@ gitgo push -n [branch] [message]   # create new branch first
 | Flag | Description |
 |------|-------------|
 | `-n`, `--new` | Create a new branch before pushing |
+| `-s`, `--select` | Interactively select which files you want to include in this push |
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygitgo"
-version = "1.3.0"
+version = "1.5.0"
 description = "GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management."
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}
@@ -22,6 +22,7 @@ classifiers = [
 ]
 dependencies = [
     "yaspin>=3.0",
+    "pick>=2.0",
 ]
 
 [project.optional-dependencies]

pygitgo-1.5.0/src/pygitgo/commands/pull.py

@@ -0,0 +1,43 @@
+from pygitgo.utils.colors import success, warning, error, info
+from pygitgo.utils.executor import run_command
+from pygitgo.exceptions import GitCommandError
+from pygitgo.commands.git_operations import get_current_branch
+import subprocess
+import sys
+
+def pull_operation(args):
+    branch = args.branch
+
+    if not branch:
+        branch = get_current_branch()
+        info(f"No branch provided. Pulling latest updates for '{branch}'...\n")
+
+    try:
+        remote_refs = run_command(["git", "ls-remote", "--heads", "origin", branch], allow_fail=True)
+        if isinstance(remote_refs, subprocess.CalledProcessError) or not remote_refs.strip():
+            error(f"\nFailed! The branch '{branch}' does not exist on the remote server.")
+            warning("You might need to push your local branch first.\n")
+            sys.exit(1)
+
+        run_command(
+            ["git", "pull", "--rebase", "--autostash", "origin", branch], 
+            loading_msg=f"Downloading latest updates for '{branch}' (auto-saving your code)..."
+        )
+        
+        success(f"\nSuccess! Your project is now up to date with '{branch}'.\n")
+
+    except GitCommandError as e:
+        error_msg = str(e).lower()
+        if "conflict" in error_msg or "rebase in progress" in error_msg:
+            error("\nMERGE CONFLICT DETECTED!")
+            warning("Your local code clashes with the new code downloaded from the server.\n")
+            info("1. Open your code editor down below.")
+            info("2. Fix the red conflict lines in your files.")
+            info("3. Save the files.")
+            info("4. Run this command to finish:  git rebase --continue\n")
+            sys.exit(1)
+        else:
+            error("\nFailed to pull updates from the server!")
+            error("Please check your internet connection and try again.")
+            error(f"Details: {e}\n")
+            sys.exit(1)

pygitgo-1.5.0/src/pygitgo/commands/staging.py

@@ -0,0 +1,50 @@
+from pygitgo.utils.colors import success, warning, error
+from pygitgo.utils.executor import run_command
+from pick import pick
+import subprocess
+import sys
+
+
+STATUS_LABELS = {
+    "M": "modified",
+    "A": "added",
+    "D": "deleted",
+    "R": "renamed",
+    "??": "new file",
+}
+
+
+def get_changed_files():
+    status = run_command(["git", "status", "--porcelain"], allow_fail=True)
+    if isinstance(status, subprocess.CalledProcessError) or not status.strip():
+        return []
+
+    files = []
+    for line in status.strip().splitlines():
+        if len(line) < 3:
+            continue
+        status_code = line[:2].strip()
+        filepath = line[3:].strip()
+        label = STATUS_LABELS.get(status_code, "changed")
+        files.append({"status": status_code, "label": label, "path": filepath})
+
+    return files
+
+
+def display_file_picker(files):
+    options = [f"({f['label']}) {f['path']}" for f in files]
+
+    selected = pick(
+        options,
+        "Select files to stage (SPACE to toggle, ENTER to confirm):",
+        multiselect=True,
+        min_selection_count=0
+    )
+
+    return [files[idx]["path"] for _, idx in selected]
+
+
+def selective_stage(selected_files):
+    for filepath in selected_files:
+        run_command(["git", "add", "--", filepath])
+    success(f"\n{len(selected_files)} file(s) staged for commit.")

{pygitgo-1.3.0 → pygitgo-1.5.0}/src/pygitgo/main.py

@@ -2,12 +2,14 @@ from pygitgo.commands.git_operations import (
     git_new_branch, git_commit, git_init, add_remote_origin,
     confirm_remote_link, git_push, get_current_branch, is_branch_exist
 )
+from pygitgo.commands.staging import get_changed_files, display_file_picker, selective_stage
 from pygitgo.utils.colors import info, success, warning, error
 from pygitgo.utils.config import get_config, config_operation
 from pygitgo.exceptions import GitCommandError, GitGoError
 from pygitgo.utils.setup import ensure_first_run_setup
 from pygitgo.commands.state import state_operations
 from pygitgo.commands.undo import undo_operations
+from pygitgo.commands.pull import pull_operation
 from pygitgo.commands.jump import jump_operation
 from pygitgo.utils.executor import run_command
 from pygitgo.auth.manager import login, logout
@@ -99,6 +101,7 @@ def link_operation(args):
 def push_operation(args):
     branch = args.branch
     message = args.message
+    select = args.select if hasattr(args, 'select') else False
 
     if args.new:
         if not branch:
@@ -128,24 +131,52 @@ def push_operation(args):
         message = get_config("default-message", "New Project Update")
         info(f"No commit message provided. Using default: '{message}'\n")
 
-    commit_made = git_commit(message)
-    
-    if commit_made:
+    if select:
+        files = get_changed_files()
+        if not files:
+            info("\nWorking tree is clean. Nothing to select.")
+            warning("Make some changes first before using GitGo to commit and push.")
+            return
+
+        selected = display_file_picker(files)
+        if not selected:
+            info("\nNo files selected. Push aborted.\n")
+            return
+
+        selective_stage(selected)
+        clean_message = message.strip('"\'')
+        run_command(["git", "commit", "-m", clean_message], loading_msg="Commiting changes...")
         git_push(branch)
+
+        leftover_files = [f for f in files if f["path"] not in selected]
+        if leftover_files:
+            print()
+            warning(f"You have {len(leftover_files)} uncommitted file(s) left in your working directory:")
+            for f in leftover_files:
+                info(f"  - {f['path']}")
+            print()
+            save_choice = input("Would you like to save these leftovers to a GitGo State for later? (y/n): ").lower()
+            if save_choice == 'y':
+                state_operations(Namespace(action="save", identifier=f"Leftovers from: {clean_message}"))
     else:
-        try:
-            unpushed = run_command(["git", "log", "--oneline", f"origin/{branch}..HEAD"], allow_fail=True, loading_msg="Checking for unpushed commits...")
-            if not isinstance(unpushed, subprocess.CalledProcessError) and unpushed.strip():
-                warning("\nNo changes to commit, but found unpushed commits. Pushing to remote...")
-                git_push(branch)
-            else:
-                info("\nWorking tree is clean and everything is up to date.")
-                warning("Make some changes first before using GitGo to commit and push.")
+        commit_made = git_commit(message)
+        
+        if commit_made:
+            git_push(branch)
+        else:
+            try:
+                unpushed = run_command(["git", "log", "--oneline", f"origin/{branch}..HEAD"], allow_fail=True, loading_msg="Checking for unpushed commits...")
+                if not isinstance(unpushed, subprocess.CalledProcessError) and unpushed.strip():
+                    warning("\nNo changes to commit, but found unpushed commits. Pushing to remote...")
+                    git_push(branch)
+                else:
+                    info("\nWorking tree is clean and everything is up to date.")
+                    warning("Make some changes first before using GitGo to commit and push.")
+                    return
+            except (GitCommandError, Exception):
+                warning("\nNo changes to commit. Cannot verify remote status.")
+                warning("Make some changes first or check your git remote configuration.")
                 return
-        except (GitCommandError, Exception):
-            warning("\nNo changes to commit. Cannot verify remote status.")
-            warning("Make some changes first or check your git remote configuration.")
-            return
 
     print("\n" + ("=" * 90))
     success("MISSION COMPLETE — NO CASUALTIES. ALL TARGETS NEUTRALIZED.\nAWAITING FOR YOUR NEXT ORDERS.\n\n")
@@ -215,11 +246,13 @@ def main():
             "  gitgo push                        Push current branch with default message\n"
             "  gitgo push main 'fix auth bug'    Push to main with a custom message\n"
             "  gitgo push 'fix auth bug'         Push current branch with a custom message\n"
-            "  gitgo push -n feature/login 'add login'   Create new branch and push"
+            "  gitgo push -n feature/login 'add login'   Create new branch and push\n"
+            "  gitgo push -s main 'fix bug'      Pick which files to include before pushing"
         ),
         formatter_class=argparse.RawDescriptionHelpFormatter
     )
     push_parser.add_argument("-n", "--new", action="store_true", help="Create a new branch before pushing")
+    push_parser.add_argument("-s", "--select", action="store_true", help="Interactively select which files to stage")
     push_parser.add_argument("branch", nargs="?", default=None, help="Branch to push to (default: current branch)")
     push_parser.add_argument("message", nargs="?", default=None, help="Commit message")
 
@@ -282,6 +315,17 @@ def main():
         help="What to undo: 'commit', 'add', or 'changes'"
     )
 
+    pull_parser = subparsers.add_parser("pull", 
+        help="Safely pull the latest code without losing your changes",
+        epilog=(
+            "Examples:\n"
+            "  gitgo pull                Safely pull updates for your current branch\n"
+            "  gitgo pull main           Safely pull updates from the 'main' branch\n"
+        ),
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    pull_parser.add_argument("branch", nargs="?", default=None, help="The branch to pull from (default is your current branch)")
+
     args = parser.parse_args()
 
     if args.ready:
@@ -309,6 +353,8 @@ def main():
             config_operation(args)
         elif args.command == "undo":
             undo_operations(args)
+        elif args.command == "pull":
+            pull_operation(args)
     except GitGoError as e:
         error(f"\n{e}\n")
         sys.exit(1)

{pygitgo-1.3.0 → pygitgo-1.5.0/src/pygitgo.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygitgo
-Version: 1.3.0
+Version: 1.5.0
 Summary: GitGo CLI - Your Fast Git Companion. Simplifies git push, link, stash, and user management.
 Author: Huerte
 License: GPL-3.0-or-later
@@ -16,6 +16,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: yaspin>=3.0
+Requires-Dist: pick>=2.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.10; extra == "dev"
@@ -182,6 +183,7 @@ Stages all changes, commits, and pushes in one command.
 ```bash
 gitgo push [branch] [message]
 gitgo push -n [branch] [message]   # create new branch first
+gitgo push -s [branch] [message]   # interactively select files to stage
 ```
 
 > [!TIP]
@@ -190,9 +192,19 @@ gitgo push -n [branch] [message]   # create new branch first
 | Flag | Description |
 |------|-------------|
 | `-n`, `--new` | Create a new branch before pushing |
+| `-s`, `--select` | Interactively select which files you want to include in this push |
 
 If there are no new changes but unpushed commits exist, GitGo detects this and pushes without creating an empty commit.
 
+### `gitgo pull`
+
+Safely downloads updates from the remote server. It automatically stashes your messy code, pulls the updates cleanly underneath using a rebase, and then instantly puts your code back exactly how it was. 
+
+```bash
+gitgo pull             # Safely pull updates for your current branch
+gitgo pull <branch>    # Safely pull updates from a specific branch
+```
+
 ### `gitgo link`
 
 Initializes a Git repository in the current directory, connects it to a remote, and pushes. Handles already-initialized repos gracefully and pulls unrelated histories.

{pygitgo-1.3.0 → pygitgo-1.5.0}/src/pygitgo.egg-info/SOURCES.txt

@@ -17,6 +17,8 @@ src/pygitgo/auth/ssh_utils.py
 src/pygitgo/commands/__init__.py
 src/pygitgo/commands/git_operations.py
 src/pygitgo/commands/jump.py
+src/pygitgo/commands/pull.py
+src/pygitgo/commands/staging.py
 src/pygitgo/commands/state.py
 src/pygitgo/commands/undo.py
 src/pygitgo/utils/__init__.py
@@ -30,7 +32,9 @@ tests/test_git_operations.py
 tests/test_jump.py
 tests/test_main.py
 tests/test_platform.py
+tests/test_pull.py
 tests/test_setup.py
+tests/test_staging.py
 tests/test_state.py
 tests/test_undo.py
 tests/test_url_validator.py

{pygitgo-1.3.0 → pygitgo-1.5.0}/src/pygitgo.egg-info/requires.txt

@@ -1,4 +1,5 @@
 yaspin>=3.0
+pick>=2.0
 
 [dev]
 pytest>=7.0

pygitgo-1.5.0/tests/test_pull.py

@@ -0,0 +1,77 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from pygitgo.commands.pull import pull_operation
+from pygitgo.exceptions import GitCommandError
+from argparse import Namespace
+import subprocess
+
+@patch("pygitgo.commands.pull.run_command")
+@patch("pygitgo.commands.pull.success")
+@patch("pygitgo.commands.pull.get_current_branch", return_value="main")
+def test_pull_operation_success_no_branch(mock_get_branch, mock_success, mock_run_command):
+    mock_run_command.side_effect = [
+        "1234567890abcdef",  
+        None                 
+    ]
+    
+    args = Namespace(branch=None)
+    pull_operation(args)
+    
+    assert mock_run_command.call_count == 2
+    mock_run_command.assert_any_call(["git", "ls-remote", "--heads", "origin", "main"], allow_fail=True)
+    mock_run_command.assert_any_call(
+        ["git", "pull", "--rebase", "--autostash", "origin", "main"], 
+        loading_msg="Downloading latest updates for 'main' (auto-saving your code)..."
+    )
+    mock_success.assert_called_once()
+
+@patch("pygitgo.commands.pull.run_command")
+@patch("pygitgo.commands.pull.success")
+def test_pull_operation_success_with_branch(mock_success, mock_run_command):
+    mock_run_command.side_effect = [
+        "1234567890abcdef",  
+        None                 
+    ]
+    
+    args = Namespace(branch="feature/test")
+    pull_operation(args)
+    
+    assert mock_run_command.call_count == 2
+    mock_run_command.assert_any_call(["git", "ls-remote", "--heads", "origin", "feature/test"], allow_fail=True)
+    mock_run_command.assert_any_call(
+        ["git", "pull", "--rebase", "--autostash", "origin", "feature/test"], 
+        loading_msg="Downloading latest updates for 'feature/test' (auto-saving your code)..."
+    )
+    mock_success.assert_called_once()
+
+@patch("pygitgo.commands.pull.sys.exit")
+@patch("pygitgo.commands.pull.error")
+@patch("pygitgo.commands.pull.run_command")
+def test_pull_operation_branch_not_found(mock_run_command, mock_error, mock_exit):
+    mock_run_command.return_value = subprocess.CalledProcessError(128, ["git", "ls-remote"])
+    
+    args = Namespace(branch="does-not-exist")
+    pull_operation(args)
+    
+    mock_exit.assert_called_once_with(1)
+    mock_error.assert_called()
+
+@patch("pygitgo.commands.pull.sys.exit")
+@patch("pygitgo.commands.pull.error")
+@patch("pygitgo.commands.pull.run_command")
+def test_pull_operation_merge_conflict(mock_run_command, mock_error, mock_exit):
+    conflict_err = GitCommandError(["git", "pull"], stderr="merge conflict in file.py")
+
+    def side_effect_fn(*args, **kwargs):
+        cmd = args[0]
+        if cmd[1] == "ls-remote":
+            return "1234567890abcdef"
+        raise conflict_err
+
+    mock_run_command.side_effect = side_effect_fn
+    
+    args = Namespace(branch="main")
+    pull_operation(args)
+    
+    mock_exit.assert_called_once_with(1)
+    mock_error.assert_any_call("\nMERGE CONFLICT DETECTED!")

pygitgo-1.5.0/tests/test_staging.py

@@ -0,0 +1,127 @@
+import pytest
+from unittest.mock import patch, MagicMock
+from pygitgo.commands.staging import get_changed_files, display_file_picker, selective_stage
+from argparse import Namespace
+import subprocess
+
+@patch("pygitgo.commands.staging.run_command")
+def test_get_changed_files_with_changes(mock_run_command):
+    mock_run_command.return_value = "M  src/main.py\n?? new_file.txt\nM  README.md"
+
+    files = get_changed_files()
+
+    assert len(files) == 3
+    assert files[0]["path"] == "src/main.py"
+    assert files[0]["label"] == "modified"
+    assert files[1]["path"] == "new_file.txt"
+    assert files[1]["label"] == "new file"
+    assert files[2]["path"] == "README.md"
+    assert files[2]["label"] == "modified"
+
+
+@patch("pygitgo.commands.staging.run_command")
+def test_get_changed_files_no_changes(mock_run_command):
+    mock_run_command.return_value = subprocess.CalledProcessError(1, ["git", "status"])
+
+    files = get_changed_files()
+
+    assert files == []
+
+
+@patch("pygitgo.commands.staging.run_command")
+def test_get_changed_files_empty_status(mock_run_command):
+    mock_run_command.return_value = ""
+
+    files = get_changed_files()
+
+    assert files == []
+
+
+@patch("pygitgo.commands.staging.run_command")
+def test_get_changed_files_deleted_file(mock_run_command):
+    mock_run_command.return_value = "D  old_file.py"
+
+    files = get_changed_files()
+
+    assert len(files) == 1
+    assert files[0]["path"] == "old_file.py"
+    assert files[0]["label"] == "deleted"
+
+
+@patch("pygitgo.commands.staging.pick")
+def test_display_file_picker_select_specific(mock_pick):
+    mock_pick.return_value = [("(modified) src/main.py", 0), ("(modified) README.md", 2)]
+
+    files = [
+        {"status": "M", "label": "modified", "path": "src/main.py"},
+        {"status": "??", "label": "new file", "path": "new_file.txt"},
+        {"status": "M", "label": "modified", "path": "README.md"},
+    ]
+
+    selected = display_file_picker(files)
+
+    assert selected == ["src/main.py", "README.md"]
+    mock_pick.assert_called_once()
+
+
+@patch("pygitgo.commands.staging.pick")
+def test_display_file_picker_select_all(mock_pick):
+    mock_pick.return_value = [("(modified) src/main.py", 0), ("(new file) new_file.txt", 1)]
+
+    files = [
+        {"status": "M", "label": "modified", "path": "src/main.py"},
+        {"status": "??", "label": "new file", "path": "new_file.txt"},
+    ]
+
+    selected = display_file_picker(files)
+
+    assert selected == ["src/main.py", "new_file.txt"]
+
+
+@patch("pygitgo.commands.staging.pick")
+def test_display_file_picker_cancel(mock_pick):
+    mock_pick.return_value = []
+
+    files = [
+        {"status": "M", "label": "modified", "path": "src/main.py"},
+    ]
+
+    selected = display_file_picker(files)
+
+    assert selected == []
+
+
+@patch("pygitgo.commands.staging.pick")
+def test_display_file_picker_select_single(mock_pick):
+    mock_pick.return_value = [("(new file) new_file.txt", 1)]
+
+    files = [
+        {"status": "M", "label": "modified", "path": "src/main.py"},
+        {"status": "??", "label": "new file", "path": "new_file.txt"},
+    ]
+
+    selected = display_file_picker(files)
+
+    assert selected == ["new_file.txt"]
+
+
+@patch("pygitgo.commands.staging.run_command")
+@patch("pygitgo.commands.staging.success")
+def test_selective_stage(mock_success, mock_run_command):
+    selected_files = ["src/main.py", "README.md"]
+
+    selective_stage(selected_files)
+
+    assert mock_run_command.call_count == 2
+    mock_run_command.assert_any_call(["git", "add", "--", "src/main.py"])
+    mock_run_command.assert_any_call(["git", "add", "--", "README.md"])
+    mock_success.assert_called_once()
+
+
+@patch("pygitgo.commands.staging.run_command")
+@patch("pygitgo.commands.staging.success")
+def test_selective_stage_single_file(mock_success, mock_run_command):
+    selective_stage(["README.md"])
+
+    mock_run_command.assert_called_once_with(["git", "add", "--", "README.md"])
+    mock_success.assert_called_once()