configulations 0.2.0 → 0.2.1

data/Gemfile

@@ -1,9 +1,12 @@
 source "http://rubygems.org"
 
+gem "json_pure", :platform => :jruby
+gem "json", :platform => :ruby_18
+
 group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.2"
   gem "rcov", ">= 0"
-  gem "ruby-debug19"
+  gem "ruby-debug19", :platforms => :mri_19
 end

data/Gemfile.lock

@@ -9,10 +9,13 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.5.3)
+    json_pure (1.5.3)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     rake (0.9.2)
     rcov (0.9.9)
+    rcov (0.9.9-java)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -33,11 +36,14 @@ GEM
       archive-tar-minitar (>= 0.5.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.2)
+  json
+  json_pure
   rcov
   rspec (~> 2.3.0)
   ruby-debug19

data/README.md

@@ -24,19 +24,29 @@ config.server.host #=> "localhost"
 config.admins.include? User.find_by_name("leon") #=> true
 ```
 
-## Known Issues
+Thanks to tonywok for starting the inheritance work... this is now possible: 
 
-* Right now data is first in- first out. If you have 2 config files with the same name
-the last one in, wins.
-* There is no inheritence. You can't set global options and then over-ride them with
-another file.
+###structure:
+```
+config/
+--application.yml   #=> (host: 'production.local')
+--application/
+-----development.yml #=> (host: 'development.local')
+-----test.yml        #=> (host: 'test.local')
+```
 
-You can however, augment the settings anytime you like. 
+if each has a host... then you can call it like so...
 
 ```ruby
-config.admins.pop #=> gives one of our admins.
+ENV["APP_ENV"] ||= "test" #=> current support vars are "RACK_ENV", "RAILS_ENV", "APP_ENV"
+MyConfig.application.host.should == "test.local"
 ```
 
+## Known Issues
+
+* Right now data is first in- first out. If you have 2 config files with the same name
+the last one in, wins.
+
 ## Future
 
 This is all I needed for now but I'd love to work out those issues mentioned above
@@ -55,6 +65,14 @@ configuration be a bit more flexible than a yml, json file would allow.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 * This list is from Jeweler. Which is awesome...
 
+## Contributors
+
+Many thanks to anyone who sends patches, emails, love my way to keep this
+software alive and a joy to maintain.
+
+* github.com/tonywok
+* github.com/al2o3cr (during pairing day at EdgeCase!)
+
 ## Copyright
 
 Copyright (c) 2011 Leon Gersing. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/configulations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configulations}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Leon Gersing"]
-  s.date = %q{2011-07-12}
+  s.authors = [%q{Leon Gersing}]
+  s.date = %q{2011-08-04}
   s.description = %q{Auto-create configuration objects for your applications from yml and json files.}
   s.email = %q{leongersing@gmail.com}
   s.extra_rdoc_files = [
@@ -50,21 +50,25 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/leongersing/configulations}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Simple Config class for Ruby apps.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
+      s.add_dependency(%q<json_pure>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
@@ -72,6 +76,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json_pure>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.2"])

data/lib/configulations.rb

@@ -36,7 +36,8 @@ class Configulations
 
     props[base] = config_data
 
-    if Dir.exists?(dir = "#{File.dirname(file)}/#{base}")
+    dir = "#{File.dirname(file)}/#{base}"
+    if File.exists?(dir) and File.directory?(dir)
       child_configs = glob_directory_against_supported_extensions(dir)
       find_properties(child_configs, props[base], base)
     end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configulations
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 0.2.0
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Leon Gersing
@@ -10,64 +15,112 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -04:00
-default_executable: 
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  prerelease: false
+  name: json_pure
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  prerelease: false
+  name: json
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
+  requirement: *id003
   prerelease: false
-  version_requirements: *id001
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: *id002
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
-  type: :development
+  requirement: *id005
   prerelease: false
-  version_requirements: *id003
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: *id004
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: *id005
+  name: ruby-debug19
 description: Auto-create configuration objects for your applications from yml and json files.
 email: leongersing@gmail.com
 executables: []
@@ -109,7 +162,6 @@ files:
 - spec/configurator_spec.rb
 - spec/magic_hash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/leongersing/configulations
 licenses: 
 - MIT
@@ -123,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2454716717098569719
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -132,11 +184,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Simple Config class for Ruby apps.