spiceweasel 0.7 → 0.7.1

data/CHANGELOG.md

@@ -35,7 +35,7 @@ This is the current, previous and future development milestones and contains the
 ===
 * add support for cookbook options
 
-0.7 *CURRENT*
+0.7
 =============
 * add support for environments
 * rescue from parser errors
@@ -44,6 +44,12 @@ This is the current, previous and future development milestones and contains the
 * add support for encrypted data bags
 * wildcard support for data bag items
 
+0.7.1 *CURRENT*
+===============
+* fixed run list parsing
+* updated examples for Chef 0.10
+* relaxed validation on existing cookbooks
+
 BACKLOG
 =======
 Next

data/README.md

@@ -18,6 +18,54 @@ File Syntax
 ===========
 The syntax for the spiceweasel file may be either JSON or YAML format of Chef primitives describing what is to be instantiated. Below or 2 examples describing the same infrastructure.
 
+YAML
+----
+From the `example.yml`:
+
+``` yaml
+cookbooks:
+- apache2:
+- apt:
+    - 1.1.1
+- mysql:
+
+environments:
+- development:
+- qa:
+- production:
+
+roles:
+- base:
+- monitoring:
+- webserver:
+
+data bags:
+- users:
+  - alice
+  - bob
+  - chuck
+- data:
+  - *
+- passwords:
+  - secret secret_key
+  - mysql
+  - rabbitmq
+
+nodes:
+- serverA:
+  - role[base]
+  - -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
+- ec2 3:
+  - role[webserver] recipe[mysql::client]
+  - -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
+```
+
 JSON
 ----
 From the `example.json`:
@@ -29,7 +77,7 @@ From the `example.json`:
         {"apache2":[]},
         {"apt":
          [
-             "1.1.0"
+             "1.1.1"
          ]
         },
         {"mysql":[]}
@@ -55,7 +103,18 @@ From the `example.json`:
              "chuck"
          ]
         },
-        {"data":[]}
+        {"data":
+         [
+             "*"
+         ]
+        },
+        {"passwords":
+         [
+             "secret secret_key",
+             "mysql",
+             "rabbitmq"
+         ]
+        }
     ],
     "nodes":
     [
@@ -65,15 +124,21 @@ From the `example.json`:
              "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems"
          ]
         },
-        {"ec2 5":
+        {"serverB serverC":
+         [
+             "role[base]",
+             "-i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems"
+         ]
+        },
+        {"ec2 3":
          [
              "role[webserver] recipe[mysql::client]",
-             "-S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small"
+             "-S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small"
          ]
         },
         {"rackspace 3":
          [
-             "recipe[mysql] role[monitoring]",
+             "recipe[mysql],role[monitoring]",
              "--image 49 --flavor 2"
          ]
         }
@@ -81,49 +146,9 @@ From the `example.json`:
 }
 ```
 
-YAML
-----
-From the `example.yml`:
-
-``` yaml
-cookbooks:
-- apache2:
-- apt:
-    - 1.1.0
-- mysql:
-
-environments:
-- development:
-- qa:
-- production:
-
-roles:
-- base:
-- monitoring:
-- webserver:
-
-data bags:
-- users:
-  - alice
-  - bob
-  - chuck
-- data:
-
-nodes:
-- serverA:
-  - role[base]
-  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
-- ec2 5:
-  - role[webserver] recipe[mysql::client]
-  - -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
-- rackspace 3:
-  - recipe[mysql] role[monitoring]
-  - --image 49 --flavor 2
-```
-
 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. If a version is passed, it is validated against an existing cookbook `metadata.rb` and if none is found, the missing cookbook is downloaded (without touching version control) and the command to untar it is provided. You may pass any additional arguments if necessary. The YAML snippet
+The `cookbooks` section of the JSON or YAML file currently supports `knife cookbook upload FOO` where `FOO` is the name of the cookbook in the `cookbooks` directory. If a version is passed, it is validated against an existing cookbook `metadata.rb` (it must match the `metadata.rb` string exactly) and if none is found, the missing cookbook is downloaded (without touching version control) and the command to untar it is provided. You may pass any additional arguments if necessary. The YAML snippet
 
 ``` yaml
 cookbooks:
@@ -216,18 +241,21 @@ knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-fi
 
 Nodes
 -----
-The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet 
+The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. The run_list may be space or comma-delimited. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet 
 
 ``` yaml
 nodes:
 - serverA:
   - role[base]
   - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
-- ec2 5:
+- serverB serverC:
+  - role[base]
+  - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
+- ec2 3:
   - role[webserver] recipe[mysql::client]
-  - -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
+  - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
 - rackspace 3:
-  - recipe[mysql] role[monitoring]
+  - recipe[mysql],role[monitoring]
   - --image 49 --flavor 2
 ```
 
@@ -235,14 +263,14 @@ produces the knife commands
 
 ```
 knife bootstrap serverA '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-a403f7cd -f m1.small
-knife ec2 server create 'role[webserver]' 'recipe[mysql::client]' -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
-knife ec2 server create 'role[webserver]' 'recipe[mysql::client]' -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
-knife ec2 server create 'role[webserver]' 'recipe[mysql::client]' -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
-knife ec2 server create 'role[webserver]' 'recipe[mysql::client]' -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -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 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
 ```
 
 Usage

data/bin/spiceweasel

