configliere 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/configliere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "configliere"
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["infochimps", "mrflip"]
-  s.date = "2012-06-30"
+  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.email = "coders@infochimps.org"
   s.extra_rdoc_files = [
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/configliere/env_var.rb",
     "lib/configliere/param.rb",
     "lib/configliere/prompt.rb",
+    "lib/configliere/vayacondios.rb",
     "spec/configliere/commandline_spec.rb",
     "spec/configliere/commands_spec.rb",
     "spec/configliere/config_block_spec.rb",
@@ -74,7 +75,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://infochimps.com/tools"
   s.licenses = ["Apache"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.15"
   s.summary = "Wise, discreet configuration management"
 
   if s.respond_to? :specification_version then

data/examples/joke.rb

@@ -14,7 +14,7 @@ Settings.define_command :a2, :description => "The second joke (answer -- PG-13,
 end
 Settings.define_command :a3, :description => "The third joke (answer -- R, strong language)" do |cmd|
   cmd.define :age_limit, :type => Integer,  :default => 17, :description => "minimum age to be able to enjoy joke 3"
-  cmd.define :bleep,     :type => :boolean, :default => false, :description => "if enabled, solecisms will be bowlerized"
+  cmd.define :bleep,     :type => :boolean, :default => false, :description => "if enabled, solecisms will be bowdlerized"
 end
 
 Settings.define :debug,   :type => :boolean, :default => false, :description => "show verbose progress", :internal => true

data/lib/configliere/config_file.rb

@@ -1,6 +1,10 @@
 module Configliere
-  # Where to load params given a bare filename
-  DEFAULT_CONFIG_DIR  = ENV['HOME'].to_s+'/.configliere'      unless defined?(DEFAULT_CONFIG_DIR)
+  # Default locations where config files live
+  DEFAULT_CONFIG_LOCATION = {
+    machine: ->(scope){ Pathname('/etc').join(scope) },
+    user:    ->(scope){ Pathname(ENV['HOME'] || '/').join(".#{scope}") },
+    app:     ->(scope){ app_dir = nil ; Pathname(Dir.pwd).ascend{ |path| app_dir = path.join('config') if path.join('config').exist? } ; app_dir }
+  } unless defined?(DEFAULT_CONFIG_LOCATION)
 
   #
   # ConfigFile -- load configuration from a simple YAML file
@@ -35,7 +39,7 @@ module Configliere
         when 'yaml' then read_yaml(File.open(filename), options)
         else             read_yaml(File.open(filename), options)
         end
-      rescue Errno::ENOENT => e
+      rescue Errno::ENOENT
         warn "Loading empty configliere settings file #{filename}"
       end
       self
@@ -76,6 +80,26 @@ module Configliere
       File.open(filename, 'w'){|f| f << 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| 
+        conf = determine_conf_location(level, scope)
+        read(conf) if Pathname(conf).exist? 
+      end
+      resolve!
+    end
+    
   protected
 
     def filetype filename
@@ -87,7 +111,7 @@ module Configliere
       if filename.to_s.include?('/')
         File.expand_path(filename)
       else
-        File.expand_path(File.join(Configliere::DEFAULT_CONFIG_DIR, filename))
+        default_conf_dir.join(filename).to_s
       end
     end
   end

data/lib/configliere/vayacondios.rb

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

data/spec/configliere/commands_spec.rb

@@ -1,99 +1,98 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'configliere/commands'
 
-describe "Configliere::Commands" do
-  before do
-    @config = Configliere::Param.new
-    @config.use :commands
-  end
+describe Configliere::Commands do
+  
+  subject{ Configliere::Param.new.use(:commands) }
 
-  after do
-    ::ARGV.replace []
-  end
+  after{ ::ARGV.replace [] }
 
-  describe "when no commands are defined" do
-    it "should know that no commands are defined" do
-      @config.commands.should be_empty
-    end
+  context 'when no commands are defined' do
+    
+    its(:commands){ should be_empty }
 
-    it "should not shift the ARGV when resolving" do
-      ::ARGV.replace ['not_command_but_arg', 'another_arg']
-      @config.resolve!
-      @config.rest.should == ['not_command_but_arg', 'another_arg']
-      @config.command_name.should be_nil
-      @config.command_info.should be_nil
+    let(:args) { %w[ not_command_but_arg another_arg ] }
+
+    it 'does not shift the ARGV when resolving' do
+      ::ARGV.replace args
+      subject.resolve!
+      subject.rest.should == args
+      subject.command_name.should be_nil
+      subject.command_info.should be_nil
     end
 
-    it "should still recognize a git-style-binary command" do
-      ::ARGV.replace ['not_command_but_arg', 'another_arg']
+    it 'still recognize a git-style-binary command' do
+      ::ARGV.replace args
       File.should_receive(:basename).and_return('prog-subcommand')
-      @config.resolve!
-      @config.rest.should == ['not_command_but_arg', 'another_arg']
-      @config.command_name.should == :subcommand
-      @config.command_info.should be_nil
+      subject.resolve!
+      subject.rest.should == args
+      subject.command_name.should == :subcommand
+      subject.command_info.should be_nil
     end
   end
 
-  describe "a simple command" do
+  context 'a simple command' do
+    let(:args) { %w[ the_command  --fuzziness=wuzzy extra_arg ] }
+
     before do
-      @config.defaults :fuzziness => 'smooth'
-      @config.define_command :the_command, :description => "foobar"
+      subject.defaults(fuzziness: 'smooth')
+      subject.define_command(:the_command, description: 'foobar')
     end
 
     it "should continue to parse flags when the command is given" do
-      ::ARGV.replace ['the_command', '--fuzziness=wuzzy', 'an_arg']
-      @config.resolve!
-      @config.should == { :fuzziness => 'wuzzy' }
+      ::ARGV.replace args
+      subject.resolve!
+      subject.should == { fuzziness: 'wuzzy' }
     end
 
     it "should continue to set args when the command is given" do
-      ::ARGV.replace ['the_command', '--fuzziness=wuzzy', 'an_arg']
-      @config.resolve!
-      @config.rest.should == ['an_arg']
+      ::ARGV.replace args
+      subject.resolve!
+      subject.rest.should == ['extra_arg']
     end
 
     it "should recognize the command when given" do
-      ::ARGV.replace ['the_command', '--fuzziness=wuzzy', 'an_arg']
-      @config.resolve!
-      @config.command_name.should == :the_command
-      @config.command_info.should == { :description => "foobar", :config => { :fuzziness => 'wuzzy' } }
+      ::ARGV.replace args
+      subject.resolve!
+      subject.command_name.should == :the_command
+      subject.command_info.should == { :description => "foobar", :config => { :fuzziness => 'wuzzy' } }
     end
 
     it "should recognize when the command is not given" do
       ::ARGV.replace ['bogus_command', '--fuzziness=wuzzy', 'an_arg']
-      @config.resolve!
-      @config.rest.should == ['bogus_command', 'an_arg']
-      @config.command_name.should be_nil
+      subject.resolve!
+      subject.rest.should == ['bogus_command', 'an_arg']
+      subject.command_name.should be_nil
     end
   end
 
   describe "a complex command" do
     before do
-      @config.defaults :outer => 'val 1'
-      @config.define_command "the_command", :description => "the command" do |cmd|
+      subject.defaults :outer => 'val 1'
+      subject.define_command "the_command", :description => "the command" do |cmd|
         cmd.define :inner, :description => "inside"
       end
     end
 
     it "should still recognize the outer param and the args" do
       ::ARGV.replace ['the_command', '--outer=wuzzy', 'an_arg', '--inner=buzz']
-      @config.resolve!
-      @config.rest.should == ['an_arg']
-      @config.command_name.should == :the_command
-      @config[:outer].should == 'wuzzy'
+      subject.resolve!
+      subject.rest.should == ['an_arg']
+      subject.command_name.should == :the_command
+      subject[:outer].should == 'wuzzy'
     end
 
     it "should recognize the inner param" do
       ::ARGV.replace ['the_command', '--outer=wuzzy', 'an_arg', '--inner=buzz']
-      @config.resolve!
-      @config[:inner].should == 'buzz'
-      @config.command_info[:config][:inner].should == 'buzz'
+      subject.resolve!
+      subject[:inner].should == 'buzz'
+      subject.command_info[:config][:inner].should == 'buzz'
     end
   end
 
-
   def capture_help_message
     stderr_output = ''
-    @config.should_receive(:warn){|str| stderr_output << str }
+    subject.should_receive(:warn){|str| stderr_output << str }
     begin
       yield
       fail('should exit via system exit')
@@ -105,20 +104,20 @@ describe "Configliere::Commands" do
 
   describe "the help message" do
     before do
-      @config.define_command :run, :description => "forrest"
-      @config.define_command :stop, :description => "hammertime"
-      @config.define :reel, :type => Integer
+      subject.define_command :run, :description => "forrest"
+      subject.define_command :stop, :description => "hammertime"
+      subject.define :reel, :type => Integer
     end
 
     it "displays a modified usage" do
       ::ARGV.replace ['--help']
-      stderr_output = capture_help_message{ @config.resolve! }
+      stderr_output = capture_help_message{ subject.resolve! }
       stderr_output.should =~ %r{usage:.*\[command\]}m
     end
 
     it "displays the commands and their descriptions" do
       ::ARGV.replace ['--help']
-      stderr_output = capture_help_message{ @config.resolve! }
+      stderr_output = capture_help_message{ subject.resolve! }
       stderr_output.should =~ %r{Available commands:\s+run\s*forrest\s+stop\s+hammertime}m
       stderr_output.should =~ %r{Params:.*--reel=Integer\s+reel}m
     end
@@ -127,8 +126,8 @@ describe "Configliere::Commands" do
   describe '#resolve!' do
     it 'calls super and returns self' do
       Configliere::ParamParent.class_eval do def resolve!() dummy ; end ; end
-      @config.should_receive(:dummy)
-      @config.resolve!.should equal(@config)
+      subject.should_receive(:dummy)
+      subject.resolve!.should equal(subject)
       Configliere::ParamParent.class_eval do def resolve!() self ; end ; end
     end
   end
@@ -136,8 +135,8 @@ describe "Configliere::Commands" do
   describe '#validate!' do
     it 'calls super and returns self' do
       Configliere::ParamParent.class_eval do def validate!() dummy ; end ; end
-      @config.should_receive(:dummy)
-      @config.validate!.should equal(@config)
+      subject.should_receive(:dummy)
+      subject.validate!.should equal(subject)
       Configliere::ParamParent.class_eval do def validate!() self ; end ; end
     end
   end

data/spec/configliere/config_file_spec.rb

@@ -1,171 +1,192 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Configliere::ConfigFile do
-  before do
-    @config = Configliere::Param.new :my_param => 'default_val', :also_a_param => true
-    FileUtils.stub! :mkdir_p
-  end
+  let(:default_params) { { my_param: 'default_val', also_a_param: true } }
+  
+  subject{ Configliere::Param.new default_params }
 
-  it 'is used by default' do
-    @config.should respond_to(:read)
+  it 'is included by default' do
+    subject.class.included_modules.should include(described_class)
   end
 
-  describe 'loading a yaml config file' do
-    before do
-      @fake_file = "---\nmy_param: val_from_file"
-    end
-
-    describe 'successfully' do
-      it 'with an absolute pathname uses it directly' do
-        File.should_receive(:open).with(%r{/fake/path.yaml}).and_return(@fake_file)
-        @config.read '/fake/path.yaml'
-      end
-      it 'with a simple filename, references it to the default config dir' do
-        File.should_receive(:open).with(File.join(Configliere::DEFAULT_CONFIG_DIR, 'file.yaml')).and_return(@fake_file)
-        @config.read 'file.yaml'
-      end
-      it 'returns the config object for chaining' do
-        File.should_receive(:open).with(File.join(Configliere::DEFAULT_CONFIG_DIR, 'file.yaml')).and_return(@fake_file)
-        @config.defaults :also_a_param => true
-        @config.read('file.yaml').should == { :my_param => 'val_from_file', :also_a_param => true }
-      end
-      after do
-        @config[:my_param].should == 'val_from_file'
+  context '#read' 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
+      subject.read(file_path).should == subject
+    end
+
+    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      
+      
+      it 'merges the data' do
+        subject.read(file_path).should == default_params.merge(file_params)
+      end      
+    end
+
+    context 'a json file' do
+      let(:file_path)   { '/absolute/path.json' }
+      let(:file_string) { file_params.to_json   }
+      
+      it 'reads successfully' do
+        subject.should_receive(:read_json).with(file_string, {})
+        subject.read file_path
+      end      
+
+      it 'merges the data' do
+        subject.read(file_path).should == default_params.merge(file_params) 
       end
     end
+    
+    context 'given a symbol' do
+      let(:file_path) { :my_settings }
 
-    it 'no longer provides a default config file' do
-      lambda{ @config.read(:my_settings) }.should raise_error(Configliere::DeprecatedError)
-      defined?(Configliere::DEFAULT_CONFIG_FILE).should_not be_true
-    end
-
-    it 'warns but does not fail if the file is missing' do
-      @config = Configliere::Param.new
-      File.stub(:open).and_raise(Errno::ENOENT)
-      @config.should_receive(:warn).with("Loading empty configliere settings file #{Configliere::DEFAULT_CONFIG_DIR}/nonexistent_file.yaml")
-      @config.read('nonexistent_file.yaml').should == {}
-    end
-  end
-
-  describe 'loading a json config file' do
-    before do
-      require 'json'
-      @fake_file = '{"my_param":"val_from_file"}'
-    end
-
-    describe 'successfully' do
-      it 'with an absolute pathname uses it directly' do
-        File.should_receive(:open).with(%r{/fake/path.json}).and_return(@fake_file)
-        @config.read '/fake/path.json'
-      end
-      it 'with a simple filename, references it to the default config dir' do
-        File.should_receive(:open).with(File.join(Configliere::DEFAULT_CONFIG_DIR, 'file.json')).and_return(@fake_file)
-        @config.read 'file.json'
-      end
-      it 'returns the config object for chaining' do
-        File.should_receive(:open).with(File.join(Configliere::DEFAULT_CONFIG_DIR, 'file.json')).and_return(@fake_file)
-        @config.defaults :also_a_param => true
-        @config.read('file.json').should == { :my_param => 'val_from_file', :also_a_param => true }
-      end
-      after do
-        @config[:my_param].should == 'val_from_file'
+      it 'no longer provides a default config file' do
+        expect{ subject.read(file_path) }.to raise_error(Configliere::DeprecatedError)
+        defined?(Configliere::DEFAULT_CONFIG_FILE).should_not be_true
       end
     end
-
-    it 'no longer provides a default config file' do
-      lambda{ @config.read(:my_settings) }.should raise_error(Configliere::DeprecatedError)
-      defined?(Configliere::DEFAULT_CONFIG_FILE).should_not be_true
-    end
-
-    it 'warns but does not fail if the file is missing' do
-      @config = Configliere::Param.new
-      File.stub(:open).and_raise(Errno::ENOENT)
-      @config.should_receive(:warn).with("Loading empty configliere settings file #{Configliere::DEFAULT_CONFIG_DIR}/nonexistent_file.json")
-      @config.read('nonexistent_file.json').should == {}
-    end
-  end
-
-  describe '#read_yaml' do
-    before do
-      @config.merge! :reload => :whatever
-      @simple_yaml       = { :my_param => 'override_val', 'also_a_param' => true, 'strkey' => 'val', :falsekey => false, :nilkey => nil }.to_yaml
-      @yaml_with_subenvs = { :development => { :reload => true }, :production => { :reload => false }}.to_yaml
-    end
-
-    it 'loads yaml' do
-      @config.read_yaml(@simple_yaml)
-      @config.should     == { :reload => :whatever, :my_param => 'override_val', :also_a_param  => true, :strkey  => 'val', :falsekey => false, :nilkey => nil }
-      @config.should_not == { :reload => :whatever, :my_param => 'override_val', 'also_a_param' => true, 'strkey' => 'val', :falsekey => false, :nilkey => nil }
+      
+    context 'given a nonexistent file' do
+      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}")
+        subject.read(file_path).should == subject
+      end
     end
 
-    describe 'with an environment scope' do
-      it 'slices out a subhash given by :env' do
-        @config.read_yaml(@yaml_with_subenvs, :env => :development)
-        @config.should == { :reload => true, :my_param => 'default_val', :also_a_param => true }
+    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
+    
+    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
+    
+    context 'with options' do
+      let(:file_params) { { development: { reload: true }, production: { reload: false } } }
+
+      before{ subject.merge!(reload: 'whatever') }
+
+      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)
+          end
+        end
+
+        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
+      
+      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  
+  end
 
-      it 'slices out a different subhash with a different :env' do
-        @config.read_yaml(@yaml_with_subenvs, :env => :production)
-        @config.should == { :reload => false, :my_param => 'default_val', :also_a_param => true }
-      end
+  context '#save!' do
+    let(:fake_file) { StringIO.new('', 'w') }
 
-      it 'does no slicing without the :env option' do
-        @config.read_yaml(@yaml_with_subenvs)
-        @config.should == { :development => { :reload => true }, :production => { :reload => false }, :reload => :whatever, :my_param => 'default_val', :also_a_param => true }
+    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)
+        fake_file.should_receive(:<<).with(default_params.to_yaml)
+        subject.save! file_path
       end
