configru 2.0.0 → 2.0.1

data/ChangeLog.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.0.1 (14 September 2012)
+
+ * Fix: Cascade options in loaded files
+
+## 2.0.0 (19 June 2012)
+
+ * Entirely new API
+
 ## 0.5.0 (27 February 2012)
 
  * Added `Configru.raw` method to access raw hashmap

data/Gemfile

@@ -1,9 +1,9 @@
 source :rubygems
 
 group :development do
-  gem 'rake', '>= 0'
-  gem 'rspec', '~> 2.8.0'
-  gem 'simplecov', '~> 0.6.0'
+  gem "rake", "~> 0.9.0"
+  gem "rspec", "~> 2.10.0"
+  gem "simplecov", "~> 0.6.0"
 end
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configru (2.0.0)
+    configru (2.0.1)
 
 GEM
   remote: http://rubygems.org/
@@ -9,14 +9,14 @@ GEM
     diff-lcs (1.1.3)
     multi_json (1.3.6)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -27,6 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   configru!
-  rake
-  rspec (~> 2.8.0)
+  rake (~> 0.9.0)
+  rspec (~> 2.10.0)
   simplecov (~> 0.6.0)

data/README.md

@@ -1,6 +1,4 @@
-# Configru
-
-[![Build Status](https://secure.travis-ci.org/programble/configru.png?branch=master)](http://travis-ci.org/programble/configru)
+# Configru [![Build Status](https://secure.travis-ci.org/programble/configru.png?branch=master)](http://travis-ci.org/programble/configru) [![Dependency Status](https://gemnasium.com/programble/configru.png?travis)](https://gemnasium.com/programble/configru)
 
 YAML configuration file loader
 
@@ -8,7 +6,40 @@ YAML configuration file loader
 
 ```ruby
 # Gemfile
-gem 'configru', '~> 2.0.0'
+gem "configru", "~> 2.0.0"
+```
+### Example
+
+```ruby
+require 'configru'
+
+Configru.load('config.yml') do
+  option :username, String, 'example_user'
+  option :token, Fixnum, 1234
+  option_group :connection do
+    option :server, String, 'example.com'
+    option :port, Fixnum, 42
+  end
+  option :path, String, Dir.home do
+    transform {|x| File.expand_path(x) }
+    validate {|x| File.directory?(x) }
+  end
+end
+
+example = Example.new(Configru.connection.server, Configru.connection.port)
+example.login(Configru.username, Configru.token)
+example.sync(Configru.path)
+```
+
+These defaults are equivalent to the following YAML:
+
+```yaml
+username: example_user
+token: 1234
+connection:
+  server: example.com
+  port: 42
+path: ~
 ```
 
 # License

data/lib/configru/version.rb

@@ -1,3 +1,3 @@
 module Configru
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/configru.rb

@@ -73,7 +73,10 @@ module Configru
 
       if input.include? key
         value = input[key]
-      else
+      elsif output.include? key # option has already been set
+        @option_path.pop
+        next
+      else # option has not been set
         value = option.default
       end
 

data/spec/configru_spec.rb

@@ -59,6 +59,16 @@ describe Configru do
     Configru.example.should == 'example_b'
   end
 
+  it 'cascades loaded files' do
+    Configru.load(example_file(:g), example_file(:h)) do
+      option :option1
+      option :option2
+    end
+
+    Configru.option1.should == 'example_g'
+    Configru.option2.should == 'example_h'
+  end
+
   it 'loads a file with a group' do
     Configru.load(example_file :c) do
       option_group :example_group do

data/spec/example_files/example_g.yml

@@ -0,0 +1,2 @@
+option1: example_g
+option2: example_g

data/spec/example_files/example_h.yml

@@ -0,0 +1 @@
+option2: example_h

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configru
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies: []
 description: YAML configuration file loader
 email:
@@ -40,6 +40,8 @@ files:
 - spec/example_files/example_d.yml
 - spec/example_files/example_e.yml
 - spec/example_files/example_f.yml
+- spec/example_files/example_g.yml
+- spec/example_files/example_h.yml
 - spec/spec_helper.rb
 - spec/structhash_spec.rb
 homepage: https://github.com/programble/configru
@@ -56,7 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2633773784802344253
+      hash: 872203077689334122
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -65,10 +67,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2633773784802344253
+      hash: 872203077689334122
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: YAML configuration file loader
@@ -81,5 +83,7 @@ test_files:
 - spec/example_files/example_d.yml
 - spec/example_files/example_e.yml
 - spec/example_files/example_f.yml
+- spec/example_files/example_g.yml
+- spec/example_files/example_h.yml
 - spec/spec_helper.rb
 - spec/structhash_spec.rb