lucy-goosey 0.1.0 → 0.2.0

data/README.md

@@ -7,6 +7,26 @@ It assumes some unix conventions, and doesn't mess with your environment or do a
 
 Heavily tested.
 
+## Examples
+
+```ruby
+  options = Lucy::Goosey.parse_options(%w{-n 1})
+
+  options['n']
+  # => '1'
+
+  options = Lucy::Goosey.parse_options(%w{--n 1 --foo bar --baz})
+
+  options['n']
+  # => '1'
+
+  options['foo']
+  # => 'bar'
+
+  options['baz']
+  # => true
+```
+
 
 ## Installation
 

data/lib/lucy-goosey.rb

@@ -7,38 +7,53 @@ module Lucy
     EQUAL = /=/
 
 
-    def self.leading_word?(word)
+    def self.magic_word?(word)
       return unless word
-      ! (word.match(UNIX_DOUBLE_FLAG) || word.match(UNIX_SINGLE_FLAG) || word.match(EQUAL))
+      (self.flag?(word) || word.match(EQUAL))
+    end
+
+    def self.flag?(word)
+      return unless word
+      word.match(UNIX_DOUBLE_FLAG) || word.match(UNIX_SINGLE_FLAG)
+    end
+
+    def self.deflag(word)
+      word.sub(UNIX_DOUBLE_FLAG, '').sub(UNIX_SINGLE_FLAG,'')
     end
 
 
+    # Public: parses array of options, loosely assuming unix-style conventions.
+    #
+    # Returns a Hash
     def self.parse_options(_args)
       args = _args.dup
       config = {}
 
-      raise ArgumentError, 'must be an array' unless _args.is_a? Array
+      raise ArgumentError, 'must be an array' unless args.is_a? Array
       return config if args.empty?
 
-      args = args[1..-1] while leading_word?(args.first)
+      args.reverse!
+      # get rid of leading words
+      args.pop while args.last && !magic_word?(args.last)
 
       args.size.times do
         break if args.empty?
-        arg  = args.shift
-        peek = args.first
-        key  = arg
-        if key.match(/=/)
-          key, value = key.split('=', 2)
-        elsif peek && peek.match(/=/)
-          config[key.sub(UNIX_DOUBLE_FLAG, '')] = true
-          key, value = peek.split('=', 2)
-        elsif peek.nil? || peek.match(UNIX_DOUBLE_FLAG) || peek.match(UNIX_SINGLE_FLAG)
-          value = true
-        else
-          value = args.shift
+        head = args.pop
+        peek = args.last
+
+        key, value = nil, nil
+        if head.match(/=/)
+          key, value = head.split('=', 2)
+        elsif peek.nil? || magic_word?(peek)
+          key, value  = head, true
+        elsif peek
+          key, value = head, [args.pop]
+          value << args.pop while (args.last && !magic_word?(args.last))
+          value = value.join(' ')
         end
-        value = true if value == 'true'
-        key = key.sub(UNIX_DOUBLE_FLAG, '').sub(UNIX_SINGLE_FLAG,'')
+        next unless key and value
+
+        key = deflag(key)
         config[key] = value
       end
 

data/lib/lucy-goosey/version.rb

@@ -1,5 +1,5 @@
 module Lucy
   module Goosey
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/test/combinatorial_test.rb

@@ -11,6 +11,7 @@ describe Lucy::Goosey do
           when /--n/ then result['n'].must_equal '1'
           when /tru/ then result['truth'].must_equal true
           when /a=b/ then result['a'].must_equal 'b'
+          when /fudge/ then result['fudge'].must_equal 'cakes are good'
           end
         end
       end

data/test/options_parsing_test.rb

@@ -15,6 +15,11 @@ describe Lucy::Goosey do
         result.must_equal({'n' => true})
       end
 
+      it "understands -n is the best" do
+        result = Lucy::Goosey.parse_options(%w(-n is the best))
+        result.must_equal({'n' => 'is the best'})
+      end
+
       it "understands -n 1" do
         result = Lucy::Goosey.parse_options(%w(-n 1))
         result.must_equal({'n' => '1'})
@@ -51,6 +56,14 @@ describe Lucy::Goosey do
     end
 
     describe "edge cases" do
+      it "lets you use lots of words" do
+        result = Lucy::Goosey.parse_options(%w(wtf bbq --foo bar none --foo-baz -n 1 -t))
+        result.must_equal({'foo' => 'bar none', 'foo-baz' => true, 't' => true, 'n' => '1'})
+
+        result = Lucy::Goosey.parse_options(%w(wtf bbq -foo bar none --foo-baz -n 1 -t))
+        result.must_equal({'foo' => 'bar none', 'foo-baz' => true, 't' => true, 'n' => '1'})
+      end
+
       it "ignores leading words" do
         result = Lucy::Goosey.parse_options(%w(wtf bbq --bar foo=baz --baz=bar -n 1 --bap))
         result.must_equal({ 'foo' => 'baz', 'baz' => 'bar', 'bar' => true, 'n' => '1', 'bap' => true })
@@ -58,12 +71,12 @@ describe Lucy::Goosey do
 
       it "works in any order" do
         result = Lucy::Goosey.parse_options(%w(--bar foo=baz --baz=bar bob=true --bap))
-        result.must_equal({ 'foo' => 'baz', 'baz' => 'bar', 'bar' => true, 'bob' => true, 'bap' => true })
+        result.must_equal({ 'foo' => 'baz', 'baz' => 'bar', 'bar' => true, 'bob' => 'true', 'bap' => true })
       end
 
       it "understands foo=bar and --baz=bar on the same line" do
         result = Lucy::Goosey.parse_options(%w(foo=baz --baz=bar bob=true --bar))
-        result.must_equal({ 'foo' => 'baz', 'baz' => 'bar', 'bar' => true, 'bob' => true })
+        result.must_equal({ 'foo' => 'baz', 'baz' => 'bar', 'bar' => true, 'bob' => 'true' })
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucy-goosey
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1157995687993160958
+      hash: -2478981354359286416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1157995687993160958
+      hash: -2478981354359286416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23