fig_newton 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b255f466e417fa2b2a63e4835aaf4b9a24dc59
-  data.tar.gz: af2583e2b178b8ac41d318546525bfb5bbc61672
+  metadata.gz: 88d726ff2918b2540e7a764e0948b8c4d1adfe7d
+  data.tar.gz: f0db4d054ff0416c03d56eeb6edefb10e3ded2f9
 SHA512:
-  metadata.gz: 543c09044ddd6a9bb633960c415995ecd52d154f881e8c92b3fd421e4e4b69e716624a6a1adb4850eb54460ec3e14d66ca9780d0b5a48574eba65c32615c98fc
-  data.tar.gz: 8038740314ecb351fdeb274f8d567d65c94192fd757144b68b97e416e8b6c9737aefd87600bee9d93e572ca3dd79442035fc88f046c2ab1664ecb8ce674f47ac
+  metadata.gz: 377ee257931cf04e49bc5113a37e4e58c8a043a0298899d6fbefcfc1f8eea5b18b3eff7eb6c6b6a2a62b903eadc2f1a455641cd48e1c4fb764dbfa27b41805c8
+  data.tar.gz: 0046d651e27a9f03c995bbacfbc4466ed48c50d4aaf6ce9871a77ad9c3e679d79e7c31c18251340c78870340d35a51e1dc861cb99b4abdd214659250205c9207

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p353
+ruby-2.0.0-p598

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 0.12 / 2015-02-24
+* Enhancements
+  * Added ability to receive boolean values from the yml (Thanks Steve Jackson)
+
 === Version 0.11 / 2014-12-19
 * Added require for socket in order to elminate possible error (Thanks Doug Morgan)
 

data/config/yaml/test_config.yml

@@ -10,3 +10,5 @@ first:
     fourth: bar
 
 port: 1234
+set_flag: true
+cleared_flag: false

data/features/fig_newton.feature

@@ -45,6 +45,16 @@ Feature: Functionality of the fig_newton gem
     When I ask for the value for "port"
     Then I should see 1234
 
+  Scenario: Requesting a true boolean value
+    Given I have read the configuration file
+    When I ask for the value for "set_flag"
+    Then I should see true
+
+  Scenario: Requesting a false boolean value
+    Given I have read the configuration file
+    When I ask for the value for "cleared_flag"
+    Then I should see false
+
   Scenario:  Requesting data from a node can be converted to a hash
     Given I have read the configuration file
     When I ask for the value for "database"

data/features/step_definitions/fig_newton_steps.rb

@@ -1,87 +1,95 @@
-Given /^I have read the configuration file$/ do
+Given (/^I have read the configuration file$/) do
   FigNewton.yml_directory = 'config/yaml'
   FigNewton.load 'test_config.yml'
 end
 
-When /^I have read the default file from the default directory$/ do
+When (/^I have read the default file from the default directory$/) do
   FigNewton.yml = nil
 end
 
-When /^I ask for the value for "([^\"]*)"$/ do |key|
+When (/^I ask for the value for "([^\"]*)"$/) do |key|
   @value = FigNewton.send key
 end
 
-Then /^I should see "([^\"]*)"$/ do |value|
-  @value.should == value
+Then (/^I should see "([^\"]*)"$/) do |value|
+  expect(@value).to eql value
 end
 
-Then /^I should see (\d+)$/ do |value|
-  @value.should == value.to_i
+Then (/^I should see (\d+)$/) do |value|
+  expect(@value).to eql value.to_i
 end
 
-When /^I ask for a value that does not exist named "([^\"]*)"$/ do |non_existing|
+Then (/^I should see true$/) do
+  expect(@value).to be true
+end
+
+Then (/^I should see false$/) do
+  expect(@value).to be false
+end
+
+When (/^I ask for a value that does not exist named "([^\"]*)"$/) do |non_existing|
   @does_not_exist = non_existing
 end
 
-Then /^I should raise a NoMethodError exception$/ do
+Then (/^I should raise a NoMethodError exception$/) do
   expect{ FigNewton.send(@does_not_exist) }.to raise_error(NoMethodError) 
 end
 
-Then /^I should have a node$/ do
-  @value.should be_an_instance_of FigNewton::Node
+Then (/^I should have a node$/) do
+  expect(@value).to be_an_instance_of FigNewton::Node
 end
 
-Then /^the "([^\"]*)" value for the node should be "([^\"]*)"$/ do |key, value|
-  @value.send(key).should == value
+Then (/^the "([^\"]*)" value for the node should be "([^\"]*)"$/) do |key, value|
+  expect(@value.send(key)).to eql value
 end
 
-When /^I ask for the node value for "([^\"]*)"$/ do |key|
+When (/^I ask for the node value for "([^\"]*)"$/) do |key|
   @value = @value.send(key)
 end
 
-Given /^I have an environment variable named "([^\"]*)" set to "([^\"]*)"$/ do |env_name, filename|
+Given (/^I have an environment variable named "([^\"]*)" set to "([^\"]*)"$/) do |env_name, filename|
   FigNewton.yml = nil
   ENV[env_name] = filename
   FigNewton.yml_directory = 'config/yaml'
   FigNewton.instance_variable_set(:@yml, nil)
 end
 
-Then /^the hash of values should look like:$/ do |table|
-  table.transpose.hashes.first.should == @value.to_hash
+Then (/^the hash of values should look like:$/) do |table|
+  expect(table.transpose.hashes.first).to eql @value.to_hash
 end
 
-Given /^I have a yml file that is named after the hostname$/ do
+Given (/^I have a yml file that is named after the hostname$/) do
   FigNewton.yml = nil
   FigNewton.yml_directory = 'config/yaml'
   @hostname = Socket.gethostname
   File.open("config/yaml/#{@hostname}.yml", 'w') {|file| file.write("from_the_hostname_file:  read from the hostname file\n")}
 end
 
-Then /^I should remove the file$/ do
+Then (/^I should remove the file$/) do
   File.delete("config/yaml/#{@hostname}.yml")
 end
 
-When(/^I ask for a value that does not exist named "(.+)" that has a default value "(.+)"$/) do |key, value|
+When (/^I ask for a value that does not exist named "(.+)" that has a default value "(.+)"$/) do |key, value|
   @value = FigNewton.send key, value
 end
 
-When(/^I ask for a value that does not exist named "(.+)" that has a default block returning "(.+)"$/) do |key, value|
+When (/^I ask for a value that does not exist named "(.+)" that has a default block returning "(.+)"$/) do |key, value|
   @value = FigNewton.send(key) {
     value
   }    
 end
 
-When(/^I ask for a value that does not exist named "(.+)" that has a default lambda returning "(.+)"$/) do |key, value|
+When (/^I ask for a value that does not exist named "(.+)" that has a default lambda returning "(.+)"$/) do |key, value|
   mylambda = lambda {|property| @lambda_property = property; return value}
   @value = FigNewton.send key, &mylambda
 end
 
-When(/^I ask for a value that does not exist named "(.+)" that has a default proc returning "(.+)"$/) do |key, value|
+When (/^I ask for a value that does not exist named "(.+)" that has a default proc returning "(.+)"$/) do |key, value|
   myproc = Proc.new {value}
   @value = FigNewton.send(key, &myproc)  
 end
 
-Then(/^the lambda should be passed the property "(.+)"$/) do |expected_property|
+Then (/^the lambda should be passed the property "(.+)"$/) do |expected_property|
   expect(@lambda_property).to eq(expected_property)
 end
 

data/fig_newton.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = FigNewton::VERSION
   
-  gem.add_dependency 'yml_reader', '>= 0.3'
+  gem.add_dependency 'yml_reader', '>= 0.5'
   
-  gem.add_development_dependency 'rspec', '>= 2.12.0'
-  gem.add_development_dependency 'cucumber', '>= 1.2.0'
+  gem.add_development_dependency 'rspec', '>= 3.2.0'
+  gem.add_development_dependency 'cucumber', '>= 1.3.19'
 end

data/lib/fig_newton/missing.rb

@@ -7,9 +7,9 @@ module FigNewton
       read_file unless @yml
       m = args.first
       value = @yml[m.to_s]
-      value = args[1] unless value
-      value = block.call(m.to_s) unless value or block.nil?
-      super unless value
+      value = args[1] if value.nil?
+      value = block.call(m.to_s) if value.nil? and block
+      super if value.nil?
       value = FigNewton::Node.new(value) unless type_known? value
       value
     end
@@ -21,14 +21,15 @@ module FigNewton
         hostname = Socket.gethostname
         hostfile = "#{yml_directory}/#{hostname}.yml"
         @yml = YAML.load_file hostfile if File.exist? hostfile
-      end 
+      end
       FigNewton.load('default.yml') if @yml.nil?
     end
 
     private
-    
+
     def type_known?(value)
-       value.kind_of? String or value.kind_of? Integer
+      known_types = [String, Integer, TrueClass, FalseClass]
+      known_types.any? { |type| value.kind_of? type }
     end
   end
 end

data/lib/fig_newton/version.rb

@@ -1,3 +1,3 @@
 module FigNewton
-  VERSION = "0.11"
+  VERSION = "0.12"
 end

data/spec/fig_newton/fig_newton_spec.rb

@@ -5,11 +5,11 @@ describe FigNewton do
     it "should retrieve the data by a key named after the method called" do
       FigNewton.yml_directory = 'conf'
       yml_mock = double('yaml')
-      File.should_receive(:read).with('conf/test').and_return('test')
-      YAML.should_receive(:load).and_return(yml_mock)
-      yml_mock.should_receive(:[]).with('desired_data').and_return('information')
+      expect(File).to receive(:read).with('conf/test').and_return('test')
+      expect(YAML).to receive(:load).and_return(yml_mock)
+      expect(yml_mock).to receive(:[]).with('desired_data').and_return('information')
       FigNewton.load('test')
-      FigNewton.desired_data.should == 'information'
+      expect(FigNewton.desired_data).to eql 'information'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig_newton
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Jeff Morgan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yml_reader
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.19
 description: Provides a simple mechanism to maintain and use different configurations
   stored in yml files.
 email: