configatron 4.0.2 → 4.0.3

data/.gitignore

@@ -15,6 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
 
 .DS_Store
 *.rbc

data/.travis.yml

@@ -4,5 +4,5 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.1.1
-install: bundle install
+install: travis_retry bundle install
 script: bundle exec rake test

data/README.md

@@ -3,7 +3,7 @@
 
 Configatron makes configuring your applications and scripts incredibly easy. No longer is a there a need to use constants or global variables. Now you can use a simple and painless system to configure your life. And, because it's all Ruby, you can do any crazy thing you would like to!
 
-One of the more important changes to V3 is that it now resembles more a `Hash` style interface. You can use `[]`, `fetch`, `each`, etc...
+One of the more important changes to V3 is that it now resembles more a `Hash` style interface. You can use `[]`, `fetch`, `each`, etc... Actually the hash notation is more robust since the dot notation won't work for some property names. See section "Differences between dot and hash notation" for more details.
 
 ## Installation
 
@@ -76,6 +76,12 @@ configatron.email.pop.port # => 110
 # and so on...
 ```
 
+### Method vs hash access
+
+As a note, method (`configatron.foo`) access will be shadowed by methods defined on the configatron object. (The configatron object descends from [`BasicObject`](http://apidock.com/ruby/BasicObject) and includes `Kernel`, so it should have a pretty bare set of methods.)
+
+If you need to use keys that are themselves method names, you can just use hash access (`configatron['foo']`).
+
 ### Namespaces
 
 The question that should be on your lips is what I need to have namespaced configuration parameters. It's easy! Configatron allows you to create namespaces.

data/lib/configatron.rb

@@ -1,4 +1,3 @@
-require 'singleton'
 require 'configatron/version'
 
 require 'configatron/deep_clone'

data/lib/configatron/root_store.rb

@@ -1,7 +1,9 @@
+require 'singleton'
+
 # This is the root configatron object, and contains methods which
 # operate on the entire configatron hierarchy.
-class Configatron::RootStore
-  include Singleton
+class Configatron::RootStore < BasicObject
+  include ::Singleton
   extend ::Forwardable
 
   attr_reader :store
@@ -22,7 +24,7 @@ class Configatron::RootStore
   end
 
   def reset!
-    @store = Configatron::Store.new(self)
+    @store = ::Configatron::Store.new(self)
   end
 
   def temp(&block)
@@ -32,7 +34,7 @@ class Configatron::RootStore
   end
 
   def temp_start
-    @temp = Configatron::DeepClone.deep_clone(@store)
+    @temp = ::Configatron::DeepClone.deep_clone(@store)
   end
 
   def temp_end

data/lib/configatron/store.rb

@@ -1,7 +1,8 @@
 require 'forwardable'
 
 class Configatron
-  class Store
+  class Store < BasicObject
+    include ::Kernel
     extend ::Forwardable
 
     def initialize(root_store, name='configatron')
@@ -14,16 +15,16 @@ class Configatron
     def [](key)
       val = fetch(key.to_sym) do
         if @root_store.locked?
-          raise Configatron::UndefinedKeyError.new("Key not found: #{key} (for locked #{self})")
+          raise ::Configatron::UndefinedKeyError.new("Key not found: #{key} (for locked #{self})")
         end
-        Configatron::Store.new(@root_store, "#{@name}.#{key}")
+        ::Configatron::Store.new(@root_store, "#{@name}.#{key}")
       end
       return val
     end
 
     def store(key, value)
       if @root_store.locked?
-        raise Configatron::LockedError.new("Cannot set key #{key} for locked #{self}")
+        raise ::Configatron::LockedError.new("Cannot set key #{key} for locked #{self}")
       end
       @attributes[key.to_sym] = value
     end
@@ -38,7 +39,7 @@ class Configatron
         end
         store(key, val)
       end
-      if val.is_a?(Configatron::Proc)
+      if val.is_a?(::Configatron::Proc)
         val = val.call
       end
       return val
@@ -50,7 +51,7 @@ class Configatron
 
     def configure_from_hash(hash)
       hash.each do |key, value|
-        if value.is_a?(Hash)
+        if value.is_a?(::Hash)
           self[key].configure_from_hash(value)
         else
           store(key, value)
@@ -65,7 +66,7 @@ class Configatron
     def inspect
       f_out = []
       @attributes.each do |k, v|
-        if v.is_a?(Configatron::Store)
+        if v.is_a?(::Configatron::Store)
           v.inspect.each_line do |line|
             if line.match(/\n/)
               line.each_line do |l|
@@ -87,13 +88,13 @@ class Configatron
     def method_missing(name, *args, &block)
       # Needed to allow 'puts'ing of a configatron.
       if name == :to_ary
-        raise NoMethodError.new("Called :to_ary")
+        raise ::NoMethodError.new("Called :to_ary")
       end
 
       # In case of Configatron bugs, prevent method_missing infinite
       # loops.
       if @method_missing
-        raise NoMethodError.new("Bug in configatron; ended up in method_missing while running: #{name.inspect}")
+        raise ::NoMethodError.new("Bug in configatron; ended up in method_missing while running: #{name.inspect}")
       end
       @method_missing = true
       do_lookup(name, *args, &block)
@@ -115,7 +116,7 @@ class Configatron
           if self.has_key?(key)
             return self[key]
           else
-            raise Configatron::UndefinedKeyError.new($1)
+            raise ::Configatron::UndefinedKeyError.new($1)
           end
         else
           return self[name]

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

data/test/unit/configatron/root_store.rb

@@ -14,7 +14,7 @@ class Critic::Unit::RootTest < Critic::Unit::Test
 
   describe 'global configatron' do
     it 'returns an instance of Configatron::RootStore' do
-      assert_equal(true, configatron.kind_of?(Configatron::RootStore))
+      assert_equal(Configatron::RootStore.instance, configatron)
     end
   end
 

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subprocess
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 5.2.3
 description: A powerful Ruby configuration system.
@@ -73,9 +82,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - History.txt
@@ -116,26 +124,33 @@ files:
 homepage: https://github.com/markbates/configatron
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 418974604606994708
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 418974604606994708
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A powerful Ruby configuration system.
 test_files:
 - test/_lib.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 42e2eb8bce1d430a7e733637d802f6385ef680d5
-  data.tar.gz: 9f35fee29168a663d1f0c6b57d526a54f54e276b
-SHA512:
-  metadata.gz: d9434069be9ce0666a151ef6882bee3e893f3e6842f2371edf510c88c7e8b9b8c48f8d397d6f9a3ba72c898af7891724607913d31e9e530a08720dbf43fc1469
-  data.tar.gz: c2b2d51eab684d3b54bc226b021c6da58a801e98cd65d37d8f479ab854f4c54d3d46b6c169eed0f9dc301d1d1a4895cd8a930a91b2b5cfb4780fcda35d0a3e16

data/.ruby-version

@@ -1 +0,0 @@
-2.1.0