gitpush-tool 0.2.8__tar.gz → 0.2.9__tar.gz

{gitpush_tool-0.2.8/gitpush_tool.egg-info → gitpush_tool-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitpush-tool
-Version: 0.2.8
+Version: 0.2.9
 Summary: Supercharged Git push tool with automatic GitHub repo creation and pushing
 Home-page: https://github.com/inevitablegs/gitpush
 Author: Ganesh Sonawane

gitpush_tool-0.2.9/gitpush_tool/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.9"

{gitpush_tool-0.2.8 → gitpush_tool-0.2.9}/gitpush_tool/cli.py

@@ -2,40 +2,10 @@ import os
 import argparse
 import sys
 import subprocess
+import shutil
 import platform
 import urllib.request
 import tempfile
-import shutil
-
-def check_gh_installed():
-    """Check if GitHub CLI is installed, attempt installation if not"""
-    if shutil.which("gh"):
-        return True
-
-    print("📦 GitHub CLI not found. Attempting installation...")
-    system = platform.system()
-    
-    try:
-        if system == "Windows":
-            return install_gh_cli_windows()
-        elif system == "Darwin":
-            subprocess.run(["brew", "install", "gh"], check=True)
-        elif system == "Linux":
-            subprocess.run(["sudo", "apt", "install", "-y", "gh"], check=True)
-        else:
-            print("❌ Unsupported OS.")
-            return False
-            
-        return shutil.which("gh") is not None
-    except Exception as e:
-        print(f"❌ Failed to install GitHub CLI: {e}")
-        return False
-
-import os
-import subprocess
-import shutil
-import tempfile
-import urllib.request
 import json
 
 def install_gh_cli_windows():
@@ -44,7 +14,7 @@ def install_gh_cli_windows():
     if shutil.which("winget"):
         try:
             print("📦 Attempting to install GitHub CLI with winget...")
-            subprocess.run(["winget", "install", "--id", "GitHub.cli", "--silent"], check=True)
+            subprocess.run(["winget", "install", "--id", "GitHub.cli", "--source", "winget", "--silent"], check=True, capture_output=True)
             print("✅ GitHub CLI installed successfully via winget.")
             return True
         except (subprocess.CalledProcessError, FileNotFoundError):
@@ -57,15 +27,10 @@ def install_gh_cli_windows():
         with urllib.request.urlopen(api_url) as response:
             data = json.loads(response.read().decode())
 
-        # Find the correct MSI asset
-        msi_url = None
-        for asset in data.get("assets", []):
-            if asset.get("name", "").endswith("_windows_amd64.msi"):
-                msi_url = asset.get("browser_download_url")
-                break
+        msi_url = next((asset["browser_download_url"] for asset in data.get("assets", []) if asset.get("name", "").endswith("_windows_amd64.msi")), None)
 
         if not msi_url:
-            print("❌ Could not find a downloadable MSI file for the latest release.")
+            print("❌ Could not find a downloadable MSI file for the latest release.", file=sys.stderr)
             return False
 
         msi_path = os.path.join(tempfile.gettempdir(), "gh_installer.msi")
@@ -74,36 +39,83 @@ def install_gh_cli_windows():
         urllib.request.urlretrieve(msi_url, msi_path)
 
         print("🛠️ Installing GitHub CLI...")
-        # Use msiexec for silent installation
         subprocess.run(["msiexec", "/i", msi_path, "/quiet", "/norestart"], check=True)
 
-        # Clean up the downloaded file
         os.remove(msi_path)
         print("✅ GitHub CLI installed successfully.")
         return True
     except Exception as e:
-        print(f"❌ Direct installation failed: {e}")
+        print(f"❌ Direct installation failed: {e}", file=sys.stderr)
+        return False
+
+def check_gh_installed():
+    """Check if GitHub CLI is installed. If not, prompt the user to install it."""
+    if shutil.which("gh"):
+        return True
+
+    print("❓ GitHub CLI (gh) is required for the '--new-repo' feature but was not found.", file=sys.stderr)
+    try:
+        answer = input("   Would you like this tool to attempt an automatic installation? (y/n): ").lower().strip()
+    except (EOFError, KeyboardInterrupt):
+        print("\nInstallation cancelled.", file=sys.stderr)
+        return False
+
+    if answer != 'y':
+        print("➡️ Installation skipped. Please install 'gh' manually from https://cli.github.com/", file=sys.stderr)
+        return False
+
+    print("\n📦 Attempting to install GitHub CLI...")
+    system = platform.system()
+    installed = False
+    
+    try:
+        if system == "Windows":
+            installed = install_gh_cli_windows()
+        elif system == "Darwin":
+            print("   Running: brew install gh")
+            subprocess.run(["brew", "install", "gh"], check=True)
+            installed = True
+        elif system == "Linux":
+            print("   Running: sudo apt update && sudo apt install -y gh")
+            subprocess.run(["sudo", "apt", "update"], check=True)
+            subprocess.run(["sudo", "apt", "install", "-y", "gh"], check=True)
+            installed = True
+        else:
+            print(f"❌ Automatic installation is not supported for your OS ({system}).", file=sys.stderr)
+            print("   Please install 'gh' manually from https://cli.github.com/", file=sys.stderr)
+            return False
+
+    except (subprocess.CalledProcessError, FileNotFoundError) as e:
+        print(f"❌ Installation failed: {e}", file=sys.stderr)
+        print("   Please try installing 'gh' manually from https://cli.github.com/", file=sys.stderr)
         return False
 
+    if installed:
+        print("\n✅ GitHub CLI was installed successfully!", file=sys.stderr)
+        print("‼️ IMPORTANT: You must open a NEW terminal for the changes to take effect.", file=sys.stderr)
+        print("   Please re-run your command in a new terminal window.", file=sys.stderr)
+        sys.exit(0)  # Exit gracefully so the user can follow instructions
+    
+    return False
+
 def gh_authenticated():
     """Check if user is authenticated with GitHub CLI"""
     try:
-        result = subprocess.run(["gh", "auth", "status"], capture_output=True, text=True)
-        return result.returncode == 0
-    except:
+        result = subprocess.run(["gh", "auth", "status"], capture_output=True, text=True, check=True)
+        return "Logged in to github.com" in result.stderr
+    except (subprocess.CalledProcessError, FileNotFoundError):
         return False
 
 def authenticate_with_gh():
     """Authenticate user with GitHub CLI"""
-    print("\n🔑 GitHub authentication required")
-    print("We'll use the GitHub CLI (gh) for authentication")
-    print("This will open your browser for secure login")
+    print("\n🔑 GitHub authentication required.")
+    print("The tool will use the GitHub CLI (gh) to open a browser for secure login.")
     
     try:
         subprocess.run(["gh", "auth", "login", "--web", "-h", "github.com"], check=True)
         return True
     except subprocess.CalledProcessError:
-        print("❌ Authentication failed")
+        print("❌ Authentication failed. Please try running 'gh auth login' manually.", file=sys.stderr)
         return False
 
 def initialize_git_repository():
@@ -113,8 +125,8 @@ def initialize_git_repository():
         
     print("🛠 Initializing git repository")
     try:
-        subprocess.run(["git", "init"], check=True)
-        subprocess.run(["git", "branch", "-M", "main"], check=True)
+        subprocess.run(["git", "init"], check=True, capture_output=True)
+        subprocess.run(["git", "branch", "-M", "main"], check=True, capture_output=True)
         
         if not os.path.exists(".gitignore"):
             with open(".gitignore", "w") as f:
@@ -145,7 +157,7 @@ Thumbs.db
             print("📁 Created .gitignore file")
         return True
     except subprocess.CalledProcessError as e:
-        print(f"❌ Failed to initialize Git repository: {e}")
+        print(f"❌ Failed to initialize Git repository: {e.stderr.decode().strip()}", file=sys.stderr)
         return False
 
 def create_initial_commit(commit_message="Initial commit"):
@@ -162,16 +174,23 @@ def create_initial_commit(commit_message="Initial commit"):
             return True
         return False
     except subprocess.CalledProcessError as e:
-        print(f"❌ Failed to create initial commit: {e}")
+        if "nothing to commit" in e.stderr.decode():
+             print(f"❌ Failed to create initial commit: No files found to commit.", file=sys.stderr)
+             print("➡️  Add some files to your project directory before creating a repository.", file=sys.stderr)
+        else:
+             print(f"❌ Failed to create initial commit: {e.stderr.decode().strip()}", file=sys.stderr)
         return False
 
 def create_with_gh_cli(repo_name, private=False, description="", commit_message="Initial commit"):
     """Create and push to new repository using GitHub CLI"""
     try:
-        if not os.path.exists(".git") and not initialize_git_repository():
-            return False
+        if not os.path.exists(".git"):
+            if not initialize_git_repository():
+                return False
         
         if not create_initial_commit(commit_message):
+            if subprocess.run(["git", "status"], capture_output=True).returncode != 0:
+                 return False
             print("ℹ️ Using existing commits")
 
         private_flag = "--private" if private else "--public"
@@ -182,21 +201,22 @@ def create_with_gh_cli(repo_name, private=False, description="", commit_message=
             cmd.extend(["--description", description])
         
         print("🚀 Creating repository and pushing code...")
-        subprocess.run(cmd, check=True)
+        process = subprocess.run(cmd, check=True, capture_output=True, text=True)
         
-        url_result = subprocess.run(
-            ["gh", "repo", "view", "--json", "url", "--jq", ".url"],
-            capture_output=True, text=True, check=True
-        )
-        repo_url = url_result.stdout.strip()
+        repo_url = process.stderr.strip()
         print(f"✅ Successfully created repository: {repo_url}")
         return True
         
     except subprocess.CalledProcessError as e:
-        print(f"❌ Failed to create repository: {e.stderr if e.stderr else 'Unknown error'}")
+        error_message = e.stderr.strip()
+        if "already exists" in error_message:
+            print(f"❌ Failed to create repository: {error_message}", file=sys.stderr)
+            print("➡️  Please choose a different repository name.", file=sys.stderr)
+        else:
+            print(f"❌ Failed to create repository: {error_message}", file=sys.stderr)
         return False
     except Exception as e:
-        print(f"❌ Unexpected error: {str(e)}")
+        print(f"❌ An unexpected error occurred: {str(e)}", file=sys.stderr)
         return False
 
 def standard_git_push(commit_message, branch, remote, force=False, tags=False):
@@ -205,14 +225,15 @@ def standard_git_push(commit_message, branch, remote, force=False, tags=False):
         subprocess.run(["git", "add", "."], check=True)
         
         if commit_message:
-            print(f"📦 Committing: '{commit_message}'")
-            subprocess.run(["git", "commit", "-m", commit_message], check=True)
+            print(f"📦 Committing with message: '{commit_message}'")
+            subprocess.run(["git", "commit", "-m", commit_message, "--allow-empty-message"], check=True)
         else:
-            print("ℹ️ No commit message provided - skipping commit")
+            print("ℹ️ No commit message provided. Pushing only staged changes.")
         
         push_cmd = ["git", "push"]
         if force:
             push_cmd.append("--force-with-lease")
+            print("⚠️ Using safe force push (--force-with-lease).")
         if tags:
             push_cmd.append("--tags")
         if remote and branch:
@@ -220,10 +241,14 @@ def standard_git_push(commit_message, branch, remote, force=False, tags=False):
         
         print(f"🚀 Executing: {' '.join(push_cmd)}")
         subprocess.run(push_cmd, check=True)
-        print("✅ Successfully pushed changes")
+        print("✅ Successfully pushed changes.")
         return True
     except subprocess.CalledProcessError as e:
-        print(f"❌ Push failed: {e}")
+        error_output = e.stderr.decode().strip() if e.stderr else str(e)
+        if "nothing to commit" in error_output:
+            print("ℹ️ No changes to commit. Nothing to do.")
+            return True
+        print(f"❌ Push failed: {error_output}", file=sys.stderr)
         return False
 
 def run():
@@ -231,37 +256,40 @@ def run():
         description="🚀 Supercharged Git push tool with GitHub repo creation",
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""Examples:
-  Standard push:         gitpush_tool "Commit message"
-  Create new repo:       gitpush_tool "Initial commit" --new-repo project-name
-  Private repository:    gitpush_tool --new-repo private-project --private
-  Force push:            gitpush_tool "Fix critical bug" --force
+  Standard push:         gitpush_tool "My new feature"
+  Create new repo:       gitpush_tool "Initial commit" --new-repo my-awesome-project
+  Private repository:    gitpush_tool "Initial commit" --new-repo my-secret-project --private
+  Force push (safe):     gitpush_tool "Rebased feature" --force
+  Initialize only:       gitpush_tool --init
 """
     )
-    parser.add_argument("commit", nargs="?", help="Commit message")
-    parser.add_argument("branch", nargs="?", default="main", help="Branch name (default: main)")
-    parser.add_argument("remote", nargs="?", default="origin", help="Remote name (default: origin)")
-    parser.add_argument("--force", action="store_true", help="Force push with --force-with-lease")
-    parser.add_argument("--tags", action="store_true", help="Push tags")
-    parser.add_argument("--init", action="store_true", help="Initialize git repo")
-    parser.add_argument("--new-repo", metavar="NAME", help="Create new GitHub repository")
-    parser.add_argument("--private", action="store_true", help="Make repository private")
-    parser.add_argument("--description", help="Repository description")
+    parser.add_argument("commit", nargs="?", help="Commit message (optional if just pushing staged changes).")
+    parser.add_argument("branch", nargs="?", default=None, help="Branch name (defaults to current branch).")
+    parser.add_argument("remote", nargs="?", default="origin", help="Remote name (default: origin).")
+    parser.add_argument("--force", action="store_true", help="Force push with --force-with-lease.")
+    parser.add_argument("--tags", action="store_true", help="Push all tags.")
+    parser.add_argument("--init", action="store_true", help="Initialize a new Git repository and exit.")
+    parser.add_argument("--new-repo", metavar="REPO_NAME", help="Create a new GitHub repository with the given name.")
+    parser.add_argument("--private", action="store_true", help="Make the new repository private.")
+    parser.add_argument("--description", help="Description for the new repository.")
 
     args = parser.parse_args()
+    
+    target_branch = args.branch
+    if not target_branch:
+        try:
+            branch_result = subprocess.run(["git", "rev-parse", "--abbrev-ref", "HEAD"], capture_output=True, text=True, check=True)
+            target_branch = branch_result.stdout.strip()
+        except subprocess.CalledProcessError:
+            target_branch = "main"
 
     if args.new_repo:
-        print(f"🆕 Creating repository: {args.new_repo}")
-        
         if not check_gh_installed():
-            print("❌ GitHub CLI (gh) is not installed")
-            print("Please install it first:")
-            print("  Mac (Homebrew): brew install gh")
-            print("  Windows (Winget): winget install --id GitHub.cli")
-            print("  Linux: See https://github.com/cli/cli#installation")
             sys.exit(1)
         
-        if not gh_authenticated() and not authenticate_with_gh():
-            sys.exit(1)
+        if not gh_authenticated():
+            if not authenticate_with_gh():
+                sys.exit(1)
         
         if not create_with_gh_cli(
             args.new_repo,
@@ -270,13 +298,15 @@ def run():
             commit_message=args.commit or "Initial commit"
         ):
             sys.exit(1)
+
     elif args.init:
         if initialize_git_repository():
-            create_initial_commit(args.commit or "Initial commit")
+             print("✅ Git repository initialized successfully.")
+    
     else:
         if not standard_git_push(
             args.commit,
-            args.branch,
+            target_branch,
             args.remote,
             args.force,
             args.tags

{gitpush_tool-0.2.8 → gitpush_tool-0.2.9/gitpush_tool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitpush-tool
-Version: 0.2.8
+Version: 0.2.9
 Summary: Supercharged Git push tool with automatic GitHub repo creation and pushing
 Home-page: https://github.com/inevitablegs/gitpush
 Author: Ganesh Sonawane

{gitpush_tool-0.2.8 → gitpush_tool-0.2.9}/setup.py

@@ -6,7 +6,7 @@ long_description = (Path(__file__).parent / "LONG_DESCRIPTION.md").read_text(enc
 
 setup(
     name="gitpush-tool",
-    version="0.2.8",
+    version="0.2.9",
     packages=find_packages(),
     install_requires=[],
     entry_points={

gitpush_tool-0.2.8/gitpush_tool/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.8"