Merge pull request #109 from markcornick/knife_environment
Update _knife with environment sub-commands
This commit is contained in:
		
						commit
						b70c7f9799
					
				
							
								
								
									
										14
									
								
								src/_knife
								
								
								
								
							
							
						
						
									
										14
									
								
								src/_knife
								
								
								
								
							|  | @ -12,6 +12,7 @@ | ||||||
| # ------- | # ------- | ||||||
| # | # | ||||||
| #  * Frank Louwers (https://github.com/franklouwers) | #  * Frank Louwers (https://github.com/franklouwers) | ||||||
|  | #  * Mark Cornick (https://github.com/markcornick) | ||||||
| # | # | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
| 
 | 
 | ||||||
|  | @ -30,7 +31,7 @@ _knife() { | ||||||
|   typeset -A opt_args |   typeset -A opt_args | ||||||
| 
 | 
 | ||||||
|   # These flags should be available everywhere according to man knife |   # These flags should be available everywhere according to man knife | ||||||
|   knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes ) |   knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes --environment ) | ||||||
| 
 | 
 | ||||||
|   cloudproviders=(bluebox ec2 rackspace slicehost terremark) |   cloudproviders=(bluebox ec2 rackspace slicehost terremark) | ||||||
|   _arguments \ |   _arguments \ | ||||||
|  | @ -43,7 +44,7 @@ _knife() { | ||||||
|    |    | ||||||
|   case $state in |   case $state in | ||||||
|   knifecmd) |   knifecmd) | ||||||
|     compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec index node recipe role search ssh status windows $cloudproviders |     compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" environment exec index node recipe role search ssh status windows $cloudproviders | ||||||
|   ;; |   ;; | ||||||
|   knifesubcmd) |   knifesubcmd) | ||||||
|     case $words[2] in |     case $words[2] in | ||||||
|  | @ -59,6 +60,9 @@ _knife() { | ||||||
|     cookbook) |     cookbook) | ||||||
|       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload |       compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload | ||||||
|     ;; |     ;; | ||||||
|  |     environment) | ||||||
|  |       compadd -Q "$@" create delete edit "from file" list show | ||||||
|  |     ;; | ||||||
|     node) |     node) | ||||||
|      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete" |      compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete" | ||||||
|     ;; |     ;; | ||||||
|  | @ -110,7 +114,7 @@ _knife() { | ||||||
|           versioncomp=1 |           versioncomp=1 | ||||||
|           _arguments '4:Cookbookversions:($(_cookbook_versions) latest)' |           _arguments '4:Cookbookversions:($(_cookbook_versions) latest)' | ||||||
|        ;; |        ;; | ||||||
|        (node|client|role) |        (node|client|role|environment) | ||||||
|          compadd "$@" --attribute |          compadd "$@" --attribute | ||||||
|        esac |        esac | ||||||
|      esac |      esac | ||||||
|  | @ -178,6 +182,10 @@ _chef_data_bags_remote() { | ||||||
|  (knife data bag list | awk '{print $1}') |  (knife data bag list | awk '{print $1}') | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | _chef_environments_remote() { | ||||||
|  |  (knife environment list | awk '{print $1}') | ||||||
|  | } | ||||||
|  | 
 | ||||||
| # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server | # The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server | ||||||
| _chef_cookbooks_local() { | _chef_cookbooks_local() { | ||||||
|  (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done) |  (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue