spiceweasel 0.7.1 → 0.8

data/README.md

@@ -2,6 +2,8 @@ Description
 ===========
 Spiceweasel is a command-line tool for batch loading Chef infrastructure. It provides a simple syntax in either JSON or YAML for describing and deploying infrastructure in order with the Chef command-line tool `knife`.
 
+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.
 
 Requirements
@@ -12,7 +14,7 @@ Written with Chef 0.9.12 and 0.10.0 and supports cookbooks, environments, roles,
 
 Testing
 -------
-Tested with Ubuntu 10.04 and 10.10 and Chef 0.9.16 and 0.10.0.rc.1.
+Tested with Ubuntu 10.04 and Chef 0.9.16 and 0.10.2.
 
 File Syntax
 ===========

data/bin/spiceweasel

@@ -1,92 +1,17 @@
 #!/usr/bin/env ruby
 
 require 'json'
-require 'mixlib/cli'
-require 'spiceweasel/version'
 require 'yaml'
 
-#ensure that the run_list contents are present in either the cookbooks or roles
-def validate_run_list(run_list, cookbooks, environments, roles)
-  run_list.each do |item|
-    if item.start_with?("recipe")
-      #recipe[foo] or recipe[foo::bar]
-      recipe = item.slice(7..-2).split("::")[0]
-      unless cookbooks.member?(recipe)
-        raise "'#{item}' is an invalid run_list recipe not managed by spiceweasel"
-        exit(-1)
-      end
-    elsif item.start_with?("environment")
-      #environment[blah]
-      environment = item.slice(12..-2)
-      unless environments.member?(environment)
-        raise "'#{item}' is an invalid run_list environment not managed by spiceweasel"
-        exit(-1)
-      end
-    elsif item.start_with?("role")
-      #role[blah]
-      role = item.slice(5..-2)
-      unless roles.member?(role)
-        raise "'#{item}' is an invalid run_list role not managed by spiceweasel"
-        exit(-1)
-      end
-    else 
-      raise "'#{item}' is an invalid run_list component"
-      exit(-1)
-    end
-  end
-end
-
-class SpiceweaselCLI
-  include Mixlib::CLI
-
-  banner("Usage: spiceweasel [option] file")
-
-  option :debug,
-  :long => "--debug",
-  :description => "Verbose debugging messages.",
-  :boolean => true
-
-  option :delete,
-  :short => "-d",
-  :long => "--delete",
-  :description => "Print the knife commands to be delete the infrastructure",
-  :boolean => true
-
-  option :dryrun,
-  :long => "--dryrun",
-  :description => "Print the knife commands to be executed to STDOUT",
-  :boolean => true
-
-  option :help,
-  :short => "-h",
-  :long => "--help",
-  :description => "Show this message",
-  :on => :tail,
-  :boolean => true,
-  :show_options => true,
-  :exit => 0
-
-  option :rebuild,
-  :short => "-r",
-  :long => "--rebuild",
-  :description => "Print the knife commands to be delete and recreate the infrastructure",
-  :boolean => true
-
-  option :version,
-  :short => "-v",
-  :long => "--version",
-  :description => "Version",
-  :boolean => true,
-  :proc => lambda {|v| puts "Spiceweasel: #{Spiceweasel::VERSION}" },
-  :exit => 0
-end
+require 'spiceweasel'
 
 #process command line options
 begin
-  ARGV << "-h" if ARGV.empty? 
-  cli = SpiceweaselCLI.new
+  ARGV << "-h" if ARGV.empty?
+  cli = Spiceweasel::CLI.new
   cli.parse_options
-rescue OptionParser::InvalidOption => e 
+  DEBUG = cli.config[:debug]
+rescue OptionParser::InvalidOption => e
   STDERR.puts e.message
   puts cli.opt_parser.to_s
   exit(-1)
@@ -94,7 +19,7 @@ end
 
 begin
   file = ARGV.last
-  STDOUT.puts "DEBUG: file: #{file}" if cli.config[:debug] 
+  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,130 +41,35 @@ end
 create = String.new()
 delete = String.new()
 
