configliere 0.0.5 → 0.0.6

data/CHANGELOG.textile

@@ -1,5 +1,14 @@
 Note that while the version # is still in the 0.0.x range, the interface may change arbitrarily while we figure out the best simplest convenientest powerfullest way to arrange things
 
+h2. Version 0.0.6 2010-04-05
+
+* configliere/define and configliere/config_file are included by default.
+* fixed a bug when ENV['HOME'] is missing (running as root)
+
+h2. Version 0.0.5 2010-01-27
+
+Configliere.use will load all gems by default
+
 h2. Version 0.0.4 2010-01-16
 
 * Cured a variety of issues noted by "@monad":http://github.com/monad -- thanks for the feedback!

data/README.textile

@@ -96,7 +96,7 @@ You can define static defaults in your module
     Settings['delorean.power_source']    #=> 'plutonium'
     Settings['delorean.missing']         #=> nil
     Settings['delorean.missing.fail']    #=> nil
-    # method-like (no deep keys tho, and you have to @#define@ the param; see below)
+    # method-like (no deep keys tho, and you have to #define the param; see below)
     Settings.dest_time                   #=> '1955-11-05'
 </pre>
 
@@ -224,8 +224,7 @@ Here are some things you don't get:
 
 If you want more, you might like the Trollop gem.  If you enjoy wordy nightmares, use "getoptlog":http://linuxdevcenter.com/pub/a/linux/2003/09/18/ruby_csv.html?page=2 from the ruby standard library.
 
-Commandline parameters are demonstrated in "examples/simple_script.rb":http://github.com/mrflip/configliere/tree/master/examples/simple_script.rb and
-"examples/env_var_script.rb":http://github.com/mrflip/configliere/tree/master/examples/env_var_script.rb
+Commandline parameters are demonstrated in "examples/simple_script.rb":http://github.com/mrflip/configliere/tree/master/examples/simple_script.rb and examples/env_var_script.rb":http://github.com/mrflip/configliere/tree/master/examples/env_var_script.rb
 
 h2. Fancy Parameters
 
@@ -332,10 +331,8 @@ h3. Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send a pull request to github.com/mrflip
 * Drop a line to the mailing list for infochimps open-source projects, infochimps-code@googlegroups.com
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/configliere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configliere}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mrflip"]
-  s.date = %q{2010-01-20}
+  s.date = %q{2010-04-06}
   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.
 
@@ -68,7 +68,7 @@ Configliere manage settings from many sources: static constants, simple config f
   s.homepage = %q{http://github.com/mrflip/configliere}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Wise, discreet configuration management}
   s.test_files = [
     "spec/configliere/commandline_spec.rb",

data/lib/configliere.rb

@@ -1,22 +1,18 @@
 require 'configliere/core_ext'
 require 'configliere/param'
+require 'configliere/define'
+require 'configliere/config_file'
 
 module Configliere
-  # Where to load params given only a symbol
-  DEFAULT_CONFIG_FILE = ENV['HOME']+'/.configliere.yaml' unless defined?(DEFAULT_CONFIG_FILE)
-  # Where to load params given a bare filename
-  DEFAULT_CONFIG_DIR  = ENV['HOME']+'/.configliere'      unless defined?(DEFAULT_CONFIG_DIR)
 
-  #
-  #
   # delegates to Configliere::Param
   def self.new *args, &block
     Configliere::Param.new *args, &block
   end
 
-  ALL_MIXINS = [:define, :encrypted, :env_var, :config_file, :commandline, :config_block]
+  ALL_MIXINS = [:define, :config_file, :commandline, :encrypted, :env_var, :config_block]
   def self.use *mixins
-    mixins = ALL_MIXINS if mixins.include?(:all)
+    mixins = ALL_MIXINS if mixins.include?(:all) || mixins.empty?
     mixins.each do |mixin|
       require "configliere/#{mixin}"
     end

data/lib/configliere/config_block.rb

@@ -24,7 +24,7 @@ module Configliere
     #   Settings.resolve!
     #
     def finally &block
-      self.final_blocks << block
+      self.final_blocks << block if block
     end
 
     # Processing to reconcile all options

data/lib/configliere/config_file.rb

@@ -1,6 +1,11 @@
 require 'yaml'
 require 'fileutils'
 module Configliere
+  # Where to load params given only a symbol
+  DEFAULT_CONFIG_FILE = ENV['HOME'].to_s+'/.configliere.yaml' unless defined?(DEFAULT_CONFIG_FILE)
+  # Where to load params given a bare filename
+  DEFAULT_CONFIG_DIR  = ENV['HOME'].to_s+'/.configliere'      unless defined?(DEFAULT_CONFIG_DIR)
+
   #
   # ConfigFile -- load configuration from a simple YAML file
   #
@@ -57,8 +62,8 @@ module Configliere
 
     def filename_for_handle handle
       case
-      when handle.is_a?(Symbol) then Configliere::DEFAULT_CONFIG_FILE
-      when handle.include?('/') then handle
+      when handle.is_a?(Symbol)      then Configliere::DEFAULT_CONFIG_FILE
+      when handle.to_s.include?('/') then handle
       else                           File.join(Configliere::DEFAULT_CONFIG_DIR, handle)
       end
     end

data/spec/configliere/config_file_spec.rb

@@ -25,6 +25,10 @@ describe "Configliere::ConfigFile" do
         File.should_receive(:open).with(Configliere::DEFAULT_CONFIG_DIR + '/file.yaml').and_return(@fake_file)
         @config.read 'file.yaml'
       end
+      it 'loads an absolute pathname from the given file' do
+        File.should_receive(:open).with('/fake/path.yaml').and_return(@fake_file)
+        @config.read '/fake/path.yaml'
+      end
       after do
         @config[:my_param].should == 'val'
       end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: configliere
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - mrflip
@@ -9,29 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -06:00
+date: 2010-04-06 00:00:00 -05:00
 default_executable: configliere
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 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\n\
   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.\n"
 email: flip@infochimps.org
@@ -96,18 +107,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Wise, discreet configuration management