spiceweasel 2.2.0 → 2.3.0

data/README.md

@@ -5,7 +5,7 @@
 
 Spiceweasel is a command-line tool for batch loading Chef infrastructure. It provides a simple syntax in Ruby, JSON or YAML for describing and deploying infrastructure in order with the Chef command-line tool `knife`. This manifest may be bundled with a Chef repository to deploy the infrastructure contained within the repository and validate that the components listed are all present. The manifest may also be extracted from an existing repository.
 
-The `examples` directory provides example manifests based on the Quick Starts provided at http://help.opscode.com/kb/otherhelp. The https://github.com/mattray/vbacd-repo provides a working example for bootstrapping a Chef repository with Spiceweasel.
+The https://github.com/mattray/lab-repo provides a working example for bootstrapping a Chef repository with Spiceweasel.
 
 The [CHANGELOG.md](https://github.com/mattray/spiceweasel/blob/master/CHANGELOG.md) covers current, previous and future development milestones and contains the features backlog.
 
@@ -19,26 +19,6 @@ Written and tested with the Chef 11.x series (previous versions of Chef may stil
 
 The syntax for the Spiceweasel file may be Ruby, JSON or YAML format of Chef primitives describing what is to be instantiated. Please refer to the [examples/example.json](https://github.com/mattray/spiceweasel/blob/master/examples/example.json) or [examples/example.yml](https://github.com/mattray/spiceweasel/blob/master/examples/example.yml) for examples of the same infrastructure. Each subsection below shows the YAML syntax converted to knife commands.
 
-## Manifest syntax changes in Spiceweasel 2.0 ##
-
-In order to be more explicit and enable a richer set of options, the syntax for the manifests was updated. Rather than depend on the order of arrays for the attributes of cookbooks, data bags and nodes; the attributes are now hashes with keys identifying the features.
-
-### New Cookbooks Syntax ###
-
-The currently supported keys are `version` and `options` and their values are strings.
-
-### New Data Bags Syntax ###
-
-The supported keys are `items` (an array of the data bag items) and `secret` for passing a secret key string.
-
-### New Nodes Syntax ###
-
-The supported keys are `run_list` and `options` and their values are strings.
-
-### New Clusters Syntax ###
-
-Clusters support is completely new, please refer to the Cluster section for documentation.
-
 ## Cookbooks ##
 
 The `cookbooks` section of the manifest currently supports `knife cookbook upload FOO` where `FOO` is the name of the cookbook in the `cookbooks` directory. The default behavior is to download the cookbook as a tarball, untar it and remove the tarball. The `--siteinstall` option will allow for use of `knife cookbook site install` with the cookbook and the creation of a vendor branch if git is the underlying version control. Validation is done to ensure the cookbook matches the name (and version if given) in the metadata and that any cookbook dependencies are listed in the manifest. You may pass any additional options if necessary. Assuming the apt cookbook was not present, the example YAML snippet
@@ -197,6 +177,12 @@ knife bootstrap windows ssh winboxB -x Administrator -P 'super_secret_password'
 knife bootstrap windows ssh winboxC -x Administrator -P 'super_secret_password' -r 'role[base],role[iisserver]'
 ```
 
+### 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`.
+
+### Bulk node creation ###
+
 You may also use the `--parallel` flag from the command line, allowing provider commands to run simultaneously for faster deployment. Using `--parallel` with the following block and the `-N webserver{{n}}`:
 
 ``` yaml
@@ -277,6 +263,10 @@ This will generate the knife commands to build the described infrastructure. Inf
 
 # OPTIONS #
 
+## --bulkdelete ##
+
+When using the delete or rebuild commands, whether or not to attempt to delete all nodes managed by a provider. The assumption is that if Spiceweasel manages all the nodes, it is safe to delete them all.
+
 ## -c/--knifeconfig ##
 
 Specify a knife.rb configuration file to use with the knife commands.
@@ -333,11 +323,19 @@ Use the 'install' command with 'knife cookbook site' instead of the default 'dow
 
 Print the version of spiceweasel currently installed.
 
-# License and Author #
+# Testing #
+
+Spiceweasel uses [RSpec](http://rspec.info/) for testing. You should run the following before commiting.
 
-Author: Matt Ray <matt@opscode.com>
+    $ rspec
+
+# License and Author #
 
-Copyright: 2011-2013 Opscode, Inc
+|                      |                                                    |
+|:---------------------|:---------------------------------------------------|
+| **Author**           |  Matt Ray (<matt@opscode.com>)                     |
+|                      |                                                    |
+| **Copyright**        |  Copyright (c) 2011-2013, Opscode, Inc.            |
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/spiceweasel/cli.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2011-2012, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-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.
@@ -48,6 +48,11 @@ module Spiceweasel
     :description => 'Verbose debugging messages',
     :boolean => true
 
+    option :bulkdelete,
+    :long => '--bulkdelete',
+    :description => 'Delete all nodes for the provider(s) in the infrastructure',
+    :boolean => false
+
     option :delete,
     :short => '-d',
     :long => '--delete',

data/lib/spiceweasel/nodes.rb

@@ -21,14 +21,13 @@ module Spiceweasel
 
     include CommandHelper
 
-    PROVIDERS = %w{bluebox clodo cs ec2 gandi hp lxc openstack rackspace slicehost terremark voxel vagrant}
+    PROVIDERS = %w{bluebox clodo cs ec2 gandi hp joyent lxc openstack rackspace slicehost terremark vagrant voxel vsphere}
 
     attr_reader :create, :delete
 
     def initialize(nodes, cookbooks, environments, roles)
       @create = Array.new
       @delete = Array.new
-      bulk_delete = false
       if nodes
         Spiceweasel::Log.debug("nodes: #{nodes}")
         nodes.each do |node|
@@ -61,24 +60,39 @@ module Spiceweasel
             provided_names = []
             if Spiceweasel::Config[:parallel]
               parallel = "seq #{count} | parallel -j 0 -v \""
-              parallel += "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, '{}')
+              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|
-                server = "knife #{provider[0]}#{Spiceweasel::Config[:knife_options]} server create #{options}".gsub(/\{\{n\}\}/, (i + 1).to_s)
+                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)
               end
             end
-            if provided_names.empty? && provider[0] != 'windows'
-              bulk_delete = true
-              delete_command("knife node#{Spiceweasel::Config[:knife_options]} list | xargs knife #{provider[0]} server delete -y")
+            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")
+              end
             else
               provided_names.each do |p_name|
-                delete_command("knife #{provider[0]} server delete -y #{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")
               end
@@ -109,7 +123,7 @@ module Spiceweasel
           end
         end
       end
-      if bulk_delete
+      if Spiceweasel::Config[:bulkdelete]
         delete_command("knife node#{Spiceweasel::Config[:knife_options]} bulk delete .* -y")
       end
     end

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/spec/bin/joyent-vsphere_spec.rb

@@ -0,0 +1,25 @@
+# Test new 2.3 functionality
+describe 'The Spiceweasel binary' 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 list | xargs knife joyent server delete -y
+knife node list | xargs knife vsphere vm delete -y
+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]'"
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "test joyent, vsphere and --bulkdelete functionality from 2.3" do
+    `#{@spiceweasel_binary} --parallel --bulkdelete -r --novalidation examples/joyent-vsphere-example.yml`.should == @expected_output
+  end
+
+end

data/spec/bin/spiceweasel_spec.rb

@@ -22,17 +22,12 @@ 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 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 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
 knife cookbook upload apache2
 knife cookbook upload apt --freeze
 knife cookbook upload mysql ntp
@@ -73,3 +68,48 @@ knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7
     `#{@spiceweasel_binary} -r --novalidation examples/example.rb`.should == @expected_output
   end
 end
+
+describe 'The Spiceweasel binary' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife cookbook delete apache2  -a -y
+knife cookbook delete apt 1.2.0 -a -y
+knife cookbook delete mysql  -a -y
+knife cookbook delete ntp  -a -y
+knife environment delete development -y
+knife environment delete qa -y
+knife environment delete production -y
+knife role delete base -y
+knife role delete iisserver -y
+knife role delete monitoring -y
+knife role delete webserver -y
+knife data bag delete users -y
+knife data bag delete data -y
+knife data bag delete passwords -y
+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 list | xargs knife rackspace server delete -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 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
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "maintains consistent output deleting from the example config with yml using --bulkdelete" do
+    `#{@spiceweasel_binary}  --bulkdelete -d --novalidation examples/example.yml`.should == @expected_output
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - lib/spiceweasel/roles.rb
 - lib/spiceweasel/version.rb
 - lib/spiceweasel.rb
+- spec/bin/joyent-vsphere_spec.rb
 - spec/bin/spiceweasel_spec.rb
 homepage: https://github.com/mattray/spiceweasel
 licenses:
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,9 +206,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: CLI for generating Chef knife commands from a simple JSON or YAML file.
 test_files:
+- spec/bin/joyent-vsphere_spec.rb
 - spec/bin/spiceweasel_spec.rb