gitshorts 1.0.3__tar.gz

gitshorts-1.0.3/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Ekaanksh-dev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

gitshorts-1.0.3/PKG-INFO

@@ -0,0 +1,265 @@
+Metadata-Version: 2.4
+Name: gitshorts
+Version: 1.0.3
+Summary: 42 git shortcuts + auto merge conflict resolver — zero AI, pure Python
+Home-page: https://github.com/Ekaanksh-dev/gitfast
+Author: Ekaanksh Patil
+Author-email: Ekaanksh Patil <pekanksh@gmail.com>
+License: MIT License
+        
+        Copyright (c) 2026 Ekaanksh-dev
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: Homepage, https://github.com/Ekaanksh-dev/gitfast
+Project-URL: Issues, https://github.com/Ekaanksh-dev/gitfast/issues
+Keywords: git,shortcuts,developer-tools,merge,cli,productivity
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Topic :: Software Development :: Version Control :: Git
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+
+# gitshorts
+
+42 git shortcuts + auto merge conflict resolver — zero AI, pure Python
+
+```bash
+pip install gitshorts
+gitshorts install
+ghelp
+```
+
+---
+
+## Why gitfast?
+
+Before gitfast — 3 commands every commit:
+```bash
+git add .
+git commit -m "fix login bug"
+git push origin main
+```
+
+After gitfast — 1 command:
+```bash
+gcp "fix login bug"
+```
+
+---
+
+## Install
+
+```bash
+# install
+pip install gitshorts
+
+# setup
+gitshorts install
+
+# reload your shell
+source ~/.bashrc          # bash
+source ~/.zshrc           # zsh
+source ~/.config/fish/config.fish   # fish
+
+# verify
+ghelp
+```
+
+---
+
+## All Commands
+
+### TIER 1 — Daily
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gs` | git status short | `git status` |
+| `gc "msg"` | add + commit | `git add . && git commit -m` |
+| `gcp "msg"` | add + commit + push | 3 separate commands |
+| `gpl` | pull current branch | `git pull origin <branch>` |
+
+### TIER 2 — Weekly
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gb` | list all branches | `git branch -a` |
+| `gnb "name"` | new branch + push upstream | 2 commands |
+| `gsw "branch"` | switch branch | `git switch` |
+| `gm "branch"` | merge branch | `git merge` |
+| `gl` | pretty log last 20 | `git log --oneline --graph` |
+| `gll` | log with file stats | `git log --stat` |
+| `gd` | diff summary | `git diff --stat` |
+| `gdf "file"` | diff one file | `git diff <file>` |
+| `gcl "url"` | clone repo | `git clone` |
+
+### TIER 3 — Rescue
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gundo` | undo last commit keep staged | `git reset --soft HEAD~1` |
+| `gundo2` | undo last commit unstage | `git reset HEAD~1` |
+| `gsave "label"` | stash with label | `git stash push -m` |
+| `gpop` | pop latest stash | `git stash pop` |
+| `gstashes` | list all stashes | `git stash list` |
+| `gdrop N` | drop stash N | `git stash drop stash@{N}` |
+| `gsquash N` | squash last N commits | `git rebase -i HEAD~N` |
+| `gabort` | abort merge or rebase | `git merge --abort` |
+| `gnuke` | wipe all uncommitted changes | `git reset --hard HEAD` |
+
+### TIER 4 — Power
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gf` | fetch all remotes | `git fetch --all --prune` |
+| `gtag v1.0` | tag + push release | 2 commands |
+| `gtags` | list all tags | `git tag -l` |
+| `gwho "file"` | blame file | `git blame` |
+| `greflog` | full history + deleted | `git reflog` |
+| `gshow "hash"` | inspect commit | `git show --stat` |
+| `gclean` | delete merged branches | complex command |
+| `gremotes` | show all remotes | `git remote -v` |
+
+### AUTH
+
+| Command | Does |
+|---------|------|
+| `gtest_ssh` | test SSH to GitHub/GitLab/Bitbucket |
+| `gsetup_ssh` | full SSH key setup in one command |
+| `gsetup_creds` | configure OS credential helper |
+| `ghttps_to_ssh` | convert HTTPS remote to SSH |
+| `gauth_info` | show full auth status |
+
+### TOKEN
+
+| Command | Does |
+|---------|------|
+| `gtoken setup` | store GitHub PAT securely |
+| `gtoken test` | verify token works |
+| `gtoken refresh` | update expired token |
+| `gtoken revoke` | remove stored token |
+| `gtoken info` | show token status + expiry |
+
+### MERGE — The Killer Feature
+
+| Command | Does |
+|---------|------|
+| `gconflicts` | scan + list all conflicts |
+| `gmerge` | auto resolve all conflicts |
+| `gmerge -i` | interactive — pick ours/theirs per conflict |
+| `gmerge --ours` | always keep our changes |
+| `gmerge --theirs` | always keep their changes |
+| `gmerge --dry-run` | show conflicts without resolving |
+
+---
+
+## Auto Push Error Fix
+
+gitfast automatically fixes the most common push error:
+
+error: failed to push some refs
+hint: Updates were rejected because the remote
+hint: contains work that you do not have locally
+
+
+When this happens gitfast:
+detects the error automatically
+pulls remote changes
+merges with your changes
+resolves conflicts if any
+pushes again
+
+You never see this error with gitfast.
+
+---
+
+## Token Security
+
+gitfast stores your GitHub token in OS secure storage:
+
+| OS | Storage |
+|----|---------|
+| macOS | Keychain |
+| Linux | GNOME Keyring |
+| Windows | Credential Manager |
+| Any OS | ~/.netrc (chmod 600) |
+
+Token is never stored in plain text. Never in .bashrc. Never logged.
+
+---
+
+## Shell Support
+
+| Shell | Support |
+|-------|---------|
+| Bash | full |
+| Zsh | full |
+| Fish | full |
+| PowerShell | full |
+
+---
+
+## OS Support
+
+| OS | Support |
+|----|---------|
+| Ubuntu / Debian | full |
+| Arch / Manjaro | full |
+| Fedora / RHEL | full |
+| macOS | full |
+| WSL2 | full |
+| Git Bash | full |
+| Any OS | netrc fallback |
+
+---
+
+## Uninstall
+
+```bash
+gitshorts uninstall
+pip uninstall gitshorts
+```
+
+---
+
+## Update
+
+```bash
+gitshorts update
+```
+
+---
+
+## License
+
+MIT — see LICENSE file
+
+---
+
+## Author
+
+Built for developers who live in the terminal.
+# gitshorts — 42 git shortcuts

