slop 3.4.3 → 3.4.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 07ec5394f499e02a0abeb5341ed660ef3822dfa3
+  data.tar.gz: 4cc1f6f9d754ae2b45c813c96c544669756650bd
+SHA512:
+  metadata.gz: 2e11fa1d72ee94114ca1153ba79b0b114bf6720a60cb90d923f976e934c9988b8ea7bab24960b86115c65e31a5dbe6a715564f57efd97b13dd690210370d52ed
+  data.tar.gz: f9ee6be396f7ae956ece36166d2c272b464dad70c1525d1a61eb0955181bee64973307694679ba634ec1baf97529b0509ed00d95cb1bdc1a29204d6867174f13

data/CHANGES.md

@@ -1,3 +1,10 @@
+3.4.4 (2013-03-12)
+------------------
+
+* Disable the run callback when the help option is used and `-h`
+  or `--help` is passed. #106
+* Ensure default `--help` option exits by default (#107, Autumn Perrault).
+
 3.4.3 (2013-01-14)
 ------------------
 

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.4.3'
+  VERSION = '3.4.4'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -144,6 +144,7 @@ class Slop
     if config[:help]
       on('-h', '--help', 'Display this help message.', :tail => true) do
         puts help
+        exit
       end
     end
   end
@@ -251,7 +252,9 @@ class Slop
       @callbacks[:no_options].each { |cb| cb.call(self) }
     end
 
-    @runner.call(self, items) if @runner.respond_to?(:call)
+    if @runner.respond_to?(:call)
+      @runner.call(self, items) unless config[:help] and present?(:help)
+    end
 
     items
   end

data/slop.gemspec

@@ -1,13 +1,14 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.4.3'
-  s.summary     = 'Option gathering made easy'
+  s.version     = '3.4.4'
+  s.summary     = 'Simple Lightweight Option Parsing'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author      = 'Lee Jarvis'
   s.email       = 'lee@jarvis.co'
   s.homepage    = 'http://github.com/injekt/slop'
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- test/*`.split("\n")
+  s.license     = 'MIT'
 
   s.required_ruby_version = '>= 1.8.7'
 

data/test/slop_test.rb

@@ -130,6 +130,13 @@ class SlopTest < TestCase
     assert_equal 'Display this help message.', slop.options.first.description
   end
 
+  test "default help exits" do
+    slop = Slop.new :help => true
+    assert_raises SystemExit do
+      slop.parse %w/--help/
+    end
+  end
+
   test ":arguments and :optional_arguments config options" do
     slop = Slop.new(:arguments => true) { on :foo }
     assert slop.fetch_option(:foo).expects_argument?
@@ -448,6 +455,21 @@ class SlopTest < TestCase
     end
   end
 
+  test "ensure a runner does not execute when a help option is present" do
+    items = []
+    Slop.parse(%w'--help foo bar') do
+      run { |o, a| items.concat a }
+    end
+    assert_equal %w'--help foo bar', items
+    items.clear
+    temp_stdout do
+      Slop.parse(%w'--help foo bar', :help => true) do
+        run { |o, a| items.concat a }
+      end
+      assert_empty items
+    end
+  end
+
   test "duplicate options should not exist, new options should replace old ones" do
     i = nil
     Slop.parse(%w'-v') do

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.4.3
-  prerelease: 
+  version: 3.4.4
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple DSL for gathering options and parsing the command line
@@ -65,32 +60,31 @@ files:
 - test/option_test.rb
 - test/slop_test.rb
 homepage: http://github.com/injekt/slop
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: Option gathering made easy
+specification_version: 4
+summary: Simple Lightweight Option Parsing
 test_files:
 - test/commands_test.rb
 - test/helper.rb
 - test/option_test.rb
 - test/slop_test.rb
-has_rdoc: