slop 0.1.7 → 0.1.8

data/lib/slop.rb

@@ -5,7 +5,7 @@ require 'slop/option'
 class Slop
   include Enumerable
 
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 
   # Raised when an option expects an argument and none is given
   class MissingArgumentError < ArgumentError; end
@@ -152,8 +152,13 @@ class Slop
   private
 
   def flag_or_option?(flag)
-    return unless flag
-    flag[1, 2].include?('-')
+    return unless flag && flag.size > 1
+
+    if flag[1] == '-'
+      return flag[0] == '-' && flag[3]
+    elsif flag[0] == '-'
+      return !flag[3]
+    end
   end
 
   def pad_options(args)

data/spec/slop_spec.rb

@@ -108,6 +108,11 @@ describe Slop do
     it "does not require argument to be true if optional is true" do
       Slop.parse("--name Lee") { opt :name, :optional => true }.value_for(:name).should == "Lee"
     end
+
+    it "responds to both long options and single character flags" do
+      Slop.parse("--name Lee") { opt :name, true }[:name].should == "Lee"
+      Slop.parse("-n Lee") { opt :n, :name, true }[:name].should == "Lee"
+    end
   end
 
   describe "options" do
@@ -145,4 +150,13 @@ describe Slop do
     end
   end
 
+  describe "flag_or_option?" do
+    it "should be true if the string is a flag or an option" do
+      good = ["-f", "--flag"]
+      bad  = ["-flag", "f", "flag", "f-lag", "flag-", "--", "-"]
+      good.each {|g| @slop.send(:flag_or_option?, g).should be_true }
+      bad.each  {|b| @slop.send(:flag_or_option?, b).should be_false }
+    end
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Lee Jarvis
@@ -32,7 +32,7 @@ dependencies:
         version: 2.1.0
   type: :development
   version_requirements: *id001
-description: ""
+description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co
 executables: []