spiceweasel 0.3 → 0.4

data/CHANGELOG.md

@@ -24,15 +24,20 @@ This is the current, previous and future development milestones and contains the
 
 0.4
 ===
-* --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
+* support versions for cookbooks
+* support site vendor for cookbooks
+
+0.5
+===
+* support JSON and YAML
 
 BACKLOG
 =======
-* support site vendor for cookbooks
-* support versions for cookbooks
+* convert to a knife plugin (knife batchload from file infrastructure.yml)
+* --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
 * add support for environments
-* make the JSON calls directly with Spice (https://github.com/danryan/spice) 
+* make the JSON calls directly with Chef APIs 
 * -e/--execute execute the commands
 * catching return codes and retrying (with retry count?)
 * on provider delete take count of vendor-specific, delete if match (ec2 server delete and node delete)

data/README.md

@@ -21,6 +21,7 @@ The syntax for the spiceweasel file is a simple YAML format of Chef primitives d
     cookbooks:
     - apache2:
     - apt:
+      - 1.1.0
     - mysql:
 
     roles:
@@ -48,16 +49,18 @@ The syntax for the spiceweasel file is a simple YAML format of Chef primitives d
 
 Cookbooks
 ---------
-The `cookbooks` section of the YAML file currently supports `knife cookbook upload FOO` where `FOO` is the name of the cookbook in the `cookbooks` directory. The YAML snippet
+The `cookbooks` section of the 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. The YAML snippet
 
     cookbooks:
     - apache2:
     - apt:
+      - 1.1.0
     - mysql:
 
 produces the knife commands
 
     knife cookbook upload apache2
+    knife cookbook site vendor apt 1.1.0
     knife cookbook upload apt
     knife cookbook upload mysql
 

data/bin/spiceweasel

@@ -76,7 +76,7 @@ begin
   cli.parse_options
 rescue OptionParser::InvalidOption => e 
   STDERR.puts e.message
-  #puts???
+  puts cli.opt_parser.to_s
   exit(-1)
 end
 
@@ -84,7 +84,7 @@ begin
   yml = YAML.load_file ARGV.last
 rescue Exception
   STDERR.puts "No infrastructure YAML file provided."
-  #puts???
+  puts cli.opt_parser.to_s
   exit(-1)
 end
 
@@ -95,10 +95,27 @@ delete = String.new()
 cookbooks = yml['cookbooks'] || []
 cookbook_list = []
 cookbooks.each do |cookbook|
-  delete += "knife cookbook delete #{cookbook.keys[0]} -y\n"
-  create += "knife cookbook upload #{cookbook.keys[0]}\n"
+  cb = cookbook.keys.first
+  #get the version if available
+  version = cookbook[cb]
+  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."
+        exit(-1)
+      end
+    elsif !File.directory?("cookbooks/#{cb}")
+      create += "knife cookbook site vendor #{cb} #{version}\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(cookbook.keys[0])
+  cookbook_list.push(cb)
 end
 
 #roles 
@@ -165,5 +182,3 @@ end
 #eventually we will execute instead of printing knife commands
 #puts "BAM!"
 #end
-
-

data/example.yml

@@ -1,6 +1,7 @@
 cookbooks:
 - apache2:
 - apt:
+    - 1.1.0
 - mysql:
 
 roles:

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spiceweasel
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  version: "0.3"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Matt Ray
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -06:00
+date: 2011-03-11 00:00:00 -06:00
 default_executable: 
 dependencies: []