slop 2.2.0 → 2.3.0

data/CHANGES.md

@@ -1,3 +1,8 @@
+2.3.0
+-----
+
+* Allow flags to have suffixed `=` char for options which accept an argument
+
 2.2.0 (2011-11-02)
 ------------------
 

data/README.md

@@ -18,20 +18,24 @@ Installation
 
 Usage
 -----
-    # parse assumes ARGV, otherwise you can pass it your own Array
-    opts = Slop.parse do
-      on :v, :verbose, 'Enable verbose mode'           # boolean value
-      on :n, :name, 'Your name', true                  # option requires a compulsory argument
-      on :s, :sex, 'Your sex', :optional => false      # the same thing
-      on '-a', '--age', 'Your age', :optional => true  # optional argument
-    end
-
-    # if ARGV is `-v --name 'lee jarvis' -s male`
-    opts.verbose? #=> true
-    opts.name?    #=> true
-    opts[:name]   #=> 'lee jarvis'
-    opts.age?     #=> false
-    opts[:age]    #=> nil
+
+```ruby
+# parse assumes ARGV, otherwise you can pass it your own Array
+opts = Slop.parse do
+  on :v, :verbose, 'Enable verbose mode'   # A boolean option
+  on :n, :name=, 'Your name'               # This option requires an argument
+  on :s, :sex, 'Your sex', true            # So does this one
+  on :a, :age, 'Your age', optional: true  # This one accepts an optional argument
+  on '-D', '--debug', 'Enable debug'       # The prefixed -'s are optional
+end
+
+# if ARGV is `-v --name 'lee jarvis' -s male`
+opts.verbose? #=> true
+opts.name?    #=> true
+opts[:name]   #=> 'lee jarvis'
+opts.age?     #=> false
+opts[:age]    #=> nil
+```
 
 For more information about creating options, see the
 [Creating Options](https://github.com/injekt/slop/wiki/Creating-Options)
@@ -39,69 +43,87 @@ wiki page.
 
 You can also return your options as a Hash
 
-    opts.to_hash #=> {:name => 'Lee Jarvis', :verbose => true, :age => nil, :sex => 'male'}
+```ruby
+opts.to_hash #=> { :name => 'Lee Jarvis', :verbose => true, :age => nil, :sex => 'male' }
+```
 
 If you want some pretty output for the user to see your options, you can just
 send the Slop object to `puts` or use the `help` method.
 
-    puts opts
-    puts opts.help
+```ruby
+puts opts
+puts opts.help
+```
 
 Will output something like
 
-    -v, --verbose      Enable verbose mode
-    -n, --name         Your name
-    -a, --age          Your age
+```
+-v, --verbose      Enable verbose mode
+-n, --name         Your name
+-a, --age          Your age
+```
 
 You can also add a banner using the `banner` method
 
-    opts = Slop.parse do
-      banner "Usage: foo.rb [options]"
-    end
+```ruby
+opts = Slop.parse do
+  banner "Usage: foo.rb [options]"
+end
+```
 
 Helpful Help
 ------------
 
 Long form:
 
-    Slop.parse do
-      ...
-      on :h, :help, 'Print this help message', :tail => true do
-        puts help
-        exit
-      end
-    end
+```ruby
+Slop.parse do
+  ...
+  on :h, :help, 'Print this help message', :tail => true do
+    puts help
+    exit
+  end
+end
+```
 
 Shortcut:
 
-    Slop.parse :help => true do
+```ruby
+Slop.parse :help => true do
       ...
-    end
+end
+```
 
 Parsing
 -------
 
 Slop's pretty good at parsing, let's take a look at what it'll extract for you
 
-    Slop.parse(:multiple_switches => false) do
-      on 's', 'server', true
-      on 'p', 'port', true, :as => :integer
-      on 'username', true, :matches => /[^a-zA-Z]+$/
-      on 'password', true
-    end
+```ruby
+Slop.parse(:multiple_switches => false) do
+  on 's', 'server='
+  on 'p', 'port=', :as => :integer
+  on 'username=', :matches => /[^a-zA-Z]+$/
+  on 'password='
+end
+```
 
 Now throw some options at it:
 
-    -s ftp://foobar.com -p1234 --username=FooBar --password 'hello there'
+```
+-s ftp://foobar.com -p1234 --username=FooBar --password 'hello there'
+```
 
 Here's what we'll get back
 
-    {
-    	:server => "ftp://foobar.com",
-    	:port => 1234,
-    	:username => "FooBar",
-    	:password => "hello there"
-    }
+```
+{
+  :server => "ftp://foobar.com",
+  :port => 1234,
+  :username => "FooBar",
+  :password => "hello there"
+}
+```
 
 Events
 ------
@@ -109,12 +131,14 @@ Events
 If you'd like to trigger an event when an option is used, you can pass a
 block to your option. Here's how:
 
-    Slop.parse do
-      on :V, :version, 'Print the version' do
-        puts 'Version 1.0.0'
-        exit
-      end
-    end
+```ruby
+Slop.parse do
+  on :V, :version, 'Print the version' do
+    puts 'Version 1.0.0'
+    exit
+  end
+end
+```
 
 Now when using the `--version` option on the command line, the trigger will
 be called and its contents executed.
@@ -127,17 +151,19 @@ they're found, just like
 [OptionParser](http://rubydoc.info/stdlib/optparse/1.9.2/OptionParser:order)
 does it.
 
-    opts = Slop.new do
-      on :n, :name, :optional => false
-    end
+```ruby
+opts = Slop.new do
+  on :n, :name, :optional => false
+end
 
-    opts.parse do |arg|
-      puts arg
-    end
+opts.parse do |arg|
+  puts arg
+end
 
-    # if ARGV is `foo --name Lee bar`
-    foo
-    bar
+# if ARGV is `foo --name Lee bar`
+foo
+bar
+```
 
 Negative Options
 ----------------
@@ -145,16 +171,18 @@ Negative Options
 Slop also allows you to prefix `--no-` to an option which will force the option
 to return a false value.
 
-    opts = Slop.parse do
-      on :v, :verbose, :default => true
-    end
+```ruby
+opts = Slop.parse do
+  on :v, :verbose, :default => true
+end
 
-    # with no command line options
-    opts[:verbose] #=> true
+# with no command line options
+opts[:verbose] #=> true
 
-    # with `--no-verbose`
-    opts[:verbose] #=> false
-    opts.verbose?  #=> false
+# with `--no-verbose`
+opts[:verbose] #=> false
+opts.verbose?  #=> false
+```
 
 Short Switches
 --------------
@@ -165,35 +193,39 @@ you would like to disable this, you can pass `multiple_switches => false` to
 a new Slop object. In which case Slop will then parse `-fbar` as the option
 `f` with the argument value `bar`.
 
-    Slop.parse do
-      on :a, 'First switch'
-      on :b, 'Second switch'
-      on :c, 'Third switch'
-    end
+```ruby
+Slop.parse do
+  on :a, 'First switch'
+  on :b, 'Second switch'
+  on :c, 'Third switch'
+end
 
-    # Using `-ac`
-    opts[:a] #=> true
-    opts[:b] #=> false
-    opts[:c] #=> true
+# Using `-ac`
+opts[:a] #=> true
+opts[:b] #=> false
+opts[:c] #=> true
 
-    Slop.parse(:multiple_switches => false) do
-      on :a, 'Some switch', true
-    end
+Slop.parse(:multiple_switches => false) do
+  on :a, 'Some switch', true
+end
 
-    # Using `ahello`
-    opts[:a] #=> 'hello'
+# Using `ahello`
+opts[:a] #=> 'hello'
+```
 
 Lists
 -----
 
 You can of course also parse lists into options. Here's how:
 
-    opts = Slop.parse do
-      opt :people, true, :as => Array
-    end
+```ruby
+opts = Slop.parse do
+  opt :people, true, :as => Array
+end
 
-    # ARGV is `--people lee,john,bill`
-    opts[:people] #=> ['lee', 'john', 'bill']
+# ARGV is `--people lee,john,bill`
+opts[:people] #=> ['lee', 'john', 'bill']
+```
 
 Slop supports a few styles of list parsing. Check out
 [this wiki page](https://github.com/injekt/slop/wiki/Lists) for more info.
@@ -204,8 +236,10 @@ Strict Mode
 Passing `strict => true` to `Slop.parse` causes it to raise a `Slop::InvalidOptionError`
 when an invalid option is found (`false` by default):
 
-    Slop.new(:strict => true).parse(%w/--foo/)
-    # => Slop::InvalidOptionError: Unknown option -- 'foo'
+```ruby
+Slop.new(:strict => true).parse(%w/--foo/)
+# => Slop::InvalidOptionError: Unknown option -- 'foo'
+```
 
 Features
 --------
@@ -223,33 +257,37 @@ I'm not, honestly! I love OptionParser. I really do, it's a fantastic library.
 So why did I build Slop? Well, I find myself using OptionParser to simply
 gather a bunch of key/value options, usually you would do something like this:
 
-    require 'optparse'
+```ruby
+require 'optparse'
 
-    things = {}
+things = {}
 
-    opt = OptionParser.new do |opt|
-      opt.on('-n', '--name NAME', 'Your name') do |name|
-        things[:name] = name
-      end
+opt = OptionParser.new do |opt|
+  opt.on('-n', '--name NAME', 'Your name') do |name|
+    things[:name] = name
+  end
 
-      opt.on('-a', '--age AGE', 'Your age') do |age|
-        things[:age] = age.to_i
-      end
+  opt.on('-a', '--age AGE', 'Your age') do |age|
+    things[:age] = age.to_i
+  end
 
-      # you get the point
-    end
+  # you get the point
+end
 
-    opt.parse
-    things #=> { :name => 'lee', :age => 105 }
+opt.parse
+things #=> { :name => 'lee', :age => 105 }
+```
 
 Which is all great and stuff, but it can lead to some repetition. The same
 thing in Slop:
 
-    require 'slop'
+```ruby
+require 'slop'
 
-    opts = Slop.parse do
-      on :n, :name, 'Your name', true
-      on :a, :age, 'Your age', true, :as => :int
-    end
+opts = Slop.parse do
+  on :n, :name=, 'Your name'
+  on :a, :age=, 'Your age', :as => :int
+end
 
-    opts.to_hash #=> { :name => 'lee', :age => 105 }
+opts.to_hash #=> { :name => 'lee', :age => 105 }
+```

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -1008,14 +1008,15 @@ class Slop
       options.push arg.sub(/\A--?/, '')
       extras[:optional] = help[0, 1] == '[' && help[-1, 1] == ']'
       extras[:help] = help
-    elsif not boolean and long.to_s =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\z/
-      options.push args.shift.to_s.sub(/\A--?/, '')
+    elsif not boolean and long.to_s =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\z/
+      extras[:argument] = true if long[-1, 1] == '='
+      options.push args.shift.to_s.sub(/\A--?/, '').sub(/\=\z/, '')
     else
       options.push nil
     end
 
     options.push args.first.respond_to?(:to_sym) ? args.shift : nil
-    options.push @arguments ?  true : (args.shift ? true : false)
+    options.push (@arguments || extras[:argument]) ? true : (args.shift ? true : false)
     options.push extras
   end
 end

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.2.0'
+  s.version = '2.3.0'
   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/option_test.rb

@@ -25,6 +25,11 @@ class OptionTest < TestCase
     refute option(:f, :foo).expects_argument?
   end
 
+  test 'expects an argument if long option is suffixed with =' do
+    assert option(:f, :foo=).expects_argument?
+    assert option('f', 'foo=').expects_argument?
+  end
+
   test 'accepts an optional argument if optional is true' do
     assert option(:f, :optional => true).accepts_optional_argument?
     assert option(:f, false, :optional => true).accepts_optional_argument?

metadata

@@ -1,32 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slop
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.3.0
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-05 00:00:00.000000000Z
 dependencies: []
-
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .yardopts
@@ -42,38 +32,29 @@ files:
 - test/slop_test.rb
 homepage: http://github.com/injekt/slop
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Option gathering made easy
-test_files: 
+test_files:
 - test/commands_test.rb
 - test/helper.rb
 - test/option_test.rb