slop 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66456d3c9b1836976bf1db77744397d30ed6eddd
-  data.tar.gz: 615f7a217ab9668b2eab4234230f67b7bad76ffc
+  metadata.gz: fb0866db90cc2226117322463845a56a78f43cc2
+  data.tar.gz: acd05e15e79c70f68d6248a9bdcf8e3c1afa128f
 SHA512:
-  metadata.gz: 5976dae0692f77d98ef26995737385da682592ddd4631209543f1604130c607f6f584a787a036595d668914245b17cc0141050e8fe36843f288bda93f5bcd74a
-  data.tar.gz: a5ed147ed93952f3d3d3e38abd8ece30bb6131e43d085281c91c0c12bd4490473fc0f3169e6f82cc6b8a1aa494d1d77188eeba63ec622794614f586bcf1fccbe
+  metadata.gz: 276b3847e95efdafb6eb47516168a3e4c984db3cf2b60c88eb8d7a9d67815956ea3d039a9ddc04dfc0d25c1ada21ab7c7d9a9825b39c31d85ab79e53b605cc78
+  data.tar.gz: 211808f3fae95a2c7d69bee7072df3e8b05cc5c2c134d81706143d459741af3914f042a8b08a6952aa8628f5324d0cff50def90eb297a5307c87ce4794e8eb49

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v4.6.1 (2017-11-20)
+-------------------
+
+Bug fixes/Enhancements
+  * Fix separator so it doesn't mutate user data. #223 (Marc-André Lafortune)
+  * Add additional tests for `Options#separator` and fix issue where
+    the last separator was ignored. #222
+
 v4.6.0 (2017-10-06)
 -------------------
 

data/README.md

@@ -30,14 +30,15 @@ opts = Slop.parse do |o|
   end
 end
 
-ARGV #=> -v --host 192.168.0.1 --check-ssl-certificate
+ARGV #=> -v --login alice --host 192.168.0.1 --check-ssl-certificate
 
 opts[:host]                 #=> 192.168.0.1
+opts[:login]                #=> alice
 opts.verbose?               #=> true
 opts.quiet?                 #=> false
 opts.check_ssl_certificate? #=> true
 
-opts.to_hash  #=> { host: "192.168.0.1", port: 80, verbose: true, quiet: false, check_ssl_certificate: true }
+opts.to_hash  #=> { host: "192.168.0.1", login: "alice", port: 80, verbose: true, quiet: false, check_ssl_certificate: true }
 ```
 
 Note that the block we've added to the `--version` flag will be executed

data/lib/slop.rb

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

data/lib/slop/options.rb

@@ -61,7 +61,7 @@ module Slop
     # the help text.
     def separator(string)
       if separators[options.size]
-        separators.last << "\n#{string}"
+        separators[-1] += "\n#{string}"
       else
         separators[options.size] = string
       end
@@ -111,6 +111,10 @@ module Slop
         str << "#{prefix}#{opt.to_s(offset: len)}\n"
       end
 
+      if sep = separators[options.size]
+        str << "#{sep}\n"
+      end
+
       str
     end
 

data/test/options_test.rb

@@ -36,6 +36,36 @@ describe Slop::Options do
     end
   end
 
+  describe "#separator" do
+    it "appends separators between options in order" do
+      @options.separator("foo")
+      @options.on("--foo")
+      @options.separator("bar")
+
+      assert_equal ["foo", "bar"], @options.separators
+    end
+
+    it "appends strings to the last separator if no options exist" do
+      @options.separator("foo")
+      @options.separator("bar")
+
+      assert_equal ["foo\nbar"], @options.separators
+    end
+
+    it "includes separators in the help text" do
+      @options.on("--foo")
+      @options.separator("bar")
+
+      help = @options.to_s.squeeze(" ")
+      assert help.end_with?("--foo \nbar\n")
+    end
+
+    it "accepts a frozen argument, even when called multiple times for the same option" do
+      @options.separator("foo".freeze)
+      @options.separator("bar".freeze)
+    end
+  end
+
   describe "#method_missing" do
     it "uses the method name as an option type" do
       option = @options.string("--name")
@@ -86,7 +116,7 @@ describe Slop::Options do
   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) 
+      assert_match(/^custom banner/, @options_config.to_s)
     end
     it "banner is disabled" do
       @options_config = Slop::Options.new({banner: false})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Simple Lightweight Option Parsing