slop 3.1.1 → 3.2.0

data/CHANGES.md

@@ -1,3 +1,8 @@
+3.2.0 (2012-05-15)
+------------------
+
+* Ensure boolean options appear correctly in `to_hash` output. (#59)
+
 3.1.1 (2012-04-24)
 ------------------
 

data/README.md

@@ -55,7 +55,7 @@ on '-p', 'password=?', 'Your password'
 You can also return your options as a Hash:
 
 ```ruby
-opts.to_hash #=> { :name => 'lee', :verbose => nil, :password => nil }
+opts.to_hash #=> { :name => 'lee', :verbose => true, :password => nil }
 ```
 
 Printing Help

data/lib/slop.rb

@@ -4,7 +4,7 @@ require 'slop/commands'
 class Slop
   include Enumerable
 
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 
   # The main Error class, all Exception classes inherit from this class.
   class Error < StandardError; end
@@ -441,6 +441,7 @@ class Slop
       elsif config[:multiple_switches] && argument
         execute_multiple_switches(option, argument, index)
       else
+        option.value = option.count > 0
         option.call(nil)
       end
     else

data/lib/slop/option.rb

@@ -84,8 +84,8 @@ class Slop
     #
     # Returns the Object once any type conversions have taken place.
     def value
-      value = @value || config[:default]
-      return if value.nil?
+      value = @value.nil? ? config[:default] : @value
+      return value if [true, false, nil].include?(value)
 
       type = config[:as]
       if type.respond_to?(:call)

data/slop.gemspec

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

@@ -157,9 +157,9 @@ class SlopTest < TestCase
   end
 
   test "to_hash()" do
-    opts = Slop.new { on :foo=; on :bar }
-    opts.parse(%w'--foo hello --bar')
-    assert_equal({ :foo => 'hello', :bar => nil }, opts.to_hash)
+    opts = Slop.new { on :foo=; on :bar; on :baz; on :zip }
+    opts.parse(%w'--foo hello --no-bar --baz')
+    assert_equal({ :foo => 'hello', :bar => false, :baz => true, :zip => nil }, opts.to_hash)
   end
 
   test "missing() returning all missing option keys" do
@@ -235,7 +235,7 @@ class SlopTest < TestCase
     opts = Slop.new { on :foo=; on :bar; on :baz }
     opts.parse %w' --foo hello --bar '
     assert_equal 'hello', opts[:foo]
-    assert_nil opts[:bar]
+    assert_equal true, opts[:bar]
     assert_nil opts[:baz]
   end
 
@@ -263,6 +263,13 @@ class SlopTest < TestCase
     assert opts.foo_bar?
   end
 
+  test "supporting underscore" do
+    opts = Slop.new { on :foo_bar= }
+    opts.parse %w' --foo_bar baz '
+    assert_equal 'baz', opts[:foo_bar]
+    assert opts.foo_bar?
+  end
+
   test "parsing an optspec and building options" do
     optspec = <<-SPEC
     ruby foo.rb [options]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70218307194080 !ruby/object:Gem::Requirement
+  requirement: &70135352281960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218307194080
+  version_requirements: *70135352281960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70218307193220 !ruby/object:Gem::Requirement
+  requirement: &70135352280820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70218307193220
+  version_requirements: *70135352280820
 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: 2699776983474295895
+      hash: 3008846930636062325
 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: 2699776983474295895
+      hash: 3008846930636062325
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11