mercenary 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb90c2919ac0f15c0eeb8abe22cdd13eee58c81
-  data.tar.gz: 737fed7cc73e411561b1393d69e0774e93af84a7
+  metadata.gz: b9f4dfe1178635732a9da7f3221db5cab85da88f
+  data.tar.gz: d1ddfc45773425b1a91016111189625a4a6f8bc1
 SHA512:
-  metadata.gz: eb6aa3eeb814791f20449a7e728b1f497c94359011787e3919eb402b753fafe4fe7852481ada652a9fe25926a5fc9d56faef21549359dd604211cc36e8776b61
-  data.tar.gz: e46388cb5e91489ca638e7b3ce44d3c5dd1090c5d9c149400b79fdd3ccddca27ba57616fb4f46dc7d9a94b596da490c50a7c1851146da966968e9d4e5fdf602e
+  metadata.gz: 43845c7d35b7cae824bc238a5bdfa340bb15ed4dde3444ffb4dee893acb104e5e769694aed071b0cf74a1c5657b019d402c21a2b6857b5fc3a368cb8ba3803dd
+  data.tar.gz: d2398c2e216c6c5c2e286e3c254b0d7a65038bc6c4e50a6711b6fbb05fe8bbe3c9bd258b93e154a9ae496f2a11c3cec41cdfb528f7eec80894a2115baba93da4

data/.travis.yml

@@ -2,7 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+sudo: false
+cache: bundler
+before_script: bundle update
 script: "./script/cibuild"
 notifications:
   email:

data/History.markdown

@@ -1,13 +1,14 @@
-## HEAD
-
-### Major Enhancements
-
-### Minor Enhancements
+## 0.3.5 / 2014-11-12
 
 ### Bug Fixes
 
+  * Capture `OptionsParser::InvalidOption` and show a nice error message (#38)
+  * Absolute paths for requires and autoloads (#39)
+
 ### Development Fixes
 
+  * Bump to RSpec 3 (#40)
+
 ## 0.3.4 / 2014-07-11
 
 ### Bug Fixes

data/lib/mercenary.rb

@@ -1,15 +1,12 @@
-lib = File.expand_path('../', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "mercenary/version"
+require File.expand_path("../mercenary/version", __FILE__)
 require "optparse"
 require "logger"
 
 module Mercenary
-  autoload :Command,   "mercenary/command"
-  autoload :Option,    "mercenary/option"
-  autoload :Presenter, "mercenary/presenter"
-  autoload :Program,   "mercenary/program"
+  autoload :Command,   File.expand_path("../mercenary/command", __FILE__)
+  autoload :Option,    File.expand_path("../mercenary/option", __FILE__)
+  autoload :Presenter, File.expand_path("../mercenary/presenter", __FILE__)
+  autoload :Program,   File.expand_path("../mercenary/program", __FILE__)
 
   # Public: Instantiate a new program and execute.
   #

data/lib/mercenary/program.rb

@@ -27,7 +27,14 @@ module Mercenary
         cmd = super(argv, opts, @config)
       end
 
-      @optparse.parse!(argv)
+      begin
+        @optparse.parse!(argv)
+      rescue OptionParser::InvalidOption => e
+        logger.error "Whoops, we can't understand your command."
+        logger.error "#{e.message}"
+        logger.error "Run your command again with the --help switch to see available options."
+        abort
+      end
 
       logger.debug("Parsed config: #{@config.inspect}")
 

data/lib/mercenary/version.rb

@@ -1,3 +1,3 @@
 module Mercenary
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/mercenary.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rspec", "~> 3.0"
 end

data/spec/option_spec.rb

@@ -28,8 +28,8 @@ describe(Mercenary::Option) do
 
   it "compares itself with other options well" do
     new_option = described_class.new(config_key, ['-l', '--largo', description])
-    expect(option.eql?(new_option)).to be_true
-    expect(option.hash.eql?(new_option.hash)).to be_true
+    expect(option.eql?(new_option)).to be(true)
+    expect(option.hash.eql?(new_option.hash)).to be(true)
   end
 
   it "has a custom #hash" do
@@ -72,7 +72,7 @@ describe(Mercenary::Option) do
     let(:description) { nil }
 
     it "knows there is no description" do
-      expect(option.description).to be_nil
+      expect(option.description).to be(nil)
     end
 
     it "knows both inputs are switches" do

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mercenary'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercenary
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.0'
 description: Lightweight and flexible library for writing command-line apps in Ruby.
 email:
 - tom@mojombo.com