Merge pull request #54 from joseluisq/fish-autoload-compliant

refactor: fish autoload-compliant

Author: joseluisq

.github/workflows/ci.yml

@@ -8,16 +8,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Test
-        uses: addnab/docker-run-action@v1
+        uses: addnab/docker-run-action@v3
         with:
           image: joseluisq/paket
           options: -v ${{ github.workspace }}:/gitnow
           shell: fish
           run: |
             fish -v
             paket --version
+            git config --global --add safe.directory /gitnow
             paket add /gitnow
             /gitnow/testing/test.fish
 
@@ -26,15 +27,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Test
-        uses: addnab/docker-run-action@v1
+        uses: addnab/docker-run-action@v3
         with:
           image: joseluisq/paket
           options: -v ${{ github.workspace }}:/gitnow
           shell: fish
           run: |
-            apk add curl
+            apk add curl && apk upgrade
             curl -sL git.io/fisher | source
             fish -v
             fisher --version

.gitignore

@@ -0,0 +1,2 @@
+/.gitnow
+**/.DS_Store

completions/__gitnow_completions.fish

@@ -0,0 +1,20 @@
+# GitNow — Speed up your Git workflow. 🐠
+# https://github.com/joseluisq/gitnow
+
+# Merge command
+
+__gitnow_load_git_functions
+
+complete -f -x -c merge -a '(__fish_git_branches)'
+
+complete -f -x -c merge \
+    -s h -l help \
+    -d "Show information about the options for this command"
+
+complete -f -x -c merge \
+    -s a -l abort \
+    -d "Abort conflicted merge"
+
+complete -f -x -c merge \
+    -s c -l continue \
+    -d "Continue merge"

completions/merge.fish

@@ -0,0 +1,26 @@
+# GitNow — Speed up your Git workflow. 🐠
+# https://github.com/joseluisq/gitnow
+
+# Move command
+
+__gitnow_load_git_functions
+
+complete -f -x -c move -a '(__fish_git_branches)'
+
+complete -f -x -c move \
+    -s h -l help \
+    -d "Show information about the options for this command"
+
+complete -f -x -c move \
+    -s p -l prev \
+    -d "Switch to a previous branch using the `--no-apply-stash` option (equivalent to \"move -\")"
+
+complete -f -x -c move \
+    -s n -l no-apply-stash \
+    -a '(__fish_git_branches)' \
+    -d "Switch to a local branch but without applying current stash"
+
+complete -f -x -c move \
+    -s u -l upstream \
+    -a '(__fish_git_branches)' \
+    -d "Fetch a remote branch and switch to it applying current stash"

completions/move.fish

@@ -0,0 +1,31 @@
+# GitNow — Speed up your Git workflow. 🐠
+# https://github.com/joseluisq/gitnow
+
+# Tag command
+
+__gitnow_load_git_functions
+
+complete -f -x -c tag \
+    -d "List all tags in a lexicographic order and treating tag names as versions"
+
+complete -f -x -c tag -a '(__fish_git_tags)'
+
+complete -f -x -c tag \
+    -s h -l help \
+    -d "Show information about the options for this command"
+
+complete -f -x -c tag \
+    -s l -l latest \
+    -d "Show only the latest Semver release tag version (no suffixed ones or others)"
+
+complete -f -x -c tag \
+    -s x -l major \
+    -d "Tag auto-incrementing a major version number"
+
+complete -f -x -c tag \
+    -s y -l minor \
+    -d "Tag auto-incrementing a minor version number"
+
+complete -f -x -c tag \
+    -s z -l patch \
+    -d "Tag auto-incrementing a patch version number"

completions/tag.fish

@@ -1,7 +1,25 @@
 # GitNow — Speed up your Git workflow. 🐠
 # https://github.com/joseluisq/gitnow
 
+set -g gitnow_version 2.11.0
+
 # Default global variables
+set -q GITNOW_CONFIG_FILE; or set -g GITNOW_CONFIG_FILE ~/.gitnow
+set -g gitnow_commands 'all' 'assume' 'bitbucket' 'bugfix' 'commit' 'commit-all' 'feature' 'github' 'gitnow' 'hotfix' 'logs' 'merge' 'move' 'pull' 'push' 'release' 'show' 'stage' 'state' 'tag' 'unstage' 'untracked' 'upstream'
+
+if set -q __fish_config_dir
+    set -g fish_config "$__fish_config_dir"
+else
+    set -q XDG_CONFIG_HOME
+        and set -g fish_config "$XDG_CONFIG_HOME/fish"
+        or set -g fish_config "~/.config/fish"
+end
+
+set -q fish_snippets; or set -g fish_snippets "$fish_config/conf.d"
+
+__gitnow_load_config
+
+# Other specific global variables
 set -g g_current_branch
 
 function __gitnow_install -e gitnow_install

conf.d/gitnow.fish

@@ -0,0 +1,20 @@
+# GitNow — Speed up your Git workflow. 🐠
+# https://github.com/joseluisq/gitnow
+
+function __gitnow_check_if_branch_exist
+    set -l xfound 0
+
+    if test (count $argv) -eq 1
+        set -l xbranch $argv[1]
+        set -l xbranch_list (__gitnow_current_branch_list)
+
+        for b in $xbranch_list
+            if [ "$xbranch" = "$b" ]
+                set xfound 1
+                break
+            end
+        end
+    end
+
+    echo $xfound
+end

conf.d/gitnow_config.fish

@@ -0,0 +1,17 @@
+# GitNow — Speed up your Git workflow. 🐠
+# https://github.com/joseluisq/gitnow
+
+function __gitnow_clone_msg
+    set -l msg $argv[1]
+
+    echo "Repository name is required!"
+    echo "Example: $msg your-repo-name"
+    echo "Usages:"
+    echo "  a) $msg username/repo-name"
+    echo "  b) $msg username repo-name"
+    echo "  c) $msg repo-name"
+    echo "     For this, it's necessary to set your $msg username (login)"
+    echo "     to global config before like: "
+    echo "     git config --global user.$msg \"your-username\""
+    echo
+end