configliere 0.4.13 → 0.4.14

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+
+bundler_args: --without docs support
+
+notifications:
+  email: false

data/.yardopts

@@ -0,0 +1,7 @@
+--readme   README.textile
+--markup   markdown
+-
+VERSION
+CHANGELOG.textile
+LICENSE.md
+README.textile

data/Gemfile

@@ -1,39 +1,42 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gem   'multi_json',  ">= 1.1"
-gem   'oj',          ">= 1.2"
-gem   'json',                    :platform => :jruby
 
 # Only necessary if you want to use Configliere::Prompt
 gem   'highline',    ">= 1.5.2"
+gem   'jruby-openssl',           :platform => :jruby # if RUBY_PLATFORM =~ /java/
+
+puts [RUBY_PLATFORM, RUBY_ENGINE, RUBY_DESCRIPTION]
 
 # Only gems that you want listed as development dependencies in the gemspec
 group :development do
   gem 'bundler',     "~> 1.1"
   gem 'rake'
-end
-
-# Gems you would use if hacking on this gem (rather than with it)
-group :support do
-  gem 'jeweler',     ">= 1.6"
-  gem 'pry'
   gem 'yard',        ">= 0.7"
-  gem 'rspec',       "~> 2.8"
+  gem 'rspec',       ">= 2.8"
+  gem 'jeweler',     ">= 1.6"
 end
 
-group :doc do
-  gem 'RedCloth',    ">= 4.2", :require => "redcloth"
-  gem 'redcarpet',   ">= 2.1"
+group :docs do
+  gem 'RedCloth',    ">= 4.2",   :require => "redcloth"
+  gem 'redcarpet',   ">= 2.1",   :platform => [:mri, :rbx]
+  gem 'kramdown',                :platform => :jruby
 end
 
 # Gems for testing and coverage
 group :test do
-  gem 'simplecov',   ">= 0.5", :platform => :ruby_19
+  gem 'simplecov',   ">= 0.5",   :platform => :ruby_19
   #
+  gem 'oj',          ">= 1.2",   :platform => [:mri, :rbx]
+  gem 'json',                    :platform => :jruby
+end
+
+# Gems you would use if hacking on this gem (rather than with it)
+group :support do
+  gem 'pry'
   gem 'guard',       ">= 1.0"
   gem 'guard-rspec', ">= 0.6"
   gem 'guard-yard'
-  #
   if RUBY_PLATFORM.include?('darwin')
     gem 'rb-fsevent', ">= 0.9"
   end

data/README.textile

@@ -8,6 +8,8 @@ You've got a script. It's got some settings. Some settings are for this module,
 
 Configliere manages settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Basically: *Settings go in, the right thing happens*.
 
+"!https://secure.travis-ci.org/infochimps-labs/configliere.png!":http://travis-ci.org/infochimps-labs/configliere
+
 h2. Example
 
 Here's a simple example, using params from a config file and the command line. In the script:

data/Rakefile

@@ -1,64 +1,45 @@
 require 'rubygems' unless defined?(Gem)
-require 'bundler'
-begin
-  Bundler.setup(:default, :development, :support)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
+Bundler.setup(:default, :development)
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "configliere"
-    gem.homepage    = "http://infochimps.com/tools"
-    gem.license     = "Apache"
-    gem.summary     = %Q{Wise, discreet configuration management}
-    gem.email       = "coders@infochimps.org"
-    gem.authors     = ["infochimps", "mrflip"]
-    gem.executables = []
-    gem.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.
-
-   "" So, Consigliere of mine, I think you should tell your Don what everyone knows. "" -- Don Corleone
+task :default => :rspec
 
-Configliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.
-} #'
-  end
-  Jeweler::RubygemsDotOrgTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: bundle install"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  Bundler.setup(:default, :development, :test)
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-begin
-  require 'rspec/core'
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-  end
-
-  # if rcov shits the bed with ruby 1.9, see
-  #   https://github.com/relevance/rcov/issues/31
-  RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.rcov = true
-    spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
-  end
-rescue LoadError
-  task(:rspec){ abort "Rspec is not available. In order to run spec, you must: bundle install" }
-  task(:rcov ){ abort "Rspec is not available. In order to run coverage, you must: bundle install" }
+desc "Run RSpec with code coverage"
+task :cov do
+  ENV['CONFIGLIERE_COV'] = "yep"
+  Rake::Task[:rspec].execute
 end
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do
-    Bundler.setup(:default, :development, :doc)
-  end
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: bundle install"
-  end
+require 'yard'
+YARD::Rake::YardocTask.new do
+  Bundler.setup(:default, :development, :docs)
 end
 
-task :default => :spec
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  Bundler.setup(:default, :development, :test)
+  gem.name        = 'configliere'
+  gem.homepage    = 'https://github.com/infochimps-labs/configliere'
+  gem.license     = 'Apache 2.0'
+  gem.email       = 'coders@infochimps.org'
+  gem.authors     = ['Infochimps']
+
+  gem.summary     = %Q{Wise, discreet configuration management}
+  gem.description = <<-EOF
+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.
+
+   "" So, Consigliere of mine, I think you should tell your Don what everyone knows. "" -- Don Corleone
+
+Configliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.
+EOF
+
+  gem.executables = []
+end
+Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

data/configliere.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "configliere"
-  s.version = "0.4.13"
+  s.version = "0.4.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["infochimps", "mrflip"]
-  s.date = "2012-08-07"
-  s.description = " 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.\n\n   \"\" So, Consigliere of mine, I think you should tell your Don what everyone knows. \"\" -- Don Corleone\n\nConfigliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.\n"
+  s.authors = ["Infochimps"]
+  s.date = "2012-08-13"
+  s.description = "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.\n\n   \"\" So, Consigliere of mine, I think you should tell your Don what everyone knows. \"\" -- Don Corleone\n\nConfigliere manage settings from many sources: static constants, simple config files, environment variables, commandline options, straight ruby. You don't have to predefine anything, but you can ask configliere to type-convert, require, document or password-obscure any of its fields. Modules can define config settings independently of each other and the main program.\n"
   s.email = "coders@infochimps.org"
   s.extra_rdoc_files = [
     "LICENSE.md",
@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
-    ".watchr",
+    ".travis.yml",
+    ".yardopts",
     "CHANGELOG.textile",
     "FEATURES.txt",
     "Gemfile",
@@ -72,10 +73,10 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://infochimps.com/tools"
-  s.licenses = ["Apache"]
+  s.homepage = "https://github.com/infochimps-labs/configliere"
+  s.licenses = ["Apache 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "Wise, discreet configuration management"
 
   if s.respond_to? :specification_version then
@@ -83,26 +84,32 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multi_json>, [">= 1.1"])
-      s.add_runtime_dependency(%q<oj>, [">= 1.2"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1"])
       s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0.7"])
+      s.add_development_dependency(%q<rspec>, [">= 2.8"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6"])
     else
       s.add_dependency(%q<multi_json>, [">= 1.1"])
-      s.add_dependency(%q<oj>, [">= 1.2"])
-      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0.7"])
+      s.add_dependency(%q<rspec>, [">= 2.8"])
+      s.add_dependency(%q<jeweler>, [">= 1.6"])
     end
   else
     s.add_dependency(%q<multi_json>, [">= 1.1"])
-    s.add_dependency(%q<oj>, [">= 1.2"])
-    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 1.5.2"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0.7"])
+    s.add_dependency(%q<rspec>, [">= 2.8"])
+    s.add_dependency(%q<jeweler>, [">= 1.6"])
   end
 end
 

data/lib/configliere.rb

@@ -11,6 +11,8 @@ require 'configliere/config_file'   # read / save! files
 # running the specs requires rspec and spork
 
 module Configliere
+  RUBY_ENGINE = 'ruby' if not defined?(::RUBY_ENGINE)
+
   ALL_MIXINS = [:define, :config_file, :commandline, :encrypted, :env_var, :config_block, :commands, :prompt]
   def self.use *mixins
     mixins = ALL_MIXINS if mixins.include?(:all) || mixins.empty?

data/lib/configliere/commands.rb

@@ -39,7 +39,7 @@ module Configliere
       commands.each do |cmd, cmd_info|
         cmd_info[:config].resolve!
       end
-      if command_name
+      if command_name && commands[command_name]
         sub_config = commands[command_name][:config]
         adoptable  = sub_config.send(:definitions).keys
         merge!(sub_config.select{|k,v| adoptable.include?(k) } )

data/lib/configliere/config_file.rb

@@ -79,29 +79,29 @@ module Configliere
       filename = expand_filename(filename)
       hsh = self.export.to_hash
       FileUtils.mkdir_p(File.dirname(filename))
-      File.open(filename, 'w'){|f| f << YAML.dump(hsh) }
+      File.open(filename, 'w'){|file| file << YAML.dump(hsh) }
     end
 
     def determine_conf_location(level, scope)
       lookup_conf_dir(level, scope).join("#{scope}.yaml").to_s
     end
-    
+
     def default_conf_dir
       lookup_conf_dir(:user, 'configliere')
     end
-    
+
     def lookup_conf_dir(level, scope)
       Configliere::DEFAULT_CONFIG_LOCATION[level].call(scope)
     end
 
     def load_configuration_in_order!(scope = 'configliere')
-      [ :machine, :user, :app ].each do |level| 
+      [ :machine, :user, :app ].each do |level|
         conf = determine_conf_location(level, scope)
-        read(conf) if Pathname(conf).exist? 
+        read(conf) if Pathname(conf).exist?
       end
       resolve!
     end
-    
+
   protected
 
     def filetype filename

data/lib/configliere/crypter.rb

@@ -1,7 +1,10 @@
-require 'openssl'                   # for encryption
-require 'digest/sha2'               # for encryption
-require "base64"                    # base64-encode the binary encrypted string
 module Configliere
+  # for encryption
+  require 'openssl'
+  require 'digest/sha2'
+  # base64-encode the binary encrypted string
+  require "base64"
+
   #
   # Encrypt and decrypt values in configliere stores
   #
@@ -56,7 +59,7 @@ module Configliere
 
     # prepend the initialization vector to the encoded message
     def self.combine_iv_and_ciphertext iv, message
-      iv + message
+      iv.force_encoding("BINARY") + message.force_encoding("BINARY")
     end
     # pull the initialization vector from the front of the encoded message
     def self.separate_iv_and_ciphertext cipher, iv_and_ciphertext

data/lib/configliere/vayacondios.rb

@@ -1 +1,2 @@
+require 'vayacondios'
 require 'vayacondios/configliere'

data/spec/configliere/config_file_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Configliere::ConfigFile do
   let(:default_params) { { my_param: 'default_val', also_a_param: true } }
-  
+
   subject{ Configliere::Param.new default_params }
 
   it 'is included by default' do
@@ -13,7 +13,7 @@ describe Configliere::ConfigFile do
     let(:file_params) { { my_param: 'val_from_file' } }
     let(:file_string) { file_params.to_yaml           }
     let(:file_path)   { '/absolute/path.yaml'         }
-    
+
     before{ File.stub(:open).and_return(file_string) }
 
     it 'returns the config object for chaining' do
@@ -22,31 +22,31 @@ describe Configliere::ConfigFile do
 
     context 'a yaml file' do
       let(:file_path) { '/absolute/path.yaml' }
-      
+
       it 'reads successfully' do
         subject.should_receive(:read_yaml).with(file_string, {})
         subject.read file_path
-      end      
-      
+      end
+
       it 'merges the data' do
         subject.read(file_path).should == default_params.merge(file_params)
-      end      
+      end
     end
 
     context 'a json file' do
       let(:file_path)   { '/absolute/path.json' }
-      let(:file_string) { file_params.to_json   }
-      
+      let(:file_string) { '{"my_param":"val_from_file"}'   }
+
       it 'reads successfully' do
         subject.should_receive(:read_json).with(file_string, {})
         subject.read file_path
-      end      
+      end
 
       it 'merges the data' do
-        subject.read(file_path).should == default_params.merge(file_params) 
+        subject.read(file_path).should == default_params.merge(file_params)
       end
     end
-    
+
     context 'given a symbol' do
       let(:file_path) { :my_settings }
 
@@ -55,10 +55,10 @@ describe Configliere::ConfigFile do
         defined?(Configliere::DEFAULT_CONFIG_FILE).should_not be_true
       end
     end
-      
+
     context 'given a nonexistent file' do
-      let(:file_path) { 'nonexistent.conf' } 
-      
+      let(:file_path) { 'nonexistent.conf' }
+
       it 'warns but does not fail if the file is missing' do
         File.stub(:open).and_raise(Errno::ENOENT)
         subject.should_receive(:warn).with("Loading empty configliere settings file #{subject.default_conf_dir}/#{file_path}")
@@ -68,22 +68,22 @@ describe Configliere::ConfigFile do
 
     context 'given an absolute path' do
       let(:file_path) { '/absolute/path.yaml' }
-      
+
       it 'uses it directly' do
         File.should_receive(:open).with(file_path).and_return(file_string)
         subject.read file_path
-      end      
+      end
     end
-    
+
     context 'given a simple filename' do
       let(:file_path) { 'simple_path.yaml' }
-      
+
       it 'references it to the default config dir' do
         File.should_receive(:open).with(File.join(subject.default_conf_dir, file_path)).and_return(file_string)
         subject.read file_path
-      end    
+      end
     end
-    
+
     context 'with options' do
       let(:file_params) { { development: { reload: true }, production: { reload: false } } }
 
@@ -92,7 +92,7 @@ describe Configliere::ConfigFile do
       context ':env key' do
         context 'valid :env' do
           let(:opts) { { env: :development } }
-          
+
           it 'slices out a subhash given by :env' do
             subject.read(file_path, opts)
             subject.should == default_params.merge(reload: true)
@@ -101,23 +101,23 @@ describe Configliere::ConfigFile do
 
         context 'invalid :env' do
           let(:opts) { { env: :not_there } }
-          
+
           it 'has no effect if the key given by :env option is absent' do
             subject.read(file_path, opts)
             subject.should == default_params.merge(reload: 'whatever')
-          end     
-        end         
+          end
+        end
       end
-      
+
       context 'no :env key' do
         let(:opts) { Hash.new }
-        
+
         it 'does no slicing without the :env option' do
           subject.read(file_path, opts)
-          subject.should == default_params.merge(reload: 'whatever').merge(file_params) 
-        end      
-      end  
-    end  
+          subject.should == default_params.merge(reload: 'whatever').merge(file_params)
+        end
+      end
+    end
   end
 
   context '#save!' do
@@ -125,14 +125,15 @@ describe Configliere::ConfigFile do
 
     context 'given an absolute pathname' do
       let(:file_path) { '/absolute/path.yaml' }
-      
+
       it 'saves the filename as given' do
         File.should_receive(:open).with(file_path, 'w').and_yield(fake_file)
+        FileUtils.stub(:mkdir_p)
         fake_file.should_receive(:<<).with(default_params.to_yaml)
         subject.save! file_path
       end
-    end 
-    
+    end
+
     context 'given a simple pathname' do
       let(:file_path) { 'simple_path.yaml' }
 
@@ -141,7 +142,7 @@ describe Configliere::ConfigFile do
         fake_file.should_receive(:<<).with(default_params.to_yaml)
         subject.save! file_path
       end
-      
+
       it 'ensures the directory exists' do
         File.should_receive(:open).with(File.join(subject.default_conf_dir, file_path), 'w').and_yield(fake_file)
         FileUtils.should_receive(:mkdir_p).with(subject.default_conf_dir.to_s)
@@ -149,27 +150,27 @@ describe Configliere::ConfigFile do
       end
     end
   end
-  
+
   context '#resolve!' do
     around do |example|
       Configliere::ParamParent.class_eval{ def resolve!() parent_method ; end }
       example.run
       Configliere::ParamParent.class_eval{ def resolve!() self ; end }
     end
-    
+
     it 'calls super and returns self' do
       subject.should_receive(:parent_method)
       subject.resolve!.should equal(subject)
     end
   end
-  
+
   describe '#validate!' do
     around do |example|
       Configliere::ParamParent.class_eval{ def validate!() parent_method ; end }
       example.run
       Configliere::ParamParent.class_eval{ def validate!() self ; end }
     end
-    
+
     it 'calls super and returns self' do
       subject.should_receive(:parent_method)
       subject.validate!.should equal(subject)
@@ -178,9 +179,9 @@ describe Configliere::ConfigFile do
 
   context '#load_configuration_in_order!' do
     let(:scope) { 'test' }
-  
+
     before{ subject.stub(:determine_conf_location).and_return('conf_dir') }
-    
+
     it 'resolves configuration in order' do
       subject.should_receive(:determine_conf_location).with(:machine, scope).ordered
       subject.should_receive(:determine_conf_location).with(:user, scope).ordered

data/spec/configliere/crypter_spec.rb

@@ -3,7 +3,7 @@ require 'configliere/crypter'
 include Configliere
 
 describe "Crypter" do
-  ENCRYPTED_FOO_VAL = "cc+Bp5jMUBHFCvPNZIfleeatB4IGaaXjVINl12HOpcs=\n"
+  ENCRYPTED_FOO_VAL = "cc+Bp5jMUBHFCvPNZIfleeatB4IGaaXjVINl12HOpcs=\n".force_encoding("BINARY")
   FOO_VAL_IV = Base64.decode64(ENCRYPTED_FOO_VAL)[0..15]
   it "encrypts" do
     # Force the same initialization vector as used to prepare the test value

data/spec/configliere/deep_hash_spec.rb

@@ -83,7 +83,6 @@ describe DeepHash do
     end
 
     it "only accepts #to_sym'bolizable things as keys" do
-      lambda{ @deep_hash[1] = 'hi'            }.should raise_error(NoMethodError, /undefined method `to_sym'/)
       lambda{ @deep_hash[{ :a => :b }] = 'hi' }.should raise_error(NoMethodError, /undefined method `to_sym'/)
       lambda{ @deep_hash[Object.new] = 'hi'   }.should raise_error(NoMethodError, /undefined method `to_sym'/)
       lambda{ @deep_hash[:a] = 'hi'           }.should_not raise_error
@@ -91,23 +90,32 @@ describe DeepHash do
   end
 
   describe '#[]' do
+    let(:orig_hash){ { :hat => :cat, :basket => :lotion, :moon => { :man => :smiling, :cheese => {:type => :tilsit} } } }
+    let(:subject  ){ Configliere::Param.new({ :hat => :cat, :basket => :lotion, :moon => { :man => :smiling, :cheese => {:type => :tilsit} } }) }
+
     it 'deep-gets dotted vals' do
-      hsh = { :hat => :cat, :basket => :lotion, :moon => { :man => :smiling, :cheese => {:type => :tilsit} } }
-      @deep_hash = Configliere::Param.new hsh.dup
-      @deep_hash['moon.man'].should == :smiling
-      @deep_hash['moon.cheese.type'].should == :tilsit
-      @deep_hash['moon.cheese.smell'].should be_nil
-      @deep_hash['moon.non.existent.interim.values'].should be_nil
-      @deep_hash['moon.non'].should be_nil
-      if (RUBY_VERSION >= '1.9') then lambda{ @deep_hash['hat.cat'] }.should raise_error(TypeError)
-      else                            lambda{ @deep_hash['hat.cat'] }.should raise_error(NoMethodError, 'undefined method `[]\' for :cat:Symbol') end
-      @deep_hash.should == hsh # shouldn't change from reading (specifically, shouldn't autovivify)
+      subject['moon.man'].should == :smiling
+      subject['moon.cheese.type'].should == :tilsit
+      subject['moon.cheese.smell'].should be_nil
+      subject['moon.non.existent.interim.values'].should be_nil
+      subject['moon.non'].should be_nil
+      subject.should == orig_hash # shouldn't change from reading (specifically, shouldn't autovivify)
+    end
+    it 'indexing through a non-hash will raise an error' do
+      begin ; p subject['hat']        ; rescue StandardError => err ; p [err, err.class] ; end
+      begin ; p subject['hat.dog']    ; rescue StandardError => err ; p [err, err.class] ; end
+      begin ; p subject['hat']['dog'] ; rescue StandardError => err ; p [err, err.class] ; end
+      begin ; p :happy_sym['dog']     ; rescue StandardError => err ; p [err, err.class] ; end
+    end
+    it 'indexing through a non-hash will raise an error' do
+      err_klass = (RUBY_VERSION >= "1.9.0") ? TypeError : NoMethodError
+      expect{ subject['hat.dog'] }.to raise_error(err_klass, /Symbol/)
+      subject.should == orig_hash # shouldn't change from reading (specifically, shouldn't autovivify)
     end
 
     it "only accepts #to_sym'bolizable things as keys" do
-      lambda{ @deep_hash[1]            }.should raise_error(NoMethodError, /undefined method `to_sym'/)
-      lambda{ @deep_hash[{ :a => :b }] }.should raise_error(NoMethodError, /undefined method `to_sym'/)
-      lambda{ @deep_hash[Object.new]   }.should raise_error(NoMethodError, /undefined method `to_sym'/)
+      lambda{ subject[{ :a => :b }] }.should raise_error(NoMethodError, /undefined method `to_sym'/)
+      lambda{ subject[Object.new]   }.should raise_error(NoMethodError, /undefined method `to_sym'/)
     end
   end
 
@@ -160,59 +168,55 @@ describe DeepHash do
   end
 
   describe '#slice' do
-    before do
-      @deep_hash = DeepHash.new({ :a => 'x', :b => 'y', :c => 10 })
-    end
+    let(:subject  ){ Configliere::Param.new({ :a => 'x', :b => 'y', :c => 10 }) }
 
     it 'returns a new hash with only the given keys' do
-      @deep_hash.slice(:a, :b).should == { :a => 'x', :b => 'y' }
-      @deep_hash.should == { :a => 'x', :b => 'y', :c => 10 }
+      subject.slice(:a, :b).should == { :a => 'x', :b => 'y' }
+      subject.should == { :a => 'x', :b => 'y', :c => 10 }
     end
 
     it 'with bang replaces the hash with only the given keys' do
-      @deep_hash.slice!(:a, :b).should == { :c => 10 }
-      @deep_hash.should == { :a => 'x', :b => 'y' }
+      subject.slice!(:a, :b).should == { :c => 10 }
+      subject.should == { :a => 'x', :b => 'y' }
     end
 
     it 'ignores an array key' do
-      @deep_hash.slice([:a, :b], :c).should == { :c => 10 }
-      @deep_hash.should == { :a => 'x', :b => 'y', :c => 10 }
+      subject.slice([:a, :b], :c).should == { :c => 10 }
+      subject.should == { :a => 'x', :b => 'y', :c => 10 }
     end
 
     it 'with bang ignores an array key' do
-      @deep_hash.slice!([:a, :b], :c).should == { :a => 'x', :b => 'y' }
-      @deep_hash.should == { :c => 10 }
+      subject.slice!([:a, :b], :c).should == { :a => 'x', :b => 'y' }
+      subject.should == { :c => 10 }
     end
 
     it 'uses splatted keys individually' do
-      @deep_hash.slice(*[:a, :b]).should == { :a => 'x', :b => 'y' }
-      @deep_hash.should == { :a => 'x', :b => 'y', :c => 10 }
+      subject.slice(*[:a, :b]).should == { :a => 'x', :b => 'y' }
+      subject.should == { :a => 'x', :b => 'y', :c => 10 }
     end
 
     it 'with bank uses splatted keys individually' do
-      @deep_hash.slice!(*[:a, :b]).should == { :c => 10 }
-      @deep_hash.should == { :a => 'x', :b => 'y' }
+      subject.slice!(*[:a, :b]).should == { :c => 10 }
+      subject.should == { :a => 'x', :b => 'y' }
     end
   end
 
   describe '#extract' do
-    before do
-      @deep_hash = DeepHash.new({ :a => 'x', :b => 'y', :c => 10 })
-    end
+    let(:subject  ){ Configliere::Param.new({ :a => 'x', :b => 'y', :c => 10 }) }
 
     it 'replaces the hash with only the given keys' do
-      @deep_hash.extract!(:a, :b).should == { :a => 'x', :b => 'y' }
-      @deep_hash.should == { :c => 10 }
+      subject.extract!(:a, :b).should == { :a => 'x', :b => 'y' }
+      subject.should == { :c => 10 }
     end
 
     it 'leaves the hash empty if all keys are gone' do
-      @deep_hash.extract!(:a, :b, :c).should == { :a => 'x', :b => 'y', :c => 10 }
-      @deep_hash.should == {}
+      subject.extract!(:a, :b, :c).should == { :a => 'x', :b => 'y', :c => 10 }
+      subject.should == {}
     end
 
     it 'gets values for all given keys even if missing' do
-      @deep_hash.extract!(:bob, :c).should == { :bob => nil, :c => 10 }
-      @deep_hash.should == { :a => 'x', :b => 'y' }
+      subject.extract!(:bob, :c).should == { :bob => nil, :c => 10 }
+      subject.should == { :a => 'x', :b => 'y' }
     end
 
     it 'is OK when empty' do
@@ -220,7 +224,7 @@ describe DeepHash do
     end
 
     it 'returns an instance of the same class' do
-      @deep_hash.slice(:a).should be_a(DeepHash)
+      subject.slice(:a).should be_a(DeepHash)
     end
   end
 
@@ -241,26 +245,23 @@ describe DeepHash do
   end
 
   describe "#fetch" do
-    before(:each) do
-      @deep_hash = DeepHash.new(:no => "in between")
-    end
+    let(:subject  ){ Configliere::Param.new({ :no => :in_between }) }
 
     it 'converts key before fetching' do
-      @deep_hash.fetch("no").should == "in between"
+      subject.fetch("no").should == :in_between
     end
 
     it 'returns alternative value if key lookup fails' do
-      @deep_hash.fetch("flying", "screwdriver").should == "screwdriver"
+      subject.fetch("flying", "screwdriver").should == "screwdriver"
     end
   end
 
   describe "#values_at" do
-    before(:each) do
-      @deep_hash = DeepHash.new(@hash).merge(:no => "in between")
-    end
+
+    let(:subject  ){ Configliere::Param.new({ :no => :in_between, "str_key" => "strk_val", :sym_key => "symk_val"}) }
 
     it 'is indifferent to whether keys are strings or symbols' do
-      @deep_hash.values_at("sym_key", :str_key, :no).should == ["symk_val", "strk_val", "in between"]
+      subject.values_at("sym_key", :str_key, :no).should == ["symk_val", "strk_val", :in_between]
     end
   end
 

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
-# encoding: UTF-8
-require 'rubygems' unless defined?(Gem)
-require 'rspec'
+require 'bundler/setup' ; Bundler.require(:default, :development, :test)
+require 'rspec/autorun'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+if ENV['CONFIGLIERE_COV']
+  require 'simplecov'
+  SimpleCov.start
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end
 
 require 'configliere'
-require 'json'
-require 'yaml'

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: configliere
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
-- infochimps
-- mrflip
+- Infochimps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2165082240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +21,31 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2165082240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: oj
-  requirement: &2165084560 !ruby/object:Gem::Requirement
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2165084560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2165087040 !ruby/object:Gem::Requirement
+  name: jruby-openssl
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165087040
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &2165097440 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2165097440
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165100620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +69,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2165100620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165102740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,8 +85,61 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165102740
-description: ! " You've got a script. It's got some settings. Some settings are for
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+description: ! "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.\n\n   \"\" So, Consigliere of mine, I think
@@ -96,7 +157,8 @@ extra_rdoc_files:
 - README.textile
 files:
 - .rspec
-- .watchr
+- .travis.yml
+- .yardopts
 - CHANGELOG.textile
 - FEATURES.txt
 - Gemfile
@@ -149,9 +211,9 @@ files:
 - spec/configliere_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-homepage: http://infochimps.com/tools
+homepage: https://github.com/infochimps-labs/configliere
 licenses:
-- Apache
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -164,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 821033604753169959
+      hash: 1408788613005433508
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Wise, discreet configuration management

data/.watchr

@@ -1,20 +0,0 @@
-# -*- ruby -*-
-
-def run_spec(file)
-  unless File.exist?(file)
-    puts "#{file} does not exist"
-    return
-  end
-
-  puts   "Running #{file}"
-  system "bundle exec rspec #{file}"
-  puts
-end
-
-watch("spec/.*/*_spec\.rb") do |match|
-  run_spec match[0]
-end
-
-watch("lib/(.*)\.rb") do |match|
-  run_spec %{spec/#{match[1]}_spec.rb}
-end