chef_cap 0.2.8 → 0.2.9

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/recipes/lib/chef_cap_helper.rb

@@ -12,12 +12,13 @@ class ChefCapHelper
         end
         next if key == :ssh_options # skip restricted variables
 
-        unless value.nil?
-          debug("Setting #{key.inspect} => #{value.inspect}")
-          ChefCapConfiguration.configuration.set key, value
-        else
+        override_value = ENV[key.to_s]
+        if value.nil? || override_value == "null"
           debug("Unsetting #{key.inspect} => #{value.inspect}")
           ChefCapConfiguration.configuration.unset key
+        else
+          debug("Setting #{key.inspect} => #{value.inspect}")
+          ChefCapConfiguration.configuration.set key, (override_value || value)
         end
       end
     end

data/spec/chef_cap_helper_spec.rb

@@ -45,6 +45,25 @@ describe ChefCapHelper do
       end
     end
 
+    context "given an environment variable matching the key name" do
+      before { ENV["gateway"] = "mygateway" }
+      after { ENV["gateway"] = nil }
+
+      it "should overwrite the value with the environment variable" do
+        @configuration.should_receive(:set).with(:gateway, "mygateway")
+        ChefCapHelper.parse_hash({"gateway" => "yourgateway"})
+      end
+    end
+
+    context "given an environment variable matching the key name" do
+      before { ENV["gateway"] = "null" }
+      after { ENV["gateway"] = nil }
+
+      it "should overwrite the value with the environment variable" do
+        @configuration.should_receive(:unset).with(:gateway)
+        ChefCapHelper.parse_hash({"gateway" => "yourgateway"})
+      end
+    end
     it "should unset null values" do
       @configuration.should_receive(:unset).with(:somekey)
       @configuration.should_not_receive(:set)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2165477760 !ruby/object:Gem::Requirement
+  requirement: &2157483920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2165477760
+  version_requirements: *2157483920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165476780 !ruby/object:Gem::Requirement
+  requirement: &2157482840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2165476780
+  version_requirements: *2157482840
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1089902353298414569
+      hash: -2444766936816973139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1089902353298414569
+      hash: -2444766936816973139
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12