soloist 0.0.7 → 0.0.8

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+# Copyright (c) 2010, 2011 Matthew Kocher
+#  
+# Permission is hereby granted, free of charge, to any person obtaining 
+# a copy of this software and associated documentation files (the 
+# "Software"), to deal in the Software without restriction, including 
+# without limitation the rights to use, copy, modify, merge, publish, 
+# distribute, sublicense, and/or sell copies of the Software, and to 
+# permit persons to whom the Software is furnished to do so, subject to 
+# the following conditions: 
+#  
+# The above copyright notice and this permission notice shall be 
+# included in all copies or substantial portions of the Software. 
+#  
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -10,7 +10,7 @@ Soloist is a script packaged as a gem which when run recurses up the file tree l
 # That's exactly what I've always wanted! How do I use it?
 * (sudo) gem install soloist
 * create a directory to store your cookbooks in, and get a cookbook: 
-	sh -c 'mkdir -p chef/cookbooks/pivotal_workstation && cd chef/cookbooks/pivotal_workstation &&  curl -L http://github.com/mkocher/pivotal_workstation/tarball/master |  gunzip | tar xvf - --strip=1'
+	sh -c 'mkdir -p chef/cookbooks/pivotal_workstation && cd chef/cookbooks/pivotal_workstation &&  curl -L http://github.com/pivotal/pivotal_workstation/tarball/master |  gunzip | tar xvf - --strip=1'
 * create your soloistrc file in the root of your project.
 
 # What if I'm just setting up my own machine, and have many projects?
@@ -91,4 +91,8 @@ and a recipe list of
 	[
 	  "pivotal_workstation::ack", 
 	  "production::foo"
-	]
+	]
+	
+License
+=======
+Soloist is MIT Licensed.  See MIT-LICENSE for details.

data/lib/soloist/chef_config_generator.rb

@@ -10,14 +10,16 @@ class ChefConfigGenerator
   def merge_env_variable_switches
     return unless @hash["env_variable_switches"]
     @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
+      ENV[variable] && ENV[variable].split(',').each do |env_variable_value|
+        sub_hash = @hash["env_variable_switches"][variable][env_variable_value]
+        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
     end
   end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/chef_config_generator_spec.rb

@@ -98,6 +98,10 @@ env_variable_switches:
   
   describe "environment variable merging" do
     before do
+      FileUtils.stub(:pwd).and_return("/")
+    end
+
+    it "merges in if the variable is set to the the value" do
       @config = <<-CONFIG
 cookbook_paths:
 - ./chef/cookbooks/
@@ -111,10 +115,6 @@ env_variable_switches:
       recipes:
       - pivotal_dev::foo
       CONFIG
-      FileUtils.stub(:pwd).and_return("/")
-    end
-
-    it "merges in if the variable is set to the the value" do
       ENV["RACK_ENV"]="development"
       @generator = ChefConfigGenerator.new(@config, "../..")
       @generator.cookbook_paths.should == [
@@ -127,6 +127,40 @@ env_variable_switches:
         ]
     end
     
+    it "splits the value on comma and applies all matching" do
+      ENV["ROLES"]="application,database"
+      @config = <<-CONFIG
+cookbook_paths:
+- ./chef/cookbooks/
+recipes:
+- pivotal_workstation::ack
+env_variable_switches:
+  ROLES:
+    application:
+      cookbook_paths:
+      - ./chef/app_cookbooks/
+      recipes:
+      - pivotal_app::application
+    database:
+      cookbook_paths:
+      - ./chef/db_cookbooks/
+      recipes:
+      - pivotal_db::database
+      CONFIG
+      @generator = ChefConfigGenerator.new(@config, "../..")
+      @generator.cookbook_paths.should =~ [
+        "//../.././chef/cookbooks/",
+        "//../.././chef/app_cookbooks/",
+        "//../.././chef/db_cookbooks/"
+        ]
+      @generator.json_hash["recipes"].should =~ [
+        "pivotal_workstation::ack", 
+        "pivotal_app::application",
+        "pivotal_db::database",
+        ]
+    end
+
+
     it "can deal with only having environment switched recipes/cookbooks" do
       config = <<-CONFIG
 env_variable_switches:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soloist
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Matthew Kocher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
 - README.markdown
 - Rakefile
 - bin/soloist