spiceweasel 1.1.2 → 1.2.0

data/README.md

@@ -12,7 +12,7 @@ Requirements
 ============
 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. It is tested with Ruby 1.8.7 and 1.9.2.
+Written and tested initially with Chef 0.9.12 (should still work) and continuing development with the 10. series. It is tested with Ruby 1.8.7 and 1.9.2.
 
 File Syntax
 ===========
@@ -43,7 +43,7 @@ data bags:
   - bob
   - chuck
 - data:
-  - *
+  - "*"
 - passwords:
   - secret secret_key
   - mysql
@@ -60,7 +60,7 @@ nodes:
   - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
 - rackspace 3:
   - recipe[mysql],role[monitoring]
-  - --image 49 --flavor 2
+  - --image 49 --flavor 2 --node-name rs{{n}}.example.com
 - windows_winrm winboxA:
   - role[base],role[iisserver]
   - -x Administrator -P 'super_secret_password'
@@ -143,7 +143,7 @@ From the `example.json`:
         {"rackspace 3":
          [
              "recipe[mysql],role[monitoring]",
-             "--image 49 --flavor 2"
+             "--image 49 --flavor 2 --node-name rs{{n}}.example.com"
          ]
         },
         {"windows_winrm winboxA":
@@ -225,7 +225,7 @@ knife role from file webserver.rb
 
 Data Bags
 ---------
-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
+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:
@@ -234,7 +234,7 @@ data bags:
   - bob
   - chuck
 - data:
-  - *
+  - "*"
 - passwords:
   - secret secret_key
   - mysql
@@ -258,7 +258,7 @@ knife data bag from file passwords rabbitmq.json --secret-file secret_key
 
 Nodes
 -----
-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 `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. If you want to give your nodes names, simply pass `-N NAME{{n}}` or `--node-name NAME{{n}}` and the `{{n}}` will be substituted by a number (works with or without --parallel).
 
 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
 
@@ -275,7 +275,7 @@ nodes:
   - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
 - rackspace 3:
   - recipe[mysql],role[monitoring]
-  - --image 49 --flavor 2
+  - --image 49 --flavor 2 --node-name rs{{n}}.example.com
 - windows_winrm winboxA:
   - role[base],role[iisserver]
   - -x Administrator -P 'super_secret_password'
@@ -294,14 +294,31 @@ knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7
 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 rackspace server create --image 49 --flavor 2 --node-name rs1.example.com -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 --flavor 2 --node-name rs2.example.com -r 'recipe[mysql],role[monitoring]'
+knife rackspace server create --image 49 --flavor 2 --node-name rs3.example.com -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]'
 ```
 
+Using `--parallel` with the following block and the `-N webserver{{n}}`
+
+``` yaml
+nodes:
+- ec2 3:
+  - role[webserver]
+  - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -N webserver{{n}}
+```
+
+produces the following:
+
+```
+seq 3 | parallel -j 0 -v "knife ec2 server create -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small -N webserver{} -r 'role[base],role[tc],role[users]'"
+```
+
+which generates nodes named "webserver1", "webserver2" and "webserver3".
+
 Extract
 =======
 Spiceweasel may also be used to generate knife commands or Spiceweasel manifests in JSON or YAML.

data/bin/spiceweasel

@@ -30,13 +30,13 @@ begin
   ARGV << "-h" if ARGV.empty?
   cli = Spiceweasel::CLI.new
   cli.parse_options
-  DEBUG = cli.config[:debug]
-  PARALLEL = cli.config[:parallel]
-  SITEINSTALL = cli.config[:siteinstall]
-  NOVALIDATION = cli.config[:novalidation]
-  EXTRACTLOCAL = cli.config[:extractlocal]
-  EXTRACTYAML = cli.config[:extractyaml]
-  EXTRACTJSON = cli.config[:extractjson]
+  Spiceweasel::DEBUG = cli.config[:debug]
+  Spiceweasel::PARALLEL = cli.config[:parallel]
+  Spiceweasel::SITEINSTALL = cli.config[:siteinstall]
+  Spiceweasel::NOVALIDATION = cli.config[:novalidation]
+  Spiceweasel::EXTRACTLOCAL = cli.config[:extractlocal]
+  Spiceweasel::EXTRACTYAML = cli.config[:extractyaml]
+  Spiceweasel::EXTRACTJSON = cli.config[:extractjson]
 rescue OptionParser::InvalidOption => e
   STDERR.puts e.message
   puts cli.opt_parser.to_s
@@ -51,13 +51,13 @@ if cli.config[:serverurl]
   options['knife_options'] += " --server-url " + cli.config[:serverurl]
 end
 
-if EXTRACTLOCAL || EXTRACTJSON || EXTRACTYAML
+if Spiceweasel::EXTRACTLOCAL || Spiceweasel::EXTRACTJSON || Spiceweasel::EXTRACTYAML
   input = Spiceweasel::DirectoryExtractor.parse_objects
-  STDOUT.puts "DEBUG: extract input: #{input}" if DEBUG
+  STDOUT.puts "DEBUG: extract input: #{input}" if Spiceweasel::DEBUG
 else
   begin
     file = ARGV.last
-    STDOUT.puts "DEBUG: file: #{file}" if DEBUG
+    STDOUT.puts "DEBUG: file: #{file}" if Spiceweasel::DEBUG
     if (file.end_with?(".yml"))
       input = YAML.load_file ARGV.last
     elsif (file.end_with?(".json"))
@@ -66,16 +66,20 @@ else
       STDERR.puts "ERROR: Unknown file type, please use a file ending with either '.json' or '.yml'."
       exit(-1)
     end
+  rescue Psych::SyntaxError => e
+    STDERR.puts e.message
+    STDERR.puts "ERROR: Parsing error in #{file}."
+    exit(-1)
   rescue JSON::ParserError => e
     STDERR.puts e.message
-    STDERR.puts "ERROR: Parsing error in the infrastructure file provided."
+    STDERR.puts "ERROR: Parsing error in #{file}."
     exit(-1)
   rescue Exception
     STDERR.puts "ERROR: No infrastructure .json or .yml file provided."
     puts cli.opt_parser.to_s
     exit(-1)
   end
-  STDOUT.puts "DEBUG: file input: #{input}" if DEBUG
+  STDOUT.puts "DEBUG: file input: #{input}" if Spiceweasel::DEBUG
 end
 
 create = String.new()
@@ -107,9 +111,9 @@ elsif cli.config[:rebuild]
   puts delete unless delete.empty?
   puts create unless create.empty?
 else
-  if EXTRACTJSON
+  if Spiceweasel::EXTRACTJSON
     puts JSON.pretty_generate(input)
-  elsif EXTRACTYAML
+  elsif Spiceweasel::EXTRACTYAML
     puts input.to_yaml
   else
     puts create unless create.empty?

data/lib/spiceweasel/cookbook_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.
@@ -29,12 +29,12 @@ class Spiceweasel::CookbookList
           version = cookbook[cb][0].to_s || ""
           args = cookbook[cb][1] || ""
         end
-        STDOUT.puts "DEBUG: cookbook: #{cb} #{version}" if DEBUG
+        STDOUT.puts "DEBUG: cookbook: #{cb} #{version}" if Spiceweasel::DEBUG
         if File.directory?("cookbooks")
           if File.directory?("cookbooks/#{cb}")
-            validateMetadata(cb,version) unless NOVALIDATION
+            validateMetadata(cb,version) unless Spiceweasel::NOVALIDATION
           else
-            if SITEINSTALL #use knife cookbook site install
+            if Spiceweasel::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
               @create += "knife cookbook#{options['knife_options']} site download #{cb} #{version} --file cookbooks/#{cb}.tgz #{args}\n"
@@ -43,14 +43,14 @@ class Spiceweasel::CookbookList
             end
           end
         else
-          STDERR.puts "'cookbooks' directory not found, unable to validate, download and load cookbooks" unless NOVALIDATION
+          STDERR.puts "'cookbooks' directory not found, unable to validate, download and load cookbooks" unless Spiceweasel::NOVALIDATION
         end
         @create += "knife cookbook#{options['knife_options']} upload #{cb}\n"
-        @delete += "knife cookbook#{options['knife_options']} delete #{cb} #{version} -y\n"
+        @delete += "knife cookbook#{options['knife_options']} delete #{cb} #{version} -a -y\n"
 
         @cookbook_list[cb] = version
       end
-      validateDependencies() unless NOVALIDATION
+      validateDependencies() unless Spiceweasel::NOVALIDATION
     end
   end
 
@@ -58,29 +58,28 @@ class Spiceweasel::CookbookList
   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
+    STDOUT.puts "DEBUG: cookbook metadata version: #{metadata}" if Spiceweasel::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|
-      STDOUT.puts "DEBUG: cookbook #{cookbook} metadata dependency: #{dependency}" if DEBUG
+      STDOUT.puts "DEBUG: cookbook #{cookbook} metadata dependency: #{dependency}" if Spiceweasel::DEBUG
       line = dependency.split()
-      cbdep = ''
-      if line[1] =~ /^"/ #ignore variables and versions
-        cbdep = line[1].gsub(/"/,'')
+      if line[1] =~ /^["']/ #ignore variables and versions
+        cbdep = line[1].gsub(/["']/,'')
         cbdep.gsub!(/\,/,'') if cbdep.end_with?(',')
+        STDOUT.puts "DEBUG: cookbook #{cookbook} metadata depends: #{cbdep}" if Spiceweasel::DEBUG
+        @dependencies << cbdep
       end
-      STDOUT.puts "DEBUG: cookbook #{cookbook} metadata depends: #{cbdep}" if DEBUG
-      @dependencies << cbdep
     end
     return @cookbook
   end
 
   #compare the list of cookbook deps with those specified
   def validateDependencies()
-    STDOUT.puts "DEBUG: cookbook validateDependencies: '#{@dependencies}'" if DEBUG
+    STDOUT.puts "DEBUG: cookbook validateDependencies: '#{@dependencies}'" if Spiceweasel::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/data_bag_list.rb

@@ -23,23 +23,23 @@ class Spiceweasel::DataBagList
     @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
+        STDERR.puts "ERROR: 'data_bags' directory not found, unable to validate or load data bag items" unless Spiceweasel::NOVALIDATION
       end
       data_bags.each do |data_bag|
         db = data_bag.keys[0]
-        STDOUT.puts "DEBUG: data bag: #{db}" if DEBUG
+        STDOUT.puts "DEBUG: data bag: #{db}" if Spiceweasel::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
+          STDERR.puts "ERROR: 'data_bags/#{db}' directory not found, unable to validate or load data bag items" unless Spiceweasel::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 #{db} item: #{item}" if DEBUG
+          STDOUT.puts "DEBUG: data bag #{db} item: #{item}" if Spiceweasel::DEBUG
           if item.start_with?("secret")
             secret = item.split()[1]
-            if !File.exists?(secret) and !NOVALIDATION
+            if !File.exists?(secret) and !Spiceweasel::NOVALIDATION
               STDERR.puts "ERROR: secret key #{secret} not found, unable to load encrypted data bags for data bag #{db}."
               exit(-1)
             end
@@ -48,10 +48,10 @@ class Spiceweasel::DataBagList
           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]}
-            STDOUT.puts "DEBUG: found items '#{items}' for data bag: #{db}" if DEBUG
+            STDOUT.puts "DEBUG: found items '#{items}' for data bag: #{db}" if Spiceweasel::DEBUG
             next
           end
-          validateItem(db, item) unless NOVALIDATION
+          validateItem(db, item) unless Spiceweasel::NOVALIDATION
           if secret
             @create += "knife data bag#{options['knife_options']} from file #{db} #{item}.json --secret-file #{secret}\n"
           else

data/lib/spiceweasel/directory_extractor.rb

@@ -25,13 +25,13 @@ class Spiceweasel::DirectoryExtractor
     cookbooks = []
     Dir.glob("cookbooks/*").each do |cookbook_full_path|
       cookbook = cookbook_full_path.split('/').last
-      STDOUT.puts "DEBUG: dir_ext: cookbook: '#{cookbook}'" if DEBUG
+      STDOUT.puts "DEBUG: dir_ext: cookbook: '#{cookbook}'" if Spiceweasel::DEBUG
       cookbook_data = Spiceweasel::CookbookData.new(cookbook)
       if cookbook_data.is_readable?
         cookbooks << cookbook_data.read
       end
     end
-    STDOUT.puts "DEBUG: dir_ext: cookbooks: '#{cookbooks}'" if DEBUG
+    STDOUT.puts "DEBUG: dir_ext: cookbooks: '#{cookbooks}'" if Spiceweasel::DEBUG
     cookbooks = self.order_cookbooks_by_dependency(cookbooks)
     objects["cookbooks"] = cookbooks unless cookbooks.empty?
 
@@ -39,7 +39,7 @@ class Spiceweasel::DirectoryExtractor
     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
+      STDOUT.puts "DEBUG: dir_ext: role: '#{role}'" if Spiceweasel::DEBUG
       roles << {role => nil}
     end
     objects["roles"] = roles unless roles.nil?
@@ -47,7 +47,7 @@ class Spiceweasel::DirectoryExtractor
     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
+      STDOUT.puts "DEBUG: dir_ext: environment: '#{environment}'" if Spiceweasel::DEBUG
       environments << {environment => nil}
     end
     objects["environments"] = environments unless environments.empty?
@@ -55,10 +55,10 @@ class Spiceweasel::DirectoryExtractor
     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
+      STDOUT.puts "DEBUG: dir_ext: data_bag: '#{data_bag}'" if Spiceweasel::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
+        STDOUT.puts "DEBUG: dir_ext: data_bag: '#{data_bag}':'#{data_bag_item_full_path}'" if Spiceweasel::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?
@@ -102,12 +102,12 @@ class Spiceweasel::DirectoryExtractor
         unsorted_cookbooks.push(cookbook)
         scount = scount + 1
       end
-      STDOUT.puts "DEBUG: dir_ext: sorted_cookbooks: '#{sorted_cookbooks}' #{scount}" if DEBUG
+      STDOUT.puts "DEBUG: dir_ext: sorted_cookbooks: '#{sorted_cookbooks}' #{scount}" if Spiceweasel::DEBUG
     end
     if scount > 0
       remainders = unsorted_cookbooks.collect {|x| x['name']}
-      STDOUT.puts "DEBUG: dir_ext: remainders: '#{remainders}'" if DEBUG
-      if NOVALIDATION #stuff is missing, oh well
+      STDOUT.puts "DEBUG: dir_ext: remainders: '#{remainders}'" if Spiceweasel::DEBUG
+      if Spiceweasel::NOVALIDATION #stuff is missing, oh well
         sorted_cookbooks.push(remainders).flatten!
       else
         deps = unsorted_cookbooks.collect {|x| x['dependencies'].collect {|x| x['cookbook']} - sorted_cookbooks}

data/lib/spiceweasel/environment_list.rb

@@ -25,11 +25,11 @@ class Spiceweasel::EnvironmentList
     if environments
       environments.each do |env|
         environment = env.keys[0]
-        STDOUT.puts "DEBUG: environment: #{environment}" if DEBUG
+        STDOUT.puts "DEBUG: environment: #{environment}" if Spiceweasel::DEBUG
         if File.directory?("environments")
-          validate(environment, cookbooks) unless NOVALIDATION
+          validate(environment, cookbooks) unless Spiceweasel::NOVALIDATION
         else
-          STDERR.puts "'environments' directory not found, unable to validate or load environments" unless NOVALIDATION
+          STDERR.puts "'environments' directory not found, unable to validate or load environments" unless Spiceweasel::NOVALIDATION
         end
         if File.exists?("environments/#{environment}.json")
           @create += "knife environment#{options['knife_options']} from file #{environment}.json\n"
@@ -56,7 +56,7 @@ class Spiceweasel::EnvironmentList
       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
+        STDOUT.puts "DEBUG: environment: '#{environment}' cookbook: '#{dep}'" if Spiceweasel::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)
@@ -67,16 +67,16 @@ class Spiceweasel::EnvironmentList
       f = File.read("environments/#{environment}.json")
       JSON.create_id = nil
       envfile = JSON.parse(f, {:symbolize_names => false})
-      STDOUT.puts "DEBUG: environment: '#{environment}' file: '#{envfile}'" if DEBUG
+      STDOUT.puts "DEBUG: environment: '#{environment}' file: '#{envfile}'" if Spiceweasel::DEBUG
       #validate that the name inside the file matches
-      STDOUT.puts "DEBUG: environment: '#{environment}' name: '#{envfile['name']}'" if DEBUG
+      STDOUT.puts "DEBUG: environment: '#{environment}' name: '#{envfile['name']}'" if Spiceweasel::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
+        STDOUT.puts "DEBUG: environment: '#{environment}' cookbook: '#{cb}'" if Spiceweasel::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)

data/lib/spiceweasel/node_list.rb

@@ -4,14 +4,14 @@ class Spiceweasel::NodeList
     if nodes
       nodes.each do |node|
         nname = node.keys[0]
-        STDOUT.puts "DEBUG: node: '#{nname}'" if DEBUG
+        STDOUT.puts "DEBUG: node: '#{nname}'" if Spiceweasel::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
+        STDOUT.puts "DEBUG: node: 'node[nname]' run_list: '#{run_list}'" if Spiceweasel::DEBUG
+        validateRunList(nname, run_list, cookbooks, roles) unless Spiceweasel::NOVALIDATION
         noptions = node[nname][1]
-        STDOUT.puts "DEBUG: node: 'node[nname]' options: '#{noptions}'" if DEBUG
-        validateOptions(nname, noptions, environments) unless NOVALIDATION
+        STDOUT.puts "DEBUG: node: 'node[nname]' options: '#{noptions}'" if Spiceweasel::DEBUG
+        validateOptions(nname, noptions, environments) unless Spiceweasel::NOVALIDATION
         #provider support
         if nname.start_with?("bluebox ","clodo ","cs ","ec2 ","gandi ","hp ","openstack ","rackspace ","slicehost ","terremark ","voxel ")
           provider = nname.split()
@@ -19,15 +19,15 @@ class Spiceweasel::NodeList
           if (provider.length == 2)
             count = provider[1]
           end
-          if PARALLEL
+          if Spiceweasel::PARALLEL
             @create += "seq #{count} | parallel -j 0 -v \""
-            @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}"
+            @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}".gsub(/\{\{n\}\}/, '{}')
             if run_list.length > 0
               @create += " -r '#{run_list}'\"\n"
             end
           else