@@ -41,6 +41,11 @@ class SpiceweaselCLI
 
   banner("Usage: spiceweasel [option] file")
 
+  option :debug,
+  :long => "--debug",
+  :description => "Verbose debugging messages.",
+  :boolean => true
+
   option :delete,
   :short => "-d",
   :long => "--delete",
@@ -89,6 +94,7 @@ 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"))
@@ -116,16 +122,17 @@ cookbook_list = []
 cookbooks.each do |cookbook|
   cb = cookbook.keys.first
   if cookbook[cb] and cookbook[cb].length > 0
-    version = cookbook[cb][0] || ""
+    version = cookbook[cb][0].to_s || ""
     args = cookbook[cb][1] || ""
   end
+  STDOUT.puts "DEBUG: cookbook: #{cb} #{version}" if cli.config[:debug] 
   delete += "knife cookbook 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(/"/,'')
-      if (metadata != version[0])
-        raise "Invalid version '#{version[0]}' of '#{cb}' requested, '#{metadata}' is already in the cookbooks directory."
+      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}")
@@ -144,6 +151,7 @@ end
 environments = input['environments'] || []
 environment_list = []
 environments.each do |environment|
+  STDOUT.puts "DEBUG: environment: #{environment.keys[0]}" if cli.config[:debug] 
   delete += "knife environment delete #{environment.keys[0]} -y\n"
   create += "knife environment from file #{environment.keys[0]}.rb\n"
   #flatten list of environments for validation later
@@ -154,6 +162,7 @@ end
 roles = input['roles'] || []
 role_list = []
 roles.each do |role|
+  STDOUT.puts "DEBUG: role: #{role.keys[0]}" if cli.config[:debug] 
   delete += "knife role delete #{role.keys[0]} -y\n"
   create += "knife role from file #{role.keys[0]}.rb\n"
   #flatten list of roles for validation later
@@ -163,11 +172,13 @@ end
 #data bags
 bags = input['data bags'] || []
 bags.each do |bag|
+  STDOUT.puts "DEBUG: data bag: #{bag.keys[0]}" if cli.config[:debug] 
   delete += "knife data bag delete #{bag.keys[0]} -y\n"
   create += "knife data bag create #{bag.keys[0]}\n"
   items = bag[bag.keys[0]] || []
   secret = nil
   while item = items.shift
+    STDOUT.puts "DEBUG: data bag #{bag.keys[0]} item: #{item}" if cli.config[:debug] 
     if item.start_with?("secret")
       secret = item.split()[1]
       next
@@ -190,30 +201,31 @@ nodes = input['nodes'] || []
 #currently use bulk_delete for deleting, add provider support real soon
 delete += "knife node bulk_delete .* -y\n"
 nodes.each do |node|
+  STDOUT.puts "DEBUG: node: #{node.keys[0]}" if cli.config[:debug] 
   # delete += "knife node delete #{node[node.keys[0]}\n"
-  run_list = node[node.keys[0]][0].split()
+  run_list = node[node.keys[0]][0].gsub(/ /,',').split(',')
+  STDOUT.puts "DEBUG: node run_list: #{run_list}" if cli.config[:debug] 
   validate_run_list(run_list, cookbook_list, environment_list, role_list)
+  #provider support
   if node.keys[0].start_with?("bluebox","ec2","openstack","rackspace","slicehost","terremark")
     provider = node.keys[0].split()
     count = 1
     if (provider.length == 2)
       count = provider[1] 
     end
+    #create the instances
     count.to_i.times do
-      create += "knife #{provider[0]} server create "
-      run_list.each do |x|
-        create += "\'#{x}\' "
+      create += "knife #{provider[0]} server create #{node[node.keys[0]][1]}"
+      if run_list.length > 0
+        create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
       end
-      create +="#{node[node.keys[0]][1]}\n"
     end
-  else
-    #multinode support
+  else #multinode support
     node.keys[0].split.each do |server|
-      create += "knife bootstrap #{server} "
-      run_list.each do |x|
-        create += "\'#{x}\' "
+      create += "knife bootstrap #{server} #{node[node.keys[0]][1]}"
+      if run_list.length > 0
+        create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
       end
-      create +="#{node[node.keys[0]][1]}\n"
     end
   end
 end

data/example.json

@@ -60,12 +60,12 @@
         {"ec2 3":
          [
              "role[webserver] recipe[mysql::client]",
-             "-S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small"
+             "-S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small"
          ]
         },
         {"rackspace 3":
          [
-             "recipe[mysql] role[monitoring]",
+             "recipe[mysql],role[monitoring]",
              "--image 49 --flavor 2"
          ]
         }

data/example.yml

@@ -35,7 +35,7 @@ nodes:
   - -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems
 - ec2 3:
   - role[webserver] recipe[mysql::client]
-  - -S mray -I ~/.ssh/mray.pem -x ubuntu -G default -i ami-a403f7cd -f m1.small
+  - -S mray -i ~/.ssh/mray.pem -x ubuntu -G default -I ami-7000f019 -f m1.small
 - rackspace 3:
-  - recipe[mysql] role[monitoring]
+  - recipe[mysql],role[monitoring]
   - --image 49 --flavor 2

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.7"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiceweasel
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  version: "0.7"
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Matt Ray
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -05:00
+date: 2011-05-05 00:00:00 -05:00
 default_executable: 
 dependencies: []