slop 3.1.0 → 3.1.1

data/CHANGES.md

@@ -1,5 +1,10 @@
-3.1.0
------
+3.1.1 (2012-04-24)
+------------------
+
+* Ensure separators before any options are still being processed (#62)
+
+3.1.0 (2012-04-23)
+------------------
 
 * Allow options to be fetched via underscores instead of dashes
   (as a fallback) (Eric Anderson, #51)

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -349,7 +349,14 @@ class Slop
     optstr = opts.each_with_index.map { |o, i|
       (str = @separators[i + 1]) ? [o, str].join("\n") : o
     }.join("\n")
-    config[:banner] ? config[:banner] + "\n" + optstr : optstr
+
+    if config[:banner]
+      config[:banner] << "\n"
+      config[:banner] << "#{@separators[0]}\n" if @separators[0]
+      config[:banner] + optstr
+    else
+      optstr
+    end
   end
   alias help to_s
 

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.1.0'
+  s.version     = '3.1.1'
   s.summary     = 'Option gathering made easy'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author      = 'Lee Jarvis'

data/test/slop_test.rb

@@ -295,6 +295,12 @@ class SlopTest < TestCase
       on :bar
     end
     assert_equal "        --foo      \nhello\nworld\n        --bar      ", opts.help
+
+    opts = Slop.new do
+      banner "foo"
+      separator "bar"
+    end
+    assert_equal "foo\nbar\n", opts.help
   end
 
   test "printing help with :help => true" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70221805243820 !ruby/object:Gem::Requirement
+  requirement: &70218307194080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221805243820
+  version_requirements: *70218307194080
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70221805243060 !ruby/object:Gem::Requirement
+  requirement: &70218307193220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221805243060
+  version_requirements: *70218307193220
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
 executables: []
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2177478579712084864
+      hash: 2699776983474295895
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2177478579712084864
+      hash: 2699776983474295895
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11