spiceweasel 1.0.0 → 1.1.0

data/README.md

@@ -1,18 +1,18 @@
 Description
 ===========
-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.
+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 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.
+The [https://github.com/mattray/vbacd-repo](https://github.com/mattray/vbacd-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.
 
 Requirements
 ============
-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.
+Spiceweasel currently depends on `knife` to run commands for it, but does not explicitly depend on the `chef` gem yet. 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.
+Written and tested initially with Chef 0.9.12 (should still work) and continuing development with the 0.10 series. It is tested with Ruby 1.8.7 and 1.9.2.
 
 File Syntax
 ===========
@@ -26,20 +26,17 @@ From the `example.yml`:
 cookbooks:
 - apache2:
 - apt:
-    - 1.1.1
+    - 1.2.0
 - mysql:
-
 environments:
 - development:
 - qa:
 - production:
-
 roles:
 - base:
 - iisserver:
 - monitoring:
 - webserver:
-
 data bags:
 - users:
   - alice
@@ -51,7 +48,6 @@ data bags:
   - secret secret_key
   - mysql
   - rabbitmq
-
 nodes:
 - serverA:
   - role[base]
@@ -84,7 +80,7 @@ From the `example.json`:
         {"apache2":[]},
         {"apt":
          [
-             "1.1.1"
+             "1.2.0"
          ]
         },
         {"mysql":[]}
@@ -174,7 +170,7 @@ The `cookbooks` section of the manifest currently supports `knife cookbook uploa
 cookbooks:
 - apache2:
 - apt:
-  - 1.1.0
+  - 1.2.0
 - mysql:
 ```
 
@@ -182,7 +178,7 @@ produces the knife commands
 
 ```
 knife cookbook upload apache2
-knife cookbook site download apt 1.1.0 --file cookbooks/apt.tgz
+knife cookbook site download apt 1.2.0 --file cookbooks/apt.tgz
 tar -C cookbooks/ -xf cookbooks/apt.tgz
 rm -f cookbooks/apt.tgz
 knife cookbook upload apt
@@ -253,8 +249,8 @@ 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 dataA.json
-knife data bag from file users dataB.json
+knife data bag from file data dataA.json
+knife data bag from file data dataB.json
 knife data bag create passwords
 knife data bag from file passwords mysql.json --secret-file secret_key
 knife data bag from file passwords rabbitmq.json --secret-file secret_key
@@ -306,6 +302,25 @@ 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]'
 ```
 
+Extract
+=======
+Spiceweasel may also be used to generate knife commands or Spiceweasel manifests in JSON or YAML.
+
+```
+spiceweasel --extractlocal
+```
+When run in your Chef repository generates the `knife` commands required to upload all the existing infrastructure that is found in the cookbooks, roles, environments and data bags directories with validation.
+
+```
+spiceweasel --extractjson
+```
+When run in your Chef repository generates JSON-formatted output that may be captured and used as your Spiceweasel manifest file.
+
+```
+spiceweasel --extractyaml
+```
+When run in your Chef repository generates YAML-formatted output that may be captured and used as your Spiceweasel manifest file.
+
 Usage
 =====
 To parse a spiceweasel manifest, run the following from your Chef repository directory:
@@ -322,6 +337,9 @@ spiceweasel path/to/infrastructure.yml
 
 This will generate the knife commands to build the described infrastructure. Infrastructure manifest files must end in either `.json` or `.yml`.
 
+OPTIONS
+=======
+
 -c/--knifeconfig
 ----------------
 Specify a knife.rb configuration file to use with the knife commands.
@@ -338,6 +356,18 @@ The delete command will generate the knife commands to delete the infrastructure
 --------
 This is the default action, printing the knife commands to be run without executing them.
 
+--extractlocal
+--------------
+When run in a chef repository, this will print the knife commands to be run.
+
+--extractjson
+--------------
+When run in a chef repository, this will print a new JSON manifest that may be used as input to Spiceweasel.
+
+--extractyaml
+--------------
+When run in a chef repository, this will print a new YAML manifest that may be used as input to Spiceweasel.
+
 -h/--help
 ---------
 Print the currently-supported usage options for spiceweasel.
@@ -366,7 +396,7 @@ License and Author
 ==================
 Author: Matt Ray <matt@opscode.com>
 
-Copyright: 2011 Opscode, Inc
+Copyright: 2011-2012 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/bin/spiceweasel

@@ -34,6 +34,9 @@ begin
   PARALLEL = cli.config[:parallel]
   SITEINSTALL = cli.config[:siteinstall]
   NOVALIDATION = cli.config[:novalidation]
+  EXTRACTLOCAL = cli.config[:extractlocal]
+  EXTRACTYAML = cli.config[:extractyaml]
+  EXTRACTJSON = cli.config[:extractjson]
 rescue OptionParser::InvalidOption => e
   STDERR.puts e.message
   puts cli.opt_parser.to_s
@@ -41,28 +44,37 @@ rescue OptionParser::InvalidOption => e
 end
 
 if cli.config[:knifeconfig]
-  options['knife_options']=" -c "+cli.config[:knifeconfig]
+  options['knife_options'] += " -c " + cli.config[:knifeconfig]
 end
 
-begin
-  file = ARGV.last
-  STDOUT.puts "DEBUG: file: #{file}" if cli.config[:debug]
-  if (file.end_with?(".yml"))
-    input = YAML.load_file ARGV.last
-  elsif (file.end_with?(".json"))
-    input = JSON.parse(File.read(ARGV.last))
-  else
-    STDERR.puts "ERROR: Unknown file type, please use a file ending with either '.json' or '.yml'."
+if cli.config[:serverurl]
+  options['knife_options'] += " --server-url " + cli.config[:serverurl]
+end
+
+if EXTRACTLOCAL || EXTRACTJSON || EXTRACTYAML
+  input = Spiceweasel::DirectoryExtractor.parse_objects
+  STDOUT.puts "DEBUG: extract input: #{input}" if DEBUG
+else
+  begin
+    file = ARGV.last
+    STDOUT.puts "DEBUG: file: #{file}" if DEBUG
+    if (file.end_with?(".yml"))
+      input = YAML.load_file ARGV.last
+    elsif (file.end_with?(".json"))
+      input = JSON.parse(File.read(ARGV.last))
+    else
+      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 "ERROR: Parsing error in the infrastructure file provided."
+    exit(-1)
+  rescue Exception
+    STDERR.puts "ERROR: No infrastructure .json or .yml file provided."
+    puts cli.opt_parser.to_s
     exit(-1)
   end
-rescue JSON::ParserError => e
-  STDERR.puts e.message
-  STDERR.puts "ERROR: Parsing error in the infrastructure file provided."
-  exit(-1)
-rescue Exception
-  STDERR.puts "ERROR: No infrastructure .json or .yml file provided."
-  puts cli.opt_parser.to_s
-  exit(-1)
 end
 
 create = String.new()
@@ -94,7 +106,13 @@ elsif cli.config[:rebuild]
   puts delete unless delete.empty?
   puts create unless create.empty?
 else
-  puts create unless create.empty?
+  if EXTRACTJSON
+    puts JSON.pretty_generate(input)
+  elsif EXTRACTYAML
+    puts input.to_yaml
+  else
+    puts create unless create.empty?
+  end
 end
 #else
 #eventually we will execute instead of printing knife commands

data/lib/spiceweasel.rb

@@ -23,4 +23,6 @@ module Spiceweasel
   autoload :RoleList, 'spiceweasel/role_list'
   autoload :DataBagList, 'spiceweasel/data_bag_list'
   autoload :NodeList, 'spiceweasel/node_list'
+  autoload :DirectoryExtractor, 'spiceweasel/directory_extractor'
+  autoload :CookbookData, 'spiceweasel/cookbook_data'
 end

data/lib/spiceweasel/cli.rb

@@ -4,7 +4,19 @@ require 'spiceweasel/version'
 class Spiceweasel::CLI
   include Mixlib::CLI
 
-  banner("Usage: spiceweasel [option] file")
+  banner("Usage: spiceweasel [option] file\n       spiceweasel [option] --extractlocal")
+
+  option :extractlocal,
+  :long => "--extractlocal",
+  :description => "Use contents of local chef repository directories to generate knife commands to build infrastructure"
+
+  option :extractjson,
+  :long => "--extractjson",
+  :description => "Use contents of local chef repository directories to generate JSON spiceweasel manifest"
+
+  option :extractyaml,
+  :long => "--extractyaml",
+  :description => "Use contents of local chef repository directories to generate YAML spiceweasel manifest"
 
   option :debug,
   :long => "--debug",
@@ -14,7 +26,7 @@ class Spiceweasel::CLI
   option :delete,
   :short => "-d",
   :long => "--delete",
-  :description => "Print the knife commands to be delete the infrastructure",
+  :description => "Print the knife commands to delete the infrastructure",
   :boolean => true
 
   option :dryrun,
@@ -31,10 +43,15 @@ class Spiceweasel::CLI
   :show_options => true,
   :exit => 0
 
+  option :serverurl,
+  :short => "-s URL",
+  :long => "--server-url URL",
+  :description => "Specify the Chef Server URL"
+
   option :knifeconfig,
   :short => "-c CONFIG",
   :long => "--knifeconfig CONFIG",
-  :description => "Specify the knife.rb configuration file to use"
+  :description => "Specify the knife.rb configuration file"
 
   option :novalidation,
   :long => "--novalidation",
@@ -60,7 +77,7 @@ class Spiceweasel::CLI
   option :version,
   :short => "-v",
   :long => "--version",
-  :description => "Version",
+  :description => "Show spiceweasel version",
   :boolean => true,
   :proc => lambda {|v| puts "Spiceweasel: #{Spiceweasel::VERSION}" },
   :exit => 0

data/lib/spiceweasel/cookbook_data.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Geoff Meakin
+# Author:: Matt Ray (<matt@opscode.com>)
+#
+# Copyright:: 2012, 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::CookbookData
+
+  attr_accessor :_name, :_dependencies, :_version
+
+  def initialize(file_name)
+    @_name = file_name.split('/').last
+    @_dependencies = []
+    @_version = ""
+    @file_name = file_name
+  end
+
+  def is_readable?
+    return false unless File.directory?("cookbooks/#{@_name}")
+    return false unless File.exists?("cookbooks/#{@_name}/metadata.rb")
+    true
+  end
+
+  def read
+    if File.exists?("cookbooks/#{@_name}/metadata.rb") && File.readable?("cookbooks/#{@_name}/metadata.rb")
+      self.instance_eval(IO.read("cookbooks/#{@_name}/metadata.rb"), "cookbooks/#{@_name}/metadata.rb", 1)
+    else
+      raise IOError, "Cannot open or read cookbooks/#{@_name}/metadata.rb!"
+    end
+    {:name => @_name, :version => @_version, :dependencies => @_dependencies }
+  end
+
+  def name(*args) # Override metadata.rb DSL
+    @_name = args.shift
+  end
+
+  def version(*args) # Override metadata.rb DSL
+    @_version = args.shift
+  end
+
+  def depends(*args) # Override metadata.rb DSL
+    cookbook = args.shift
+    if args.length > 0
+      cookbook_version = args.shift
+    end
+    @_dependencies << {:cookbook => cookbook, :version => cookbook_version}
+  end
+
+  def method_missing(m, *args, &block)
+    true
+  end
+
+end

data/lib/spiceweasel/cookbook_list.rb

@@ -65,13 +65,14 @@ class Spiceweasel::CookbookList
     end
     deps = File.open("cookbooks/#{cookbook}/metadata.rb").grep(/^depends/)
     deps.each do |dependency|
+      STDOUT.puts "DEBUG: cookbook #{cookbook} metadata dependency: #{dependency}" if DEBUG
       line = dependency.split()
       cbdep = ''
-      if line[1][0].eql?('"') #ignore variables and versions
+      if line[1] =~ /^"/ #ignore variables and versions
         cbdep = line[1].gsub(/"/,'')
         cbdep.gsub!(/\,/,'') if cbdep.end_with?(',')
       end
-      STDOUT.puts "DEBUG: #{cookbook} metadata depends: #{cbdep}" if DEBUG
+      STDOUT.puts "DEBUG: cookbook #{cookbook} metadata depends: #{cbdep}" if DEBUG
       @dependencies << cbdep
     end
     return @cookbook
@@ -79,6 +80,7 @@ class Spiceweasel::CookbookList
 
   #compare the list of cookbook deps with those specified
   def validateDependencies()
+    STDOUT.puts "DEBUG: cookbook validateDependencies: '#{@dependencies}'" if DEBUG
     @dependencies.each do |dep|
       if !member?(dep)
         STDERR.puts "ERROR: Cookbook dependency '#{dep}' is missing from the list of cookbooks in the manifest."

data/lib/spiceweasel/directory_extractor.rb

@@ -0,0 +1,140 @@
+#
+# Author:: Geoff Meakin
+# Author:: Matt Ray (<matt@opscode.com>)
+#
+# Copyright:: 2012, 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::DirectoryExtractor
+
+  def self.parse_objects
+    objects = {"cookbooks" => nil, "roles" => nil, "environments" => nil, "data bags" => nil, "nodes" => nil}
+    # COOKBOOKS
+    cookbooks = []
+    Dir.glob("cookbooks/*").each do |cookbook_full_path|
+      cookbook = self.grab_filename_from_path cookbook_full_path
+      STDOUT.puts "DEBUG: dir_ext: cookbook: '#{cookbook}'" if DEBUG
+      cookbook_data = Spiceweasel::CookbookData.new(cookbook)
+      if cookbook_data.is_readable?
+        cookbooks << cookbook_data.read
+      end
+    end
+    cookbook_names = self.order_cookbooks_by_dependency cookbooks
+    objects["cookbooks"] = cookbook_names unless cookbook_names.empty?
+
+    # ROLES
+    roles = []
+    Dir.glob("roles/*.{rb,json}").each do |role_full_path|
+      role = self.grab_name_from_path role_full_path
+      STDOUT.puts "DEBUG: dir_ext: role: '#{role}'" if DEBUG
+      roles << {role => nil}
+    end
+    objects["roles"] = roles unless roles.nil?
+    # ENVIRONMENTS
+    environments = []
+    Dir.glob("environments/*.{rb,json}").each do |environment_full_path|
+      environment = self.grab_name_from_path environment_full_path
+      STDOUT.puts "DEBUG: dir_ext: environment: '#{environment}'" if DEBUG
+      environments << {environment => nil}
+    end
+    objects["environments"] = environments unless environments.empty?
+    # DATA BAGS
+    data_bags = []
+    Dir.glob("data_bags/*").each do |data_bag_full_path|
+      data_bag = data_bag_full_path.split('/').last
+      STDOUT.puts "DEBUG: dir_ext: data_bag: '#{data_bag}'" if DEBUG
+      data_bag_items = []
+      Dir.glob("#{data_bag_full_path}/*.{rb,json}").each do |data_bag_item_full_path|
+        STDOUT.puts "DEBUG: dir_ext: data_bag: '#{data_bag}':'#{data_bag_item_full_path}'" if DEBUG
+        data_bag_items << self.grab_name_from_path(data_bag_item_full_path)
+      end if File.directory?(data_bag_full_path)
+      data_bags << {data_bag => data_bag_items} unless data_bag_items.empty?
+    end
+    objects["data bags"] = data_bags unless data_bags.empty?
+    # NODES
+    # TODO: Cant use this yet as node_list.rb doesnt support node from file syntax but expects the node info to be part of the objects passed in
+    # nodes = []
+    # Dir.glob("nodes/*.{rb,json}").each do |node_full_path|
+    #   node = self.grab_name_from_path node_full_path
+    #   nodes  << {node => nil}
+    # end
+    # objects["nodes"] = nodes unless nodes.empty?
+
+    objects
+  end
+
+  def self.grab_filename_from_path path
+    path.split('/').last
+  end
+
+  def self.grab_name_from_path path
+    name = self.grab_filename_from_path(path).split('.')
+    if name.length>1
+      name.pop
+    end
+    name.join('.')
+  end
+  def self.order_cookbooks_by_dependency cookbooks
+
+    # Weak algorithm, not particularly elegant, ignores version info as unlikely to have two versions of a cookbook anyway
+    ordered_cookbooks = []
+
+    left_to_sort = cookbooks
+    num_sorted_cookbooks_this_iteration = -1
+
+    while left_to_sort.size > 0 && num_sorted_cookbooks_this_iteration != 0
+
+      unsorted_cookbooks = left_to_sort
+      left_to_sort = []
+      num_sorted_cookbooks_this_iteration
+      unsorted_cookbooks.each do |cookbook|
+        name = cookbook[:name]
+        dependencies = cookbook[:dependencies]
+
+        next if ordered_cookbooks.include? name
+
+        if dependencies.nil?
+          ordered_cookbooks << name
+          num_sorted_cookbooks_this_iteration += 1
+          next
+        end
+
+        dependencies_satisfied_yet = true
+        dependencies.each {|dependency| dependencies_satisfied_yet = false unless ordered_cookbooks.include? dependency[:cookbook]}
+        if dependencies_satisfied_yet
+          ordered_cookbooks << name
+          num_sorted_cookbooks_this_iteration += 1
+          next
+        end
+
+        left_to_sort << cookbook
+
+      end
+
+    end
+
+    if left_to_sort.size > 0
+      STDERR.puts "ERROR: Dependencies not satisfied or circular dependencies between cookbooks: #{left_to_sort}"
+      exit(-1)
+    end
+    output_cookbooks = []
+    ordered_cookbooks.each do |cookbook|
+      output_cookbooks << {cookbook => nil}
+    end
+    output_cookbooks
+
+  end
+
+end

data/lib/spiceweasel/environment_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2011, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-2012, 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.
@@ -65,15 +65,17 @@ class Spiceweasel::EnvironmentList
     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'})
+      JSON.create_id = nil
+      envfile = JSON.parse(f, {:symbolize_names => false})
+      STDOUT.puts "DEBUG: environment: '#{environment}' file: '#{envfile}'" if DEBUG
       #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."
+      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|
+      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."

data/lib/spiceweasel/node_list.rb

@@ -13,7 +13,7 @@ class Spiceweasel::NodeList
         STDOUT.puts "DEBUG: node: 'node[nname]' options: '#{noptions}'" if DEBUG
         validateOptions(nname, noptions, environments) unless NOVALIDATION
         #provider support
-        if nname.start_with?("bluebox ","clodo ","cs ","ec2 ","gandi ","openstack ","rackspace ","slicehost ","terremark ","voxel ")
+        if nname.start_with?("bluebox ","clodo ","cs ","ec2 ","gandi ","hp ","openstack ","rackspace ","slicehost ","terremark ","voxel ")
           provider = nname.split()
           count = 1
           if (provider.length == 2)

data/lib/spiceweasel/role_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2011, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-2012, 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.
@@ -81,15 +81,16 @@ class Spiceweasel::RoleList
     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'})
+      JSON.create_id = nil
+      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."
+      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|
+      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]

data/lib/spiceweasel/version.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Matt Ray (<matt@opscode.com>)
 #
-# Copyright:: 2011, Opscode, Inc <legal@opscode.com>
+# Copyright:: 2011-2012 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.
@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 -06:00
-default_executable: 
+date: 2012-05-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2151771000 !ruby/object:Gem::Requirement
+  requirement: &70140549239420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151771000
+  version_requirements: *70140549239420
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &2151768280 !ruby/object:Gem::Requirement
+  requirement: &70140549239000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151768280
+  version_requirements: *70140549239000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151764400 !ruby/object:Gem::Requirement
+  requirement: &70140549238580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151764400
+  version_requirements: *70140549238580
 description: Provides a CLI tool for generating knife commands to build Chef-managed
   infrastructure from a simple YAML or JSON file.
 email:
@@ -58,8 +57,10 @@ extra_rdoc_files: []
 files:
 - bin/spiceweasel
 - lib/spiceweasel/cli.rb
+- lib/spiceweasel/cookbook_data.rb
 - lib/spiceweasel/cookbook_list.rb
 - lib/spiceweasel/data_bag_list.rb
+- lib/spiceweasel/directory_extractor.rb
 - lib/spiceweasel/environment_list.rb
 - lib/spiceweasel/node_list.rb
 - lib/spiceweasel/role_list.rb
@@ -67,7 +68,6 @@ files:
 - lib/spiceweasel.rb
 - README.md
 - spec/bin/spiceweasel_spec.rb
-has_rdoc: true
 homepage: http://github.com/mattray/spiceweasel
 licenses: []
 post_install_message: 
@@ -88,9 +88,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: spiceweasel
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CLI for generating Chef knife commands from a simple YAML file.
 test_files:
 - spec/bin/spiceweasel_spec.rb
+has_rdoc: