soloist 1.0.2 → 1.0.3

data/lib/soloist/config.rb

@@ -74,11 +74,11 @@ module Soloist
     end
 
     def compiled
-      @compiled ||= royal_crown.dup.tap do |rc|
-        while rc["env_variable_switches"]
-          rc.delete("env_variable_switches").each do |variable, switch|
+      @compiled ||= royal_crown.dup.tap do |working_royal_crown|
+        while working_royal_crown["env_variable_switches"]
+          working_royal_crown.delete("env_variable_switches").each do |variable, switch|
             switch.each do |value, inner|
-              rc.merge!(inner) if ENV[variable] == value
+              working_royal_crown.merge!(inner) if ENV[variable] == value
             end
           end
         end

data/lib/soloist/royal_crown.rb

@@ -14,8 +14,25 @@ module Soloist
       self["node_attributes"] = Hashie::Mash.new(hash)
     end
 
+    def merge!(other_royal_crown)
+      merge_recipes(other_royal_crown["recipes"])
+      merge_cookbook_paths(other_royal_crown["cookbook_paths"])
+      self.node_attributes.deep_merge!(other_royal_crown["node_attributes"])
+      self.env_variable_switches = other_royal_crown["env_variable_switches"]
+      self
+    end
+
+    def merge_recipes(new_recipes = [])
+      merge_array_property("recipes", new_recipes)
+    end
+
+    def merge_cookbook_paths(new_cookbook_paths = [])
+      merge_array_property("cookbook_paths", new_cookbook_paths)
+    end
+
     def env_variable_switches=(hash)
-      self["env_variable_switches"] = Hashie::Mash.new(hash)
+      self["env_variable_switches"] ||= Hashie::Mash.new
+      self["env_variable_switches"].merge!(Hashie::Mash.new(hash))
     end
 
     def to_yaml
@@ -52,5 +69,11 @@ module Soloist
     def self.nilable_properties
       (properties - [:path]).map(&:to_s)
     end
+
+    def merge_array_property(property_name, values)
+      self[property_name] ||= []
+      self[property_name] += values
+      self[property_name].uniq!
+    end
   end
 end

data/lib/soloist/version.rb

@@ -1,3 +1,3 @@
 module Soloist
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/soloist.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.license = 'MIT'
+
   s.add_dependency "chef"
   s.add_dependency "librarian-chef"
   s.add_dependency "thor"

data/spec/lib/soloist/config_spec.rb

@@ -109,6 +109,10 @@ describe Soloist::Config do
         "TONGUES" => {
           "FINE" => {
             "recipes" => ["hobo_fist"],
+            "cookbook_paths" => ["shell_in"],
+            "node_attributes" => {
+              "doc" => "absent"
+            },
             "env_variable_switches" => nested
           }
         }
@@ -132,6 +136,10 @@ describe Soloist::Config do
         config.compiled.recipes.should =~ ["hobo_fist"]
       end
 
+      it "merges the node attributes" do
+        config.compiled.node_attributes.should == {"doc" => "absent"}
+      end
+
       context "when an inactive switch is nested" do
         let(:nested) { {"BEANS" => {"EW" => {"recipes" => ["slammin"]}}} }
 
@@ -141,10 +149,15 @@ describe Soloist::Config do
       end
 
       context "when an active switch is nested" do
-        let(:nested) { {"BEANS" => {"FINE" => {"recipes" => ["slammin"]}}} }
+        let(:nested) { {"BEANS" => {"FINE" => {"cookbook_paths" => ["shell_out"], "recipes" => ["slammin"], "node_attributes" => {"kocher" => "present"}}}} }
 
         it "merges the attributes" do
-          config.compiled.recipes.should =~ ["slammin"]
+          config.compiled.recipes.should =~ ["slammin", "hobo_fist"]
+          config.compiled.cookbook_paths.should =~ ["shell_in", "shell_out"]
+        end
+
+        it "merges the node attributes" do
+          config.compiled.node_attributes.should == {"doc" => "absent", "kocher" => "present"}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soloist
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -263,7 +263,8 @@ files:
 - spec/lib/soloist/spotlight_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/mkocher/soloist
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: