subelsky_power_tools 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    subelsky_power_tools (1.0.2)
+    subelsky_power_tools (1.2.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/subelsky_power_tools/environment.rb

@@ -3,12 +3,22 @@ require "subelsky_power_tools"
 module SubelskyPowerTools::Environment
   extend self
 
+  def extract!(*keys)
+    get_keys(keys,true)
+  end
+
   def extract(*keys)
+    get_keys(keys,false)
+  end
+  
+  private
+
+  def get_keys(keys,raise_error_if_blank)
     keys.map! { |k| k.upcase.to_s }
     msg = "Must specify #{keys.join(", ")}"
 
     keys.inject([]) do |total,key|
-      fail msg if ENV[key].to_s.strip.empty?
+      fail msg if raise_error_if_blank && ENV[key].to_s.strip.empty?
       total << ENV[key]
     end
   end

data/lib/subelsky_power_tools/version.rb

@@ -1,3 +1,3 @@
 module SubelskyPowerTools
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/lib/environment_spec.rb

@@ -2,31 +2,59 @@ require "spec_helper"
 require "subelsky_power_tools/environment"
 
 describe SubelskyPowerTools::Environment do
-  def conduct_test(val1 = "shaz",val2 = "bot")
-    ENV['_SPT_EE_TEST_VALUE1'] = val1
-    ENV['_SPT_EE_TEST_VALUE2'] = val2
-    SubelskyPowerTools::Environment.extract(:'_spt_ee_test_value1',:'_spt_ee_test_value2')
-  end
+  context "extraction of required environment variables" do
+    def conduct_test(val1 = "shaz",val2 = "bot")
+      ENV['_SPT_EE_TEST_VALUE1'] = val1
+      ENV['_SPT_EE_TEST_VALUE2'] = val2
+      SubelskyPowerTools::Environment.extract!(:'_spt_ee_test_value1',:'_spt_ee_test_value2')
+    end
 
-  it "succeeds if all specified variables are non-blank" do
-    expect { conduct_test }.not_to raise_error
-  end
+    it "succeeds if all specified variables are non-blank" do
+      expect { conduct_test }.not_to raise_error
+    end
 
-  it "fails the program if any specified variable is blank" do
-    expect { conduct_test(" ","bot") }.to raise_error(RuntimeError)
-  end
+    it "raises error if any specified variable is blank" do
+      expect { conduct_test(" ","bot") }.to raise_error(RuntimeError)
+    end
 
-  it "fails the program if any specified variable is zero-width" do
-    expect { conduct_test("shaz","") }.to raise_error(RuntimeError)
-  end
+    it "raises error if any specified variable is zero-width" do
+      expect { conduct_test("shaz","") }.to raise_error(RuntimeError)
+    end
+
+    it "raises error if any specified variable is nil" do
+      expect { conduct_test("",nil) }.to raise_error(RuntimeError)
+    end
 
-  it "fails the program if any specified variable is nil" do
-    expect { conduct_test("",nil) }.to raise_error(RuntimeError)
+    it "returns the value of the extracted variables" do
+      val1, val2 = conduct_test("alpha","beta")
+      val1.should == "alpha"
+      val2.should == "beta"
+    end
   end
 
-  it "returns the value of the extracted variables" do
-    val1, val2 = conduct_test("alpha","beta")
-    val1.should == "alpha"
-    val2.should == "beta"
+  context "extraction of optional environment variables" do
+    def conduct_test(val1 = "shaz",val2 = "bot")
+      ENV['_SPT_EE_TEST_VALUE1'] = val1
+      ENV['_SPT_EE_TEST_VALUE2'] = val2
+      SubelskyPowerTools::Environment.extract(:'_spt_ee_test_value1',:'_spt_ee_test_value2')
+    end
+
+    it "succeeds if any specified variable is blank" do
+      expect { conduct_test(" ","bot") }.not_to raise_error
+    end
+
+    it "succeeds if any specified variable is zero-width" do
+      expect { conduct_test("shaz","") }.not_to raise_error
+    end
+
+    it "suceeds if any specified variable is nil" do
+      expect { conduct_test("",nil) }.not_to raise_error
+    end
+
+    it "returns the value of the extracted variables" do
+      val1, val2 = conduct_test(nil,"beta")
+      val1.should == nil
+      val2.should == "beta"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subelsky_power_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-14 00:00:00.000000000 -04:00
+date: 2011-08-21 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160525580 !ruby/object:Gem::Requirement
+  requirement: &2164636140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160525580
+  version_requirements: *2164636140
 description: ! "This is a collection of Ruby extensions and utilities I've been carting
   around from project to project. \nMany are taken from the Facets project (I just
   don't want to include that whole gem in my codebases).\n"