configliere 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/configliere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configliere}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mrflip"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-04-02}
   s.default_executable = %q{configliere}
   s.description = %q{ You've got a script. It's got some settings. Some settings are for this module, some are for that module. Most of them don't change. Except on your laptop, where the paths are different.  Or when you're in production mode. Or when you're testing from the command line.
 
@@ -67,7 +67,7 @@ Configliere manage settings from many sources: static constants, simple config f
   ]
   s.homepage = %q{http://github.com/mrflip/configliere}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Wise, discreet configuration management}
   s.test_files = [
     "examples/config_block_script.rb",
@@ -89,6 +89,7 @@ Configliere manage settings from many sources: static constants, simple config f
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/configliere.rb

@@ -7,7 +7,7 @@ module Configliere
 
   # delegates to Configliere::Param
   def self.new *args, &block
-    Configliere::Param.new *args, &block
+    Configliere::Param.new(*args, &block)
   end
 
   ALL_MIXINS = [:define, :config_file, :commandline, :encrypted, :env_var, :config_block, :git_style_binaries]
@@ -20,7 +20,7 @@ module Configliere
 
   # Base class for Configliere errors.
   Error = Class.new(StandardError)
-  
+
 end
 
 # Defines a global config object
@@ -32,5 +32,5 @@ Settings = Configliere.new unless defined?(Settings)
 # pattern.
 #
 def Settings *args
-  Settings.defaults *args
+  Settings.defaults(*args)
 end

data/lib/configliere/config_file.rb

@@ -13,7 +13,16 @@ module Configliere
     # Load params from disk.
     # * file is in YAML format, as a hash of handle => param_hash pairs
     # * filename defaults to Configliere::DEFAULT_CONFIG_FILE (~/.configliere, probably)
-    def read handle
+    #
+    # @option [String] :env
+    #   If an :env option is given, only the indicated subhash is merged. This
+    #   lets you for example specify production / environment / test settings
+    #
+    # @example
+    #     # Read from config/apey_eye.yaml and use settings appropriate for development/staging/production
+    #     Settings.read(root_path('config/apey_eye.yaml'), :env => (ENV['RACK_ENV'] || 'production'))
+    #
+    def read handle, options={}
       filename = filename_for_handle(handle)
       begin
         params = YAML.load(File.open(filename)) || {}
@@ -22,6 +31,10 @@ module Configliere
         params = {}
       end
       params = params[handle] if handle.is_a?(Symbol)
+      # Extract the :env (production/development/etc)
+      if options[:env]
+        params = params[options[:env]]
+      end
       deep_merge! params
     end
 

data/lib/configliere/core_ext/blank.rb

@@ -1,3 +1,7 @@
+#
+# This is taken in whole from the extlib gem. Thanks y'all.
+#
+
 class Object
   ##
   # Returns true if the object is nil or empty (if applicable)
@@ -11,7 +15,7 @@ class Object
   # @api public
   def blank?
     nil? || (respond_to?(:empty?) && empty?)
-  end
+  end unless method_defined?(:blank?)
 end # class Object
 
 class Numeric
@@ -27,7 +31,7 @@ class Numeric
   # @api public
   def blank?
     false
-  end
+  end unless method_defined?(:blank?)
 end # class Numeric
 
 class NilClass
@@ -41,7 +45,7 @@ class NilClass
   # @api public
   def blank?
     true
-  end
+  end unless method_defined?(:blank?)
 end # class NilClass
 
 class TrueClass
@@ -55,7 +59,7 @@ class TrueClass
   # @api public
   def blank?
     false
-  end
+  end unless method_defined?(:blank?)
 end # class TrueClass
 
 class FalseClass
@@ -69,7 +73,7 @@ class FalseClass
   # @api public
   def blank?
     true
-  end
+  end unless method_defined?(:blank?)
 end # class FalseClass
 
 class String
@@ -85,5 +89,5 @@ class String
   # @api public
   def blank?
     strip.empty?
-  end
+  end unless method_defined?(:blank?)
 end # class String

data/lib/configliere/core_ext/hash.rb

@@ -30,12 +30,12 @@ class Hash
   #
   def deep_merge hsh2
     merge hsh2, &Hash::DEEP_MERGER
-  end
+  end unless method_defined?(:deep_merge)
 
   def deep_merge! hsh2
     update hsh2, &Hash::DEEP_MERGER
     self
-  end
+  end unless method_defined?(:deep_merge!)
 
   #
   # Treat hash as tree of hashes:
@@ -55,7 +55,7 @@ class Hash
     args.each{|key| hsh = (hsh[key] ||= self.class.new) }
     # set leaf value
     hsh[last_key] = val
-  end
+  end unless method_defined?(:deep_set)
 
   #
   # Treat hash as tree of hashes:
@@ -73,11 +73,10 @@ class Hash
   def deep_get *args
     last_key = args.pop
     # dig down to last subtree (building out if necessary)
-    hsh = args.inject(self){|hsh, key| hsh[key] || {} }
+    hsh = args.inject(self){|h, k| h[k] || {} }
     # get leaf value
     hsh[last_key]
-  end
-
+  end unless method_defined?(:deep_get)
 
   #
   # Treat hash as tree of hashes:
@@ -92,19 +91,18 @@ class Hash
     last_key  = args.pop
     last_hsh  = args.empty? ? self : (deep_get(*args)||{})
     last_hsh.delete(last_key)
-  end
+  end unless method_defined?(:deep_delete)
 
   #
   # remove all key-value pairs where the value is nil
   #
   def compact
     reject{|key,val| val.nil? }
-  end
+  end unless method_defined?(:compact)
   #
   # Replace the hash with its compacted self
   #
   def compact!
     replace(compact)
-  end
-
+  end unless method_defined?(:compact!)
 end

data/lib/configliere/define.rb

@@ -1,7 +1,7 @@
 module Configliere
   module Define
     # Definitions for params: :description, :type, :encrypted, etc.
-    attr_accessor :param_definitions
+    attr_writer :param_definitions
 
     # @param param the setting to describe. Either a simple symbol or a dotted param string.
     # @param definitions the defineables to set (:description, :type, :encrypted, etc.)

data/lib/configliere/env_var.rb

@@ -9,8 +9,8 @@ module Configliere
       envs.each do |env|
         case env
         when Hash
-          env.each do |param, env|
-            adopt_env_var! param, env
+          env.each do |env_param, env_var|
+            adopt_env_var! env_param, env_var
           end
         else
           param = env.to_s.downcase.to_sym

data/lib/configliere/param.rb

@@ -93,7 +93,7 @@ module Configliere
 
     def use *args
       hsh = args.pop if args.last.is_a?(Hash)
-      Configliere.use *args
+      Configliere.use(*args)
       self.deep_merge!(hsh) unless hsh.nil?
     end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: configliere
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - mrflip
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +00:00
+date: 2011-04-02 00:00:00 -05:00
 default_executable: configliere
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,7 +110,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -122,14 +118,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Wise, discreet configuration management