Introduced a new btype argument to bundle command.

The `name` argument will be phased out. Instead, the btype will indicate the type of a plugin. Currently it can have valuse of plugin and theme.

Introduced a new btype argument to bundle command.
The `name` argument will be phased out. Instead, the btype will indicate the type of a plugin. Currently it can have valuse of plugin and theme.
Shrikant Sharat
1 parent 24fbcce0a0
Showing 1 changed file with 34 additions and 27 deletions Side-by-side Diff
antigen.zsh
@@ -2,7 +2,8 @@
  
 # Each line in this string has the following entries separated by a space
 # character.
-# <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir>
+# <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir>,
+# <bundle-type>
 # FIXME: Is not kept local by zsh!
 local _ANTIGEN_BUNDLE_RECORD=""
  
@@ -14,6 +15,7 @@ bundle () {
     local url="$ANTIGEN_DEFAULT_REPO_URL"
     local loc=/
     local name=
+    local btype=plugin
     local load=true
  
     # Set spec values based on the positional arguments.
@@ -60,11 +62,12 @@ bundle () {
     fi
  
     # Add it to the record.
-    _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$name $url $loc $clone_dir"
+    _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$name $url $loc $clone_dir $btype"
  
     # Load it, unless specified otherwise.
     if $load; then
-        bundle-load "$name"
+        # bundle-load "$name"
+        bundle-load "$clone_dir/$loc" "$btype"
     fi
 }
  
@@ -100,6 +103,7 @@ bundle-install () {
         local url="$(echo "$spec" | awk '{print $2}')"
         local loc="$(echo "$spec" | awk '{print $3}')"
         local clone_dir="$(echo "$spec" | awk '{print $4}')"
+        local btype="$(echo "$spec" | awk '{print $5}')"
  
         if [[ -z "$(echo "$handled_repos" | grep -Fm1 "$url")" ]]; then
             if [[ ! -d $clone_dir ]]; then
@@ -121,7 +125,7 @@ bundle-install () {
             cp "$clone_dir/$loc" "$ADOTDIR/bundles/$name"
         fi
  
-        bundle-load "$name"
+        bundle-load "$clone_dir/$loc" "$btype"
  
     done
  
@@ -172,42 +176,45 @@ bundle-cleanup () {
  
 bundle-load () {
  
-    local name="$1"
-    local bundle_dir="$ADOTDIR/bundles/$name"
+    local location="$1"
+    local btype="$2"
  
-    # Source the plugin script
-    local script_loc="$bundle_dir/$name.plugin.zsh"
-    if [[ -f $script_loc ]]; then
-        source "$script_loc"
-    fi
+    if [[ $btype == theme ]]; then
  
-    # If the name of the plugin ends with `.lib`, all the *.zsh files in it are
-    # sourced. This is kind of a hack to source the libraries of oh-my-zsh.
-    if [[ $name == *.lib ]]; then
-        # FIXME: This throws an error if no files match the given glob pattern.
-        for lib ($bundle_dir/*.zsh) source $lib
-    fi
+        # Of course, if its a theme, the location would point to the script
+        # file.
+        source "$location"
  
-    # If the name ends with `.theme`, it is handled as if it were a zsh-theme
-    # plugin.
-    if [[ $name == *.theme ]]; then
-        local theme_file="$bundle_dir/${name%.theme}.zsh-theme"
-        test -f "$theme_file" && source "$theme_file"
-    fi
+    else
  
-    # Add to $fpath, for completion(s)
-    fpath=($bundle_dir $fpath)
+        # Source the plugin script
+        # FIXME: I don't know. Looks very very ugly. Needs a better
+        # implementation once tests are ready.
+        local script_loc="$(ls "$location" | grep -m1 '.plugin.zsh$')"
+        if [[ -f $script_loc ]]; then
+            # If we have a `*.plugin.zsh`, source it.
+            source "$script_loc"
+        elif [[ ! -z "$(ls "$location" | grep -m1 '.zsh$')" ]]; then
+            # If there is no `*.plugin.zsh` file, source *all* the `*.zsh`
+            # files.
+            for script ($location/*.zsh) source "$script"
+        fi
+
+        # Add to $fpath, for completion(s)
+        fpath=($location $fpath)
+
+    fi
  
 }
  
 bundle-lib () {
-    bundle --name=oh-my-zsh.lib --loc=lib
+    bundle --loc=lib
 }
  
 bundle-theme () {
     local url="$ANTIGEN_DEFAULT_REPO_URL"
     local name="${1:-robbyrussell}"
-    bundle-install "$url" --name=$name.theme --loc=themes/$name.zsh-theme
+    bundle --loc=themes/$name.zsh-theme --btype=theme
 }
  
 bundle-apply () {
...	...	@@ -2,7 +2,8 @@
2	2
3	3	# Each line in this string has the following entries separated by a space
4	4	# character.
5		-# <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir>
	5	+# <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir>,
	6	+# <bundle-type>
6	7	# FIXME: Is not kept local by zsh!
7	8	local _ANTIGEN_BUNDLE_RECORD=""
8	9
...	...	@@ -14,6 +15,7 @@ bundle () {
14	15	local url="$ANTIGEN_DEFAULT_REPO_URL"
15	16	local loc=/
16	17	local name=
	18	+ local btype=plugin
17	19	local load=true
18	20
19	21	# Set spec values based on the positional arguments.
...	...	@@ -60,11 +62,12 @@ bundle () {
60	62	fi
61	63
62	64	# Add it to the record.
63		- _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$name $url $loc $clone_dir"
	65	+ _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$name $url $loc $clone_dir $btype"
64	66
65	67	# Load it, unless specified otherwise.
66	68	if $load; then
67		- bundle-load "$name"
	69	+ # bundle-load "$name"
	70	+ bundle-load "$clone_dir/$loc" "$btype"
68	71	fi
69	72	}
70	73
...	...	@@ -100,6 +103,7 @@ bundle-install () {
100	103	local url="$(echo "$spec" \| awk '{print $2}')"
101	104	local loc="$(echo "$spec" \| awk '{print $3}')"
102	105	local clone_dir="$(echo "$spec" \| awk '{print $4}')"
	106	+ local btype="$(echo "$spec" \| awk '{print $5}')"
103	107
104	108	if [[ -z "$(echo "$handled_repos" \| grep -Fm1 "$url")" ]]; then
105	109	if [[ ! -d $clone_dir ]]; then
...	...	@@ -121,7 +125,7 @@ bundle-install () {
121	125	cp "$clone_dir/$loc" "$ADOTDIR/bundles/$name"
122	126	fi
123	127
124		- bundle-load "$name"
	128	+ bundle-load "$clone_dir/$loc" "$btype"
125	129
126	130	done
127	131
...	...	@@ -172,42 +176,45 @@ bundle-cleanup () {
172	176
173	177	bundle-load () {
174	178
175		- local name="$1"
176		- local bundle_dir="$ADOTDIR/bundles/$name"
	179	+ local location="$1"
	180	+ local btype="$2"
177	181
178		- # Source the plugin script
179		- local script_loc="$bundle_dir/$name.plugin.zsh"
180		- if [[ -f $script_loc ]]; then
181		- source "$script_loc"
182		- fi
	182	+ if [[ $btype == theme ]]; then
183	183
184		- # If the name of the plugin ends with `.lib`, all the *.zsh files in it are
185		- # sourced. This is kind of a hack to source the libraries of oh-my-zsh.
186		- if [[ $name == *.lib ]]; then
187		- # FIXME: This throws an error if no files match the given glob pattern.
188		- for lib ($bundle_dir/*.zsh) source $lib
189		- fi
	184	+ # Of course, if its a theme, the location would point to the script
	185	+ # file.
	186	+ source "$location"
190	187
191		- # If the name ends with `.theme`, it is handled as if it were a zsh-theme
192		- # plugin.
193		- if [[ $name == *.theme ]]; then
194		- local theme_file="$bundle_dir/${name%.theme}.zsh-theme"
195		- test -f "$theme_file" && source "$theme_file"
196		- fi
	188	+ else
197	189
198		- # Add to $fpath, for completion(s)
199		- fpath=($bundle_dir $fpath)
	190	+ # Source the plugin script
	191	+ # FIXME: I don't know. Looks very very ugly. Needs a better
	192	+ # implementation once tests are ready.
	193	+ local script_loc="$(ls "$location" \| grep -m1 '.plugin.zsh$')"
	194	+ if [[ -f $script_loc ]]; then
	195	+ # If we have a `*.plugin.zsh`, source it.
	196	+ source "$script_loc"
	197	+ elif [[ ! -z "$(ls "$location" \| grep -m1 '.zsh$')" ]]; then
	198	+ # If there is no `.plugin.zsh` file, source all* the `*.zsh`
	199	+ # files.
	200	+ for script ($location/*.zsh) source "$script"
	201	+ fi
	202	+
	203	+ # Add to $fpath, for completion(s)
	204	+ fpath=($location $fpath)
	205	+
	206	+ fi
200	207
201	208	}
202	209
203	210	bundle-lib () {
204		- bundle --name=oh-my-zsh.lib --loc=lib
	211	+ bundle --loc=lib
205	212	}
206	213
207	214	bundle-theme () {
208	215	local url="$ANTIGEN_DEFAULT_REPO_URL"
209	216	local name="${1:-robbyrussell}"
210		- bundle-install "$url" --name=$name.theme --loc=themes/$name.zsh-theme
	217	+ bundle --loc=themes/$name.zsh-theme --btype=theme
211	218	}
212	219
213	220	bundle-apply () {