spiceweasel 2.4.0 → 2.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 627c6a6eb70983a3e5983fffbd71531819c8b860
+  data.tar.gz: 6bf43f3a1d8782bd0dbc52cc337cda04063b7001
+SHA512:
+  metadata.gz: fa76e167b464d2864b0c8e43c1d2e52b0f7cfda1070053a3d69f18dc46a08261c0809e2ed013a101eda7db47b2dee0d3a6ae11b09d48c83bd647b0365d111a08
+  data.tar.gz: f8507cfee9414238ff01c57893eb0ee07a937c4a6a8ac3b892d88887e9afed4ded2d5b7605e82ddfc242c8105e303c83b7422ac929bce9a364d3f59baafa2b4a

data/README.md

@@ -13,7 +13,7 @@ The [CHANGELOG.md](https://github.com/mattray/spiceweasel/blob/master/CHANGELOG.
 
 Spiceweasel currently depends on `knife` to run commands for it, and requires the `chef` gem for validating cookbook metadata. [Berkshelf](https://berkshelf.com) is a dependency for the Cookbook `Berksfile` support. Infrastructure files must end in `.rb`, `.json` or `.yml` to be processed.
 
-Written and tested with the Chef 11.x series (previous versions of Chef may still work). It is tested with Ruby 1.9.3. Version 2.0 was the last version known to work with Ruby 1.8.7 due to the introduction of the Berkshelf dependency in 2.1.
+Written and tested with the Chef 11.x series (previous versions of Chef may still work). It is tested with Ruby 1.9.3. Version 2.0 was the last version known to work with Ruby 1.8.7 due to the introduction of the Berkshelf dependency in 2.1. If you want to use Ruby 2.0, you will need to use the Chef 11.6 (or later) gem.
 
 # File Syntax #
 
@@ -202,7 +202,7 @@ which generates nodes named "webserver1", "webserver2" and "webserver3".
 
 ## Clusters ##
 
-Clusters are not a type supported by Chef, this is a logical construct added by Spiceweasel to enable managing sets of infrastructure together. The `clusters` section is a special case of `nodes`, where each member of the named cluster in the manifest will be put in the same environment to ensure that the entire cluster may be created in sync (refresh and delete coming soon). The node syntax is the same as that under `nodes`, the only addition is the cluster name.
+Clusters are not a type supported by Chef, this is a logical construct added by Spiceweasel to enable managing sets of infrastructure together. The `clusters` section is a special case of `nodes`, where each member of the named cluster in the manifest will be put in the same Environment to ensure that the entire cluster may be created in sync (refresh and delete coming soon). The node syntax is the same as that under `nodes`, the only addition is the cluster name.
 
 ```
 clusters:
@@ -226,6 +226,33 @@ knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7
 
 Another use of `clusters` is with the `--cluster-file` option, which will allow the use of a different file to define the members of the cluster. If there are any `nodes` or `clusters` defined in the primary manifest file, they will be removed and the content of the `--cluster-file` will be used instead. This allows you to switch the target destination of infrastructure by picking different `--cluster-file` endpoints.
 
+## knife ##
+
+The `knife` section allows you to run arbitrary knife commands after you have deployed the infrastructure specified in the rest of the manifest. Validation is done to ensure that the knife commands called are installed on the system. The example YAML snippet
+
+``` yaml
+knife:
+- ssh:
+  - "'role:monitoring' 'sudo chef-client' -x user"
+- rackspace server delete:
+  - -y --node-name db3 --purge
+- vsphere:
+  - vm clone --bootstrap --template 'abc' my-new-webserver1
+  - vm clone --bootstrap --template 'def' my-new-webserver2
+- vsphere vm clone:
+  - --bootstrap --template 'ghi' my-new-webserver3
+```
+
+assumes the `knife-rackspace` and `knife-vsphere` plugins are installed and produces the knife commands
+
+```
+knife ssh 'role:monitoring' 'sudo chef-client' -x user
+knife rackspace server delete -y --node-name db3 --purge
+knife vsphere vm clone --bootstrap --template 'abc' my-new-webserver1
+knife vsphere vm clone --bootstrap --template 'def' my-new-webserver2
+knife vsphere vm clone --bootstrap --template 'ghi' my-new-webserver3
+```
+
 # Extract #
 
 Spiceweasel may be used to generate knife commands or Spiceweasel manifests in JSON or YAML from an existing Chef repository.
@@ -271,6 +298,16 @@ When using the delete or rebuild commands, whether or not to attempt to delete a
 
 Specify a knife.rb configuration file to use with the knife commands.
 
+## --chef-client ##
+
+This will generate the knife commands to run the chef-client on each of the nodes in the manifest. The nodes refreshed will be matched by node name, environment for clusters and by cloud provider run list otherwise.
+
+knife ssh 'name:*' 'sudo chef-client'
+knife ssh 'role:base and recipe:apt\:\:cacher-ng' 'uptime'
+knife ssh "role:web"
+
+You may also use `-a` or `--attribute` to specify an attribute to use with `knife ssh`.
+
 ## --cluster-file ##
 
 Specify the file to use to override the `nodes` and `clusters` from the primary manifest file. This allows you to switch the target destination of infrastructure by picking different `--cluster-file` endpoints.

data/lib/spiceweasel/berksfile.rb

@@ -48,8 +48,12 @@ module Spiceweasel
       create_command("berks upload #{berks_options}")
       Berkshelf.ui.mute do
         Spiceweasel::Log.debug("berkshelf resolving dependencies: #{resolve_opts}")
-        # berks.resolve(resolve_opts) blows up with Berkshelf 2.0
-        berks.resolve(resolve_opts).each do |cb|
+        if(Gem::Version.new(Berkshelf::VERSION) >= Gem::Version.new('2.0.0'))
+          ckbks = berks.install(resolve_opts)
+        else
+          ckbks = berks.resolve(resolve_opts)
+        end
+        ckbks.each do |cb|
           @cookbook_list[cb.cookbook_name] = cb.version
           delete_command("knife cookbook#{Spiceweasel::Config[:knife_options]} delete #{cb.cookbook_name} #{cb.version} -a -y")
         end

data/lib/spiceweasel/cli.rb

@@ -17,7 +17,7 @@
 #
 
 require 'mixlib/cli'
-require 'json'
+require 'yajl/json_gem'
 require 'yaml'
 
 require 'spiceweasel'
@@ -54,6 +54,16 @@ module Spiceweasel
     :description => 'Delete all nodes for the provider(s) in the infrastructure',
     :boolean => false
 
+    option :attribute,
+    :short => '-a',
+    :long => '--attribute ATTR',
+    :description => "The attribute to use for opening the connection - default depends on the context. Used in conjunction with '--chef-client'"
+
+    option :chefclient,
+    :long => '--chef-client',
+    :description => 'Print the knife commands to run chef-client on the nodes of the infrastructure',
+    :boolean => true
+
     option :delete,
     :short => '-d',
     :long => '--delete',
@@ -130,6 +140,12 @@ module Spiceweasel
     :description => "Use the 'install' command with 'knife cookbook site' instead of the default 'download'",
     :boolean => true
 
+    option :timeout,
+    :short => '-T seconds',
+    :long => '--timeout',
+    :description => "Specify the maximum number of seconds a command is allowed to run without producing output.  Default is 60 seconds",
+    :default => 60
+
     option :version,
     :short => '-v',
     :long => '--version',
@@ -167,17 +183,18 @@ module Spiceweasel
 
       create, delete = process_manifest(manifest)
 
-      if Spiceweasel::Config[:extractjson]
+      case
+      when Spiceweasel::Config[:extractjson]
         puts JSON.pretty_generate(manifest)
-      elsif Spiceweasel::Config[:extractyaml]
+      when Spiceweasel::Config[:extractyaml]
         puts manifest.to_yaml
-      elsif Spiceweasel::Config[:delete]
+      when Spiceweasel::Config[:delete]
         if Spiceweasel::Config[:execute]
           Execute.new(delete)
         else
           puts delete unless delete.empty?
         end
-      elsif Spiceweasel::Config[:rebuild]
+      when Spiceweasel::Config[:rebuild]
         if Spiceweasel::Config[:execute]
           Execute.new(delete)
           Execute.new(create)
@@ -192,6 +209,7 @@ module Spiceweasel
           puts create unless create.empty?
         end
       end
+
       exit 0
     end
 
@@ -219,6 +237,9 @@ module Spiceweasel
         else
           knife.configure_chef
         end
+        if @config[:timeout]
+          Spiceweasel::Config[:cmd_timeout] = @config[:timeout].to_i
+        end
         if @config[:serverurl]
           Spiceweasel::Config[:knife_options] += "--server-url #{@config[:serverurl]} "
         end
@@ -289,14 +310,28 @@ module Spiceweasel
       environments = Environments.new(manifest['environments'], cookbooks)
       roles = Roles.new(manifest['roles'], environments, cookbooks)
       data_bags = DataBags.new(manifest['data bags'])
-      nodes = Nodes.new(manifest['nodes'], cookbooks, environments, roles)
-      clusters = Clusters.new(manifest['clusters'], cookbooks, environments, roles)
-      knife = Knife.new(manifest['knife'])
+      knifecommands = get_knife_commands() unless Spiceweasel::Config[:novalidation]
+      nodes = Nodes.new(manifest['nodes'], cookbooks, environments, roles, knifecommands)
+      clusters = Clusters.new(manifest['clusters'], cookbooks, environments, roles, knifecommands)
+      knife = Knife.new(manifest['knife'], knifecommands)
 
       create += environments.create + roles.create + data_bags.create + nodes.create + clusters.create + knife.create
       delete += environments.delete + roles.delete + data_bags.delete + nodes.delete + clusters.delete
+
+      # --chef-client only runs on nodes
+      if Spiceweasel::Config[:chefclient]
+        create = nodes.create + clusters.create
+        delete = []
+      end
       return create, delete
     end
 
+    def get_knife_commands()
+      require 'mixlib/shellout'
+      allknifes = Mixlib::ShellOut.new('knife -h').run_command.stdout.split(/\n/)
+      allknifes.keep_if {|x| x.start_with?('knife')}
+      Spiceweasel::Log.debug(allknifes)
+      return allknifes
+    end
   end
 end

data/lib/spiceweasel/clusters.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2012, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2012-2013, Opscode, Inc <legal@opscode.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,39 +21,45 @@ module Spiceweasel
 
     attr_reader :create, :delete
 
-    def initialize(clusters, cookbooks, environments, roles)
+    def initialize(clusters, cookbooks, environments, roles, knifecommands)
       @create = Array.new
       @delete = Array.new
       if clusters
         Spiceweasel::Log.debug("clusters: #{clusters}")
         clusters.each do |cluster|
           cluster_name = cluster.keys.first
-          Spiceweasel::Log.debug("cluster: '#{cluster_name}' '#{cluster[cluster_name]}'")
-          # add a tag to the Nodes
-          cluster[cluster_name].each do |node|
-            node_name = node.keys.first
-            run_list = node[node_name]['run_list'] || ''
-            options = node[node_name]['options'] || ''
-            # cluster tag is the cluster name + runlist once tags are working for every plugin
-            # until then, we're going to override the Environment
-            if options =~ /-E/ #delete any Environment
-              env = options.split('-E')[1].split[0]
-              edel = "-E#{env}"
-              options[edel] = "" if options.include?(edel)
-              edel = "-E #{env}"
-              options[edel] = "" if options.include?(edel)
-              Spiceweasel::Log.warn("deleting specified Environment '#{env}' from cluster: '#{cluster_name}'")
-            end
-            #push the Environment back on the options
-            node[node_name]['options'] = options + " -E #{cluster_name}"
-          end
-          # let's reuse the Nodes logic
-          nodes = Spiceweasel::Nodes.new(cluster[cluster_name], cookbooks, environments, roles)
-          @create.concat(nodes.create)
-          @delete.concat(nodes.delete)
+          cluster_process_nodes(cluster, cluster_name, cookbooks, environments, roles, knifecommands)
         end
       end
     end
 
+    # configure the individual nodes within the cluster
+    def cluster_process_nodes(cluster, environment, cookbooks, environments, roles, knifecommands)
+      Spiceweasel::Log.debug("cluster::cluster_process_nodes '#{environment}' '#{cluster[environment]}'")
+      cluster[environment].each do |node|
+        node_name = node.keys.first
+        options = node[node_name]['options'] || ''
+        validate_environment(options, environment, environments) unless Spiceweasel::Config[:novalidation]
+        #push the Environment back on the options
+        node[node_name]['options'] = options + " -E #{environment}"
+      end
+      # let's reuse the Nodes logic
+      nodes = Spiceweasel::Nodes.new(cluster[environment], cookbooks, environments, roles, knifecommands)
+      @create.concat(nodes.create)
+      @delete.concat(nodes.delete)
+    end
+
+    def validate_environment(options, cluster, environments)
+      unless environments.member?(cluster)
+        STDERR.puts "ERROR: Environment '#{cluster}' is listed in the cluster, but not specified as an 'environment' in the manifest."
+        exit(-1)
+      end
+      if options =~ /-E/ #Environment must match the cluster
+        env = options.split('-E')[1].split[0]
+        STDERR.puts "ERROR: Environment '#{env}' is specified for a node in cluster '#{cluster}'. The Environment is the cluster name."
+        exit(-1)
+      end
+    end
+
   end
 end

data/lib/spiceweasel/data_bags.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'json'
+require 'yajl/json_gem'
 
 module Spiceweasel
   class DataBags

data/lib/spiceweasel/environments.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'json'
+require 'yajl/json_gem'
 
 module Spiceweasel
   class Environments
@@ -73,7 +73,7 @@ module Spiceweasel
         when /\.json$/
           env = Chef::JSONCompat.from_json(IO.read(file))
         when /\.rb$/
-          if (Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
+          if (Chef::VERSION.split('.')[0].to_i < 11)
             env = Chef::Environment.new(false)
           else
             env = Chef::Environment.new

data/lib/spiceweasel/execute.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2012, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2012-2013, Opscode, Inc <legal@opscode.com>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@ module Spiceweasel
     def initialize(commands)
       # for now we're shelling out
       commands.each do | cmd |
-        knife = Mixlib::ShellOut.new(cmd.command, cmd.shellout_opts.merge(:live_stream => STDOUT))
+        Spiceweasel::Log.debug("Command will timeout after #{Spiceweasel::Config[:cmd_timeout]} seconds.")
+        knife = Mixlib::ShellOut.new(cmd.command, cmd.shellout_opts.merge(:live_stream => STDOUT, :timeout => Spiceweasel::Config[:timeout]))
         # check for parallel? and eventually use threads
         knife.run_command
         puts knife.stderr

data/lib/spiceweasel/knife.rb

@@ -16,8 +16,6 @@
 # limitations under the License.
 #
 
-require 'mixlib/shellout'
-
 module Spiceweasel
   class Knife
 
@@ -25,12 +23,9 @@ module Spiceweasel
 
     attr_reader :knife_list, :create
 
-    def initialize(knives = {})
+    def initialize(knives = {}, allknifes = [])
       @create = Array.new
       if knives
-        allknifes = Mixlib::ShellOut.new('knife -h').run_command.stdout.split(/\n/)
-        allknifes.keep_if {|x| x.start_with?('knife')}
-        Spiceweasel::Log.debug(allknifes)
         knives.each do |knife|
           Spiceweasel::Log.debug("knife: #{knife}")
           knife.keys.each do |knf|

data/lib/spiceweasel/nodes.rb

@@ -21,28 +21,29 @@ module Spiceweasel
 
     include CommandHelper
 
-    PROVIDERS = %w{bluebox clodo cs ec2 gandi hp joyent lxc openstack rackspace slicehost terremark vagrant voxel vsphere}
+    PROVIDERS = %w{bluebox clodo cs ec2 gandi hp joyent kvm lxc openstack rackspace slicehost terremark vagrant voxel vsphere}
 
     attr_reader :create, :delete
 
-    def initialize(nodes, cookbooks, environments, roles)
+    def initialize(nodes, cookbooks, environments, roles, knifecommands)
       @create = Array.new
       @delete = Array.new
+      chefclient = Array.new
+      create_command_options = {}
       if nodes
         Spiceweasel::Log.debug("nodes: #{nodes}")
         nodes.each do |node|
           name = node.keys.first
+          names = name.split
           Spiceweasel::Log.debug("node: '#{name}' '#{node[name]}'")
+          # get the node's run_list and options
           if node[name]
-            #convert spaces to commas, drop multiple commas
-            run_list = node[name]['run_list'] || ''
-            run_list = run_list.gsub(/ /,',').gsub(/,+/,',')
+            run_list = process_run_list(node[name]['run_list'])
             Spiceweasel::Log.debug("node: '#{name}' run_list: '#{run_list}'")
-            validateRunList(name, run_list, cookbooks, roles) unless Spiceweasel::Config[:novalidation]
+            validate_run_list(name, run_list, cookbooks, roles) unless Spiceweasel::Config[:novalidation]
             options = node[name]['options'] || ''
             Spiceweasel::Log.debug("node: '#{name}' options: '#{options}'")
-            validateOptions(name, options, environments) unless Spiceweasel::Config[:novalidation]
-            create_command_options = {}
+            validate_options(name, options, environments) unless Spiceweasel::Config[:novalidation]
             %w(allow_create_failure timeout).each do |key|
               if(node[name].has_key?(key))
                 create_command_options[key] = node[name][key]
@@ -50,86 +51,53 @@ module Spiceweasel
             end
             additional_commands = node[name]['additional_commands'] || []
           end
-          #provider support
-          provider = name.split()
-          if PROVIDERS.member?(provider[0])
-            count = 1
-            if provider.length == 2
-              count = provider[1]
-            end
-            provided_names = []
-            if Spiceweasel::Config[:parallel]
-              parallel = "seq #{count} | parallel -j 0 -v \""
-              if provider[0].eql?('vsphere')
-                parallel += "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, '{}')
-              else
-                parallel += "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, '{}')
-              end
-              parallel += " -r '#{run_list}'" unless run_list.empty?
-              parallel += "\""
-              create_command(parallel, create_command_options)
-            else
-              count.to_i.times do |i|
-                if provider[0].eql?('vsphere')
-                  server = "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
-                else
-                  server = "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
-                end
-                server += " -r '#{run_list}'" unless run_list.empty?
-                provided_names << node[name]['name'].gsub('{{n}}', (i + 1).to_s) if node[name]['name']
-                create_command(server, create_command_options)
+          if Spiceweasel::Config[:chefclient]
+            chefclient.push(process_chef_client(names, options, run_list))
+          else #create/delete
+            #provider support
+            if PROVIDERS.member?(names[0])
+              count = 1
+              if names.length == 2
+                count = names[1]
               end
-            end
-            if Spiceweasel::Config[:bulkdelete] && provided_names.empty? && provider[0] != 'windows'
-              if provider[0].eql?('vsphere')
-                delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider[0]} vm delete -y")
-              else
-                delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider[0]} server delete -y")
+              process_providers(names[0], count, node[name]['name'], options, run_list, create_command_options, knifecommands)
+            elsif names[0].start_with?("windows_")
+              #windows node bootstrap support
+              protocol = names.shift.split('_') #split on 'windows_ssh' etc
+              names.each do |server|
+                servercommand = "knife bootstrap #{protocol[0]} #{protocol[1]}#{Spiceweasel::Config[:knife_options]} #{server} #{options}"
+                servercommand += " -r '#{run_list}'" unless run_list.empty?
+                create_command(servercommand, create_command_options)
+                delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
+                delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
               end
             else
-              provided_names.each do |p_name|
-                if provider[0].eql?('vsphere')
-                  delete_command("knife #{provider[0]} vm delete -y #{p_name}")
-                else
-                  delete_command("knife #{provider[0]} server delete -y #{p_name}")
-                end
-                delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{p_name} -y")
-                delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{p_name} -y")
+              #node bootstrap support
+              name.split.each_with_index do |server, i|
+                servercommand = "knife bootstrap#{Spiceweasel::Config[:knife_options]} #{server} #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+                servercommand += " -r '#{run_list}'" unless run_list.empty?
+                create_command(servercommand, create_command_options)
+                delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
+                delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
               end
             end
-          elsif name.start_with?("windows") #windows node bootstrap support
-            nodeline = name.split()
-            provider = nodeline.shift.split('_') #split on 'windows_ssh' etc
-            nodeline.each do |server|
-              servercommand = "knife bootstrap #{provider[0]} #{provider[1]}#{Spiceweasel::Config[:knife_options]} #{server} #{options}"
-              servercommand += " -r '#{run_list}'" unless run_list.empty?
-              create_command(servercommand, create_command_options)
-              delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
-              delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
-            end
-          else #node bootstrap support
-            name.split.each_with_index do |server, i|
-              servercommand = "knife bootstrap#{Spiceweasel::Config[:knife_options]} #{server} #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
-              servercommand += " -r '#{run_list}'" unless run_list.empty?
-              create_command(servercommand, create_command_options)
-              delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
-              delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{server} -y")
-            end
-          end
-          unless additional_commands.empty?
-            additional_commands.each do |cmd|
-              create_command(cmd, create_command_options)
+            unless additional_commands.empty?
+              additional_commands.each do |cmd|
+                create_command(cmd, create_command_options)
+              end
             end
           end
         end
-      end
-      if Spiceweasel::Config[:bulkdelete]
-        delete_command("knife node#{Spiceweasel::Config[:knife_options]} bulk delete .* -y")
+        if Spiceweasel::Config[:bulkdelete]
+          delete_command("knife node#{Spiceweasel::Config[:knife_options]} bulk delete .* -y")
+        end
+        #remove repeats in chefclient and push into create_command
+        chefclient.flatten.each_with_index {|x,i| create_command(x, create_command_options) unless x.eql?(chefclient[i-1])}
       end
     end
 
     #ensure run_list contents are listed previously.
-    def validateRunList(node, run_list, cookbooks, roles)
+    def validate_run_list(node, run_list, cookbooks, roles)
       run_list.split(',').each do |item|
         if item.start_with?("recipe[")
           #recipe[foo] or recipe[foo::bar]
@@ -153,7 +121,7 @@ module Spiceweasel
     end
 
     #for now, just check that -E is legit
-    def validateOptions(node, options, environments)
+    def validate_options(node, options, environments)
       if options =~ /-E/ #check for environments
         env = options.split('-E')[1].split()[0]
         unless environments.member?(env)
@@ -163,5 +131,223 @@ module Spiceweasel
       end
     end
 
+    #manage all the provider logic
+    def process_providers(provider, count, name, options, run_list, create_command_options, knifecommands)
+      validate_provider(provider, knifecommands) unless Spiceweasel::Config[:novalidation]
+      provided_names = []
+      if Spiceweasel::Config[:parallel]
+        parallel = "seq #{count} | parallel -u -j 0 -v \""
+        if ['vsphere'].member?(provider)
+          parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, '{}')
+        elsif ['kvm'].member?(provider)
+          parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm create #{options}".gsub(/\{\{n\}\}/, '{}')
+        else
+          parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, '{}')
+        end
+        parallel += " -r '#{run_list}'" unless run_list.empty?
+        parallel += "\""
+        create_command(parallel, create_command_options)
+      else
+        count.to_i.times do |i|
+          if ['vsphere'].member?(provider)
+            server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+          elsif ['kvm'].member?(provider)
+            server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+          else
+            server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+          end
+          server += " -r '#{run_list}'" unless run_list.empty?
+          provided_names << name.gsub('{{n}}', (i + 1).to_s) if name
+          create_command(server, create_command_options)
+        end
+      end
+      if Spiceweasel::Config[:bulkdelete] && provided_names.empty? && provider != 'windows'
+        if ['kvm','vsphere'].member?(provider)
+          delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider} vm delete -y")
+        else
+          delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider} server delete -y")
+        end
+      else
+        provided_names.each do |p_name|
+          if ['kvm','vsphere'].member?(provider)
+            delete_command("knife #{provider} vm delete -y #{p_name}")
+          else
+            delete_command("knife #{provider} server delete -y #{p_name}")
+          end
+          delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{p_name} -y")
+          delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{p_name} -y")
+        end
+      end
+    end
+
+    #check that the knife plugin is installed
+    def validate_provider(provider, knifecommands)
+      unless knifecommands.index {|x| x.start_with?("knife #{provider}")}
+        STDERR.puts "ERROR: 'knife #{provider}' is not a currently installed plugin for knife."
+        exit(-1)
+      end
+    end
+
+    def process_chef_client(names, options, run_list)
+      commands = []
+      environment = nil
+      protocol = 'ssh'
+      protooptions = ''
+      #protocol options
+      sudo = nil
+      value = nil #store last option for space-separated values
+      options.split().each do |opt|
+        sudo = 'sudo ' if opt =~ /^--sudo$/
+        protooptions += '--no-host-key-verify ' if opt =~ /^--no-host-key-verify$/
+        # SSH identity file used for authentication
+        if value =~ /^-i$|^--identity-file$/
+          protooptions += "-i #{opt} "
+          value = nil
+        end
+        if opt =~ /^-i|^--identity-file/
+          if opt =~ /^-i$|^--identity-file$/
+            value = '-i'
+          else
+            opt.sub!(/-i/,'') if opt =~ /^-i/
+            opt.sub!(/--identity-file/,'') if opt =~ /^--identity-file/
+            protooptions += "-i #{opt} "
+            value = nil
+          end
+        end
+        # ssh gateway
+        if value =~ /^-G$|^--ssh-gateway$/
+          protooptions += "-G #{opt} "
+          value = nil
+        end
+        if opt =~ /^-G|^--ssh-gateway/
+          if opt =~ /^-G$|^--ssh-gateway$/
+            value = '-G'
+          else
+            opt.sub!(/-G/,'') if opt =~ /^-G/
+            opt.sub!(/--ssh-gateway/,'') if opt =~ /^--ssh-gateway/
+            protooptions += "-G #{opt} "
+            value = nil
+          end
+        end
+        # ssh password
+        if value =~ /^-P$|^--ssh-password$/
+          protooptions += "-P #{opt} "
+          value = nil
+        end
+        if opt =~ /^-P|^--ssh-password/
+          if opt =~ /^-P$|^--ssh-password$/
+            value = '-P'
+          else
+            opt.sub!(/-P/,'') if opt =~ /^-P/
+            opt.sub!(/--ssh-password/,'') if opt =~ /^--ssh-password/
+            protooptions += "-P #{opt} "
+            value = nil
+          end
+        end
+        # ssh port
+        if value =~ /^-p$|^--ssh-port$/
+          protooptions += "-p #{opt} "
+          value = nil
+        end
+        if opt =~ /^-p|^--ssh-port/
+          if opt =~ /^-p$|^--ssh-port$/
+            value = '-p'
+          else
+            opt.sub!(/-p/,'') if opt =~ /^-p/
+            opt.sub!(/--ssh-port/,'') if opt =~ /^--ssh-port/
+            protooptions += "-p #{opt} "
+            value = nil
+          end
+        end
+        # ssh username
+        if value =~ /^-x$|^--ssh-user$/
+          protooptions += "-x #{opt} "
+          sudo = 'sudo ' unless opt.eql?('root')
+          value = nil
+        end
+        if opt =~ /^-x|^--ssh-user/
+          if opt =~ /^-x$|^--ssh-user$/
+            value = '-x'
+          else
+            opt.sub!(/-x/,'') if opt =~ /^-x/
+            opt.sub!(/--ssh-user/,'') if opt =~ /^--ssh-user/
+            protooptions += "-x #{opt} "
+            sudo = 'sudo ' unless opt.eql?('root')
+            value = nil
+          end
+        end
+        # environment
+        if value =~ /^-E$|^--environment$/
+          environment = opt
+          value = nil
+        end
+        if opt =~ /^-E|^--environment/
+          if opt =~ /^-E$|^--environment$/
+            value = '-E'
+          else
+            opt.sub!(/-E/,'') if opt =~ /^-E/
+            opt.sub!(/--environment/,'') if opt =~ /^--environment/
+            environment = opt
+            value = nil
+          end
+        end
+        # nodename
+        if value =~ /^-N$|^--node-name$/
+          names = [opt.gsub(/{{n}}/, '*')]
+          value = nil
+        end
+        if opt =~ /^-N|^--node-name/
+          if opt =~ /^-N$|^--node-name$/
+            value = '-N'
+          else
+            opt.sub!(/-N/,'') if opt =~ /^-N/
+            opt.sub!(/--node-name/,'') if opt =~ /^--node-name/
+            names = [opt.gsub(/{{n}}/, '*')]
+            value = nil
+          end
+        end
+      end
+      if names[0].start_with?("windows_")
+        #windows node bootstrap support
+        protocol = names.shift.split('_')[1] #split on 'windows_ssh' etc
+        sudo = nil #no sudo for Windows even if ssh is used
+      end
+      names = [] if PROVIDERS.member?(names[0])
+      # check options for -N, override name
+      protooptions  += "-a #{Spiceweasel::Config[:attribute]}" if Spiceweasel::Config[:attribute]
+      if names.empty?
+        search = chef_client_search(nil, run_list, environment)
+        commands.push("knife #{protocol} '#{search}' '#{sudo}chef-client' #{protooptions} #{Spiceweasel::Config[:knife_options]}")
+      else
+        names.each do |name|
+          search = chef_client_search(name, run_list, environment)
+          commands.push("knife #{protocol} '#{search}' '#{sudo}chef-client' #{protooptions} #{Spiceweasel::Config[:knife_options]}")
+        end
+      end
+      return commands
+    end
+
+    #create the knife ssh chef-client search pattern
+    def chef_client_search(name, run_list, environment)
+      search = []
+      search.push("name:#{name}") if name
+      search.push("chef_environment:#{environment}") if environment
+      run_list.split(',').each do |item|
+        item.sub!(/\[/, ':')
+        item.chop!
+        item.sub!(/::/, '\:\:')
+        search.push(item)
+      end
+      return "#{search.join(" and ")}"
+    end
+
+    #standardize the node run_list formatting
+    def process_run_list(run_list)
+      return '' if run_list.nil?
+      run_list.gsub!(/ /,',')
+      run_list.gsub!(/,+/,',')
+      return run_list
+    end
+
   end
 end

data/lib/spiceweasel/roles.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'json'
+require 'yajl/json_gem'
 require 'chef'
 
 module Spiceweasel
@@ -75,7 +75,7 @@ module Spiceweasel
         when /\.json$/
           c_role = Chef::JSONCompat.from_json(IO.read(file))
         when /\.rb$/
-          if(Chef::Version.new(Chef::VERSION) < Chef::Version.new('11.0.0'))
+          if (Chef::VERSION.split('.')[0].to_i < 11)
             c_role = Chef::Role.new(true)
           else
             c_role = Chef::Role.new

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/spec/bin/chef_client_spec.rb

@@ -0,0 +1,72 @@
+describe 'testing 2.5 --chef-client' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife ssh 'name:serverA and role:base' 'sudo chef-client' -i ~/.ssh/mray.pem -x user --no-host-key-verify -p 22
+knife ssh 'name:serverB and chef_environment:development and role:base' 'sudo chef-client' -i ~/.ssh/mray.pem -x user
+knife ssh 'name:serverC and chef_environment:development and role:base' 'sudo chef-client' -i ~/.ssh/mray.pem -x user
+knife ssh 'name:db* and chef_environment:qa and recipe:mysql and role:monitoring' 'chef-client'
+knife winrm 'name:winboxA and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'name:winboxB and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'name:winboxC and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'chef_environment:amazon and role:mysql' 'sudo chef-client' -i ~/.ssh/mray.pem -x ubuntu -G default
+knife ssh 'chef_environment:amazon and role:webserver and recipe:mysql\\:\\:client' 'sudo chef-client' -i ~/.ssh/mray.pem -x ubuntu -G default
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test chef-client in 2.5, yml" do
+    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.yml`.should == @expected_output
+  end
+
+  it "test chef-client in 2.5, json" do
+    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.json`.should == @expected_output
+  end
+
+  it "test chef-client in 2.5, rb" do
+    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.rb`.should == @expected_output
+  end
+end
+
+describe 'testing 2.5 --chef-client with --cluster-file' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife ssh 'name:serverB and chef_environment:qa and role:base and role:webserver' 'sudo chef-client' -i ~/.ssh/mray.pem -x user
+knife ssh 'name:serverC and chef_environment:qa and role:base and role:webserver' 'sudo chef-client' -i ~/.ssh/mray.pem -x user
+knife winrm 'name:winboxA and chef_environment:qa and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'name:winboxB and chef_environment:qa and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'name:winboxC and chef_environment:qa and role:base and role:iisserver' 'chef-client' -x Administrator -P 'super_secret_password'
+knife ssh 'chef_environment:qa and role:webserver and recipe:mysql\\:\\:client' 'sudo chef-client' -x ubuntu -P ubuntu
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test chef-client with --cluster-file in 2.5, yml" do
+    `#{@spiceweasel_binary} --novalidation --chef-client --cluster-file examples/cluster-file-example.yml examples/example.yml`.should == @expected_output
+  end
+
+  it "test chef-client with --cluster-file in 2.5, json" do
+    `#{@spiceweasel_binary} --novalidation --chef-client --cluster-file examples/cluster-file-example.yml examples/example.json`.should == @expected_output
+  end
+
+  it "test chef-client with --cluster-file in 2.5, rb" do
+    `#{@spiceweasel_binary} --novalidation --chef-client --cluster-file examples/cluster-file-example.yml examples/example.rb`.should == @expected_output
+  end
+end
+
+describe 'testing 2.5 --chef-client with -a' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife ssh 'chef_environment:mycluster and role:mysql' 'sudo chef-client' -i ~/.ssh/mray.pem -x ubuntu -a ec2.public_hostname
+knife ssh 'chef_environment:mycluster and role:webserver and recipe:mysql\\:\\:client' 'sudo chef-client' -i ~/.ssh/mray.pem -x ubuntu -a ec2.public_hostname
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test chef-client with -a ec2.public_hostname in 2.5" do
+    `#{@spiceweasel_binary} --novalidation --chef-client -a ec2.public_hostname examples/example-cluster.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/joyent-vsphere_spec.rb

@@ -11,8 +11,8 @@ knife node bulk delete .* -y
 knife cookbook upload apache2
 knife environment from file qa.rb
 knife role from file base.rb
-seq 2 | parallel -j 0 -v "knife joyent server create -i ~/.ssh/joyent.pem -E qa -r 'role[base]'"
-seq 2 | parallel -j 0 -v "knife vsphere vm clone -P secret_password -x Administrator --template some_template -r 'role[base]'"
+seq 2 | parallel -u -j 0 -v "knife joyent server create -i ~/.ssh/joyent.pem -E qa -r 'role[base]'"
+seq 2 | parallel -u -j 0 -v "knife vsphere vm clone -P secret_password -x Administrator --template some_template -r 'role[base]'"
     OUTPUT
 
     @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])

data/spec/bin/kvm_spec.rb

@@ -0,0 +1,28 @@
+describe 'testing 2.5 kvm' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife cookbook delete apache2  -a -y
+knife environment delete qa -y
+knife role delete base -y
+knife node delete winboxA -y
+knife client delete winboxA -y
+knife node delete winboxB -y
+knife client delete winboxB -y
+knife cookbook upload apache2
+knife environment from file qa.rb
+knife role from file base.rb
+seq 2 | parallel -u -j 0 -v "knife kvm vm create -E qa --template-file ~/.chef/bootstrap/ubuntu11.10-gems.erb --vm-disk /path-to/ubuntu1110-x64.qcow2 --vm-name knife-kvm-test-ubuntu --ssh-user ubuntu --ssh-password ubuntu --pool default --kvm-host my-test-host --kvm-user root --kvm-password secret -r 'role[base]'"
+knife bootstrap windows winrm winboxA -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'
+knife bootstrap windows winrm winboxB -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'
+seq 1 | parallel -u -j 0 -v "knife kvm vm create -E production --template-file ~/.chef/bootstrap/ubuntu11.10-gems.erb --vm-disk /path-to/ubuntu1110-x64.qcow2 --vm-name knife-kvm-test-ubuntu --ssh-user ubuntu --ssh-password ubuntu --pool default --kvm-host my-test-host --kvm-user root --kvm-password secret -E qa -r 'role[mysql]'"
+seq 3 | parallel -u -j 0 -v "knife kvm vm create --template-file ~/.chef/bootstrap/ubuntu11.10-gems.erb --vm-disk /path-to/ubuntu1110-x64.qcow2 --vm-name knife-kvm-test-ubuntu --ssh-user ubuntu --ssh-password ubuntu --pool default --kvm-host my-test-host --kvm-user root --kvm-password secret -E qa -r 'role[webserver],recipe[mysql::client]'"
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test kvm, cluster functionality from 2.5" do
+    `#{@spiceweasel_binary} --parallel -r --novalidation examples/kvm-example.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/spiceweasel_spec.rb

@@ -38,12 +38,12 @@ knife data bag from file users alice.json bob.json chuck.json
 knife data bag create data
 knife data bag create passwords
 knife data bag from file passwords mysql.json rabbitmq.json --secret-file secret_key
-knife bootstrap serverA -i ~/.ssh/mray.pem -x user --sudo -r 'role[base]'
-knife bootstrap serverB -i ~/.ssh/mray.pem -x user --sudo -E production -r 'role[base]'
-knife bootstrap serverC -i ~/.ssh/mray.pem -x user --sudo -E production -r 'role[base]'
-knife rackspace server create --image 49 --flavor 2 -N db1 -r 'recipe[mysql],role[monitoring]'
-knife rackspace server create --image 49 --flavor 2 -N db2 -r 'recipe[mysql],role[monitoring]'
-knife rackspace server create --image 49 --flavor 2 -N db3 -r 'recipe[mysql],role[monitoring]'
+knife bootstrap serverA --identity-file ~/.ssh/mray.pem --ssh-user user --sudo --no-host-key-verify --ssh-port 22 -r 'role[base]'
+knife bootstrap serverB -E development -i ~/.ssh/mray.pem -x user --sudo -r 'role[base]'
+knife bootstrap serverC -E development -i ~/.ssh/mray.pem -x user --sudo -r 'role[base]'
+knife rackspace server create --image 49 -E qa --flavor 2 -N db1 -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 -E qa --flavor 2 -N db2 -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 -E qa --flavor 2 -N db3 -r 'recipe[mysql],role[monitoring]'
 knife bootstrap windows winrm winboxA -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'
 knife bootstrap windows ssh winboxB -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'
 knife bootstrap windows ssh winboxC -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'

metadata

@@ -1,158 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 2.4.0
-  prerelease: 
+  version: 2.5.0
 platform: ruby
 authors:
 - Matt Ray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: Provides a CLI tool for generating knife commands to build Chef-managed
@@ -184,35 +179,38 @@ files:
 - lib/spiceweasel/roles.rb
 - lib/spiceweasel/version.rb
 - lib/spiceweasel.rb
+- spec/bin/chef_client_spec.rb
 - spec/bin/joyent-vsphere_spec.rb
 - spec/bin/knife_spec.rb
+- spec/bin/kvm_spec.rb
 - spec/bin/spiceweasel_spec.rb
 homepage: https://github.com/mattray/spiceweasel
 licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI for generating Chef knife commands from a simple JSON or YAML file.
 test_files:
+- spec/bin/chef_client_spec.rb
 - spec/bin/joyent-vsphere_spec.rb
 - spec/bin/knife_spec.rb
+- spec/bin/kvm_spec.rb
 - spec/bin/spiceweasel_spec.rb