-#cookbooks 
-cookbooks = input['cookbooks'] || []
-cookbook_list = []
-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 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(/"/,'').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 site download #{cb} #{version} --file cookbooks/#{cb}.tgz #{args}\n"
-      create += "tar -C cookbooks/ -xf cookbooks/#{cb}.tgz\n"
-    end
-  else
-    STDERR.puts "cookbooks directory not found, validation and downloading skipped"
-  end
-  create += "knife cookbook upload #{cb}\n"
-  #flatten list of cookbooks for validation later
-  cookbook_list.push(cb)
-end
+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'])
 
-#environments 
-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
-  environment_list.push(environment.keys[0])
-end
+node_list = Spiceweasel::NodeList.new(input['nodes'], cookbook_list, environment_list, role_list)
 
-#roles 
-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
-  role_list.push(role.keys[0])
-end
+create += cookbook_list.create
+create += environment_list.create
+create += role_list.create
+create += data_bag_list.create
+create += node_list.create
 
-#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
-    end
-    if item =~ /\*/ #wildcard support
-      files = Dir.glob("data_bags/#{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 #{bag.keys[0]} data_bags/#{bag.keys[0]}/#{item}.json --secret-file #{secret}\n"
-    else
-      create += "knife data bag from file #{bag.keys[0]} data_bags/#{bag.keys[0]}/#{item}.json\n"
-    end
-  end
-end
-
-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].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 #{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 #{server} #{node[node.keys[0]][1]}"
-      if run_list.length > 0
-        create += " -r '#{node[node.keys[0]][0].gsub(/ /,',')}'\n"
-      end
-    end
-  end
-end
+delete += cookbook_list.delete
+delete += environment_list.delete
+delete += role_list.delete
+delete += data_bag_list.delete
+delete += node_list.delete
 
 #just print the knife commands, do not execute
 #if cli.config[:dryrun]
-if cli.config[:delete] 
+if cli.config[:delete]
   puts delete unless delete.empty?
 elsif cli.config[:rebuild]
   puts delete unless delete.empty?
   puts create unless create.empty?
 else
   puts create unless create.empty?
-end       
+end
 #else
 #eventually we will execute instead of printing knife commands
 #puts "BAM!"

data/lib/spiceweasel.rb

@@ -1,3 +1,9 @@
 module Spiceweasel
-  # Your code goes here...
+  autoload :CLI, 'spiceweasel/cli'
+  autoload :RunList, 'spiceweasel/run_list'
+  autoload :CookbookList, 'spiceweasel/cookbook_list'
+  autoload :EnvironmentList, 'spiceweasel/environment_list'
+  autoload :RoleList, 'spiceweasel/role_list'
+  autoload :DataBagList, 'spiceweasel/data_bag_list'
+  autoload :NodeList, 'spiceweasel/node_list'
 end

data/lib/spiceweasel/cli.rb

@@ -0,0 +1,47 @@
+require 'mixlib/cli'
+require 'spiceweasel/version'
+
+class Spiceweasel::CLI
+  include Mixlib::CLI
+
+  banner("Usage: spiceweasel [option] file")
+
+  option :debug,
+  :long => "--debug",
+  :description => "Verbose debugging messages.",
+  :boolean => true
+
+  option :delete,
+  :short => "-d",
+  :long => "--delete",
+  :description => "Print the knife commands to be delete the infrastructure",
+  :boolean => true
+
+  option :dryrun,
+  :long => "--dryrun",
+  :description => "Print the knife commands to be executed to STDOUT",
+  :boolean => true
+
+  option :help,
+  :short => "-h",
+  :long => "--help",
+  :description => "Show this message",
+  :on => :tail,
+  :boolean => true,
+  :show_options => true,
+  :exit => 0
+
+  option :rebuild,
+  :short => "-r",
+  :long => "--rebuild",
+  :description => "Print the knife commands to be delete and recreate the infrastructure",
+  :boolean => true
+
+  option :version,
+  :short => "-v",
+  :long => "--version",
+  :description => "Version",
+  :boolean => true,
+  :proc => lambda {|v| puts "Spiceweasel: #{Spiceweasel::VERSION}" },
+  :exit => 0
+end

data/lib/spiceweasel/cookbook_list.rb

@@ -0,0 +1,39 @@
+class Spiceweasel::CookbookList
+  def initialize(cookbooks = [])
+    @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)
+          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"
+        end
+      else
+        STDERR.puts "cookbooks directory not found, validation and downloading skipped"
+      end
+      @create += "knife cookbook upload #{cb}\n"
+
+      @cookbooks << cb
+    end
+  end
+
+  attr_reader :cookbooks, :create, :delete
+
+  def member?(cookbook)
+    cookbooks.include?(cookbook)
+  end
+end

