slop 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b97913fc755da80d6ce7680b9c62edaa097f18
-  data.tar.gz: e5717f5a2ae612a433f9b602a1fbb0692a75cb77
+  metadata.gz: 09ca8b84867d657dc875e33dd3d230c4e38f7789
+  data.tar.gz: 89f3079de8089096383c7a7c10e2ca01b3ae0706
 SHA512:
-  metadata.gz: 80d06a261ab8201470395cc679f0b833ca16f1c340ba6fe4f0a819cbb6fec16b9b41bd86b46d745f27bdbc047a0fbd3b2a5038aaa897f561e657780858437da9
-  data.tar.gz: 102f8d9c8d39db648ef5bb2f9aeae9366ee5b98d83748e8aab076a948ff63699f3fc6ea4eb7371df28958afb9d9e8f97d70a8d7f6fb9ebe477894b07c6fc6ad5
+  metadata.gz: 340ec84f97161a331d066eec37d45347dfb3368569276df62c214aa9fcf4d7cc5f9b4de442bfc85f02efa0f0492cf32739efe2a1fcac132695d02a165c67bd13
+  data.tar.gz: 0c3d8e9a7bd21afd3a6748a4b71901dbf4e08c1e6434c731cbabd117441eb7030721d07743ce893caaba92eb6eb2f37e613019de4258a00af0af05950e96eadd

data/.travis.yml

@@ -1,8 +1,11 @@
 cache: bundler
+before_install:
+  - gem update bundler
 rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - rbx-2
   - jruby-head
   - ruby-head

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v4.3.0 (2016-03-19)
+-------------------
+
+Features
+  * Allow disabling array delimiter. #189 (Mike Pastore)
+  * Allow passing custom banner as config. #191 (Philip Rees)
+
 v4.2.1 (2015-11-25)
 -------------------
 

data/README.md

@@ -132,6 +132,9 @@ end
 # --files foo.txt --files bar.rb
 ```
 
+If you want to disable the built-in string-splitting, set the delimiter to
+`nil`.
+
 Custom option types
 -------------------
 
@@ -272,7 +275,7 @@ Upgrading from version 3
 ------------------------
 
 Slop v4 is completely non-backwards compatible. The code has been rewritten
-from the group up. If you're already using version 3 you have *have* to update
+from the ground up. If you're already using version 3 you *have* to update
 your code to use version 4. Here's an overview of the more fundamental changes:
 
 #### No more `instance_eval`

data/lib/slop.rb

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

data/lib/slop/options.rb

@@ -26,7 +26,7 @@ module Slop
     def initialize(**config)
       @options    = []
       @separators = []
-      @banner     = "usage: #{$0} [options]"
+      @banner     = config[:banner].is_a?(String) ? config[:banner] : config.fetch(:banner, "usage: #{$0} [options]")
       @config     = DEFAULT_CONFIG.merge(config)
       @parser     = Parser.new(self, @config)
 

data/lib/slop/types.rb

@@ -62,7 +62,11 @@ module Slop
   class ArrayOption < Option
     def call(value)
       @value ||= []
-      @value.concat value.split(delimiter, limit)
+      if delimiter
+        @value.concat value.split(delimiter, limit)
+      else
+        @value << value
+      end
     end
 
     def default_value
@@ -70,7 +74,7 @@ module Slop
     end
 
     def delimiter
-      config[:delimiter] || ","
+      config.fetch(:delimiter, ",")
     end
 
     def limit

data/test/options_test.rb

@@ -55,7 +55,7 @@ describe Slop::Options do
   end
 
   describe "#to_s" do
-    it "is prefixed with the banner" do
+    it "is prefixed with the default banner" do
       assert_match(/^usage/, @options.to_s)
     end
 
@@ -82,4 +82,15 @@ describe Slop::Options do
       assert_match(/^    -h, --help/, @options.to_s.lines.last)
     end
   end
+
+  describe "custom banner" do
+    it "is prefixed with defined banner" do
+      @options_config = Slop::Options.new({banner: "custom banner"})
+      assert_match(/^custom banner/, @options_config.to_s) 
+    end
+    it "banner is disabled" do
+      @options_config = Slop::Options.new({banner: false})
+      assert_match("", @options_config.to_s)
+    end
+  end
 end

data/test/types_test.rb

@@ -67,6 +67,7 @@ describe Slop::ArrayOption do
   before do
     @options = Slop::Options.new
     @files   = @options.array "--files"
+    @multi   = @options.array "-M", delimiter: nil
     @delim   = @options.array "-d", delimiter: ":"
     @limit   = @options.array "-l", limit: 2
     @result  = @options.parse %w(--files foo.txt,bar.rb)
@@ -85,6 +86,11 @@ describe Slop::ArrayOption do
     assert_equal %w(foo.txt bar.rb), @result[:files]
   end
 
+  it "collects multiple option values with no delimiter" do
+    @result.parser.parse %w(-M foo,bar -M bar,qux)
+    assert_equal %w(foo,bar bar,qux), @result[:M]
+  end
+
   it "can use a custom delimiter" do
     @result.parser.parse %w(-d foo.txt:bar.rb)
     assert_equal %w(foo.txt bar.rb), @result[:d]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple Lightweight Option Parsing