spiceweasel 2.5.1 → 2.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE1ZWZmNWJlZTc0NDQ1ZjQ4MjlhMjA0N2M4NWQ5MGY1NTFlNTAzMQ==
+    MDZhOGZjMDFmZjhhZTQ2ZTAwYmU0NmQyNzNjNTczNWE0MDIyZjVjOA==
   data.tar.gz: !binary |-
-    ZmYxNmM3ZjFlYWUzZTQ5YzM0ZmNhNTk5MWZmZmUzZjBiOWZkZmM5MA==
+    MGNjYWFiMzVjODZjMzAwYTdmMGYyMDM5ZTBhZmRmYjM0MzEwODg0NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmNiNzVmMjFkZWMzOWVkY2MwOWM3ZDc1YmFiMWUyZTA5NTM0MTIyZjA5YzUx
-    YmQwZjM0ODFjNmQ2NDU4ZmY0YTViMDhkYWZkNzU3ZTA2OTFhNjBkOGYyYTQ5
-    MWJjMmIwZDZhZmU0YWFmZWJhNjMyOTM3ZTIxY2UzZDBiMGU0ZTU=
+    MjY5YjBhOGRlNmViZjk3MGVmNDg3MjA1NjBmNTI0MGU4NmM3NzYwZjdhNzU3
+    Mzc4M2Q0OGFhNTJjMzNkZDE5NjZkNWJhMzIyOTVkNjg4OTIyYTI3NzViYjQy
+    MGM0NTE5NzNjY2I4ZmE1NmMzYmNlNjYwZDhiNTU4MmM0NjAxZWE=
   data.tar.gz: !binary |-
-    ZGZmZDUxNmI3OTAyOGNjMGQ0NjI3YTQxZDYwYjU5MDM4Zjc5YTA0NjgyYTEw
-    M2RmMTc4YTY2OGQyZThjNDI2ZTdhMzIyYjg4NjEwOGMyOTgzNWI0ZGI0NzM3
-    Yzk5ODRjZDg3MWViZmJiZTY1ZWNjMDdkNTg1OWU4YzExZGQxMjY=
+    MDkzOWM4NmExM2E3YTQ5ZDdmZTA2OTAxNDljYTNjNmI3NzNiYzk4OTIyZTQ3
+    Y2Q0MWY3NGRkMjBmMjMyY2ZiZjZjOGM5MWE0ODYwOTA4ZTNlMzMxN2FhZWVm
+    YWY5MDY3NjVmZWE1YTNhYzIwMjhlNDczOTMyYzAwMTMyNjNkMmE=

data/README.md

@@ -179,7 +179,7 @@ knife bootstrap windows ssh winboxC -x Administrator -P 'super_secret_password'
 
 ### Providers ###
 
-The following knife plugins are currently supported as providers: `bluebox, clodo, cs, ec2, gandi, hp, joyent, lxc, openstack, rackspace, slicehost, terremark, vagrant, voxel` and `vsphere`.
+The following knife plugins are currently supported as providers: `bluebox, clodo, cs, digital_ocean, ec2, gandi, google, hp, joyent, kvm, linode, lxc, openstack, rackspace, slicehost, terremark, vagrant, voxel` and `vsphere`.
 
 ### Bulk node creation ###
 
@@ -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 (every node in the Environment) may be **created** and **destroyed** in sync. The node syntax is the same as that under `nodes`, the only addition is the cluster name.
 
 ```
 clusters:
@@ -340,6 +340,10 @@ When run in a chef repository, this will print a new YAML manifest that may be u
 
 Print the currently-supported usage options for spiceweasel.
 
+## --node-only ##
+
+Loads from JSON or creates nodes on the server without bootstrapping, useful for pre-creating nodes. If you specify a run list with the node, it will override any run list specified within the JSON file.
+
 ## --novalidation ##
 
 Disable validation ensuring existence of the cookbooks, environments, roles, data bags and nodes in infrastructure file.

data/lib/spiceweasel/cli.rb

@@ -114,6 +114,11 @@ module Spiceweasel
     :description => "Set the log file location, defaults to STDOUT",
     :proc => nil
 
+    option :node_only,
+    :long => '--node-only',
+    :description => 'Create node(s) on the server, do not bootstrap',
+    :boolean => false
+
     option :novalidation,
     :long => '--novalidation',
     :description => 'Disable validation',
@@ -172,7 +177,7 @@ module Spiceweasel
       if Spiceweasel::Config[:extractlocal] || Spiceweasel::Config[:extractjson] || Spiceweasel::Config[:extractyaml]
         manifest = Spiceweasel::ExtractLocal.parse_objects
       else
-        manifest = parse_and_validate_input(ARGV.last)
+        manifest = parse_and_validate_input(get_manifest())
         if Spiceweasel::Config[:clusterfile]
           # if we have a cluster file, override any nodes or clusters in the original manifest
           manifest['nodes'] = manifest['clusters'] = {}
@@ -296,6 +301,17 @@ module Spiceweasel
       output
     end
 
+    # find the .rb/.json/.yml file from the ARGV that isn't the clusterfile
+    def get_manifest()
+      ARGV.each do |arg|
+        if arg =~ /\.json$|\.rb$|\.yml$/
+          unless ARGV[ARGV.find_index(arg)-1].eql?('--cluster-file')
+            return arg
+          end
+        end
+      end
+    end
+
     def process_manifest(manifest)
       berksfile = Berksfile.new(manifest['berksfile']) if manifest.include?('berksfile')
       if berksfile

data/lib/spiceweasel/clusters.rb

@@ -46,7 +46,11 @@ module Spiceweasel
       # let's reuse the Nodes logic
       nodes = Spiceweasel::Nodes.new(cluster[environment], cookbooks, environments, roles, knifecommands)
       @create.concat(nodes.create)
-      @delete.concat(nodes.delete)
+      #what about providers??
+      nodes.delete.each do |del|
+        @delete << del unless del.to_s =~ /^knife client|^knife node/
+      end
+      @delete << "for N in $(knife node list -E #{environment}); do knife client delete $N -y; knife node delete $N -y; done"
     end
 
     def validate_environment(options, cluster, environments)

data/lib/spiceweasel/nodes.rb

@@ -21,7 +21,7 @@ module Spiceweasel
 
     include CommandHelper
 
-    PROVIDERS = %w{bluebox clodo cs ec2 gandi hp joyent kvm lxc openstack rackspace slicehost terremark vagrant voxel vsphere}
+    PROVIDERS = %w{bluebox clodo cs digital_ocean ec2 gandi google hp joyent kvm linode lxc openstack rackspace slicehost terremark vagrant voxel vsphere}
 
     attr_reader :create, :delete
 
@@ -53,14 +53,13 @@ module Spiceweasel
           end
           if Spiceweasel::Config[:chefclient]
             chefclient.push(process_chef_client(names, options, run_list))
+          elsif Spiceweasel::Config[:node_only]
+            process_nodes_only(names, options, run_list, create_command_options)
           else #create/delete
             #provider support
             if PROVIDERS.member?(names[0])
-              count = 1
-              if names.length == 2
-                count = names[1]
-              end
-              process_providers(names[0], count, node[name]['name'], options, run_list, create_command_options, knifecommands)
+              count = names.length == 2 ? names[1] : 1
+              process_providers(names, 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
@@ -92,7 +91,8 @@ module Spiceweasel
           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])}
+        chefclient.flatten.each_with_index {|x,i| create_command(x, create_command_options) unless x.eql?(chefclient[i-1])} if Spiceweasel::Config[:chefclient]
+        #nodeonly
       end
     end
 
@@ -131,48 +131,124 @@ module Spiceweasel
       end
     end
 
+    # handle --nodes-only
+    def process_nodes_only(names, options, run_list, create_command_options)
+      nodenames = []
+      if PROVIDERS.member?(names[0])
+        count = names.length == 2 ? names[1] : 1
+        options.split().each do |opt|
+          if opt =~ /^-N|^--node-name/
+            optname = opt.sub(/-N|--node-name/,'').lstrip
+            optname = options.split[options.split.find_index(opt)+1] if optname.empty?
+            count.to_i.times do |i|
+              nodenames.push(optname.gsub(/\{\{n\}\}/, (i + 1).to_s))
+            end
+          end
+        end
+      elsif names[0].start_with?("windows_")
+        nodenames.push(names[1..-1])
+      else #standard nodes
+        nodenames.push(names)
+      end
+      nodenames.flatten.each do |node|
+        if File.directory?("nodes/")
+          if File.exists?("nodes/#{node}.json")
+            validate_node_file(node) unless Spiceweasel::Config[:novalidation]
+            servercommand = "knife node from file #{node}.json #{Spiceweasel::Config[:knife_options]}".rstrip
+          else
+            STDERR.puts "'nodes/#{node}.json' not found, unable to validate or load node. Using 'knife node create' instead."
+            servercommand = "knife node create -d #{node} #{Spiceweasel::Config[:knife_options]}".rstrip
+          end
+        else
+          STDERR.puts "'nodes' directory not found, unable to validate or load nodes. Using 'knife node create' instead."
+          servercommand = "knife node create -d #{node} #{Spiceweasel::Config[:knife_options]}".rstrip
+        end
+        create_command(servercommand, create_command_options)
+        create_command("knife node run_list set #{node} '#{run_list}'", create_command_options) unless run_list.empty?
+        delete_command("knife node#{Spiceweasel::Config[:knife_options]} delete #{node} -y")
+        delete_command("knife client#{Spiceweasel::Config[:knife_options]} delete #{node} -y")
+      end
+    end
+
+    # validate individual node files
+    def validate_node_file(name)
+      # read in the file
+      node = Chef::JSONCompat.from_json(IO.read("nodes/#{name}.json"))
+      # check the node name vs. contents of the file
+      if(node['name'] != name)
+        STDERR.puts "ERROR: Node '#{name}' listed in the manifest does not match the name '#{node['name']}' within the nodes/#{name}.json file."
+        exit(-1)
+      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]
+    def process_providers(names, count, name, options, run_list, create_command_options, knifecommands)
+      provider = names[0]
+      validate_provider(provider, names, count, options, 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\}\}/, '{}')
+      if name.nil? && options.split.index('-N') #pull this out for deletes
+        name = options.split[options.split.index('-N')+1]
+        count.to_i.times {|i| provided_names << name.gsub('{{n}}', (i + 1).to_s)} if name
+      end
+      # google can have names or numbers
+      if provider.eql?('google') && names[1].to_i == 0
+        names[1..-1].each do |gname|
+          server = "knife google#{Spiceweasel::Config[:knife_options]} server create #{gname} #{options}"
+          server += " -r '#{run_list}'" unless run_list.empty?
+          create_command(server, create_command_options)
+          provided_names << gname
         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)
+        if Spiceweasel::Config[:parallel]
+          parallel = "seq #{count} | parallel -u -j 0 -v \""
+          if provider.eql?('vsphere')
+            parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, '{}')
+          elsif provider.eql?('kvm')
+            parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm create #{options}".gsub(/\{\{n\}\}/, '{}')
+          elsif provider.eql?('digital_ocean')
+            parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} droplet create #{options}".gsub(/\{\{n\}\}/, '{}')
+          elsif provider.eql?('google')
+            parallel += "knife #{provider}#{Spiceweasel::Config[:knife_options]} server create #{name} #{options}".gsub(/\{\{n\}\}/, '{}')
           else
-            server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+            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 provider.eql?('vsphere')
+              server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm clone #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+            elsif provider.eql?('kvm')
+              server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} vm create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+            elsif provider.eql?('digital_ocean')
+              server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} droplet create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+            elsif provider.eql?('google')
+              server = "knife #{provider}#{Spiceweasel::Config[:knife_options]} server create #{name} #{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?
+            create_command(server, create_command_options)
           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 Spiceweasel::Config[:bulkdelete] && provided_names.empty?
         if ['kvm','vsphere'].member?(provider)
           delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider} vm delete -y")
+        elsif ['digital_ocean'].member?(provider)
+          delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider} droplet destroy -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}")
+            delete_command("knife #{provider} vm delete #{p_name} -y")
+          elsif ['digital_ocean'].member?(provider)
+            delete_command("knife #{provider} droplet destroy #{p_name} -y")
           else
-            delete_command("knife #{provider} server delete -y #{p_name}")
+            delete_command("knife #{provider} server delete #{p_name} -y")
           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")
@@ -181,11 +257,17 @@ module Spiceweasel
     end
 
     #check that the knife plugin is installed
-    def validate_provider(provider, knifecommands)
+    def validate_provider(provider, names, count, options, 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
+      if provider.eql?('google')
+        if names[1].to_i != 0 && !options.split.member?('-N')
+          STDERR.puts "ERROR: 'knife google' currently requires providing a name. Please use -N within the options."
+          exit(-1)
+        end
+      end
     end
 
     def process_chef_client(names, options, run_list)
@@ -300,8 +382,7 @@ module Spiceweasel
           if opt =~ /^-N$|^--node-name$/
             value = '-N'
           else
-            opt.sub!(/-N/,'') if opt =~ /^-N/
-            opt.sub!(/--node-name/,'') if opt =~ /^--node-name/
+            opt.sub!(/-N|--node-name/,'') if opt =~ /^-N|^--node-name/
             names = [opt.gsub(/{{n}}/, '*')]
             value = nil
           end

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

data/spec/bin/chef_client_spec.rb

@@ -20,11 +20,11 @@ knife ssh 'chef_environment:amazon and role:webserver and recipe:mysql\\:\\:clie
   end
 
   it "test chef-client in 2.5, json" do
-    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.json`.should == @expected_output
+    `#{@spiceweasel_binary} --chef-client examples/example.json --novalidation`.should == @expected_output
   end
 
   it "test chef-client in 2.5, rb" do