data/lib/spiceweasel/data_bag_list.rb

@@ -0,0 +1,32 @@
+class Spiceweasel::DataBagList
+  def initialize(data_bags = [])
+    @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"
+        end
+      end
+    end
+  end
+
+  attr_reader :create, :delete
+end

data/lib/spiceweasel/environment_list.rb

@@ -0,0 +1,18 @@
+class Spiceweasel::EnvironmentList
+  def initialize(environments = [])
+    @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]
+    end
+  end
+
+  attr_reader :environments, :create, :delete
+
+  def member?(environment)
+    environments.include?(environment)
+  end
+end

data/lib/spiceweasel/node_list.rb

@@ -0,0 +1,38 @@
+class Spiceweasel::NodeList
+  def initialize(nodes, cookbook_list, environment_list, role_list)
+    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"
+          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"
+          end
+        end
+      end
+    end
+  end
+
+  attr_reader :create, :delete
+end

data/lib/spiceweasel/role_list.rb

@@ -0,0 +1,18 @@
+class Spiceweasel::RoleList
+  def initialize(roles = [])
+    @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]
+    end
+  end
+
+  attr_reader :roles, :create, :delete
+
+  def member?(role)
+    roles.include?(role)
+  end
+end

data/lib/spiceweasel/run_list.rb

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

data/lib/spiceweasel/version.rb

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

data/spec/bin/spiceweasel_spec.rb

@@ -0,0 +1,39 @@
+# Cover-all spec to prevent regressions during refactor
+describe 'The Spiceweasel binary' do
+  before(:each) do
+    @expected_output = <<-OUTPUT
+knife cookbook upload apache2
+knife cookbook upload apt
+knife cookbook upload mysql
+knife environment from file development.rb
+knife environment from file qa.rb
+knife environment from file production.rb
+knife role from file base.rb
+knife role from file monitoring.rb
+knife role from file webserver.rb
+knife data bag create users
+knife data bag from file users data_bags/users/alice.json
+knife data bag from file users data_bags/users/bob.json
+knife data bag from file users data_bags/users/chuck.json
+knife data bag create data
+knife data bag create passwords
+knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
+knife data bag from file passwords data_bags/passwords/rabbitmq.json --secret-file secret_key
+knife bootstrap serverA -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
+knife bootstrap serverB -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
+knife bootstrap serverC -i ~/.ssh/mray.pem -x user --sudo -d ubuntu10.04-gems -r 'role[base]'
+knife 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]'
+    OUTPUT
+
+    @spiceweasel_binary = File.join(File.dirname(__FILE__), *%w[.. .. bin spiceweasel])
+  end
+
+  it "maintains consistent output from the example config" do
+    `#{@spiceweasel_binary} --dryrun example.yml`.should == @expected_output
+  end
+end

metadata

@@ -1,27 +1,62 @@
 --- !ruby/object:Gem::Specification 
 name: spiceweasel
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  version: "0.8"
 platform: ruby
 authors: 
 - Matt Ray
+- Elliot Crosby-McCullough
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -05:00
+date: 2011-07-21 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: chef
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mixlib-cli
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 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: 
 - spiceweasel
 extensions: []
@@ -29,20 +64,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- CHANGELOG.md
-- Gemfile
-- README.md
-- Rakefile
 - bin/spiceweasel
-- example.json
-- example.yml
-- lib/spiceweasel.rb
+- lib/spiceweasel/cli.rb
+- lib/spiceweasel/cookbook_list.rb
+- lib/spiceweasel/data_bag_list.rb
+- lib/spiceweasel/environment_list.rb
+- lib/spiceweasel/node_list.rb
+- lib/spiceweasel/role_list.rb
+- lib/spiceweasel/run_list.rb
 - lib/spiceweasel/version.rb
-- spiceweasel.gemspec
-- test.sh
+- lib/spiceweasel.rb
+- README.md
 has_rdoc: true
-homepage: ""
+homepage: http://github.com/mattray/spiceweasel
 licenses: []
 
 post_install_message: 
@@ -51,29 +85,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: spiceweasel
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 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

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*

data/CHANGELOG.md

