spiceweasel 0.5 → 0.6.1

data/CHANGELOG.md

@@ -31,6 +31,10 @@ This is the current, previous and future development milestones and contains the
 ===
 * support JSON and YAML
 
+0.6
+===
+* add support for cookbook options
+
 BACKLOG
 =======
 * convert to a knife plugin (knife batchload from file infrastructure.yml)

data/README.md

@@ -28,7 +28,8 @@ From the `example.json`:
             {"apache2":[]},
             {"apt":
              [
-                 "1.1.0"
+                 "1.1.0",
+                 "-B testing"
              ]
             },
             {"mysql":[]}
@@ -81,6 +82,7 @@ From the `example.yml`:
     - apache2:
     - apt:
       - 1.1.0
+      - -B testing
     - mysql:
 
     roles:
@@ -108,18 +110,19 @@ From the `example.yml`:
 
 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.  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` and if none is found, the missing cookbook is downloaded. You may pass any additional arguments (ie. a Git branch) if necessary. The YAML snippet
 
     cookbooks:
     - apache2:
     - apt:
       - 1.1.0
+      - -B testing
     - mysql:
 
 produces the knife commands
 
     knife cookbook upload apache2
-    knife cookbook site vendor apt 1.1.0
+    knife cookbook site vendor apt 1.1.0 -B testing
     knife cookbook upload apt
     knife cookbook upload mysql
 

data/bin/spiceweasel

@@ -105,8 +105,10 @@ cookbooks = input['cookbooks'] || []
 cookbook_list = []
 cookbooks.each do |cookbook|
   cb = cookbook.keys.first
-  #get the version if available
-  version = cookbook[cb]
+  if cookbook[cb] and cookbook[cb].length > 0
+    version = cookbook[cb][0] || ""
+    args = cookbook[cb][1] || ""
+  end
   delete += "knife cookbook delete #{cb} #{version} -y\n"
   if File.directory?("cookbooks")
     if version and File.directory?("cookbooks/#{cb}")
@@ -117,7 +119,7 @@ cookbooks.each do |cookbook|
         exit(-1)
       end
     elsif !File.directory?("cookbooks/#{cb}")
-      create += "knife cookbook site vendor #{cb} #{version}\n"
+      create += "knife cookbook site vendor #{cb} #{version} #{args}\n"
     end
   else
     STDERR.puts "cookbooks directory not found, validation and downloading skipped"

data/example.json

@@ -4,7 +4,8 @@
         {"apache2":[]},
         {"apt":
          [
-             "1.1.0"
+             "1.1.0",
+             "-B testing"
          ]
         },
         {"mysql":[]}

data/example.yml

@@ -2,6 +2,7 @@ cookbooks:
 - apache2:
 - apt:
     - 1.1.0
+    - -B testing
 - mysql:
 
 roles:

data/lib/spiceweasel/version.rb

@@ -1,3 +1,3 @@
 module Spiceweasel
-  VERSION = "0.5"
+  VERSION = "0.6.1"
 end

data/spiceweasel.gemspec

@@ -1,6 +1,10 @@
 # -*- 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"

metadata

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