gitshorts-1.0.3/README.md

@@ -0,0 +1,220 @@
+# gitshorts
+
+42 git shortcuts + auto merge conflict resolver — zero AI, pure Python
+
+```bash
+pip install gitshorts
+gitshorts install
+ghelp
+```
+
+---
+
+## Why gitfast?
+
+Before gitfast — 3 commands every commit:
+```bash
+git add .
+git commit -m "fix login bug"
+git push origin main
+```
+
+After gitfast — 1 command:
+```bash
+gcp "fix login bug"
+```
+
+---
+
+## Install
+
+```bash
+# install
+pip install gitshorts
+
+# setup
+gitshorts install
+
+# reload your shell
+source ~/.bashrc          # bash
+source ~/.zshrc           # zsh
+source ~/.config/fish/config.fish   # fish
+
+# verify
+ghelp
+```
+
+---
+
+## All Commands
+
+### TIER 1 — Daily
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gs` | git status short | `git status` |
+| `gc "msg"` | add + commit | `git add . && git commit -m` |
+| `gcp "msg"` | add + commit + push | 3 separate commands |
+| `gpl` | pull current branch | `git pull origin <branch>` |
+
+### TIER 2 — Weekly
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gb` | list all branches | `git branch -a` |
+| `gnb "name"` | new branch + push upstream | 2 commands |
+| `gsw "branch"` | switch branch | `git switch` |
+| `gm "branch"` | merge branch | `git merge` |
+| `gl` | pretty log last 20 | `git log --oneline --graph` |
+| `gll` | log with file stats | `git log --stat` |
+| `gd` | diff summary | `git diff --stat` |
+| `gdf "file"` | diff one file | `git diff <file>` |
+| `gcl "url"` | clone repo | `git clone` |
+
+### TIER 3 — Rescue
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gundo` | undo last commit keep staged | `git reset --soft HEAD~1` |
+| `gundo2` | undo last commit unstage | `git reset HEAD~1` |
+| `gsave "label"` | stash with label | `git stash push -m` |
+| `gpop` | pop latest stash | `git stash pop` |
+| `gstashes` | list all stashes | `git stash list` |
+| `gdrop N` | drop stash N | `git stash drop stash@{N}` |
+| `gsquash N` | squash last N commits | `git rebase -i HEAD~N` |
+| `gabort` | abort merge or rebase | `git merge --abort` |
+| `gnuke` | wipe all uncommitted changes | `git reset --hard HEAD` |
+
+### TIER 4 — Power
+
+| Command | Does | Replaces |
+|---------|------|---------|
+| `gf` | fetch all remotes | `git fetch --all --prune` |
+| `gtag v1.0` | tag + push release | 2 commands |
+| `gtags` | list all tags | `git tag -l` |
+| `gwho "file"` | blame file | `git blame` |
+| `greflog` | full history + deleted | `git reflog` |
+| `gshow "hash"` | inspect commit | `git show --stat` |
+| `gclean` | delete merged branches | complex command |
+| `gremotes` | show all remotes | `git remote -v` |
+
+### AUTH
+
+| Command | Does |
+|---------|------|
+| `gtest_ssh` | test SSH to GitHub/GitLab/Bitbucket |
+| `gsetup_ssh` | full SSH key setup in one command |
+| `gsetup_creds` | configure OS credential helper |
+| `ghttps_to_ssh` | convert HTTPS remote to SSH |
+| `gauth_info` | show full auth status |
+
+### TOKEN
+
+| Command | Does |
+|---------|------|
+| `gtoken setup` | store GitHub PAT securely |
+| `gtoken test` | verify token works |
+| `gtoken refresh` | update expired token |
+| `gtoken revoke` | remove stored token |
+| `gtoken info` | show token status + expiry |
+
+### MERGE — The Killer Feature
+
+| Command | Does |
+|---------|------|
+| `gconflicts` | scan + list all conflicts |
+| `gmerge` | auto resolve all conflicts |
+| `gmerge -i` | interactive — pick ours/theirs per conflict |
+| `gmerge --ours` | always keep our changes |
+| `gmerge --theirs` | always keep their changes |
+| `gmerge --dry-run` | show conflicts without resolving |
+
+---
+
+## Auto Push Error Fix
+
+gitfast automatically fixes the most common push error:
+
+error: failed to push some refs
+hint: Updates were rejected because the remote
+hint: contains work that you do not have locally
+
+
+When this happens gitfast:
+detects the error automatically
+pulls remote changes
+merges with your changes
+resolves conflicts if any
+pushes again
+
+You never see this error with gitfast.
+
+---
+
+## Token Security
+
+gitfast stores your GitHub token in OS secure storage:
+
+| OS | Storage |
+|----|---------|
+| macOS | Keychain |
+| Linux | GNOME Keyring |
+| Windows | Credential Manager |
+| Any OS | ~/.netrc (chmod 600) |
+
+Token is never stored in plain text. Never in .bashrc. Never logged.
+
+---
+
+## Shell Support
+
+| Shell | Support |
+|-------|---------|
+| Bash | full |
+| Zsh | full |
+| Fish | full |
+| PowerShell | full |
+
+---
+
+## OS Support
+
+| OS | Support |
+|----|---------|
+| Ubuntu / Debian | full |
+| Arch / Manjaro | full |
+| Fedora / RHEL | full |
+| macOS | full |
+| WSL2 | full |
+| Git Bash | full |
+| Any OS | netrc fallback |
+
+---
+
+## Uninstall
+
+```bash
+gitshorts uninstall
+pip uninstall gitshorts
+```
+
+---
+
+## Update
+
+```bash
+gitshorts update
+```
+
+---
+
+## License
+
+MIT — see LICENSE file
+
+---
+
+## Author
+
+Built for developers who live in the terminal.
+# gitshorts — 42 git shortcuts

gitshorts-1.0.3/gitfast/__init__.py

@@ -0,0 +1,15 @@
+__version__ = "1.0.3"
+__author__  = "Ekaanksh Patil"
+__email__   = "pekanksh@email.com"
+__license__ = "MIT"
+__description__ = "42 git shortcuts + auto merge conflict resolver"
+
+from gitfast.utils.colors import Colors
+
+def banner():
+    print(f"""
+{Colors.BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━{Colors.RESET}
+{Colors.YELLOW}  ⚡ gitfast v{__version__}{Colors.RESET}
+{Colors.GRAY}  42 git shortcuts. Zero friction.{Colors.RESET}
+{Colors.BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━{Colors.RESET}
+""")

gitshorts-1.0.3/gitfast/cli.py

@@ -0,0 +1,72 @@
+import sys
+from gitfast.utils.colors import Printer
+from gitfast import __version__
+from gitfast.core.installer import install
+from gitfast.core.uninstaller import uninstall
+from gitfast.core.updater import update, check_for_updates
+from gitfast.token.manager import gtoken
+from gitfast.core.setup_wizard import gsetup
+
+
+def main():
+    """Main CLI entry point — gitfast command"""
+    args = sys.argv[1:]
+
+    if not args:
+        install()
+        return
+
+    cmd = args[0]
+
+    if cmd == "install":
+        install()
+
+    elif cmd == "uninstall":
+        uninstall()
+
+    elif cmd == "update":
+        update()
+
+    elif cmd == "check":
+        check_for_updates()
+
+    elif cmd == "version":
+        print(f"gitfast v{__version__}")
+
+    elif cmd == "setup":
+         gsetup()
+
+    elif cmd == "token":
+        action = args[1] if len(args) > 1 else "info"
+        gtoken(action)
+
+    else:
+        Printer.error(f"Unknown command: {cmd}")
+        help_cmd()
+
+
+def help_cmd():
+    """Show all available commands"""
+    Printer.header(f"gitfast v{__version__}")
+    print("  USAGE: gitfast <command>")
+    print("")
+    print("  COMMANDS:")
+    print("  install      install shortcuts into your shell")
+    print("  uninstall    remove gitfast from all shells")
+    print("  update       update to latest version")
+    print("  check        check if update available")
+    print("  version      show current version")
+    print("  token        manage GitHub token")
+    print("")
+    print("  TOKEN:")
+    print("  token setup    store token securely")
+    print("  token test     verify token works")
+    print("  token refresh  update expired token")
+    print("  token revoke   remove token")
+    print("  token info     show token status")
+    print("")
+    print("  SHORTCUTS (after install):")
+    print("  ghelp          show all git shortcuts")
+    print("  gcp 'msg'      add + commit + push")
+    print("  gmerge         auto resolve conflicts")
+    Printer.divider()

gitshorts-1.0.3/gitfast/core/detector.py

@@ -0,0 +1,63 @@
+import sys
+from gitfast.utils.os_utils import (
+    get_os,
+    get_shell,
+    get_shell_config,
+    get_package_manager,
+    is_git_installed,
+)
+from gitfast.utils.colors import Printer
+
+
+class SystemInfo:
+    def __init__(self):
+        self.os      = get_os()
+        self.shell   = get_shell()
+        self.config  = get_shell_config()
+        self.pkg_mgr = get_package_manager()
+        self.git_ok  = is_git_installed()
+
+    def display(self):
+        Printer.header("System Detection")
+        print(f"  OS              : {self.os}")
+        print(f"  Shell           : {self.shell}")
+        print(f"  Config file     : {self.config}")
+        print(f"  Package manager : {self.pkg_mgr}")
+        print(f"  Git installed   : {'yes' if self.git_ok else 'no'}")
+        Printer.divider()
+
+    def is_supported(self):
+        if self.os == "unknown":
+            Printer.error("Unsupported OS detected")
+            return False
+
+        if not self.git_ok:
+            Printer.error("Git is not installed")
+            Printer.info(f"Install it with: {self._git_install_cmd()}")
+            return False
+
+        return True
+
+    def _git_install_cmd(self):
+        cmds = {
+            "ubuntu": "sudo apt install git",
+            "arch":   "sudo pacman -S git",
+            "fedora": "sudo dnf install git",
+            "macos":  "brew install git",
+            "wsl2":   "sudo apt install git",
+            "gitbash":"winget install git",
+        }
+        return cmds.get(self.os, "sudo apt install git")
+
+
+def detect():
+    """Run full system detection and return SystemInfo"""
+    info = SystemInfo()
+    info.display()
+
+    if not info.is_supported():
+        Printer.error("System not supported — exiting")
+        sys.exit(1)
+
+    Printer.success("System supported — ready to install")
+    return info