-            count.to_i.times do
-              @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}"
+            count.to_i.times do |i|
+              @create += "knife #{provider[0]}#{options['knife_options']} server create #{noptions}".gsub(/\{\{n\}\}/, (i + 1).to_s)
               if run_list.length > 0
                 @create += " -r '#{run_list}'\n"
               end
@@ -46,8 +46,8 @@ class Spiceweasel::NodeList
           end
           @delete += "knife node#{options['knife_options']} list | xargs knife #{provider[0]} server delete -y\n"
         else #node bootstrap support
-          nname.split.each do |server|
-            @create += "knife bootstrap#{options['knife_options']} #{server} #{noptions}"
+          nname.split.each_with_index do |server, i|
+            @create += "knife bootstrap#{options['knife_options']} #{server} #{noptions}".gsub(/\{\{n\}\}/, (i + 1).to_s)
             if run_list.length > 0
               @create += " -r '#{run_list}'\n"
             end

data/lib/spiceweasel/role_list.rb

@@ -25,11 +25,11 @@ class Spiceweasel::RoleList
     if roles
       flatroles = roles.collect {|x| x.keys}.flatten
       flatroles.each do |role|
-        STDOUT.puts "DEBUG: role: #{role}" if DEBUG
+        STDOUT.puts "DEBUG: role: #{role}" if Spiceweasel::DEBUG
         if File.directory?("roles")
-          validate(role, environments, cookbooks, flatroles) unless NOVALIDATION
+          validate(role, environments, cookbooks, flatroles) unless Spiceweasel::NOVALIDATION
         else
-          STDERR.puts "ERROR: 'roles' directory not found, unable to validate or load roles" unless NOVALIDATION
+          STDERR.puts "ERROR: 'roles' directory not found, unable to validate or load roles" unless Spiceweasel::NOVALIDATION
         end
         if File.exists?("roles/#{role}.json")
           @create += "knife role#{options['knife_options']} from file #{role}.json\n"
@@ -48,7 +48,7 @@ class Spiceweasel::RoleList
     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
+      STDOUT.puts "DEBUG: role: '#{role}' name: '#{name}'" if Spiceweasel::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)
@@ -56,12 +56,12 @@ class Spiceweasel::RoleList
       #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
+        STDOUT.puts "DEBUG: role: '#{role}' line: '#{line}'" if Spiceweasel::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
+            STDOUT.puts "DEBUG: role: '#{role}' cookbook: '#{rl}': dep: '#{dep}'" if Spiceweasel::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)
@@ -69,7 +69,7 @@ class Spiceweasel::RoleList
           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
+            STDOUT.puts "DEBUG: role: '#{role}' role: '#{rl}': dep: '#{dep}'" if Spiceweasel::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)
@@ -84,7 +84,7 @@ class Spiceweasel::RoleList
       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
+      STDOUT.puts "DEBUG: role: '#{role}' name: '#{rolefile['name']}'" if Spiceweasel::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)
@@ -94,7 +94,7 @@ class Spiceweasel::RoleList
         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
+          STDOUT.puts "DEBUG: role: '#{role}' cookbook: '#{rl}': dep: '#{dep}'" if Spiceweasel::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)
@@ -102,7 +102,7 @@ class Spiceweasel::RoleList
         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
+          STDOUT.puts "DEBUG: role: '#{role}' role: '#{rl}': dep: '#{dep}'" if Spiceweasel::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)

data/lib/spiceweasel/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Spiceweasel
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spiceweasel
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-09-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70201875475900 !ruby/object:Gem::Requirement
+  requirement: &70331172604580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201875475900
+  version_requirements: *70331172604580
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
-  requirement: &70201875475480 !ruby/object:Gem::Requirement
+  requirement: &70331172604160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201875475480
+  version_requirements: *70331172604160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201875475060 !ruby/object:Gem::Requirement
+  requirement: &70331172603740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201875475060
+  version_requirements: *70331172603740
 description: Provides a CLI tool for generating knife commands to build Chef-managed
   infrastructure from a simple YAML or JSON file.
 email: