spiceweasel 0.9.0 → 0.9.1

data/README.md

@@ -36,6 +36,7 @@ environments:
 
 roles:
 - base:
+- iisserver:
 - monitoring:
 - webserver:
 
@@ -64,6 +65,12 @@ nodes:
 - rackspace 3:
   - recipe[mysql],role[monitoring]
   - --image 49 --flavor 2
+- windows_winrm winboxA:
+  - role[base],role[iisserver]
+  - -x Administrator -P 'super_secret_password'
+- windows_ssh winboxB winboxC:
+  - role[base],role[iisserver]
+  - -x Administrator -P 'super_secret_password'
 ```
 
 JSON
@@ -91,6 +98,7 @@ From the `example.json`:
     "roles":
     [
         {"base":[]},
+        {"iisserver":[]},
         {"monitoring":[]},
         {"webserver":[]}
     ],
@@ -141,6 +149,18 @@ From the `example.json`:
              "recipe[mysql],role[monitoring]",
              "--image 49 --flavor 2"
          ]
+        },
+        {"windows_winrm winboxA":
+         [
+             "role[base],role[iisserver]",
+             "-x Administrator -P 'super_secret_password'"
+         ]
+        },
+        {"windows_ssh winboxB winboxC":
+         [
+             "role[base],role[iisserver]",
+             "-x Administrator -P 'super_secret_password'"
+         ]
         }
     ]
 }
@@ -148,7 +168,7 @@ From the `example.json`:
 
 Cookbooks
 ---------
-The `cookbooks` section of the JSON or YAML file 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. If a version is passed, it is validated against the existing cookbook `metadata.rb` and it must match the `metadata.rb` string exactly. You may pass any additional arguments if necessary. The YAML snippet
+The `cookbooks` section of the JSON or YAML file 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. If a version is passed, it is validated against the existing cookbook `metadata.rb` and it must match the `metadata.rb` string exactly. You may pass any additional arguments if necessary. The example YAML snippet
 
 ``` yaml
 cookbooks:
@@ -171,7 +191,7 @@ knife cookbook upload mysql
 
 Environments
 ------------
-The `environments` section of the JSON or YAML file currently supports `knife environment from file FOO` where `FOO` is the name of the environment file ending in `.rb` in the `environments` directory. The YAML snippet
+The `environments` section of the JSON or YAML file currently supports `knife environment from file FOO` where `FOO` is the name of the environment file ending in `.rb` in the `environments` directory. The example YAML snippet
 
 ``` yaml
 environments:
@@ -190,7 +210,7 @@ knife environment from file production.rb
 
 Roles
 -----
-The `roles` section of the JSON or YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The YAML snippet
+The `roles` section of the JSON or YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The example YAML snippet
 
 ``` yaml
 roles:
@@ -242,7 +262,7 @@ knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-fi
 
 Nodes
 -----
-The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. The run_list may be space or comma-delimited. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet
+The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. The run_list may be space or comma-delimited. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. You may specify multiple nodes to have the same configuration by listing them separated by a space. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. Windows nodes need to specify either `windows_winrm` or `windows_ssh` depending on the protocol used, followed by the name of the node(s). The example YAML snippet
 
 ``` yaml
 nodes:
@@ -258,6 +278,12 @@ nodes:
 - rackspace 3:
   - recipe[mysql],role[monitoring]
   - --image 49 --flavor 2
+- windows_winrm winboxA:
+  - role[base],role[iisserver]
+  - -x Administrator -P 'super_secret_password'
+- windows_ssh winboxB winboxC:
+  - role[base],role[iisserver]
+  - -x Administrator -P 'super_secret_password'
 ```
 
 produces the knife commands
@@ -272,6 +298,9 @@ knife ec2 server create 'role[webserver],recipe[mysql::client]' -S mray -i ~/.ss
 knife rackspace server create 'recipe[mysql],role[monitoring]' --image 49 --flavor 2
 knife rackspace server create 'recipe[mysql],role[monitoring]' --image 49 --flavor 2
 knife rackspace server create 'recipe[mysql],role[monitoring]' --image 49 --flavor 2
+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]'
 ```
 
 Usage

data/lib/spiceweasel/node_list.rb

@@ -31,6 +31,17 @@ class Spiceweasel::NodeList
             end
           end
           @delete += "knife node#{options['knife_options']} list | xargs knife #{provider[0]} server delete -y\n"
+        elsif node.keys[0].start_with?("windows") #windows node bootstrap support
+          nodeline = node.keys[0].split()
+          provider = nodeline.shift.split('_') #split on 'windows_ssh' etc
+          nodeline.each do |server|
+            @create += "knife bootstrap #{provider[0]} #{provider[1]}#{options['knife_options']} #{server} #{node[node.keys[0]][1]}"
+            if run_list.length > 0
+              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+            end
+            @delete += "knife node#{options['knife_options']} delete #{server} -y\n"
+          end
+          @delete += "knife node#{options['knife_options']} list | xargs knife #{provider[0]} server delete -y\n"
         else #node bootstrap support
           node.keys[0].split.each do |server|
             @create += "knife bootstrap#{options['knife_options']} #{server} #{node[node.keys[0]][1]}"

data/lib/spiceweasel/recipe_list.rb

@@ -0,0 +1,40 @@
+#
+# Author:: Matt Ray (<matt@opscode.com>)
+#
+# Copyright:: 2011, 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#find a list of all the recipes provided by the included cookbooks for validation
+class Spiceweasel::RecipeList
+  def initialize(cookbooks = [], options = {})
+    @recipes = []
+    if NOVALIDATION
+      STDOUT.puts "DEBUG: Skipping validation of recipes" if DEBUG
+    else
+      if cookbooks
+        cookbooks.each do |cookbook|
+          #check contents of each cookbook and pull out the recipes
+          #store in recipes in the form cookbook::recipe
+        end
+      end
+    end
+  end
+
+  attr_reader :recipes, :create, :delete
+
+  def member?(recipe)
+    recipes.include?(recipe)
+  end
+end

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 -06:00
+date: 2011-12-14 00:00:00.000000000 -06:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2151797000 !ruby/object:Gem::Requirement
+  requirement: &2164297640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151797000
+  version_requirements: *2164297640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2151795080 !ruby/object:Gem::Requirement
+  requirement: &2164297040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151795080
+  version_requirements: *2164297040
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &2151793020 !ruby/object:Gem::Requirement
+  requirement: &2164296500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151793020
+  version_requirements: *2164296500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151791600 !ruby/object:Gem::Requirement
+  requirement: &2164295960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151791600
+  version_requirements: *2164295960
 description: This provides a CLI for generating knife commands to build Chef-managed
   infrastructure from a simple YAML file.
 email:
@@ -73,6 +73,7 @@ files:
 - lib/spiceweasel/data_bag_list.rb
 - lib/spiceweasel/environment_list.rb
 - lib/spiceweasel/node_list.rb
+- lib/spiceweasel/recipe_list.rb
 - lib/spiceweasel/role_list.rb
 - lib/spiceweasel/run_list.rb
 - lib/spiceweasel/version.rb