methadone 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf2e467dfef11e61fd7f58da69b83a58b14ed95
-  data.tar.gz: c4b5ccba71b1d321c7903ed4aa7a174b1ebba65c
+  metadata.gz: ea5a066a8f38016a6a0a185bae7a5f57e4d686cf
+  data.tar.gz: 690d8cfdc514e92027804e18cb5836e46e820b3c
 SHA512:
-  metadata.gz: e1d2154ca7452e62ab16fe0fd2deb43e61a385ce7f46724cb07c4ee7176897f7f235aa9f212eb99740847e68415a0e15fd6a47d508482ff2d4fd3cb6aaf9c990
-  data.tar.gz: cd2ea0edd3b87534072160a47c371817cec145cd08fb4a18998d1fa23c2a4710f14dd6931623944d290a148e18ad7892fdc011b684f55dffbdd6c18a9228e2e4
+  metadata.gz: c75f27bba82d19ea8990d0293d4a2cc40c9e39e1447b97f4f4d3a3329c6ef2df897e2179b2ac94937f2ecf07f19daa874ac09601efe9c0044ee2f1b388e589f8
+  data.tar.gz: f85d5d1f8c0ae99125a4a1175ef65ae1931be39e66ee4b1f5e06e1b38e9b3c9543c061b7573e7d70c0c096ce0ac635b78b6aa8ad1cca189b5e26a9c4a1d5ae4b

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.2.0

data/.travis.yml

@@ -7,5 +7,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - jruby-18mode
   - jruby-19mode

data/Gemfile

@@ -1,5 +1,6 @@
 source 'http://www.rubygems.org'
 
 gem 'open4', :platform => :ruby_18
+gem 'test-unit'
 # Specify your gem's dependencies in methadone.gemspec
 gemspec

data/lib/methadone/main.rb

@@ -133,14 +133,18 @@ module Methadone
       @env_var = env_var
     end
 
-    # Set the name of the file, in the user's home directory, where defaults can be configured.
+    # Set the path to the file where defaults can be configured.
+    #
     # The format of this file can be either a simple string of options, like what goes
     # in the environment variable (see #defaults_from_env_var), or YAML, in which case
     # it should be a hash where keys are the option names, and values their defaults.
     #
-    # filename:: name of the file, relative to the user's home directory
+    # Relative paths will be expanded relative to the user's home directory.
+    #
+    # filename:: path to the file.  If relative, will look in user's HOME directory.
+    #            If absolute, this is the absolute path to where the file should be.
     def defaults_from_config_file(filename,options={})
-      @rc_file = File.join(ENV['HOME'],filename)
+      @rc_file = File.expand_path(filename, ENV['HOME'])
     end
 
     # Start your command-line app, exiting appropriately when

data/lib/methadone/version.rb

@@ -1,3 +1,3 @@
 module Methadone #:nodoc:
-  VERSION = "1.8.0" #:nodoc:
+  VERSION = "1.9.0" #:nodoc:
 end

data/methadone.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("mocha", "0.13.2")
   s.add_development_dependency("sdoc")
   s.add_development_dependency("rspec", "~> 3.0.0")
+  s.add_development_dependency("i18n", "= 0.6.1")
 end

data/test/test_main.rb

@@ -652,6 +652,31 @@ class TestMain < BaseTest
 
   end
 
+  test_that "we can get defaults from an absolute config filename" do
+    tempfile = Tempfile.new('methadone_test.rc')
+    Given app_to_use_rc_file(tempfile.path)
+    And {
+      @flag_value = any_string
+      rc_file = File.join(tempfile.path)
+      File.open(rc_file,'w') do |file|
+        file.puts({
+          'switch' => true,
+          'flag' => @flag_value,
+        }.to_yaml)
+      end
+    }
+    When {
+      @code = lambda { go! }
+    }
+    Then {
+      assert_exits(0,&@code)
+      @switch.should == true
+      @flag.should == @flag_value
+    }
+
+  end
+
+
   test_that "we can specify an rc file even if it doesn't exist" do
     Given app_to_use_rc_file
     And {
@@ -740,7 +765,7 @@ class TestMain < BaseTest
 
 private
 
-  def app_to_use_rc_file
+  def app_to_use_rc_file(rc_file = '.my_app.rc')
     lambda {
       reset!
       @switch = nil
@@ -752,7 +777,7 @@ private
         @args = args
       end
 
-      defaults_from_config_file '.my_app.rc'
+      defaults_from_config_file rc_file
 
       on('--switch','Some Switch')
       on('--flag FOO','Some Flag')

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: methadone
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - davetron5000
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: clean_test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,30 +126,44 @@ dependencies:
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: Methadone provides a lot of small but useful features for developing
   a command-line app, including an opinionated bootstrapping process, some helpful
   cucumber steps, and some classes to bridge logging and output into a simple, unified,
@@ -161,10 +175,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -237,17 +251,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: methadone
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Kick the bash habit and start your command-line apps off right