slop 3.4.0 → 3.4.1

data/CHANGES.md

@@ -1,3 +1,10 @@
+3.4.1 (2013-01-13)
+------------------
+
+* Ensure options replace any existing duplicates
+* Command config options now inherit config options from top level Slop.
+* Command help output now adds command in usage string.
+
 3.4.0 (2013-01-12)
 ------------------
 

data/Rakefile

@@ -10,20 +10,20 @@ Rake::TestTask.new do |t|
   t.test_files = Dir['test/*_test.rb']
 end
 
-begin
-  require 'rdoc/task'
+# begin
+#   require 'rdoc/task'
 
-  # requires sdoc and horo gems
-  RDoc::Task.new do |rdoc|
-    rdoc.title = 'Slop API Documentation'
-    rdoc.rdoc_dir = 'doc'
-    rdoc.options << '-f' << 'sdoc'
-    rdoc.options << '-T' << 'rails'
-    rdoc.options << '-e' << 'UTF-8'
-    rdoc.options << '-g'
-    rdoc.rdoc_files.include('lib/**/*.rb')
-  end
-rescue LoadError
-end
+#   # requires sdoc and horo gems
+#   RDoc::Task.new do |rdoc|
+#     rdoc.title = 'Slop API Documentation'
+#     rdoc.rdoc_dir = 'doc'
+#     rdoc.options << '-f' << 'sdoc'
+#     rdoc.options << '-T' << 'rails'
+#     rdoc.options << '-e' << 'UTF-8'
+#     rdoc.options << '-g'
+#     rdoc.rdoc_files.include('lib/**/*.rb')
+#   end
+# rescue LoadError
+# end
 
 task :default => :test

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -131,6 +131,7 @@ class Slop
     @callbacks = {}
     @separators = {}
     @runner = nil
+    @command = config.delete(:command)
 
     if block_given?
       block.arity == 1 ? yield(self) : instance_eval(&block)
@@ -191,7 +192,8 @@ class Slop
   #
   # Returns a new instance of Slop mapped to this command.
   def command(command, options = {}, &block)
-    @commands[command.to_s] = Slop.new(options, &block)
+    options = @config.merge(options)
+    @commands[command.to_s] = Slop.new(options.merge(:command => command.to_s), &block)
   end
 
   # Parse a list of items, executing and gathering options along the way.
@@ -261,6 +263,10 @@ class Slop
   # Returns the created instance of Slop::Option.
   def on(*objects, &block)
     option = build_option(objects, &block)
+    original = options.find do |o|
+      o.long and o.long == option.long or o.short and o.short == option.short
+    end
+    options.delete(original) if original
     options << option
     option
   end
@@ -426,7 +432,12 @@ class Slop
     end
 
     banner = config[:banner]
-    banner = "Usage: #{File.basename($0, '.*')}#{' [command]' if @commands.any?} [options]" if banner.nil?
+    if banner.nil?
+      banner = "Usage: #{File.basename($0, '.*')}"
+      banner << " #{@command}" if @command
+      banner << " [command]" if @commands.any?
+      banner << " [options]"
+    end
     if banner
       "#{banner}\n#{@separators[0] ? "#{@separators[0]}\n" : ''}#{optstr}"
     else

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'slop'
-  s.version     = '3.4.0'
+  s.version     = '3.4.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

@@ -448,4 +448,13 @@ class SlopTest < TestCase
     end
   end
 
+  test "duplicate options should not exist, new options should replace old ones" do
+    i = nil
+    Slop.parse(%w'-v') do
+      on(:v) { i = 'first' }
+      on(:v) { i = 'second' }
+    end
+    assert_equal 'second', i
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake