configliere 0.4.8 → 0.4.10

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/CHANGELOG.textile

@@ -1,3 +1,12 @@
+h2. Version 0.4.10
+
+Minor improvement to the sub-command (git-style) module. Still not great.
+
+h2. Version 0.4.9
+
+Gemfile dependencies less aggressive.
+Uses MultiJSON; removed strict dependency on JSON
+
 h2. Version 0.4.7
 
 * can now load JSON

data/Gemfile

@@ -1,27 +1,40 @@
 source "http://rubygems.org"
 
-gem 'json'
+gem   'multi_json',  ">= 1.1"
+gem   'oj',          ">= 1.2"
+gem   'json',                    :platform => :jruby
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+# Only necessary if you want to use Configliere::Prompt
+gem   'highline',    ">= 1.5.2"
+
+# Only gems that you want listed as development dependencies in the gemspec
 group :development do
-  gem 'bundler',   "~> 1.0.12"
-  gem 'yard',      "~> 0.6.7"
-  gem 'jeweler',   "~> 1.5.2"
-  gem 'rspec',     "~> 2.5.0"
-  gem 'spork',     "~> 0.9.0.rc5"
-  gem 'RedCloth' # for yard
+  gem 'bundler',     "~> 1.1"
+  gem 'rake'
 end
 
-group :development do
-  # Only necessary if you want to use Configliere::Prompt
-  gem 'highline',  ">= 1.5.2"
+# 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"
+end
+
+group :doc do
+  gem 'RedCloth',    ">= 4.2", :require => "redcloth"
+  gem 'redcarpet',   ">= 2.1"
 end
 
-group :optional do
-  # only interesting for coverage testing
-  gem 'rcov',      ">= 0.9.9"
-  gem 'reek'
-  gem 'roodi'
-  gem 'watchr'
+# Gems for testing and coverage
+group :test do
+  gem 'simplecov',   ">= 0.5", :platform => :ruby_19
+  #
+  gem 'guard',       ">= 1.0"
+  gem 'guard-rspec', ">= 0.6"
+  gem 'guard-yard'
+  #
+  if RUBY_PLATFORM.include?('darwin')
+    gem 'rb-fsevent', ">= 0.9"
+  end
 end

data/Guardfile

@@ -0,0 +1,14 @@
+# -*- ruby -*-
+
+format = 'progress' # 'doc' for more verbose, 'progress' for less
+tags   = %w[ ]      # builder_spec model_spec
+
+guard 'rspec', :version => 2, :cli => "--format #{format} #{ tags.map{|tag| "--tag #{tag}"}.join(' ')  }" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^examples/(\w+)/(.+)\.rb$}) { |m| "spec/examples/#{m[1]}_spec.rb" }
+  watch(%r{^examples/(\w+)\.rb$})      { |m| "spec/examples/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)/(.+)\.rb$})       { |m| "spec/#{m[1]}/#{m[2]}_spec.rb"  }
+  watch(%r{^lib/(\w+)\.rb$})           { |m| "spec/#{m[1]}}_spec.rb"         }
+  watch('spec/spec_helper.rb')         { 'spec' }
+  watch(/spec\/support\/(.+)\.rb/)     { 'spec' }
+end

data/LICENSE.md

@@ -0,0 +1,95 @@
+# License for Configliere
+
+The configliere code is __Copyright (c) 2011, 2012 Infochimps, Inc__
+
+This code is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an **AS IS** BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+__________________________________________________________________________
+
+# Apache License
+
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+_TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION_
+
+## 1. Definitions.
+
+* **License** shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+* **Licensor** shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+* **Legal Entity** shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+* **You** (or **Your**) shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+* **Source** form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+* **Object** form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+* **Work** shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+* **Derivative Works** shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+* **Contribution** shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+* **Contributor** shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+## 2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+## 3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+## 4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+  - (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+  - (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+  - (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+  - (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+## 5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+## 6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+## 7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+## 8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+## 9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+## APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets `[]` replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+> Copyright [yyyy] [name of copyright owner]
+>
+> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+>
+>     http://www.apache.org/licenses/LICENSE-2.0
+>
+> Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

data/Rakefile

@@ -1,7 +1,7 @@
-require 'rubygems'
+require 'rubygems' unless defined?(Gem)
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :development, :support)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -12,80 +12,53 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "configliere"
-    gem.homepage = "http://infochimps.com/labs"
-    gem.license = "MIT"
-    gem.summary = %Q{Wise, discreet configuration management}
+    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
 
 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.
 } #'
-    gem.email = "coders@infochimps.org"
-    gem.authors = ["infochimps", "mrflip"]
-    gem.executables = []
   end
   Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  puts "Jeweler (or a dependency) not available. Install it with: bundle install"
 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 do
-    abort "Rspec is not available. In order to run spec, you must: sudo gem install rspec"
-  end
+  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" }
 end
 
 begin
-  require 'reek/rake/task'
-  Reek::Rake::Task.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
-  end
-end
-
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
+  require 'yard'
+  YARD::Rake::YardocTask.new do
+    Bundler.setup(:default, :development, :doc)
   end
 rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: bundle install"
   end
 end
 
 task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.10

data/configliere.gemspec

@@ -4,30 +4,26 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{configliere}
-  s.version = "0.4.8"
+  s.name = "configliere"
+  s.version = "0.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{infochimps}, %q{mrflip}]
-  s.date = %q{2011-08-26}
-  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.
-
-   "" 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.
-}
-  s.email = %q{coders@infochimps.org}
+  s.authors = ["infochimps", "mrflip"]
+  s.date = "2012-06-30"
+  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",
+    "LICENSE.md",
     "README.textile"
   ]
   s.files = [
-    ".document",
+    ".rspec",
     ".watchr",
     "CHANGELOG.textile",
     "FEATURES.txt",
     "Gemfile",
-    "LICENSE",
+    "Guardfile",
+    "LICENSE.md",
     "README.textile",
     "Rakefile",
     "VERSION",
@@ -44,6 +40,7 @@ Configliere manage settings from many sources: static constants, simple config f
     "examples/env_var_script.rb",
     "examples/help_message_demo.rb",
     "examples/independent_config.rb",
+    "examples/joke.rb",
     "examples/prompt.rb",
     "examples/simple_script.rb",
     "examples/simple_script.yaml",
@@ -74,65 +71,37 @@ Configliere manage settings from many sources: static constants, simple config f
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://infochimps.com/labs}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Wise, discreet configuration management}
-  s.test_files = [
-    "examples/config_block_script.rb",
-    "examples/encrypted_script.rb",
-    "examples/env_var_script.rb",
-    "examples/help_message_demo.rb",
-    "examples/independent_config.rb",
-    "examples/prompt.rb",
-    "examples/simple_script.rb",
-    "spec/configliere/commandline_spec.rb",
-    "spec/configliere/commands_spec.rb",
-    "spec/configliere/config_block_spec.rb",
-    "spec/configliere/config_file_spec.rb",
-    "spec/configliere/crypter_spec.rb",
-    "spec/configliere/deep_hash_spec.rb",
-    "spec/configliere/define_spec.rb",
-    "spec/configliere/encrypted_spec.rb",
-    "spec/configliere/env_var_spec.rb",
-    "spec/configliere/param_spec.rb",
-    "spec/configliere/prompt_spec.rb",
-    "spec/configliere_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.homepage = "http://infochimps.com/tools"
+  s.licenses = ["Apache"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Wise, discreet configuration management"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     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_development_dependency(%q<bundler>, ["~> 1.0.12"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-      s.add_development_dependency(%q<RedCloth>, [">= 0"])
-      s.add_development_dependency(%q<highline>, [">= 1.5.2"])
+      s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
     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<bundler>, ["~> 1.0.12"])
-      s.add_dependency(%q<yard>, ["~> 0.6.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-      s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.1"])
+      s.add_dependency(%q<rake>, [">= 0"])
     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<bundler>, ["~> 1.0.12"])
-    s.add_dependency(%q<yard>, ["~> 0.6.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
-    s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 1.5.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.1"])
+    s.add_dependency(%q<rake>, [">= 0"])
   end
 end
 

data/examples/joke.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+$: << File.dirname(__FILE__)+'/../lib'
+require 'configliere'
+
+Settings.use :commands
+
+Settings.define_command :q1, :description => "The first joke (question)"
+Settings.define_command :q2, :description => "The second joke (question)"
+Settings.define_command :q3, :description => "The third joke (question)"
+
+Settings.define_command :a1, :description => "The first joke (answer -- all ages)"
+Settings.define_command :a2, :description => "The second joke (answer -- PG-13, themes of death)" do |cmd|
+  cmd.define :age_limit, :type => Integer,  :default => 13, :description => "minimum age to be able to enjoy joke 2"
+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"
+end
+
+Settings.define :debug,   :type => :boolean, :default => false, :description => "show verbose progress", :internal => true
+Settings.define :age,     :type => Integer, :required => true,  :description => "Your age, in human years"
+Settings.define :fake_id, :type => :boolean, :default => false, :description => "A fake ID might be enough to bypass the age test"
+
+class Clown
+
+  def q1
+    puts "what do you call a deer with no eyes?"
+  end
+
+  def a1
+    q1
+    puts "no-eye deer"
+  end
+
+  def q2
+    puts "what do you call a dead deer with no eyes?"
+  end
+
+  def a2
+    q2
+    puts "still no-eye deer"
+  end
+
+  def q3
+    puts "what do you call a dead, castrated deer with no eyes?"
+  end
+
+  def a3
+    q3
+    puts "still no-#{Settings[:bleep] ? 'bleeping' : 'fucking'} no-eye deer"
+  end
+
+  def check_age_limit!
+    return if not Settings[:age_limit]
+    if Settings[:fake_id]
+      puts "ok but you didn't hear it from me...\n\n"
+      return true
+    end
+    if (Settings.age < Settings[:age_limit])
+      warn "Sorry kid, you're too young for this joke. Try this again when you're older (or maybe ask for --help)"
+      exit(1)
+    end
+  end
+
+  def check_command!
+    if not Settings.command_name
+      Settings.die "Which joke would you like to hear?"
+    end
+  end
+
+  def run
+    check_command!
+    check_age_limit!
+    self.public_send(Settings.command_name)
+  end
+end
+
+Settings.resolve!
+
+if Settings.debug
+  puts "   -- received command #{Settings.command_name}, settings #{Settings}"
+  puts ""
+  puts ""
+end
+
+
+Clown.new.run

data/lib/configliere/commands.rb

@@ -21,7 +21,9 @@ module Configliere
       command_configuration = Configliere::Param.new
       command_configuration.use :commandline, :env_var
       yield command_configuration if block_given?
-      commands[cmd] = options.merge(:config => command_configuration)
+      commands[cmd] = options
+      commands[cmd][:config] = command_configuration
+      commands[cmd]
     end
 
     def commands
@@ -34,9 +36,14 @@ module Configliere
 
     def resolve!
       super()
-      commands.each_value do |cmd_info|
+      commands.each do |cmd, cmd_info|
         cmd_info[:config].resolve!
       end
+      if command_name
+        sub_config = commands[command_name][:config]
+        adoptable  = sub_config.send(:definitions).keys
+        merge!(sub_config.select{|k,v| adoptable.include?(k) } )
+      end
       self
     end
 
@@ -72,6 +79,7 @@ module Configliere
       help = ["\nAvailable commands:"]
       commands.sort_by(&:to_s).each do |cmd, info|
         help << ("  %-27s %s" % [cmd, info[:description]]) unless info[:internal]
+        info[:config].param_lines[1..-1].each{|line| help << "    #{line}" } rescue nil
       end
       help << "\nRun `#{script_base_and_command.first} help COMMAND' for more help on COMMAND" if commands.include?(:help)
       help.flatten.join("\n")

data/lib/configliere/config_file.rb

@@ -33,7 +33,7 @@ module Configliere
         case filetype(filename)
         when 'json' then read_json(File.open(filename), options)
         when 'yaml' then read_yaml(File.open(filename), options)
-        else            read_yaml(File.open(filename), options)
+        else             read_yaml(File.open(filename), options)
         end
       rescue Errno::ENOENT => e
         warn "Loading empty configliere settings file #{filename}"
@@ -56,7 +56,8 @@ module Configliere
     # we depend on you to require some sort of JSON
     #
     def read_json json_str, options={}
-      new_data = JSON.load(json_str) || {}
+      require 'multi_json'
+      new_data = MultiJson.load(json_str) || {}
       # Extract the :env (production/development/etc)
       if options[:env]
         new_data = new_data[options[:env]] || {}

data/lib/configliere.rb

@@ -1,6 +1,5 @@
 require 'date'                      # type conversion
 require 'time'                      # type conversion
-require 'yaml'                      # read files
 require 'fileutils'                 # so save! can mkdir
 require 'configliere/deep_hash'     # magic hash for params
 require 'configliere/param'         # params container

data/spec/configliere/config_file_spec.rb

@@ -12,7 +12,7 @@ describe Configliere::ConfigFile do
 
   describe 'loading a yaml config file' do
     before do
-      @fake_file = '{ :my_param: val_from_file }'
+      @fake_file = "---\nmy_param: val_from_file"
     end
 
     describe 'successfully' do

data/spec/configliere_spec.rb

@@ -10,6 +10,6 @@ describe "Configliere" do
   end
 
   it 'requires corresponding plugins when you call use' do
-    lambda{ Configliere.use(:param, :foo) }.should raise_error(LoadError, 'no such file to load -- configliere/foo')
+    lambda{ Configliere.use(:param, :foo) }.should raise_error(LoadError, /no.*load.*configliere\/foo/)
   end
 end

data/spec/spec_helper.rb

@@ -1,23 +1,8 @@
 # encoding: UTF-8
-require 'rubygems'
-require 'spork'
+require 'rubygems' unless defined?(Gem)
 require 'rspec'
 
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster.
-  # However, changes don't take effect until you restart spork.
-
-  $LOAD_PATH.unshift(File.dirname(__FILE__))
-  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-  require 'configliere'
-
-  RSpec.configure do |config|
-  end
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+require 'configliere'

metadata

@@ -1,123 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: configliere
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.10
   prerelease: 
-  version: 0.4.8
 platform: ruby
-authors: 
+authors:
 - infochimps
 - mrflip
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: json
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70312657570540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70312657570540
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: &70312657570060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.12
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70312657570060
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70312657569580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.6.7
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70312657569580
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &70312657569100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: spork
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70312657569100
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70312657584980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.0.rc5
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70312657584980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70312657584500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: highline
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id008
-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"
+  version_requirements: *70312657584500
+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"
 email: coders@infochimps.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
+extra_rdoc_files:
+- LICENSE.md
 - README.textile
-files: 
-- .document
+files:
+- .rspec
 - .watchr
 - CHANGELOG.textile
 - FEATURES.txt
 - Gemfile
-- LICENSE
+- Guardfile
+- LICENSE.md
 - README.textile
 - Rakefile
 - VERSION
@@ -134,6 +118,7 @@ files:
 - examples/env_var_script.rb
 - examples/help_message_demo.rb
 - examples/independent_config.rb
+- examples/joke.rb
 - examples/prompt.rb
 - examples/simple_script.rb
 - examples/simple_script.yaml
@@ -163,54 +148,32 @@ files:
 - spec/configliere_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-homepage: http://infochimps.com/labs
-licenses: 
-- MIT
+homepage: http://infochimps.com/tools
+licenses:
+- Apache
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3607110922924291664
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1763180514100081494
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Wise, discreet configuration management
-test_files: 
-- examples/config_block_script.rb
-- examples/encrypted_script.rb
-- examples/env_var_script.rb
-- examples/help_message_demo.rb
-- examples/independent_config.rb
-- examples/prompt.rb
-- examples/simple_script.rb
-- spec/configliere/commandline_spec.rb
-- spec/configliere/commands_spec.rb
-- spec/configliere/config_block_spec.rb
-- spec/configliere/config_file_spec.rb
-- spec/configliere/crypter_spec.rb
-- spec/configliere/deep_hash_spec.rb
-- spec/configliere/define_spec.rb
-- spec/configliere/encrypted_spec.rb
-- spec/configliere/env_var_spec.rb
-- spec/configliere/param_spec.rb
-- spec/configliere/prompt_spec.rb
-- spec/configliere_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.document

@@ -1,7 +0,0 @@
-README.textile
-lib/**/*.rb
-bin/*
--
-LICENSE
-CHANGELOG.textile
-VERSION

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 mrflip
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.