soloist 0.0.5 → 0.0.6

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.8.7-p299@soloist

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soloist (0.0.3)
+    soloist (0.0.5)
       chef (= 0.9.12)
       json (= 1.4.6)
 

data/README.markdown

@@ -19,9 +19,9 @@ Just put your soloistrc file in your home directory, and point it to wherever yo
 # How do I write a solistrc file?
 It's a yaml file, currently with two lists to maintain:
 
-The first, _Cookbook\_Paths_, should point (using an absolute or path relative to your soloistrc file) to the directory containing your cookbooks, such was pivotal_workstation.
+The first, _cookbook\_paths_, should point (using an absolute or path relative to your soloistrc file) to the directory containing your cookbooks, such was pivotal_workstation.
 
-The second, _Recipes_ should be a list of recipes you wish to run.
+The second, _recipes_ should be a list of recipes you wish to run.
 
 # Then What?
 $> soloist
@@ -76,19 +76,19 @@ I'm trying out adding support in the soloistrc file for selecting recipes based
 	- pivotal_workstation::ack
 	env_variable_switches:
 	  RACK_ENV:
-	    development:
+	    production:
 	      cookbook_paths:
-	      - ./chef/dev_cookbooks/
+	      - ./chef/production_cookbooks/
 	      recipes:
-	      - pivotal_dev::foo
+	      - production::foo
 
 The values are merged in, so this results in a cookbook path of
 	[
       "./chef/cookbooks/",
-      "./chef/dev_cookbooks/"
+      "./chef/production_cookbooks/"
     ]
 and a recipe list of
 	[
 	  "pivotal_workstation::ack", 
-	  "pivotal_dev::foo"
+	  "production::foo"
 	]

data/lib/soloist/chef_config_generator.rb

@@ -12,9 +12,11 @@ class ChefConfigGenerator
     @hash["env_variable_switches"].keys.each do |variable|
       sub_hash = @hash["env_variable_switches"][variable][ENV[variable]]
       if sub_hash && sub_hash["recipes"]
+        @hash["recipes"] ||= []
         @hash["recipes"] = (@hash["recipes"] + sub_hash["recipes"]).uniq
       end
       if sub_hash && sub_hash["cookbook_paths"]
+        @hash["cookbook_paths"] ||= []
         @hash["cookbook_paths"] = (@hash["cookbook_paths"] + sub_hash["cookbook_paths"]).uniq
       end
     end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/chef_config_generator_spec.rb

@@ -96,5 +96,44 @@ env_variable_switches:
         "pivotal_dev::foo"
         ]
     end
-  end     
+    
+    it "can deal with only having environment switched recipes/cookbooks" do
+      config = <<-CONFIG
+env_variable_switches:
+  RACK_ENV:
+    development:
+      cookbook_paths:
+      - ./chef/development_cookbooks/
+      recipes:
+      - pivotal_development::foo
+      CONFIG
+      @generator = ChefConfigGenerator.new(config, "../..")
+      @generator.cookbook_paths.should == [
+        "//../.././chef/development_cookbooks/"
+        ]
+      @generator.json_hash["recipes"].should == [
+        "pivotal_development::foo"
+        ]
+    end
+    it "can deal with only having empty recipes/cookbooks" do
+      config = <<-CONFIG
+cookbook_paths:
+recipes:
+env_variable_switches:
+  RACK_ENV:
+    development:
+      cookbook_paths:
+      - ./chef/development_cookbooks/
+      recipes:
+      - pivotal_development::foo
+      CONFIG
+      @generator = ChefConfigGenerator.new(config, "../..")
+      @generator.cookbook_paths.should == [
+        "//../.././chef/development_cookbooks/"
+        ]
+      @generator.json_hash["recipes"].should == [
+        "pivotal_development::foo"
+        ]
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - README.markdown