-
-      it 'has no effect if the key given by :env option is absent' do
-        @config.read_yaml(@yaml_with_subenvs, :env => :foobar)
-        @config.should == { :reload => :whatever, :my_param => 'default_val', :also_a_param => true }
+    end 
+    
+    context 'given a simple pathname' do
+      let(:file_path) { 'simple_path.yaml' }
+
+      it 'saves the filename in the default config dir' do
+        File.should_receive(:open).with(File.join(subject.default_conf_dir, file_path), 'w').and_yield(fake_file)
+        fake_file.should_receive(:<<).with(default_params.to_yaml)
+        subject.save! file_path
       end
-
-      it 'lets you use a string if the loading hash has a string' do
-        yaml_with_string_subenv = { 'john_woo' => { :reload => :sideways }}.to_yaml
-        @config.read_yaml(yaml_with_string_subenv, :env => 'john_woo')
-        @config.should == { :reload => :sideways, :my_param => 'default_val', :also_a_param => true }
+      
+      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)
+        subject.save! file_path
       end
     end
   end
-
-  describe 'saves to a config file' do
-    it 'with an absolute pathname, as given' do
-      fake_file = StringIO.new('', 'w')
-      File.should_receive(:open).with(%r{/fake/path.yaml}, 'w').and_yield(fake_file)
-      fake_file.should_receive(:<<).with({ :my_param => 'default_val', :also_a_param => true }.to_yaml)
-      @config.save! '/fake/path.yaml'
-    end
-
-    it 'with a simple pathname, in the default config dir' do
-      fake_file = StringIO.new('', 'w')
-      File.should_receive(:open).with(Configliere::DEFAULT_CONFIG_DIR + '/file.yaml', 'w').and_yield(fake_file)
-      fake_file.should_receive(:<<).with({ :my_param => 'default_val', :also_a_param => true }.to_yaml)
-      @config.save! 'file.yaml'
-    end
-
-    it 'and ensures the directory exists' do
-      fake_file = StringIO.new('', 'w')
-      File.stub!(:open).with(%r{/fake/path.yaml}, 'w').and_yield(fake_file)
-      FileUtils.should_receive(:mkdir_p).with(%r{/fake})
-      @config.save! '/fake/path.yaml'
-    end
-  end
-
-  describe '#resolve!' do
+  
+  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
-      Configliere::ParamParent.class_eval do def resolve!() dummy ; end ; end
-      @config.should_receive(:dummy)
-      @config.resolve!.should equal(@config)
-      Configliere::ParamParent.class_eval do def resolve!() self ; end ; end
+      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
-      Configliere::ParamParent.class_eval do def validate!() dummy ; end ; end
-      @config.should_receive(:dummy)
-      @config.validate!.should equal(@config)
-      Configliere::ParamParent.class_eval do def validate!() self ; end ; end
+      subject.should_receive(:parent_method)
+      subject.validate!.should equal(subject)
     end
   end
 
+  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
+      subject.should_receive(:determine_conf_location).with(:app, scope).ordered
+      subject.should_receive(:resolve!).ordered
+      subject.load_configuration_in_order!(scope)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,5 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'configliere'
+require 'json'
+require 'yaml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configliere
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70312657570540 !ruby/object:Gem::Requirement
+  requirement: &2161847760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70312657570540
+  version_requirements: *2161847760
 - !ruby/object:Gem::Dependency
   name: oj
-  requirement: &70312657570060 !ruby/object:Gem::Requirement
+  requirement: &2161846860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70312657570060
+  version_requirements: *2161846860
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70312657569580 !ruby/object:Gem::Requirement
+  requirement: &2161827640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312657569580
+  version_requirements: *2161827640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70312657569100 !ruby/object:Gem::Requirement
+  requirement: &2161826540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70312657569100
+  version_requirements: *2161826540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70312657584980 !ruby/object:Gem::Requirement
+  requirement: &2161825840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70312657584980
+  version_requirements: *2161825840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70312657584500 !ruby/object:Gem::Requirement
+  requirement: &2161825100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312657584500
+  version_requirements: *2161825100
 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
@@ -134,6 +134,7 @@ files:
 - lib/configliere/env_var.rb
 - lib/configliere/param.rb
 - lib/configliere/prompt.rb
+- lib/configliere/vayacondios.rb
 - spec/configliere/commandline_spec.rb
 - spec/configliere/commands_spec.rb
 - spec/configliere/config_block_spec.rb
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1763180514100081494
+      hash: -1692998738984216950
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Wise, discreet configuration management