slop 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d86e1d2fe70c0ce378fdf9e6c1ca771970b11b
-  data.tar.gz: 1da89cf463e52371680e66a913b09c215b1ac730
+  metadata.gz: 46b97913fc755da80d6ce7680b9c62edaa097f18
+  data.tar.gz: e5717f5a2ae612a433f9b602a1fbb0692a75cb77
 SHA512:
-  metadata.gz: 3b4448b3fad94248ecdb67c8cf6af710c588a3da82a20e3d9286c0be123bdd97373cb187b7b0ed4da0ee5a1e6c9a80b1de7e52ec055e268482b56eacdcf4c0ef
-  data.tar.gz: b6ea3a312f1f8f5f7570b634d8f1ff42cee7e345067c3dbdaf037477c9b62e3e5c40d28a4515bf42a52bf3e506720b7b599dea25351d468001e4c0d17205ce87
+  metadata.gz: 80d06a261ab8201470395cc679f0b833ca16f1c340ba6fe4f0a819cbb6fec16b9b41bd86b46d745f27bdbc047a0fbd3b2a5038aaa897f561e657780858437da9
+  data.tar.gz: 102f8d9c8d39db648ef5bb2f9aeae9366ee5b98d83748e8aab076a948ff63699f3fc6ea4eb7371df28958afb9d9e8f97d70a8d7f6fb9ebe477894b07c6fc6ad5

data/.travis.yml

@@ -1,8 +1,15 @@
+cache: bundler
 rvm:
   - 2.0.0
   - 2.1
   - 2.2
   - rbx-2
+  - jruby-head
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
 notifications:
   email:
     on_success: change

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+v4.2.1 (2015-11-25)
+-------------------
+
+Features:
+  * Better handling of option names with multiple words. #169 (Tim Rogers)
+
+Minor enhancements:
+  * add ARGF notes to Arguments (README). #173 (Rick Hull)
+
+Bug fixes:
+  * Fix arguments removed with option arguments. #182 (Naoki Mizuno)
+  * Fix bug where true is passed to BoolOption block regardless
+    of --no- prefix. #184 (Ben Brady)
+  * only raise MissingArgument if not `default_value`. #163 (Ben Brady)
+
 v4.2.0 (2015-04-18)
 -------------------
 

data/README.md

@@ -101,6 +101,21 @@ end
 p opts.arguments #=> ["connect", "GET"] # also aliased to `args`
 ```
 
+This is particularly useful when writing scripts with `ARGF`:
+
+```ruby
+opts = Slop.parse do |blah|
+  # ...
+end
+
+# make sure sloptions aren't consumed by ARGF
+ARGV.replace opts.arguments
+
+ARGF.each { |line|
+  # ...
+}
+```
+
 Arrays
 ------
 

data/lib/slop.rb

@@ -6,7 +6,7 @@ require 'slop/types'
 require 'slop/error'
 
 module Slop
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 
   # Parse an array of options (defaults to ARGV). Accepts an
   # optional hash of configuration options and block.

data/lib/slop/option.rb

@@ -47,11 +47,16 @@ module Slop
     def ensure_call(value)
       @count += 1
 
-      if value.nil? && expects_argument? && !suppress_errors?
-        raise Slop::MissingArgument.new("missing argument for #{flag}", flags)
+      if value.nil? && expects_argument?
+        if default_value
+          @value = default_value
+        elsif !suppress_errors?
+          raise Slop::MissingArgument.new("missing argument for #{flag}", flags)
+        end
+      else
+        @value = call(value)
       end
 
-      @value = call(value)
       block.call(@value) if block.respond_to?(:call)
     end
 

data/lib/slop/parser.rb

@@ -53,6 +53,7 @@ module Slop
         end
 
         # support `foo=bar`
+        orig_flag = flag.dup
         if flag.include?("=")
           flag, arg = flag.split("=")
         end
@@ -60,8 +61,15 @@ module Slop
         if opt = try_process(flag, arg)
           # since the option was parsed, we remove it from our
           # arguments (plus the arg if necessary)
-          arguments.delete(flag)
-          arguments.delete(arg) if opt.expects_argument?
+          # delete argument first while we can find its index.
+          if opt.expects_argument?
+            arguments.each_with_index do |argument, i|
+              if argument == orig_flag && !orig_flag.include?("=")
+                arguments.delete_at(i + 1)
+              end
+            end
+          end
+          arguments.delete(orig_flag)
         end
       end
 
@@ -94,7 +102,7 @@ module Slop
         process(option, arg)
       elsif flag.start_with?("--no-") && option = matching_option(flag.sub("no-", ""))
         process(option, false)
-      elsif flag =~ /\A-[^-]/ && flag.size > 2
+      elsif flag =~ /\A-[^-]{2,}/
         # try and process as a set of grouped short flags. drop(1) removes
         # the prefixed -, then we add them back to each flag separately.
         flags = flag.split("").drop(1).map { |f| "-#{f}" }

data/lib/slop/types.rb

@@ -16,7 +16,7 @@ module Slop
 
     def call(value)
       self.explicit_value = value
-      true
+      !force_false?
     end
 
     def value
@@ -92,5 +92,4 @@ module Slop
       true
     end
   end
-
 end

data/test/parser_test.rb

@@ -66,5 +66,15 @@ describe Slop::Parser do
       @parser.parse %w(-v -- --name lee)
       assert_equal %w(--name lee), @parser.arguments
     end
+
+    it "correctly removes the option argument" do
+      @parser.parse %w(lee --name lee lee)
+      assert_equal %w(lee lee), @parser.arguments
+    end
+
+    it "correctly removes options that use =" do
+      @parser.parse %w(lee --name=lee lee)
+      assert_equal %w(lee lee), @parser.arguments
+    end
   end
 end

data/test/result_test.rb

@@ -32,6 +32,9 @@ describe Slop::Result do
     @options.string("--foo", default: "bar")
     @result.parser.parse %w()
     assert_equal "bar", @result[:foo]
+
+    @result.parser.parse %w(--foo)
+    assert_equal "bar", @result[:foo]
   end
 
   it "handles custom finishing" do

data/test/types_test.rb

@@ -6,7 +6,9 @@ describe Slop::BoolOption do
     @verbose  = @options.bool "--verbose"
     @quiet    = @options.bool "--quiet"
     @inversed = @options.bool "--inversed", default: true
-    @result   = @options.parse %w(--verbose --no-inversed)
+    @bloc     = @options.bool("--bloc"){|val| (@bloc_val ||= []) << val}
+    @result   = @options.parse %w(--verbose --no-inversed
+                                  --bloc --no-bloc)
   end
 
   it "returns true if used" do
@@ -20,6 +22,10 @@ describe Slop::BoolOption do
   it "can be inversed via --no- prefix" do
     assert_equal false, @result[:inversed]
   end
+
+  it "will invert the value passed to &block via --no- prefix" do
+    assert_equal [true, false], @bloc_val
+  end
 end
 
 describe Slop::IntegerOption do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake