Initial binary support (zsh-users#299)

desyncr · Mar 12, 2017 · 7dc408a · 7dc408a
1 parent 4908b97
commit 7dc408a
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 50 deletions.
diff --git a/bin/antigen.zsh b/bin/antigen.zsh
@@ -309,13 +309,17 @@ fi
     return
   fi
 
-  # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` files.
-  local bundle_files
-  bundle_files=($location/*.zsh(N) $location/*.sh(N))
-  if [[ $#bundle_files -gt 0 ]]; then
-    echo "${(j:\n:)bundle_files}"
+    # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` files.
+    local bundle_files
+    bundle_files=($location/*.zsh(N) $location/*.sh(N))
+    if [[ $#bundle_files -gt 0 ]]; then
+        echo "${(j:\n:)bundle_files}"
+        return
+    fi
+
+    # Add to PATH (binary bundle)
+    echo "$location"
     return
-  fi
 }
 
 # Parses a bundle url in bundle-metadata format: url[|branch]
@@ -563,11 +567,14 @@ fi
   local make_local_clone="$3"
   local btype="$4"
   local src
+
   for src in $(-antigen-load-list "$url" "$loc" "$make_local_clone" "$btype"); do
+    # TODO Refactor this out
     if [[ -d "$src" ]]; then
-      if (( ! ${fpath[(I)$location]} )); then
-        fpath=($location $fpath)
-      fi
+        if (( ! ${fpath[(I)$src]} )); then
+            fpath=($src $fpath)
+        fi
+        PATH="$PATH:$src"
     else
       # Hack away local variables. See https://github.com/zsh-users/antigen/issues/122
       # This is needed to seek-and-destroy local variable definitions *outside*
@@ -1350,22 +1357,23 @@ _antigen () {
 # Returns
 #   Nothing. Generates _ZCACHE_META_PATH and _ZCACHE_PAYLOAD_PATH
 -zcache-generate-cache () {
-  local -aU _extensions_paths
-  local -a _bundles_meta
-  local _payload=''
-  local location
-
-  _payload+="#-- START ZCACHE GENERATED FILE\NL"
-  _payload+="#-- GENERATED: $(date)\NL"
-  _payload+='#-- ANTIGEN v1.4.1\NL'
-  for bundle in $_ZCACHE_BUNDLES; do
-    # -antigen-load-list "$url" "$loc" "$make_local_clone"
-    eval "$(-antigen-parse-bundle ${=bundle})"
-    _bundles_meta+=("$url $loc $btype $make_local_clone $branch")
-
-    if $make_local_clone; then
-      -antigen-ensure-repo "$url"
-    fi
+    local -aU _extensions_paths
+    local -aU _binary_paths
+    local -a _bundles_meta
+    local _payload=''
+    local location
+
+    _payload+="#-- START ZCACHE GENERATED FILE\NL"
+    _payload+="#-- GENERATED: $(date)\NL"
+    _payload+='#-- ANTIGEN v1.4.1\NL'
+    for bundle in $_ZCACHE_BUNDLES; do
+        # -antigen-load-list "$url" "$loc" "$make_local_clone"
+        eval "$(-antigen-parse-bundle ${=bundle})"
+        _bundles_meta+=("$url $loc $btype $make_local_clone $branch")
+
+        if $make_local_clone; then
+            -antigen-ensure-repo "$url"
+        fi
 
     -antigen-load-list "$url" "$loc" "$make_local_clone" | while read line; do
       if [[ -f "$line" ]]; then

diff --git a/src/ext/zcache/functions.zsh b/src/ext/zcache/functions.zsh
@@ -61,22 +61,23 @@
 # Returns
 #   Nothing. Generates _ZCACHE_META_PATH and _ZCACHE_PAYLOAD_PATH
 -zcache-generate-cache () {
-  local -aU _extensions_paths
-  local -a _bundles_meta
-  local _payload=''
-  local location
-
-  _payload+="#-- START ZCACHE GENERATED FILE\NL"
-  _payload+="#-- GENERATED: $(date)\NL"
-  _payload+='#-- ANTIGEN {{ANTIGEN_VERSION}}\NL'
-  for bundle in $_ZCACHE_BUNDLES; do
-    # -antigen-load-list "$url" "$loc" "$make_local_clone"
-    eval "$(-antigen-parse-bundle ${=bundle})"
-    _bundles_meta+=("$url $loc $btype $make_local_clone $branch")
-
-    if $make_local_clone; then
-      -antigen-ensure-repo "$url"
-    fi
+    local -aU _extensions_paths
+    local -aU _binary_paths
+    local -a _bundles_meta
+    local _payload=''
+    local location
+
+    _payload+="#-- START ZCACHE GENERATED FILE\NL"
+    _payload+="#-- GENERATED: $(date)\NL"
+    _payload+='#-- ANTIGEN {{ANTIGEN_VERSION}}\NL'
+    for bundle in $_ZCACHE_BUNDLES; do
+        # -antigen-load-list "$url" "$loc" "$make_local_clone"
+        eval "$(-antigen-parse-bundle ${=bundle})"
+        _bundles_meta+=("$url $loc $btype $make_local_clone $branch")
+
+        if $make_local_clone; then
+            -antigen-ensure-repo "$url"
+        fi
 
     -antigen-load-list "$url" "$loc" "$make_local_clone" | while read line; do
       if [[ -f "$line" ]]; then

diff --git a/src/helpers/load-list.zsh b/src/helpers/load-list.zsh
@@ -47,12 +47,16 @@
     return
   fi
 
-  # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` files.
-  local bundle_files
-  bundle_files=($location/*.zsh(N) $location/*.sh(N))
-  if [[ $#bundle_files -gt 0 ]]; then
-    echo "${(j:\n:)bundle_files}"
+    # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` files.
+    local bundle_files
+    bundle_files=($location/*.zsh(N) $location/*.sh(N))
+    if [[ $#bundle_files -gt 0 ]]; then
+        echo "${(j:\n:)bundle_files}"
+        return
+    fi
+
+    # Add to PATH (binary bundle)
+    echo "$location"
     return
-  fi
 }
 
diff --git a/src/lib/load.zsh b/src/lib/load.zsh
@@ -13,11 +13,14 @@
   local make_local_clone="$3"
   local btype="$4"
   local src
+
   for src in $(-antigen-load-list "$url" "$loc" "$make_local_clone" "$btype"); do
+    # TODO Refactor this out
     if [[ -d "$src" ]]; then
-      if (( ! ${fpath[(I)$location]} )); then
-        fpath=($location $fpath)
-      fi
+        if (( ! ${fpath[(I)$src]} )); then
+            fpath=($src $fpath)
+        fi
+        PATH="$PATH:$src"
     else
       # Hack away local variables. See https://github.com/zsh-users/antigen/issues/122
       # This is needed to seek-and-destroy local variable definitions *outside*

diff --git a/tests/.zshenv b/tests/.zshenv
@@ -64,6 +64,23 @@ echo 'alias unsourced-alias="echo unsourced-alias"' > "$PLUGIN_DIR2"/aliases.zsh
     pg2 commit -m 'Initial commit'
 } > /dev/null
 
+# Another test plugin.
+
+export PLUGIN_DIR3="$PWD/test-plugin3"
+mkdir "$PLUGIN_DIR3"
+
+# A wrapper function over `git` to work with the test plugin repo.
+alias pg3='git --git-dir "$PLUGIN_DIR3/.git" --work-tree "$PLUGIN_DIR3"'
+
+echo "echo '######'" > "$PLUGIN_DIR3"/hr
+chmod u+x "$PLUGIN_DIR3"/hr
+
+{
+    pg3 init
+    pg3 add .
+    pg3 commit -m 'Initial commit'
+} > /dev/null
+
 # Wrapper around \wc command to handle wc format differences between GNU and BSD
 # GNU:
 #  echo 1 | wc -l
@@ -76,3 +93,4 @@ echo 'alias unsourced-alias="echo unsourced-alias"' > "$PLUGIN_DIR2"/aliases.zsh
 function wc () {
     command wc "$@" | xargs
 }
+
diff --git a/tests/bundle.t b/tests/bundle.t
@@ -81,3 +81,13 @@ Handle local bundles (--no-local-clone).
 
   $ -antigen-bundle-short-name "/home/user/local-bundle"
   user/local-bundle
+
+Load a binary bundle.
+
+  $ antigen-bundle $PLUGIN_DIR3 &> /dev/null
+  $ hr
+  ######
+
+  $ echo $PATH | grep test-plugin3
+  *plugin3* (glob)
+