-    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.rb`.should == @expected_output
+    `#{@spiceweasel_binary} examples/example.rb --novalidation --chef-client`.should == @expected_output
   end
 end
 
@@ -47,11 +47,11 @@ knife ssh 'chef_environment:qa and role:webserver and recipe:mysql\\:\\:client'
   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
+    `#{@spiceweasel_binary} --cluster-file examples/cluster-file-example.yml --novalidation examples/example.json --chef-client`.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
+    `#{@spiceweasel_binary} --novalidation --chef-client examples/example.rb --cluster-file examples/cluster-file-example.yml`.should == @expected_output
   end
 end
 

data/spec/bin/google_spec.rb

@@ -0,0 +1,105 @@
+describe 'testing 2.6 google' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife cookbook delete apache2  -a -y
+knife environment delete qa -y
+knife role delete base -y
+knife role delete webserver -y
+knife google server delete gmas1 -y
+knife node delete gmas1 -y
+knife client delete gmas1 -y
+knife google server delete gdef1 -y
+knife node delete gdef1 -y
+knife client delete gdef1 -y
+knife google server delete gdef2 -y
+knife node delete gdef2 -y
+knife client delete gdef2 -y
+knife google server delete aaa -y
+knife node delete aaa -y
+knife client delete aaa -y
+knife google server delete bbb -y
+knife node delete bbb -y
+knife client delete bbb -y
+knife google server delete ccc -y
+knife node delete ccc -y
+knife client delete ccc -y
+knife google server delete foo -y
+knife google server delete bar -y
+knife google server delete g-qa1 -y
+knife google server delete g-qa2 -y
+for N in $(knife node list -E qa); do knife client delete $N -y; knife node delete $N -y; done
+knife cookbook upload apache2
+knife environment from file qa.rb
+knife role from file base.rb webserver.rb
+knife google server create gmas1 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N gmas1 -r 'role[base]'
+knife google server create gdef1 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N gdef1 -r 'role[base]'
+knife google server create gdef2 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N gdef2 -r 'role[base]'
+knife google server create aaa -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create bbb -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create ccc -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create foo -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -E qa -r 'role[mysql]'
+knife google server create bar -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -E qa -r 'role[mysql]'
+knife google server create g-qa1 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N g-qa1 -E qa -r 'role[mysql]'
+knife google server create g-qa2 -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N g-qa2 -E qa -r 'role[mysql]'
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test knife-google functionality from 2.6" do
+    `#{@spiceweasel_binary} -r --novalidation examples/google-example.yml`.should == @expected_output
+  end
+
+end
+
+describe 'testing 2.6 google --parallel' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife cookbook delete apache2  -a -y
+knife environment delete qa -y
+knife role delete base -y
+knife role delete webserver -y
+knife google server delete gmas1 -y
+knife node delete gmas1 -y
+knife client delete gmas1 -y
+knife google server delete gdef1 -y
+knife node delete gdef1 -y
+knife client delete gdef1 -y
+knife google server delete gdef2 -y
+knife node delete gdef2 -y
+knife client delete gdef2 -y
+knife google server delete aaa -y
+knife node delete aaa -y
+knife client delete aaa -y
+knife google server delete bbb -y
+knife node delete bbb -y
+knife client delete bbb -y
+knife google server delete ccc -y
+knife node delete ccc -y
+knife client delete ccc -y
+knife google server delete foo -y
+knife google server delete bar -y
+knife google server delete g-qa1 -y
+knife google server delete g-qa2 -y
+for N in $(knife node list -E qa); do knife client delete $N -y; knife node delete $N -y; done
+knife cookbook upload apache2
+knife environment from file qa.rb
+knife role from file base.rb webserver.rb
+seq 1 | parallel -u -j 0 -v "knife google server create gmas{} -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N gmas{} -r 'role[base]'"
+seq 2 | parallel -u -j 0 -v "knife google server create gdef{} -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N gdef{} -r 'role[base]'"
+knife google server create aaa -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create bbb -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create ccc -E qa -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -r 'role[mysql]'
+knife google server create foo -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -E qa -r 'role[mysql]'
+knife google server create bar -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -E qa -r 'role[mysql]'
+seq 2 | parallel -u -j 0 -v "knife google server create g-qa{} -m n1-standard-1 -I debian-7-wheezy-v20130723 -Z us-central2-a -i ~/.ssh/id_rsa -x jdoe -N g-qa{} -E qa -r 'role[mysql]'"
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test knife-google functionality from 2.6" do
+    `#{@spiceweasel_binary} --parallel -r --novalidation examples/google-example.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/kvm_spec.rb

@@ -8,6 +8,7 @@ knife node delete winboxA -y
 knife client delete winboxA -y
 knife node delete winboxB -y
 knife client delete winboxB -y
+for N in $(knife node list -E qa); do knife client delete $N -y; knife node delete $N -y; done
 knife cookbook upload apache2
 knife environment from file qa.rb
 knife role from file base.rb

data/spec/bin/node_spec.rb

@@ -0,0 +1,108 @@
+describe 'testing 2.6' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife node delete serverA -y
+knife client delete serverA -y
+knife node delete serverB -y
+knife client delete serverB -y
+knife node delete serverC -y
+knife client delete serverC -y
+knife linode server delete db1 -y
+knife node delete db1 -y
+knife client delete db1 -y
+knife linode server delete db2 -y
+knife node delete db2 -y
+knife client delete db2 -y
+knife linode server delete db3 -y
+knife node delete db3 -y
+knife client delete db3 -y
+knife node delete winboxA -y
+knife client delete winboxA -y
+knife node delete winboxB -y
+knife client delete winboxB -y
+knife node delete winboxC -y
+knife client delete winboxC -y
+knife digital_ocean droplet destroy DOmysql -y
+knife digital_ocean droplet destroy DOweb1 -y
+knife digital_ocean droplet destroy DOweb2 -y
+knife digital_ocean droplet destroy DOweb3 -y
+for N in $(knife node list -E digital); do knife client delete $N -y; knife node delete $N -y; done
+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 linode server create --image 49 -E qa --flavor 2 -N db1 -r 'recipe[mysql],role[monitoring]'
+knife linode server create --image 49 -E qa --flavor 2 -N db2 -r 'recipe[mysql],role[monitoring]'
+knife linode 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'
+knife bootstrap windows ssh winboxC -x Administrator -P 'super_secret_password'
+knife digital_ocean droplet create -S mray -i ~/.ssh/mray.pem -x ubuntu -I ami-8af0f326 -f m1.medium -N DOmysql -E digital -r 'role[mysql]'
+knife digital_ocean droplet create -S mray -i ~/.ssh/mray.pem -x ubuntu -I ami-7000f019 -f m1.small -N DOweb1 -E digital -r 'role[webserver],recipe[mysql::client]'
+knife digital_ocean droplet create -S mray -i ~/.ssh/mray.pem -x ubuntu -I ami-7000f019 -f m1.small -N DOweb2 -E digital -r 'role[webserver],recipe[mysql::client]'
+knife digital_ocean droplet create -S mray -i ~/.ssh/mray.pem -x ubuntu -I ami-7000f019 -f m1.small -N DOweb3 -E digital -r 'role[webserver],recipe[mysql::client]'
+    OUTPUT
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test for cluster deletion and digital_ocean and linode in 2.6" do
+    `#{@spiceweasel_binary} --rebuild --novalidation examples/node-example.yml`.should == @expected_output
+  end
+
+end
+
+describe 'testing 2.6 --node-only' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife node delete serverA -y
+knife client delete serverA -y
+knife node delete serverB -y
+knife client delete serverB -y
+knife node delete serverC -y
+knife client delete serverC -y
+knife node delete db1 -y
+knife client delete db1 -y
+knife node delete db2 -y
+knife client delete db2 -y
+knife node delete db3 -y
+knife client delete db3 -y
+knife node delete winboxA -y
+knife client delete winboxA -y
+knife node delete winboxB -y
+knife client delete winboxB -y
+knife node delete winboxC -y
+knife client delete winboxC -y
+for N in $(knife node list -E digital); do knife client delete $N -y; knife node delete $N -y; done
+knife node create -d serverA
+knife node run_list set serverA 'role[base]'
+knife node create -d serverB
+knife node run_list set serverB 'role[base]'
+knife node create -d serverC
+knife node run_list set serverC 'role[base]'
+knife node create -d db1
+knife node run_list set db1 'recipe[mysql],role[monitoring]'
+knife node create -d db2
+knife node run_list set db2 'recipe[mysql],role[monitoring]'
+knife node create -d db3
+knife node run_list set db3 'recipe[mysql],role[monitoring]'
+knife node create -d winboxA
+knife node run_list set winboxA 'role[base],role[iisserver]'
+knife node create -d winboxB
+knife node create -d winboxC
+knife node create -d DOmysql
+knife node run_list set DOmysql 'role[mysql]'
+knife node create -d DOweb1
+knife node run_list set DOweb1 'role[webserver],recipe[mysql::client]'
+knife node create -d DOweb2
+knife node run_list set DOweb2 'role[webserver],recipe[mysql::client]'
+knife node create -d DOweb3
+knife node run_list set DOweb3 'role[webserver],recipe[mysql::client]'
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "tests node deletion and creation using --node-only" do
+    `#{@spiceweasel_binary} --node-only --rebuild --novalidation examples/node-example.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/spiceweasel_spec.rb

@@ -22,12 +22,22 @@ knife node delete serverB -y
 knife client delete serverB -y
 knife node delete serverC -y
 knife client delete serverC -y
+knife rackspace server delete db1 -y
+knife node delete db1 -y
+knife client delete db1 -y
+knife rackspace server delete db2 -y
+knife node delete db2 -y
+knife client delete db2 -y
+knife rackspace server delete db3 -y
+knife node delete db3 -y
+knife client delete db3 -y
 knife node delete winboxA -y
 knife client delete winboxA -y
 knife node delete winboxB -y
 knife client delete winboxB -y
 knife node delete winboxC -y
 knife client delete winboxC -y
+for N in $(knife node list -E amazon); do knife client delete $N -y; knife node delete $N -y; done
 knife cookbook upload apache2
 knife cookbook upload apt --freeze
 knife cookbook upload mysql ntp
@@ -97,7 +107,15 @@ knife node delete serverB -y
 knife client delete serverB -y
 knife node delete serverC -y
 knife client delete serverC -y
-knife node list | xargs knife rackspace server delete -y
+knife rackspace server delete db1 -y
+knife node delete db1 -y
+knife client delete db1 -y
+knife rackspace server delete db2 -y
+knife node delete db2 -y
+knife client delete db2 -y
+knife rackspace server delete db3 -y
+knife node delete db3 -y
+knife client delete db3 -y
 knife node delete winboxA -y
 knife client delete winboxA -y
 knife node delete winboxB -y
@@ -105,9 +123,7 @@ knife client delete winboxB -y
 knife node delete winboxC -y
 knife client delete winboxC -y
 knife node bulk delete .* -y
-knife node list | xargs knife ec2 server delete -y
-knife node list | xargs knife ec2 server delete -y
-knife node bulk delete .* -y
+for N in $(knife node list -E amazon); do knife client delete $N -y; knife node delete $N -y; done
     OUTPUT
 
     @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Matt Ray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -180,9 +180,11 @@ files:
 - lib/spiceweasel/version.rb
 - lib/spiceweasel.rb
 - spec/bin/chef_client_spec.rb
+- spec/bin/google_spec.rb
 - spec/bin/joyent-vsphere_spec.rb
 - spec/bin/knife_spec.rb
 - spec/bin/kvm_spec.rb
+- spec/bin/node_spec.rb
 - spec/bin/spiceweasel_spec.rb
 homepage: https://github.com/mattray/spiceweasel
 licenses:
@@ -210,7 +212,9 @@ 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/google_spec.rb
 - spec/bin/joyent-vsphere_spec.rb
 - spec/bin/knife_spec.rb
 - spec/bin/kvm_spec.rb
+- spec/bin/node_spec.rb
 - spec/bin/spiceweasel_spec.rb