spiceweasel 0.8.1 → 0.8.2

data/README.md

@@ -4,17 +4,20 @@ Spiceweasel is a command-line tool for batch loading Chef infrastructure. It pro
 
 The `examples` directory provides examples based on the Quick Starts provided at [http://help.opscode.com/kb/otherhelp](http://help.opscode.com/kb/otherhelp).
 
-CHANGELOG.md covers current, previous and future development milestones and contains the features backlog.
+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 [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. Infrastructure files must either end in .json or .yml to be processed.
 
-Written with Chef 0.9.12 and 0.10.0 and supports cookbooks, environments, roles, data bags and nodes.
+Written initially with Chef 0.9.12 (should still work) and continuing to develop with support for 0.10.
 
 Testing
 -------
-Tested with Ubuntu 10.04 and Chef 0.9.16 and 0.10.2.
+Tested with Ubuntu 10.04 and Chef 0.9.16 and 0.10.4.
 
 File Syntax
 ===========
@@ -164,7 +167,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.1.0 --file cookbooks/apt.tgz
 tar -C cookbooks/ -xf cookbooks/apt.tgz
 knife cookbook upload apt
 knife cookbook upload mysql
@@ -172,7 +175,7 @@ knife cookbook upload mysql
 
 Environments
 ------------
-The `environments` section of the JSON or YAML file currently supports `knife environment from file FOO` where `FOO` is the name of the environment file ending in `.rb` in the `environments` directory. The YAML snippet 
+The `environments` section of the JSON or YAML file currently supports `knife environment from file FOO` where `FOO` is the name of the environment file ending in `.rb` in the `environments` directory. The YAML snippet
 
 ``` yaml
 environments:
@@ -181,7 +184,7 @@ environments:
 - production:
 ```
 
-produces the knife commands 
+produces the knife commands
 
 ```
 knife environment from file development.rb
@@ -191,7 +194,7 @@ knife environment from file production.rb
 
 Roles
 -----
-The `roles` section of the JSON or YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The YAML snippet 
+The `roles` section of the JSON or YAML file currently supports `knife role from file FOO` where `FOO` is the name of the role file ending in `.rb` in the `roles` directory. The YAML snippet
 
 ``` yaml
 roles:
@@ -200,7 +203,7 @@ roles:
 - webserver:
 ```
 
-produces the knife commands 
+produces the knife commands
 
 ```
 knife role from file base.rb
@@ -210,7 +213,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 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
 
 ``` yaml
 data bags:
@@ -226,7 +229,7 @@ data bags:
   - rabbitmq
 ```
 
-produces the knife commands 
+produces the knife commands
 
 ```
 knife data bag create users
@@ -243,7 +246,7 @@ knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-fi
 
 Nodes
 -----
-The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. The run_list may be space or comma-delimited. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. A shortcut syntax for bulk-creating nodes with various providers where the line starts with the provider and ends with the number of nodes to be provisioned. The YAML snippet 
+The `nodes` section of the JSON or YAML file bootstraps a node for each entry where the entry is a hostname or provider and count. Each node requires 2 items after it in a sequence. The first item is the run_list and the second the CLI options used. The run_list may be space or comma-delimited. Validation is performed on the run_list components to ensure that only recipes and roles listed in the file are used. 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:
@@ -261,7 +264,7 @@ nodes:
   - --image 49 --flavor 2
 ```
 
-produces the knife commands 
+produces the knife commands
 
 ```
 knife bootstrap serverA 'role[base]' -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems

data/bin/spiceweasel

@@ -5,6 +5,8 @@ require 'yaml'
 
 require 'spiceweasel'
 
+options={'knife_options' => ''}
+
 #process command line options
 begin
   ARGV << "-h" if ARGV.empty?
@@ -17,6 +19,10 @@ rescue OptionParser::InvalidOption => e
   exit(-1)
 end
 
+if cli.config[:knifeconfig]
+  options['knife_options']=" -c "+cli.config[:knifeconfig]
+end
+
 begin
   file = ARGV.last
   STDOUT.puts "DEBUG: file: #{file}" if cli.config[:debug]
@@ -41,12 +47,12 @@ end
 create = String.new()
 delete = String.new()
 
-cookbook_list = Spiceweasel::CookbookList.new(input['cookbooks'])
-environment_list = Spiceweasel::EnvironmentList.new(input['environments'])
-role_list = Spiceweasel::RoleList.new(input['roles'])
-data_bag_list = Spiceweasel::DataBagList.new(input['data bags'])
+cookbook_list = Spiceweasel::CookbookList.new(input['cookbooks'], options)
+environment_list = Spiceweasel::EnvironmentList.new(input['environments'], options)
+role_list = Spiceweasel::RoleList.new(input['roles'], options)
+data_bag_list = Spiceweasel::DataBagList.new(input['data bags'], options)
 
-node_list = Spiceweasel::NodeList.new(input['nodes'], cookbook_list, environment_list, role_list)
+node_list = Spiceweasel::NodeList.new(input['nodes'], cookbook_list, environment_list, role_list, options)
 
 create += cookbook_list.create
 create += environment_list.create

data/lib/spiceweasel/cli.rb

@@ -44,4 +44,10 @@ class Spiceweasel::CLI
   :boolean => true,
   :proc => lambda {|v| puts "Spiceweasel: #{Spiceweasel::VERSION}" },
   :exit => 0
+
+  option :knifeconfig,
+  :short => "-c CONFIG",
+  :long => "--knifeconfig CONFIG",
+  :description => "The knife.rb configuration file to use."
+
 end

data/lib/spiceweasel/cookbook_list.rb

@@ -1,33 +1,35 @@
 class Spiceweasel::CookbookList
-  def initialize(cookbooks = [])
+  def initialize(cookbooks = [], options = {})
     @create = @delete = ''
     @cookbooks = []
-    cookbooks.each do |cookbook|
-      cb = cookbook.keys.first
-      if cookbook[cb] and cookbook[cb].length > 0
-        version = cookbook[cb][0].to_s || ""
-        args = cookbook[cb][1] || ""
-      end
-      STDOUT.puts "DEBUG: cookbook: #{cb} #{version}" if 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(/"/,'').to_s
-          if (metadata != version)
-            raise "Invalid version #{version} of '#{cb}' requested, #{metadata} is already in the cookbooks directory."
-            exit(-1)
+    if cookbooks
+      cookbooks.each do |cookbook|
+        cb = cookbook.keys.first
+        if cookbook[cb] and cookbook[cb].length > 0
+          version = cookbook[cb][0].to_s || ""
+          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}")
+            @create += "knife cookbook#{options['knife_options']} site download #{cb} #{version} --file cookbooks/#{cb}.tgz #{args}\n"
+            @create += "tar -C cookbooks/ -xf cookbooks/#{cb}.tgz\n"
           end
-        elsif !File.directory?("cookbooks/#{cb}")
-          @create += "knife cookbook site download #{cb} #{version} --file cookbooks/#{cb}.tgz #{args}\n"
-          @create += "tar -C cookbooks/ -xf cookbooks/#{cb}.tgz\n"
+        else
+          STDERR.puts "cookbooks directory not found, validation and downloading skipped"
         end
-      else
-        STDERR.puts "cookbooks directory not found, validation and downloading skipped"
-      end
-      @create += "knife cookbook upload #{cb}\n"
+        @create += "knife cookbook#{options['knife_options']} upload #{cb}\n"
 
-      @cookbooks << cb
+        @cookbooks << cb
+      end
     end
   end
 

data/lib/spiceweasel/data_bag_list.rb

@@ -1,28 +1,30 @@
 class Spiceweasel::DataBagList
-  def initialize(data_bags = [])
+  def initialize(data_bags = [], options = {})
     @create = @delete = ''
-    data_bags.each do |data_bag|
-      STDOUT.puts "DEBUG: data bag: #{data_bag.keys[0]}" if DEBUG
-      @delete += "knife data bag delete #{data_bag.keys[0]} -y\n"
-      @create += "knife data bag create #{data_bag.keys[0]}\n"
-      items = data_bag[data_bag.keys[0]] || []
-      secret = nil
-      while item = items.shift
-        STDOUT.puts "DEBUG: data bag #{data_bag.keys[0]} item: #{item}" if DEBUG
-        if item.start_with?("secret")
-          secret = item.split()[1]
-          next
-        end
-        if item =~ /\*/ #wildcard support
-          files = Dir.glob("data_bags/#{data_bag.keys[0]}/#{item}.json")
-          items += files.collect {|x| x[x.rindex('/')+1..-6]}
-          puts items
-          next
-        end
-        if secret
-          @create += "knife data bag from file #{data_bag.keys[0]} data_bags/#{data_bag.keys[0]}/#{item}.json --secret-file #{secret}\n"
-        else
-          @create += "knife data bag from file #{data_bag.keys[0]} data_bags/#{data_bag.keys[0]}/#{item}.json\n"
+    if data_bags
+      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]] || []
+        secret = nil
+        while item = items.shift
+          STDOUT.puts "DEBUG: data bag #{data_bag.keys[0]} item: #{item}" if DEBUG
+          if item.start_with?("secret")
+            secret = item.split()[1]
+            next
+          end
+          if item =~ /\*/ #wildcard support
+            files = Dir.glob("data_bags/#{data_bag.keys[0]}/#{item}.json")
+            items += files.collect {|x| x[x.rindex('/')+1..-6]}
+            puts items
+            next
+          end
+          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"
+          else
+            @create += "knife data bag#{options['knife_options']} from file #{data_bag.keys[0]} data_bags/#{data_bag.keys[0]}/#{item}.json\n"
+          end
         end
       end
     end

data/lib/spiceweasel/environment_list.rb

@@ -1,12 +1,14 @@
 class Spiceweasel::EnvironmentList
-  def initialize(environments = [])
+  def initialize(environments = [], options = {})
     @create = @delete = ''
     @environments = []
-    environments.each do |environment|
-      STDOUT.puts "DEBUG: environment: #{environment.keys[0]}" if DEBUG
-      @delete += "knife environment delete #{environment.keys[0]} -y\n"
-      @create += "knife environment from file #{environment.keys[0]}.rb\n"
-      @environments << environment.keys[0]
+    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]
+      end
     end
   end
 

data/lib/spiceweasel/node_list.rb

@@ -1,33 +1,35 @@
 class Spiceweasel::NodeList
-  def initialize(nodes, cookbook_list, environment_list, role_list)
+  def initialize(nodes, cookbook_list, environment_list, role_list, options = {})
     nodes ||= []
     @create = @delete = ''
 
-    @delete += "knife node bulk_delete .* -y\n"
-    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)
-      #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 #{node[node.keys[0]][1]}"
-          if run_list.length > 0
-            @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+    @delete += "knife node#{options['knife_options']} bulk_delete .* -y\n"
+    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)
+        #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
-        end
-      else #multinode support
-        node.keys[0].split.each do |server|
-          @create += "knife bootstrap #{server} #{node[node.keys[0]][1]}"
-          if run_list.length > 0
-            @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+          #create the instances
+          count.to_i.times do
+            @create += "knife #{provider[0]}#{options['knife_options']} server create #{node[node.keys[0]][1]}"
+            if run_list.length > 0
+              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+            end
+          end
+        else #multinode support
+          node.keys[0].split.each do |server|
+            @create += "knife bootstrap#{options['knife_options']} #{server} #{node[node.keys[0]][1]}"
+            if run_list.length > 0
+              @create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
+            end
           end
         end
       end

data/lib/spiceweasel/role_list.rb

@@ -1,12 +1,14 @@
 class Spiceweasel::RoleList
-  def initialize(roles = [])
+  def initialize(roles = [], options = {})
     @create = @delete = ''
     @roles = []
-    roles.each do |role|
-      STDOUT.puts "DEBUG: role: #{role.keys[0]}" if DEBUG
-      @delete += "knife role delete #{role.keys[0]} -y\n"
-      @create += "knife role from file #{role.keys[0]}.rb\n"
-      @roles << role.keys[0]
+    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]
+      end
     end
   end
 

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,91 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spiceweasel
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
+version: !ruby/object:Gem::Version
+  version: 0.8.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt Ray
 - Elliot Crosby-McCullough
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-11 00:00:00 -05:00
+date: 2011-10-28 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160839960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160839960
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2160839480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixlib-cli
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160839480
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: &2160839000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160839000
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160838480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: This provides a CLI for generating knife commands to build Chef-managed infrastructure from a simple YAML file.
-email: 
+  prerelease: false
+  version_requirements: *2160838480
+description: This provides a CLI for generating knife commands to build Chef-managed
+  infrastructure from a simple YAML file.
+email:
 - matt@opscode.com
 - elliot.cm@gmail.com
-executables: 
+executables:
 - spiceweasel
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/spiceweasel
 - lib/spiceweasel/cli.rb
 - lib/spiceweasel/cookbook_list.rb
@@ -101,36 +82,27 @@ files:
 has_rdoc: true
 homepage: http://github.com/mattray/spiceweasel
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spiceweasel
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: CLI for generating Chef knife commands from a simple YAML file.
-test_files: 
+test_files:
 - spec/bin/spiceweasel_spec.rb