knife-whisk 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 14bd4c3ad621d14ee341d773ff75ad7afa5dacf1
+  data.tar.gz: b028449ba2113dc75b28262ebfec758692db58f7
+SHA512:
+  metadata.gz: 19dc6286ebf16222c7d5682f9b795492f29d3a677c987fa562bb66a00d98482e92ff31ca27e5c1b554a06e3ffac85d5b3709dfc11f297dfc8f1078693327c623
+  data.tar.gz: 3ad95946d5165a3926a8a0bdf0510e54005035142b68d2ef80a3d771a16331a3a848ff8273735d9a4394e9141d8af204bcc26350814ed8a73b399507a8e6cfc4

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.bundle
+

data/CONTRIBUTING.markdown

@@ -0,0 +1,8 @@
+## Contributing
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+Pester us if we don't get your Pull Requests merged in a timely fashion. :)

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in knife-whisk.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2013 Banno, LLC.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.markdown

@@ -0,0 +1,153 @@
+# knife-whisk
+
+A utility for quickly whipping up new servers in a team environment
+
+![whisk](https://github.com/Banno/knife-whisk/raw/master/whisk.jpg)
+## Overview
+Chef is a great tool for configuring servers once they're up, but it doesn't address configuration management for initializing cloud servers in the first place. This tool lets your team define named servers and configuration mixins to help your team always create new servers uniformly. Currently, it will generate `knife ec2 server create` commands based upon the configuration defined in your `whisk.yml` file. You're free to provide overrides and additional flags when generating a new command to spit out a slight alteration of an existing server's config.
+
+All together, this tool provides us with a "frictionless" experience for understanding how servers are created in our organization and quick access to recreate them correctly during a crisis.
+
+## Usage
+Assume you've got knife-whisk installed and configured correctly and it's pointing to a whisk.yml that looks like this:
+
+```
+mixins:
+  defaults:
+    image: ami-950680fc      # ubuntu instance store
+    subnet: subnet-12345678  # private subnet
+    region: us-east-1
+    user-data: user_data/before_bootstrap.sh
+    flavor: m1.small
+    ssh-user: ubuntu
+    template: chef_full
+    security-groups: default
+  ebs_instance:
+    image: ami-e50e888c
+  public_subnet:
+    subnet: subnet-87654321
+
+security-groups:
+  default: sg-12345678
+  java_app_server: sg-34567890
+
+servers:
+  app_server:
+    mixins:
+    - defaults
+    config:
+      run-list:
+      - "recipe[application-wrapper]"
+      security-groups:
+      - default
+      - java_app_server
+      environment: prod
+```
+
+`knife whisk generate` will work like this:
+
+```
+$ knife whisk generate app_server
+knife ec2 server create --image ami-950680fc --subnet subnet-12345678 --region us-east-1 --user-data user_data/before_bootstrap.sh --flavor m1.small --ssh-user ubuntu --template chef_full --run-list recipe[application-wrapper] --environment prod --security-groups-ids sg-12345678,sg-3456789
+```
+
+Let's mix in the public_subnet mixin:
+
+```
+$ knife whisk generate app_server --mixins public_subnet
+
+knife ec2 server create --image ami-950680fc --subnet subnet-87654321 --region us-east-1 --user-data user_data/before_bootstrap.sh --flavor m1.small --ssh-user ubuntu --template chef_full --run-list recipe[application-wrapper] --environment prod --security-groups-ids sg-12345678,sg-34567890
+```
+
+See how the subnet flag was updated? Now let's try something with overrides.
+
+```
+ $ knife whisk generate app_server --mixins public_subnet --overrides "--environment dev --flavor m2.4xlarge"
+ 
+knife ec2 server create --image ami-950680fc --subnet subnet-87654321 --region us-east-1 --user-data user_data/before_bootstrap.sh --flavor m2.4xlarge --ssh-user ubuntu --template chef_full --run-list recipe[application-wrapper] --environment dev --security-groups-ids sg-12345678,sg-34567890
+```
+
+This is where knife-whisk shines. You don't have to be aware of all the ins and outs of AWS or whatever cloud provider you use, you just ask for the defaults or whatever other mixins you need on the server you want to fire up.
+
+Most importantly, as a team you define what your production servers look like in your whisk.yml file and you'll never bring up a new node with a missing security group because you forgot some ancillary service was on the node that needed it.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```
+gem 'knife-whisk'
+```
+
+And then execute:
+
+```
+$ bundle install
+```
+
+Or install it yourself as:
+
+```
+$ gem install knife-whisk
+```
+
+##Configuration
+
+A `whisk.yml` file must exist for knife-whisk to work. There is an example in the example directory. The path to the file can be set in your knife config, via the `--whisk-config` or `-C` flag, or will look for it by default in your .chef directory.
+
+Best way to do it is to just put your whisk.yml in your chef directory under config/ and put something like this in your knife.rb.
+
+```
+knife[:whisk_config_file] = "#{ENV['CHEF_REPO_DIR']}/config/whisk.yml"
+```
+
+##Subcommands
+
+This plugin provides the following Knife subcommands. Specific command options can be found by invoking the subcommand with a `--help` flag.
+
+### knife whisk mixin list
+Lists the available mixins
+###knife whisk mixin show
+Shows the yaml output of the details of the mixin
+###knife whisk server list
+Lists the available servers templates
+###knife whisk server show
+Shows the yaml output of the details of the server
+###knife whisk generate
+Outputs a knife command with the provided server template, mixins, or overrides. When using the `--overrides` flag you must provide long form flag names, I.E `--node-name` not `-N`.
+
+####Examples:
+
+```
+knife whisk generate --mixins defaults,public_subnet --overrides "--node-name server1 --image ami-123456"
+```
+
+```
+knife whisk generate application_server
+```
+
+```
+knife whisk generate application_server --mixins public_subnet
+```
+
+```
+knife whisk generate application_server --overrides "--environment=dev --node-name dev-application-server"
+```
+
+## Tab Completion
+
+### ZSH
+This repository also includes a zsh folder, with a replacement for oh-my-zsh's knife plugin.  Copy that to your ~/.oh-my-zsh/plugins/knife folder, and enabled the plugin by adding "knife" to your plugins=() in your .zshrc. You will likely need to reload your shell. 
+
+## Todo
+* Support for non ec2 setups
+* whisk add mixin
+* whisk add server
+* bash tab completion
+
+##Authors
+- Nic Grayson (<nic.grayson@banno.com>)
+- Kevin Nuckolls (<kevin.nuckolls@banno.com>)
+- Danny Lockard (<danny.lockard@banno.com>)
+
+If you want to contribute, thanks! Please see [contribution guidelines](https://github.com/Banno/knife-whisk/blob/master/CONTRIBUTING.markdown).

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/examples/whisk.yml

@@ -0,0 +1,53 @@
+mixins:
+  defaults:
+    image: ami-950680fc      # ubuntu instance store
+    subnet: subnet-12345678  # private subnet
+    region: us-east-1        
+    user-data: user_data/before_bootstrap.sh
+    flavor: m1.small
+    ssh-user: ubuntu
+    template: chef_full
+    security-groups: default
+  ebs:
+    image: ami-e50e888c
+  public_subnet:
+    subnet: subnet-87654321
+
+security-groups:
+  default: sg-12345678
+  load_balancer: sg-23456789
+  java_app_server: sg-34567890
+  database_server: sg-45678901
+
+servers:
+  prod_nginx_load_balancer:
+    mixins:
+    - defaults
+    - public_subnet
+    config:
+      run-list: 
+      - "recipe[nginx]"
+      - "role[load_balancer]"
+      security-groups:
+      - default
+      - load_balancer
+      environment: stag
+  app_server:
+    mixins:
+    - defaults
+    - public_subnet
+    config:
+      run-list:
+      - "recipe[essentials]"
+      security-groups:
+      - default
+      - java_app_server
+      environment: prod
+  database_server:
+    mixins: 
+      - defaults
+      - ebs
+    config:
+      run-list:
+      - "recipe[postgres]"
+      environment: prod

data/knife-whisk.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'knife-whisk/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "knife-whisk"
+  gem.version       = Knife::Whisk::VERSION
+  gem.authors       = ["Nic Grayson"]
+  gem.email         = ["nic.grayson@banno.com"]
+  gem.summary       = %q{Extends knife to display knife ec2 server create commands}
+  gem.description   = %q{A utility for quickly whipping up new servers in a team environment}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.add_development_dependency 'chef'
+  gem.require_paths = ["lib"]
+end

data/lib/chef/knife/knife-whisk.rb

@@ -0,0 +1,190 @@
+require 'chef/knife'
+require 'yaml'
+
+class Chef
+  class Knife
+    module WhiskBase
+      def self.included(includer)
+        includer.class_eval do
+
+          option :whisk_config_file,
+            :short => '-C PATH',
+            :long => '--whisk-config PATH',
+            :description => "Specify path to your whisk.yml file",
+            :proc => Proc.new { |path| Chef::Config[:knife][:whisk_config_file] = path }
+          
+          option :mixins,
+            :short => '-M MIXINS',
+            :long => '--mixins MIXINS',
+            :description => "Overrides server mixins, takes comma seperated list of mixins",
+            :proc => Proc.new { |input| input.split(",") }
+          
+          option :overrides,
+            :short => '-O STRING',
+            :long => '--overrides STRING',
+            :description => "Override flags, takes string containing flags and values",
+            :proc => Proc.new { |string|
+              # checks if the flags have -- in front, if not error, if so strip them before returning
+              if Hash[*string.split].keys.select { |n| n[0..1] != "--" }.size == 0
+                Hash[Hash[*string.split].map {|key, val|[key.sub(/^--/, ''), val]}]
+              else
+                false
+              end
+            }
+        end
+      end
+
+      def exit_with_message(message)
+        ui.fatal message 
+        Kernel.exit(1) 
+      end
+            
+      def get_config
+        if Chef::Config[:knife][:whisk_config_file].nil?
+          if File.exists?(::Chef::Knife::chef_config_dir+"/whisk.yml")
+            YAML.load_file(::Chef::Knife::chef_config_dir+"/whisk.yml")
+          else
+            return false
+          end
+        else
+          YAML.load_file(Chef::Config[:knife][:whisk_config_file])
+        end
+      end
+
+      def get_security_groups(groups)
+        groups.split(',').map! { |name| name.replace(get_config["security-groups"][name]) }.join(',')
+      end
+
+      def security_group_exists?(group) 
+        ! get_config["security-groups"][group].nil?
+      end
+
+      def mixin_exists?(mixin)
+        ! get_config["mixins"][mixin].nil?
+      end
+
+      def server_exists?(server)
+        ! get_config["servers"][server].nil?
+      end
+
+      def add_quotes(val)
+        "\"#{val}\""
+      end
+
+    end
+  end
+
+  class WhiskServerList < Chef::Knife
+    include Knife::WhiskBase
+    banner "knife whisk server list"
+    
+    def run
+      exit_with_message("Required whisk.yml does not exist") unless get_config
+      get_config["servers"].each do |server|
+        puts server.first
+      end
+    end
+  end
+
+  class WhiskServerShow < Chef::Knife
+    include Knife::WhiskBase
+    banner "knife whisk server show SERVER"
+    
+    def run
+      exit_with_message("Required whisk.yml does not exist") unless get_config
+      exit_with_message("You must specify a server name") unless name_args.size == 1
+      
+      if server_exists?(name_args.first)
+        puts name_args.first
+        puts get_config["servers"]["#{name_args.first}"].to_yaml
+      else
+        exit_with_message("#{name_args.first} server template does not exist")
+      end
+    end
+  end
+
+  class WhiskMixinList < Chef::Knife
+    include Knife::WhiskBase
+    banner "knife whisk mixin list"
+    
+    def run
+      exit_with_message("Required whisk.yml does not exist") unless get_config
+      get_config["mixins"].each do |mixin|
+        puts mixin.first
+      end
+    end
+  end
+
+  class WhiskMixinShow < Chef::Knife
+    include Knife::WhiskBase
+    banner "knife whisk mixin show MIXIN"
+    
+    def run
+      exit_with_message("Required whisk.yml does not exist") unless get_config
+      exit_with_message("You must specify a mixin") unless name_args.size == 1
+      
+      if mixin_exists?(name_args.first)
+        puts name_args.first
+        puts get_config["mixins"]["#{name_args.first}"].to_yaml
+      else
+        exit_with_message("#{name_args.first} mixin does not exist")
+      end
+    end
+  end
+
+  class WhiskGenerate < Chef::Knife
+    include Knife::WhiskBase
+    banner "knife whisk generate [SERVER]"
+    
+    def run
+      exit_with_message("Required whisk.yml does not exist") unless get_config
+      
+      full_hash = get_config
+            
+      if name_args.size == 0
+        server_config = full_hash["mixins"]["defaults"]
+        server_mixins = ["defaults"]
+      elsif server_exists?(name_args.first)
+        server_mixins = full_hash["servers"][name_args.first]["mixins"]
+        server_config = full_hash["servers"][name_args.first]["config"]
+      else
+        exit_with_message("#{name_args.first} server template does not exist")
+      end
+      
+      unless @config[:mixins].nil?
+        server_mixins = server_mixins + @config[:mixins]
+      end
+
+      #checks to make sure all mixins exist
+      server_mixins.each { |mixin| exit_with_message("#{mixin} mixin does not exist") unless mixin_exists?(mixin) }
+
+      #merges together all mixin config values with server config values
+      output_hash = server_mixins.inject(Hash.new) {|output, mixin| output.merge(full_hash["mixins"][mixin])}.merge(server_config)
+      
+      #convert config values that are arrays to comma seperates strings
+      output_hash.each do |mixin, value|
+        if value.kind_of?(Array)
+          output_hash[mixin] = value.join(",")
+        end
+      end
+      
+      unless @config[:overrides].nil?
+        exit_with_message("Please use long form flags only in overrides") unless @config[:overrides].kind_of?(Hash)
+        output_hash = output_hash.merge(@config[:overrides])
+      end
+      
+      #convert security-group names to ids if needed and make sure they exist in the lookup hash
+      unless output_hash["security-groups"].nil?
+        exit_with_message("security-groups not defined in whisk.yml") unless get_config["security-groups"]
+        output_hash["security-groups"].split(',').each { |group| exit_with_message("#{group} security group does not exist in whisk.yml") unless security_group_exists?(group)}
+        output_hash["security-group-ids"] = get_security_groups(output_hash["security-groups"])
+        output_hash.delete("security-groups")
+      end
+      
+      # run-list needs quotes for knife ec2 to accept the arg
+      output_hash["run-list"] = add_quotes(output_hash["run-list"]) unless output_hash["run-list"].nil?
+
+      printf "knife ec2 server create %s\n", output_hash.map { |key, value| ["--"+key, value] }.join(" ")
+    end
+  end
+end

data/lib/knife-whisk/version.rb

@@ -0,0 +1,5 @@
+module Knife
+  module Whisk
+    VERSION = "1.0.0"
+  end
+end

data/zsh/_knife

@@ -0,0 +1,197 @@
+#compdef 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 has a very special syntax, some example calls are:
+# knife status
+# knife cookbook list
+# knife role show ROLENAME
+# knife data bag show DATABAGNAME
+# knife role show ROLENAME --attribute ATTRIBUTENAME
+# knife cookbook show COOKBOOKNAME COOKBOOKVERSION recipes
+
+# The -Q switch in compadd allow for completions of things like "data bag" without having to go through two rounds of completion and avoids zsh inserting a \ for escaping spaces
+_knife() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  cloudproviders=(bluebox ec2 rackspace slicehost terremark)
+  _arguments \
+    '1: :->knifecmd'\
+    '2: :->knifesubcmd'\
+    '3: :->knifesubcmd2' \
+    '4: :->knifesubcmd3' \
+    '5: :->knifesubcmd4' \
+    '6: :->knifesubcmd5'
+  
+  case $state in
+  knifecmd)
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" exec environment index node recipe role search ssh status windows $cloudproviders whisk
+  ;;
+  knifesubcmd)
+    case $words[2] in
+    (bluebox|ec2|rackspace|slicehost|terremark)
+      compadd "$@" server images
+    ;;
+    client)
+      compadd -Q "$@" "bulk delete" list create show delete edit reregister
+    ;;
+    configure)
+      compadd "$@" client
+    ;;
+    cookbook)
+      compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
+    ;;
+  environment)
+      compadd -Q "$@" list create delete edit show "from file"
+      ;;
+    node)
+     compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
+    ;;
+    recipe)
+     compadd "$@" list
+    ;;
+    role)
+      compadd -Q "$@" "bulk delete" create delete edit "from file" list show
+    ;; 
+    windows)
+      compadd "$@" bootstrap
+    ;;
+    whisk)
+      compadd "$@" mixin server generate
+    ;;
+    *)
+    _arguments '2:Subsubcommands:($(_knife_options1))'
+    esac
+   ;;
+   knifesubcmd2)
+    case $words[3] in
+     server)
+      compadd "$@" list create delete
+    ;;
+     images)
+      compadd "$@" list
+    ;;
+     site)
+      compadd "$@" vendor show share search download list unshare
+    ;;
+     (show|delete|edit)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_remote))'
+    ;;
+    (upload|test)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_local) --all)'
+    ;;
+    list)
+     compadd -a "$@" knife_general_flags
+    ;;
+    bag)
+      compadd -Q "$@" show edit list "from file" create delete
+    ;;
+    mixin)
+      compadd "$@" list show
+    ;;
+    server)
+      compadd "$@" list show
+    ;;
+  generate)
+      compadd "$@" `knife whisk server list`
+    ;;
+    *)
+      _arguments '3:Subsubcommands:($(_knife_options2))'
+    esac
+   ;;
+   knifesubcmd3)
+     case $words[3] in
+      show)
+       case $words[2] in
+       cookbook)
+          versioncomp=1
+          _arguments '4:Cookbookversions:($(_cookbook_versions) latest)'
+       ;;
+       (node|client|role)
+         compadd "$@" --attribute
+       esac
+     esac
+     case $words[4] in
+     (show|edit)
+     _arguments '4:Subsubsubcommands:($(_chef_$words[2]_$words[3]s_remote))'
+    ;;
+     file)
+     _arguments '*:file or directory:_files -g "*.(rb|json)"'
+    ;;
+      list)
+     compadd -a "$@" knife_general_flags
+    ;;
+        *)
+       _arguments '*:Subsubcommands:($(_knife_options3))'
+    esac
+    ;;
+    knifesubcmd4)
+      if (( versioncomp > 0 )); then
+        compadd "$@" attributes definitions files libraries providers recipes resources templates
+      else
+       _arguments '*:Subsubcommands:($(_knife_options2))'
+      fi
+    ;; 
+    knifesubcmd5) 
+      _arguments '*:Subsubcommands:($(_knife_options3))'
+   esac
+}
+
+# Helper functions to provide the argument completion for several depths of commands
+_knife_options1() {
+ ( for line in $( knife $words[2] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options2() {
+ ( for line in $( knife $words[2] $words[3] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options3() {
+ ( for line in $( knife $words[2] $words[3] $words[4] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+# The chef_x_remote functions use knife to get a list of objects of type x on the server
+_chef_roles_remote() {
+ (knife role list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_clients_remote() {
+ (knife client list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_nodes_remote() {
+ (knife node list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_cookbooks_remote() {
+ (knife cookbook list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_sitecookbooks_remote() {
+ (knife cookbook site list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_chef_data_bags_remote() {
+ (knife data bag list --format json | grep \" | awk '{print $1}' | awk -F"," '{print $1}' | awk -F"\"" '{print $2}')
+}
+
+_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
+_chef_cookbooks_local() {
+ local knife_rb="$HOME/.chef/knife.rb"
+ if [ -f ./.chef/knife.rb ]; then
+  knife_rb="./.chef/knife.rb"
+ fi
+ (for i in $( grep cookbook_path $knife_rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)
+}
+
+# This function extracts the available cookbook versions on the chef server
+_cookbook_versions() {
+  (knife cookbook show $words[4] | grep -v $words[4] | grep -v -E '\]|\[|\{|\}' | sed 's/ //g' | sed 's/"//g')
+}
+
+_knife "$@"

metadata

@@ -0,0 +1,69 @@
+--- !ruby/object:Gem::Specification
+name: knife-whisk
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+platform: ruby
+authors:
+- Nic Grayson
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-03-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A utility for quickly whipping up new servers in a team environment
+email:
+- nic.grayson@banno.com
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- CONTRIBUTING.markdown
+- Gemfile
+- LICENSE.txt
+- README.markdown
+- Rakefile
+- examples/whisk.yml
+- knife-whisk.gemspec
+- lib/chef/knife/knife-whisk.rb
+- lib/knife-whisk/version.rb
+- whisk.jpg
+- zsh/_knife
+homepage: ''
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.0.0
+signing_key: 
+specification_version: 4
+summary: Extends knife to display knife ec2 server create commands
+test_files: []