@@ -1,83 +0,0 @@
-This is the current, previous and future development milestones and contains the features backlog.
-
-0.1
-===
-* initial README.md describing goals
-* command-line tool
-* basic options all supported
-* create repo on GitHub
-* publish as a gem on RubyGems
-
-0.2
-===
-* switch to mixlib-cli
-* --dryrun The option `--dryrun` will print the commands to run, but not actually execute them (the default behavior)
-* --delete The option `--delete` will delete each cookbook, role, data bag, environment and node described in the yml file. All nodes from the system are deleted with `knife node bulk_delete`.
-* --rebuild The option `--rebuild` will remove all currently managed infrastructure for this chef repository and rebuild it from scratch.
-
-0.3
-===
-* renamed MILESTONES.md to CHANGELOG.md
-* fixed version number
-* updated YAML schema and examples because Ruby 1.8 does not order hashes.
-* validate that the recipes and roles listed in the nodes are loaded
-
-0.4
-===
-* support versions for cookbooks
-* support site vendor for cookbooks
-
-0.5
-===
-* support JSON and YAML
-
-0.6
-===
-* add support for cookbook options
-
-0.7
-=============
-* add support for environments
-* rescue from parser errors
-* update cookbook download syntax
-* multiple nodes with same runlists syntax
-* 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
-----
-* make spiceweasel a library rather than an executable
-* switch to using lib/ directory
-* convert to a knife plugin
- * knife batch create from file infrastructure.yml
- * knife batch delete from file infrastructure.json
- * knife batch rebuild from file infrastructure.yml
-Future
-------
-* --chef-client The option `--chef-client` will make a `knife ssh` call to each box and run `chef-client` on each.
-* --chef-client validation that nodes are added
-* -e/--execute execute the commands
- * catching return codes and retrying (with retry count?)
-* make the JSON calls directly with Chef APIs 
-* execution-phase validation
- * check metadata.rb of cookbooks for their dependencies
- * validate within role files rather than the names of files (assumption that they are the same)
- * validate cookbooks referenced in roles
- * validate not trying to use environments with 0.9.x
- * validate within environment files rather than the names of files (assumption that they are the same)
- * validate cookbooks referenced in environments
- * validate recipes from cookbooks in run_lists
-* wildcards for environments and roles
-* on provider delete take count of vendor-specific, delete if match (ec2 server delete and node delete)
-* knife winrm bootstrap FQDN [RUN LIST...] (options)
-* use GNU parallel with knife?
-* extract existing infrastructure
- * knife batch extract

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in spiceweasel.gemspec
-gemspec

data/Rakefile

@@ -1,2 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks

data/example.json

@@ -1,73 +0,0 @@
-{
-    "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"
-         ]
-        }
-    ]
-}

data/example.yml

@@ -1,41 +0,0 @@
-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

data/spiceweasel.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "json"
-require "mixlib/cli"
-require "spiceweasel/version"
-require "yaml"
-
-
-Gem::Specification.new do |s|
-  s.name        = "spiceweasel"
-  s.version     = Spiceweasel::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Matt Ray"]
-  s.email       = ["matt@opscode.com"]
-  s.homepage    = ""
-  s.summary     = %q{CLI for generating Chef knife commands from a simple YAML file.}
-  s.description = %q{This provides a CLI for generating knife commands to build Chef-managed infrastructure from a simple YAML file.}
-
-  s.rubyforge_project = "spiceweasel"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end

data/test.sh

@@ -1,48 +0,0 @@
-echo "------------>spiceweasel"
-spiceweasel
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -h"
-spiceweasel -h
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -h example.yml"
-spiceweasel -h example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -v"
-spiceweasel -v
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -v example.yml"
-spiceweasel -v example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --version"
-spiceweasel --version
-echo "------------>Return code:$?"
-echo "------------>spiceweasel example.yml"
-spiceweasel example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --dryrun"
-spiceweasel --dryrun
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --dryrun example.yml"
-spiceweasel --dryrun example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --help"
-spiceweasel --help
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -d"
-spiceweasel -d
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -d example.yml"
-spiceweasel -d example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --delete example.yml"
-spiceweasel --delete example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -r"
-spiceweasel -r
-echo "------------>Return code:$?"
-echo "------------>spiceweasel -r example.yml"
-spiceweasel -r example.yml
-echo "------------>Return code:$?"
-echo "------------>spiceweasel --rebuild example.yml"
-spiceweasel --rebuild example.yml
-echo "------------>Return code:$?"