spiceweasel 0.9.1 → 1.0.0

data/README.md

@@ -1,8 +1,8 @@
 Description
 ===========
-Spiceweasel is a command-line tool for batch loading Chef infrastructure. It provides a simple syntax in either JSON or YAML for describing and deploying infrastructure in order with the Chef command-line tool `knife`.
+Spiceweasel is a command-line tool for batch loading Chef infrastructure from a file.. It provides a simple syntax in either 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 `examples` directory provides examples based on the Quick Starts provided at [http://help.opscode.com/kb/otherhelp](http://help.opscode.com/kb/otherhelp).
+The `examples` directory provides example manifests based on the Quick Starts provided at [http://help.opscode.com/kb/otherhelp](http://help.opscode.com/kb/otherhelp).
 
 The [https://github.com/mattray/ravel-repo](https://github.com/mattray/ravel-repo) provides a working example for bootstrapping a Chef repository with Spiceweasel.
 
@@ -10,7 +10,7 @@ The [CHANGELOG.md](https://github.com/mattray/spiceweasel/blob/master/CHANGELOG.
 
 Requirements
 ============
-Spiceweasel currently depends on `knife` to run commands for it. Infrastructure files must either end in .json or .yml to be processed.
+Spiceweasel currently depends on `knife` to run commands for it, but does not explicitly depend on the `chef` gem. Infrastructure files must either end in .json or .yml to be processed.
 
 Written and tested initially with Chef 0.9.12 (should still work) and continuing development with the 0.10 series.
 
@@ -58,7 +58,7 @@ nodes:
   - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
 - serverB serverC:
   - role[base]
-  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
+  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production
 - ec2 3:
   - role[webserver] recipe[mysql::client]
   - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
@@ -135,7 +135,7 @@ From the `example.json`:
         {"serverB serverC":
          [
              "role[base]",
-             "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems"
+             "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production"
          ]
         },
         {"ec2 3":
@@ -168,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 example YAML snippet
+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. 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. Assuming the apt cookbook was not present, the example YAML snippet
 
 ``` yaml
 cookbooks:
@@ -191,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 example YAML snippet
+The `environments` section of the manifest currently supports `knife environment from file FOO` where `FOO` is the name of the environment file ending in `.rb` or `.json` in the `environments` directory. Validation is done to ensure the filename matches the environment and that any cookbooks referenced are listed in the manifest. The example YAML snippet
 
 ``` yaml
 environments:
@@ -210,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 example YAML snippet
+The `roles` section of the manifest currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` or `.json` in the `roles` directory. Validation is done to ensure the filename matches the role name and that any cookbooks or roles referenced are listed in the manifest. The example YAML snippet
 
 ``` yaml
 roles:
@@ -229,7 +229,7 @@ knife role from file webserver.rb
 
 Data Bags
 ---------
-The `data bags` section of the JSON or YAML file currently creates the data bags listed with `knife data bag create FOO` where `FOO` is the name of the data bag. Individual items may be added to the data bag as part of a JSON or YAML sequence, the assumption is made that they `.json` files and in the `data_bags/FOO` directory. You may also pass a wildcard as an entry to load all matching data bags (ie. `*`). Encrypted data bags are supported by listing `secret filename` as the first item (where `filename` is the secret key to be used). Assuming the presence of `dataA.json` and `dataB.json` in the `data_bags/data` directory, the YAML snippet
+The `data bags` section of the manifest currently creates the data bags listed with `knife data bag create FOO` where `FOO` is the name of the data bag. Individual items may be added to the data bag as part of a JSON or YAML sequence, the assumption is made that they `.json` files and in the proper `data_bags/FOO` directory. You may also pass a wildcard as an entry to load all matching data bags (ie. `*`). Encrypted data bags are supported by listing `secret filename` as the first item (where `filename` is the secret key to be used). Validation is done to ensure the JSON is properly formatted, the id matches and any secret keys are in the correct locations. Assuming the presence of `dataA.json` and `dataB.json` in the `data_bags/data` directory, the YAML snippet
 
 ``` yaml
 data bags:
@@ -249,20 +249,22 @@ produces the knife commands
 
 ```
 knife data bag create users
-knife data bag from file users data_bags/users/alice.json
-knife data bag from file users data_bags/users/bob.json
-knife data bag from file users data_bags/users/chuck.json
+knife data bag from file users alice.json
+knife data bag from file users bob.json
+knife data bag from file users chuck.json
 knife data bag create data
-knife data bag from file users data_bags/data/dataA.json
-knife data bag from file users data_bags/data/dataB.json
+knife data bag from file users dataA.json
+knife data bag from file users dataB.json
 knife data bag create passwords
-knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
-knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-file secret_key
+knife data bag from file passwords mysql.json --secret-file secret_key
+knife data bag from file passwords rabbitmq.json --secret-file secret_key
 ```
 
 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. 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
+The `nodes` section of the manifest bootstraps a node for each entry where the entry is a hostname or provider and count. 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). Each node requires 2 items after it in a sequence. You may also use the `--parallel` flag from the command line, allowing provider commands to run simultaneously for faster deployment.
+
+The first item after the node is the run_list and the second are 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 cookbooks and roles listed in the manifest are used. Validation on the options ensures that any Environments referenced are also listed. You may specify multiple nodes to have the same configuration by listing them separated by a space. The example YAML snippet
 
 ``` yaml
 nodes:
@@ -271,7 +273,7 @@ nodes:
   - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
 - serverB serverC:
   - role[base]
-  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
+  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production
 - ec2 3:
   - role[webserver] recipe[mysql::client]
   - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
@@ -289,15 +291,16 @@ nodes:
 produces the knife commands
 
 ```
-knife bootstrap serverA 'role[base]' -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
-knife bootstrap serverB 'role[base]' -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
-knife bootstrap serverC 'role[base]' -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
-knife ec2 server create 'role[webserver],recipe[mysql::client]' -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
-knife ec2 server create 'role[webserver],recipe[mysql::client]' -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
-knife ec2 server create 'role[webserver],recipe[mysql::client]' -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
-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 serverA -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
+knife bootstrap serverB -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production -r 'role[base]'
+knife bootstrap serverC -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production -r 'role[base]'
+knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
+knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
+knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
+knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
+knife rackspace server create --image 49 --flavor 2 -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 --flavor 2 -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 --flavor 2 -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]'
@@ -305,7 +308,7 @@ knife bootstrap windows ssh winboxC -x Administrator -P 'super_secret_password'
 
 Usage
 =====
-To run a spiceweasel file, run the following from you Chef repository directory:
+To parse a spiceweasel manifest, run the following from your Chef repository directory:
 
 ```
 spiceweasel path/to/infrastructure.json
@@ -317,7 +320,7 @@ or
 spiceweasel path/to/infrastructure.yml
 ```
 
-This will generate the knife commands to build the described infrastructure. Infrastructure files must end in either `.json` or `.yml`.
+This will generate the knife commands to build the described infrastructure. Infrastructure manifest files must end in either `.json` or `.yml`.
 
 -c/--knifeconfig
 ----------------
@@ -329,7 +332,7 @@ This provides verbose debugging messages.
 
 -d/--delete
 -----------
-The delete command will generate the knife commands to delete the infrastructure described in the file. This includes each cookbook, role, data bag, environment and node listed. Node deletion will specify individual nodes, attempt to pass the list of nodes to the cloud provider for deletion, and finish with `knife node bulk delete`. If you are mixing individual nodes with cloud provider nodes it is possible that nodes may be missed from cloud provider deletion and you should double-check (ie. `knife ec2 server list`).
+The delete command will generate the knife commands to delete the infrastructure described in the manifest. This includes each cookbook, environment, role, data bag and node listed. Node deletion will specify individual nodes, attempt to pass the list of nodes to the cloud provider for deletion, and finish with `knife node bulk delete`. If you are mixing individual nodes with cloud provider nodes it is possible that nodes may be missed from cloud provider deletion and you should double-check (ie. `knife ec2 server list`).
 
 --dryrun
 --------
@@ -339,13 +342,17 @@ This is the default action, printing the knife commands to be run without execut
 ---------
 Print the currently-supported usage options for spiceweasel.
 
+--novalidation
+--------------
+Disable validation ensuring existence of the cookbooks, environments, roles, data bags and nodes in infrastructure file.
+
 --parallel
 ----------
-Use the GNU 'parallel' command to execute 'knife VENDOR server create' commands that may be parallelized.
+Use the GNU 'parallel' command to execute 'knife VENDOR server create' commands that may be run simultaneously.
 
 -r/--rebuild
----------
-The rebuild command will generate the knife commands to delete and recreate the infrastructure described in the file. This includes each cookbook, role, data bag, environment and node listed. Currently all nodes from the system are deleted with `knife node bulk_delete`, specific-node support will be added in a future release.
+------------
+The rebuild command will generate the knife commands to delete and recreate the infrastructure described in the manifest. This includes each cookbook, environment, role, data bag and node listed.
 
 --siteinstall
 -------------

data/bin/spiceweasel

@@ -1,5 +1,23 @@
 #!/usr/bin/env ruby
 
+#
+# 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.
+#
+
 require 'json'
 require 'yaml'
 
@@ -15,6 +33,7 @@ begin
   DEBUG = cli.config[:debug]
   PARALLEL = cli.config[:parallel]
   SITEINSTALL = cli.config[:siteinstall]
+  NOVALIDATION = cli.config[:novalidation]
 rescue OptionParser::InvalidOption => e
   STDERR.puts e.message
   puts cli.opt_parser.to_s
@@ -33,15 +52,15 @@ begin
   elsif (file.end_with?(".json"))
     input = JSON.parse(File.read(ARGV.last))
   else
-    raise "Unknown file type, please use a file ending with either '.json' or '.yml'."
+    STDERR.puts "ERROR: Unknown file type, please use a file ending with either '.json' or '.yml'."
     exit(-1)
   end
 rescue JSON::ParserError => e
   STDERR.puts e.message
-  STDERR.puts "Parsing error in the infrastructure file provided."
+  STDERR.puts "ERROR: Parsing error in the infrastructure file provided."
   exit(-1)
 rescue Exception
-  STDERR.puts "No infrastructure .json or .yml file provided."
+  STDERR.puts "ERROR: No infrastructure .json or .yml file provided."
   puts cli.opt_parser.to_s
   exit(-1)
 end
@@ -50,10 +69,9 @@ create = String.new()
 delete = String.new()
 
 cookbook_list = Spiceweasel::CookbookList.new(input['cookbooks'], options)
-environment_list = Spiceweasel::EnvironmentList.new(input['environments'], options)
-role_list = Spiceweasel::RoleList.new(input['roles'], options)
+environment_list = Spiceweasel::EnvironmentList.new(input['environments'], cookbook_list, options)
+role_list = Spiceweasel::RoleList.new(input['roles'], environment_list, cookbook_list, options)
 data_bag_list = Spiceweasel::DataBagList.new(input['data bags'], options)
-
 node_list = Spiceweasel::NodeList.new(input['nodes'], cookbook_list, environment_list, role_list, options)
 
 create += cookbook_list.create

data/lib/spiceweasel.rb

@@ -1,6 +1,23 @@
+#
+# 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.
+#
+
 module Spiceweasel
   autoload :CLI, 'spiceweasel/cli'
-  autoload :RunList, 'spiceweasel/run_list'
   autoload :CookbookList, 'spiceweasel/cookbook_list'
   autoload :EnvironmentList, 'spiceweasel/environment_list'
   autoload :RoleList, 'spiceweasel/role_list'

data/lib/spiceweasel/cli.rb

@@ -36,6 +36,11 @@ class Spiceweasel::CLI
   :long => "--knifeconfig CONFIG",
   :description => "Specify the knife.rb configuration file to use"
 
+  option :novalidation,
+  :long => "--novalidation",
+  :description => "Disable validation",
+  :boolean => true
+
   option :parallel,
   :long => "--parallel",
   :description => "Use the GNU 'parallel' command to parallelize 'knife VENDOR server create' commands that are not order-dependent",

data/lib/spiceweasel/cookbook_list.rb

@@ -1,7 +1,27 @@
+#
+# 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.
+#
+
 class Spiceweasel::CookbookList
   def initialize(cookbooks = [], options = {})
     @create = @delete = ''
-    @cookbooks = []
+    @cookbook_list = {}
+    @dependencies = []
+    #validate each of the cookbooks specified in the manifest
     if cookbooks
       cookbooks.each do |cookbook|
         cb = cookbook.keys.first
@@ -10,16 +30,10 @@ class Spiceweasel::CookbookList
           args = cookbook[cb][1] || ""
         end
         STDOUT.puts "DEBUG: cookbook: #{cb} #{version}" if DEBUG
-        @delete += "knife cookbook#{options['knife_options']} delete #{cb} #{version} -y\n"
         if File.directory?("cookbooks")
-          if version and File.directory?("cookbooks/#{cb}")
-            #check metadata.rb for requested version
-            metadata = File.open("cookbooks/#{cb}/metadata.rb").grep(/^version/)[0].split()[1].gsub(/"/,'').to_s
-            if (metadata != version)
-              raise "Invalid version #{version} of '#{cb}' requested, #{metadata} is already in the cookbooks directory."
-              exit(-1)
-            end
-          elsif !File.directory?("cookbooks/#{cb}")
+          if File.directory?("cookbooks/#{cb}")
+            validateMetadata(cb,version) unless NOVALIDATION
+          else
             if SITEINSTALL #use knife cookbook site install
               @create += "knife cookbook#{options['knife_options']} site install #{cb} #{version} #{args}\n"
             else #use knife cookbook site download, untar and then remove the tarball
@@ -29,18 +43,53 @@ class Spiceweasel::CookbookList
             end
           end
         else
-          STDERR.puts "cookbooks directory not found, validation and downloading skipped"
+          STDERR.puts "'cookbooks' directory not found, unable to validate, download and load cookbooks" unless NOVALIDATION
         end
         @create += "knife cookbook#{options['knife_options']} upload #{cb}\n"
+        @delete += "knife cookbook#{options['knife_options']} delete #{cb} #{version} -y\n"
+
+        @cookbook_list[cb] = version
+      end
+      validateDependencies() unless NOVALIDATION
+    end
+  end
+
+  #check the metadata for versions and gather deps
+  def validateMetadata(cookbook,version)
+    #check metadata.rb for requested version
+    metadata = File.open("cookbooks/#{cookbook}/metadata.rb").grep(/^version/)[0].split()[1].gsub(/"/,'').to_s
+    STDOUT.puts "DEBUG: cookbook metadata version: #{metadata}" if DEBUG
+    if version and (metadata != version)
+      STDERR.puts "ERROR: Invalid version '#{version}' of '#{cookbook}' requested, '#{metadata}' is already in the cookbooks directory."
+      exit(-1)
+    end
+    deps = File.open("cookbooks/#{cookbook}/metadata.rb").grep(/^depends/)
+    deps.each do |dependency|
+      line = dependency.split()
+      cbdep = ''
+      if line[1][0].eql?('"') #ignore variables and versions
+        cbdep = line[1].gsub(/"/,'')
+        cbdep.gsub!(/\,/,'') if cbdep.end_with?(',')
+      end
+      STDOUT.puts "DEBUG: #{cookbook} metadata depends: #{cbdep}" if DEBUG
+      @dependencies << cbdep
+    end
+    return @cookbook
+  end
 
-        @cookbooks << cb
+  #compare the list of cookbook deps with those specified
+  def validateDependencies()
+    @dependencies.each do |dep|
+      if !member?(dep)
+        STDERR.puts "ERROR: Cookbook dependency '#{dep}' is missing from the list of cookbooks in the manifest."
+        exit(-1)
       end
     end
   end
 
-  attr_reader :cookbooks, :create, :delete
+  attr_reader :cookbook_list, :create, :delete
 
   def member?(cookbook)
-    cookbooks.include?(cookbook)
+    cookbook_list.keys.include?(cookbook)
   end
 end

data/lib/spiceweasel/data_bag_list.rb

@@ -1,34 +1,81 @@
+#
+# 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.
+#
+
+require 'json'
+
 class Spiceweasel::DataBagList
   def initialize(data_bags = [], options = {})
     @create = @delete = ''
     if data_bags
+      if !File.directory?("data_bags")
+        STDERR.puts "ERROR: 'data_bags' directory not found, unable to validate or load data bag items" unless NOVALIDATION
+      end
       data_bags.each do |data_bag|
-        STDOUT.puts "DEBUG: data bag: #{data_bag.keys[0]}" if DEBUG
-        @delete += "knife data bag#{options['knife_options']} delete #{data_bag.keys[0]} -y\n"
-        @create += "knife data bag#{options['knife_options']} create #{data_bag.keys[0]}\n"
-        items = data_bag[data_bag.keys[0]] || []
+        db = data_bag.keys[0]
+        STDOUT.puts "DEBUG: data bag: #{db}" if DEBUG
+        if !File.directory?("data_bags/#{db}")
+          STDERR.puts "ERROR: 'data_bags/#{db}' directory not found, unable to validate or load data bag items" unless NOVALIDATION
+        end
+        @create += "knife data bag#{options['knife_options']} create #{db}\n"
+        @delete += "knife data bag#{options['knife_options']} delete #{db} -y\n"
+        items = data_bag[db] || []
         secret = nil
         while item = items.shift
-          STDOUT.puts "DEBUG: data bag #{data_bag.keys[0]} item: #{item}" if DEBUG
+          STDOUT.puts "DEBUG: data bag #{db} item: #{item}" if DEBUG
           if item.start_with?("secret")
             secret = item.split()[1]
+            if !File.exists?(secret) and !NOVALIDATION
+              STDERR.puts "ERROR: secret key #{secret} not found, unable to load encrypted data bags for data bag #{db}."
+              exit(-1)
+            end
             next
           end
-          if item =~ /\*/ #wildcard support
-            files = Dir.glob("data_bags/#{data_bag.keys[0]}/#{item}.json")
+          if item =~ /\*/ #wildcard support, will fail if directory not present
+            files = Dir.glob("data_bags/#{db}/#{item}.json")
             items += files.collect {|x| x[x.rindex('/')+1..-6]}
-            puts items
+            STDOUT.puts "DEBUG: found items '#{items}' for data bag: #{db}" if DEBUG
             next
           end
+          validateItem(db, item) unless NOVALIDATION
           if secret
-            @create += "knife data bag#{options['knife_options']} from file #{data_bag.keys[0]} data_bags/#{data_bag.keys[0]}/#{item}.json --secret-file #{secret}\n"
+            @create += "knife data bag#{options['knife_options']} from file #{db} #{item}.json --secret-file #{secret}\n"
           else
-            @create += "knife data bag#{options['knife_options']} from file #{data_bag.keys[0]} data_bags/#{data_bag.keys[0]}/#{item}.json\n"
+            @create += "knife data bag#{options['knife_options']} from file #{db} #{item}.json\n"
           end
         end
       end
     end
   end
 
+  #validate the item to be loaded
+  def validateItem(db, item)
+    if !File.exists?("data_bags/#{db}/#{item}.json")
+      STDERR.puts "ERROR: data bag '#{db}' item '#{item}' file 'data_bags/#{db}/#{item}.json' does not exist"
+      exit(-1)
+    end
+    f = File.read("data_bags/#{db}/#{item}.json")
+    itemfile = JSON.parse(f) #invalid JSON will throw a trace
+    #validate the id matches the file name
+    if !item.eql?(itemfile['id'])
+      STDERR.puts "ERROR: data bag '#{db}' item '#{item}' listed in the manifest does not match the id '#{itemfile['id']}' within the 'data_bags/#{db}/#{item}.json' file."
+      exit(-1)
+    end
+  end
+
   attr_reader :create, :delete
 end

data/lib/spiceweasel/environment_list.rb

@@ -1,20 +1,94 @@
+#
+# 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.
+#
+
+require 'json'
+
 class Spiceweasel::EnvironmentList
-  def initialize(environments = [], options = {})
+  def initialize(environments = [], cookbooks = {}, options = {})
     @create = @delete = ''
-    @environments = []
+    @environment_list = []
     if environments
-      environments.each do |environment|
-        STDOUT.puts "DEBUG: environment: #{environment.keys[0]}" if DEBUG
-        @delete += "knife environment#{options['knife_options']} delete #{environment.keys[0]} -y\n"
-        @create += "knife environment#{options['knife_options']} from file #{environment.keys[0]}.rb\n"
-        @environments << environment.keys[0]
+      environments.each do |env|
+        environment = env.keys[0]
+        STDOUT.puts "DEBUG: environment: #{environment}" if DEBUG
+        if File.directory?("environments")
+          validate(environment, cookbooks) unless NOVALIDATION
+        else
+          STDERR.puts "'environments' directory not found, unable to validate or load environments" unless NOVALIDATION
+        end
+        if File.exists?("environments/#{environment}.json")
+          @create += "knife environment#{options['knife_options']} from file #{environment}.json\n"
+        else #assume no .json means they want .rb and catchall for misssing dir
+          @create += "knife environment#{options['knife_options']} from file #{environment}.rb\n"
+        end
+        @delete += "knife environment#{options['knife_options']} delete #{environment} -y\n"
+        @environment_list << environment
+      end
+    end
+  end
+
+  #validate the content of the environment file
+  def validate(environment, cookbooks)
+    #validate the environments passed in match the name of either the .rb or .json
+    if File.exists?("environments/#{environment}.rb")
+      #validate that the name inside the file matches
+      name = File.open("environments/#{environment}.rb").grep(/^name/)[0].split()[1].gsub(/"/,'').to_s
+      if !environment.eql?(name)
+        STDERR.puts "ERROR: Environment '#{environment}' listed in the manifest does not match the name '#{name}' within the environments/#{environment}.rb file."
+        exit(-1)
+      end
+      #validate the cookbooks exist if they're mentioned
+      envcookbooks = File.open("environments/#{environment}.rb").grep(/^cookbook /)
+      envcookbooks.each do |cb|
+        dep = cb.split()[1].gsub(/"/,'').gsub(/,/,'')
+        STDOUT.puts "DEBUG: environment: '#{environment}' cookbook: '#{dep}'" if DEBUG
+        if !cookbooks.member?(dep)
+          STDERR.puts "ERROR: Cookbook dependency '#{dep}' from environment '#{environment}' is missing from the list of cookbooks in the manifest."
+          exit(-1)
+        end
+      end
+    elsif File.exists?("environments/#{environment}.json")
+      #load the json, don't symbolize since we don't need json_class
+      f = File.read("environments/#{environment}.json")
+      envfile = JSON.parse(f, {symbolize_names: 'false'})
+      #validate that the name inside the file matches
+      STDOUT.puts "DEBUG: environment: '#{environment}' name: '#{envfile[:name]}'" if DEBUG
+      if !environment.eql?(envfile[:name])
+        STDERR.puts "ERROR: Environment '#{environment}' listed in the manifest does not match the name '#{envfile[:name]}' within the 'environments/#{environment}.json' file."
+        exit(-1)
+      end
+      #validate the cookbooks exist if they're mentioned
+      envfile[:cookbook_versions].keys.each do |cb|
+        STDOUT.puts "DEBUG: environment: '#{environment}' cookbook: '#{cb}'" if DEBUG
+        if !cookbooks.member?(cb.to_s)
+          STDERR.puts "ERROR: Cookbook dependency '#{cb}' from environment '#{environment}' is missing from the list of cookbooks in the manifest."
+          exit(-1)
+        end
       end
+    else #environment is not here
+      STDERR.puts "ERROR: Invalid Environment '#{environment}' listed in the manifest but not found in the environments directory."
+      exit(-1)
     end
   end
 
-  attr_reader :environments, :create, :delete
+  attr_reader :environment_list, :create, :delete
 
   def member?(environment)
-    environments.include?(environment)
+    environment_list.include?(environment)
   end
 end

data/lib/spiceweasel/node_list.rb

@@ -1,52 +1,55 @@
 class Spiceweasel::NodeList
-  def initialize(nodes, cookbook_list, environment_list, role_list, options = {})
-    nodes ||= []
+  def initialize(nodes, cookbooks, environments, roles, options = {})
     @create = @delete = ''
-
     if nodes
       nodes.each do |node|
-        STDOUT.puts "DEBUG: node: #{node.keys[0]}" if DEBUG
-        run_list = node[node.keys[0]][0].gsub(/ /,',').split(',')
-        STDOUT.puts "DEBUG: node run_list: #{run_list}" if DEBUG
-        Spiceweasel::RunList.new(run_list).validate(cookbook_list, environment_list, role_list)
+        nname = node.keys[0]
+        STDOUT.puts "DEBUG: node: '#{nname}'" if DEBUG
+        #convert spaces to commas, drop multiple commas
+        run_list = node[nname][0].gsub(/ /,',').gsub(/,+/,',')
+        STDOUT.puts "DEBUG: node: 'node[nname]' run_list: '#{run_list}'" if DEBUG
+        validateRunList(nname, run_list, cookbooks, roles) unless NOVALIDATION
+        noptions = node[nname][1]
+        STDOUT.puts "DEBUG: node: 'node[nname]' options: '#{noptions}'" if DEBUG
+        validateOptions(nname, noptions, environments) unless NOVALIDATION
         #provider support
-        if node.keys[0].start_with?("bluebox","ec2","gandi","openstack","rackspace","slicehost","terremark","voxel")
-          provider = node.keys[0].split()
+        if nname.start_with?("bluebox ","clodo ","cs ","ec2 ","gandi ","openstack ","rackspace ","slicehost ","terremark ","voxel ")
+          provider = nname.split()
           count = 1
           if (provider.length == 2)
             count = provider[1]
           end
           if PARALLEL
             @create += "seq #{count} | parallel -j 0 -v \""
-            @create += "knife #{provider[0]}#{options['knife_options']} server create #{node[node.keys[0]][1]}"
+            @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}"
             if run_list.length > 0
-              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\"\n"
+              @create += " -r '#{run_list}'\"\n"
             end
           else
             count.to_i.times do
-              @create += "knife #{provider[0]}#{options['knife_options']} server create #{node[node.keys[0]][1]}"
+              @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}"
               if run_list.length > 0
-                @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+                @create += " -r '#{run_list}'\n"
               end
             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()
+        elsif nname.start_with?("windows") #windows node bootstrap support
+          nodeline = nname.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]}"
+            @create += "knife bootstrap #{provider[0]} #{provider[1]}#{options['knife_options']} #{server} #{noptions}"
             if run_list.length > 0
-              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+              @create += " -r '#{run_list}'\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]}"
+          nname.split.each do |server|
+            @create += "knife bootstrap#{options['knife_options']} #{server} #{noptions}"
             if run_list.length > 0
-              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+              @create += " -r '#{run_list}'\n"
             end
             @delete += "knife node#{options['knife_options']} delete #{server} -y\n"
           end
@@ -56,5 +59,40 @@ class Spiceweasel::NodeList
     @delete += "knife node#{options['knife_options']} bulk delete .* -y\n"
   end
 
+  #ensure run_list contents are listed previously.
+  def validateRunList(node, run_list, cookbooks, roles)
+    run_list.split(',').each do |item|
+      if item.start_with?("recipe[")
+        #recipe[foo] or recipe[foo::bar]
+        cb = item.split(/\[|\]/)[1].split(':')[0]
+        unless cookbooks.member?(cb)
+          STDERR.puts "ERROR: '#{node}' run list cookbook '#{cb}' is missing from the list of cookbooks in the manifest."
+          exit(-1)
+        end
+      elsif item.start_with?("role[")
+        #role[blah]
+        role = item.split(/\[|\]/)[1]
+        unless roles.member?(role)
+          STDERR.puts "ERROR: '#{node}' run list role '#{role}' is missing from the list of roles in the manifest."
+          exit(-1)
+        end
+      else
+        STDERR.puts "ERROR: '#{node}' run list '#{item}' is an invalid run list entry in the manifest."
+        exit(-1)
+      end
+    end
+  end
+
+  #for now, just check that -E is legit
+  def validateOptions(node, options, environments)
+    if options =~ /-E/ #check for environments
+      env = options.split('-E')[1].split()[0]
+      unless environments.member?(env)
+        STDERR.puts "ERROR: '#{node}' environment '#{env}' is missing from the list of environments in the manifest."
+        exit(-1)
+      end
+    end
+  end
+
   attr_reader :create, :delete
 end

data/lib/spiceweasel/role_list.rb

@@ -1,20 +1,123 @@
+#
+# 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.
+#
+
+require 'json'
+
 class Spiceweasel::RoleList
-  def initialize(roles = [], options = {})
+  def initialize(roles = {}, environments = [], cookbooks = {}, options = {})
     @create = @delete = ''
-    @roles = []
+    @role_list = []
     if roles
-      roles.each do |role|
-        STDOUT.puts "DEBUG: role: #{role.keys[0]}" if DEBUG
-        @delete += "knife role#{options['knife_options']} delete #{role.keys[0]} -y\n"
-        @create += "knife role#{options['knife_options']} from file #{role.keys[0]}.rb\n"
-        @roles << role.keys[0]
+      flatroles = roles.collect {|x| x.keys}.flatten
+      flatroles.each do |role|
+        STDOUT.puts "DEBUG: role: #{role}" if DEBUG
+        if File.directory?("roles")
+          validate(role, environments, cookbooks, flatroles) unless NOVALIDATION
+        else
+          STDERR.puts "ERROR: 'roles' directory not found, unable to validate or load roles" unless NOVALIDATION
+        end
+        if File.exists?("roles/#{role}.json")
+          @create += "knife role#{options['knife_options']} from file #{role}.json\n"
+        else #assume no .json means they want .rb and catchall for misssing dir
+          @create += "knife role#{options['knife_options']} from file #{role}.rb\n"
+        end
+        @delete += "knife role#{options['knife_options']} delete #{role} -y\n"
+        @role_list << role
+      end
+    end
+  end
+
+  #validate the content of the role file
+  def validate(role, environments, cookbooks, roles)
+    #validate the role passed in match the name of either the .rb or .json
+    if File.exists?("roles/#{role}.rb")
+      #validate that the name inside the file matches
+      name = File.open("roles/#{role}.rb").grep(/^name/)[0].split()[1].gsub(/"/,'').to_s
+      STDOUT.puts "DEBUG: role: '#{role}' name: '#{name}'" if DEBUG
+      if !role.eql?(name)
+        STDERR.puts "ERROR: Role '#{role}' listed in the manifest does not match the name '#{name}' within the roles/#{role}.rb file."
+        exit(-1)
+      end
+      #grab any lines with 'recipe[' or 'role['
+      rolerl = File.open("roles/#{role}.rb").grep(/recipe\[|role\[/)
+      rolerl.each do |line|
+        STDOUT.puts "DEBUG: role: '#{role}' line: '#{line}'" if DEBUG
+        line.strip.split(',').each do |rl|
+          if rl =~ /recipe\[/ #it's a cookbook
+            #split on the brackets and any colons
+            dep = rl.split(/\[|\]/)[1].split(':')[0]
+            STDOUT.puts "DEBUG: role: '#{role}' cookbook: '#{rl}': dep: '#{dep}'" if DEBUG
+            if !cookbooks.member?(dep)
+              STDERR.puts "ERROR: Cookbook dependency '#{dep}' from role '#{role}' is missing from the list of cookbooks in the manifest."
+              exit(-1)
+            end
+          elsif rl =~ /role\[/ #it's a role
+            #split on the brackets
+            dep = rl.split(/\[|\]/)[1]
+            STDOUT.puts "DEBUG: role: '#{role}' role: '#{rl}': dep: '#{dep}'" if DEBUG
+            if !roles.member?(dep)
+              STDERR.puts "ERROR: Role dependency '#{dep}' from role '#{role}' is missing from the list of roles in the manifest."
+              exit(-1)
+            end
+          end
+        end
+      end
+      #TODO validate any environment-specific runlists
+    elsif File.exists?("roles/#{role}.json")
+      #load the json, don't symbolize since we don't need json_class
+      f = File.read("roles/#{role}.json")
+      rolefile = JSON.parse(f, {symbolize_names: 'false'})
+      #validate that the name inside the file matches
+      STDOUT.puts "DEBUG: role: '#{role}' name: '#{rolefile[:name]}'" if DEBUG
+      if !role.eql?(rolefile[:name])
+        STDERR.puts "ERROR: Role '#{role}' listed in the manifest does not match the name '#{rolefile[:name]}' within the 'roles/#{role}.json' file."
+        exit(-1)
+      end
+      #validate the cookbooks and roles exist if they're mentioned in run_lists
+      rolefile[:run_list].each do |rl|
+        if rl =~ /recipe\[/ #it's a cookbook
+          #split on the brackets and any colons
+          dep = rl.split(/\[|\]/)[1].split(':')[0]
+          STDOUT.puts "DEBUG: role: '#{role}' cookbook: '#{rl}': dep: '#{dep}'" if DEBUG
+          if !cookbooks.member?(dep)
+            STDERR.puts "ERROR: Cookbook dependency '#{dep}' from role '#{role}' is missing from the list of cookbooks in the manifest."
+            exit(-1)
+          end
+        elsif rl =~ /role\[/ #it's a role
+          #split on the brackets
+          dep = rl.split(/\[|\]/)[1]
+          STDOUT.puts "DEBUG: role: '#{role}' role: '#{rl}': dep: '#{dep}'" if DEBUG
+          if !roles.member?(dep)
+            STDERR.puts "ERROR: Role dependency '#{dep}' from role '#{role}' is missing from the list of roles in the manifest."
+            exit(-1)
+          end
+        end
       end
+      #TODO validate any environment-specific runlists
+    else #role is not here
+      STDERR.puts "ERROR: Invalid Role '#{role}' listed in the manifest but not found in the roles directory."
+      exit(-1)
     end
   end
 
-  attr_reader :roles, :create, :delete
+  attr_reader :role_list, :create, :delete
 
   def member?(role)
-    roles.include?(role)
+    role_list.include?(role)
   end
 end

data/lib/spiceweasel/version.rb

@@ -1,3 +1,21 @@
+#
+# 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.
+#
+
 module Spiceweasel
-  VERSION = "0.9.1"
+  VERSION = "1.0.0"
 end

data/spec/bin/spiceweasel_spec.rb

@@ -9,31 +9,36 @@ knife environment from file development.rb
 knife environment from file qa.rb
 knife environment from file production.rb
 knife role from file base.rb
+knife role from file iisserver.rb
 knife role from file monitoring.rb
 knife role from file webserver.rb
 knife data bag create users
-knife data bag from file users data_bags/users/alice.json
-knife data bag from file users data_bags/users/bob.json
-knife data bag from file users data_bags/users/chuck.json
+knife data bag from file users alice.json
+knife data bag from file users bob.json
+knife data bag from file users chuck.json
 knife data bag create data
 knife data bag create passwords
-knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
-knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-file secret_key
+knife data bag from file passwords mysql.json --secret-file secret_key
+knife data bag from file passwords rabbitmq.json --secret-file secret_key
 knife bootstrap serverA -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
-knife bootstrap serverB -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
-knife bootstrap serverC -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
+knife bootstrap serverB -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production -r 'role[base]'
+knife bootstrap serverC -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -E production -r 'role[base]'
+knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
 knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -r 'role[webserver],recipe[mysql::client]'
 knife rackspace server create --image 49 --flavor 2 -r 'recipe[mysql],role[monitoring]'
 knife rackspace server create --image 49 --flavor 2 -r 'recipe[mysql],role[monitoring]'
 knife rackspace server create --image 49 --flavor 2 -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]'
     OUTPUT
 
     @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
   end
 
   it "maintains consistent output from the example config" do
-    `#{@spiceweasel_binary} --dryrun example.yml`.should == @expected_output
+    `#{@spiceweasel_binary} --novalidation --dryrun example.yml`.should == @expected_output
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,23 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000 -06:00
+date: 2011-12-23 00:00:00.000000000 -06:00
 default_executable: 
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: &2164297640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2164297640
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164297040 !ruby/object:Gem::Requirement
+  requirement: &2151771000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164297040
+  version_requirements: *2151771000
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &2164296500 !ruby/object:Gem::Requirement
+  requirement: &2151768280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164296500
+  version_requirements: *2151768280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164295960 !ruby/object:Gem::Requirement
+  requirement: &2151764400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,9 +45,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164295960
-description: This provides a CLI for generating knife commands to build Chef-managed
-  infrastructure from a simple YAML file.
+  version_requirements: *2151764400
+description: Provides a CLI tool for generating knife commands to build Chef-managed
+  infrastructure from a simple YAML or JSON file.
 email:
 - matt@opscode.com
 - elliot.cm@gmail.com
@@ -73,9 +62,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
 - lib/spiceweasel.rb
 - README.md

data/lib/spiceweasel/recipe_list.rb

@@ -1,40 +0,0 @@
-#
-# 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/run_list.rb

@@ -1,36 +0,0 @@
-class Spiceweasel::RunList
-  def initialize(run_list)
-    @run_list = run_list
-  end
-
-  def validate(cookbooks, environments, roles)
-    @run_list.each do |item|
-      if item.start_with?("recipe")
-        #recipe[foo] or recipe[foo::bar]
-        recipe = item.slice(7..-2).split("::")[0]
-        unless cookbooks.member?(recipe)
-          raise "'#{item}' is an invalid run_list recipe not managed by spiceweasel"
-          exit(-1)
-        end
-      elsif item.start_with?("environment")
-        #environment[blah]
-        environment = item.slice(12..-2)
-        unless environments.member?(environment)
-          raise "'#{item}' is an invalid run_list environment not managed by spiceweasel"
-          exit(-1)
-        end
-      elsif item.start_with?("role")
-        #role[blah]
-        role = item.slice(5..-2)
-        unless roles.member?(role)
-          raise "'#{item}' is an invalid run_list role not managed by spiceweasel"
-          exit(-1)
-        end
-      else
-        raise "'#{item}' is an invalid run_list component"
-        exit(-1)
-      end
-    end
-  end
-
-end