optparshie 1.1.1 → 1.2.0

data/Gemfile

@@ -2,13 +2,11 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "hashie", ">= 1.2.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "rspec", ">= 2.3.0"
+  gem "bundler", ">= 1.0.0"
+  gem "jeweler", ">= 1.6.4"
 end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/example/example1.rb

@@ -28,5 +28,5 @@ puts("opt.waros => #{opt.waros}");
 # Oops! It's already defined method....
 # opt.on => Usage: example1 (blah blah blah)
 
-# instead of you can access through hash
-puts("opt.mash.on => #{opt.mash.on}");
+# You should access via short option instead.... :X
+puts("opt.o => #{opt.o}");

data/lib/optparshie.rb

@@ -1,132 +1,148 @@
-#!/bin/env ruby
-#-*- coding: utf-8 -*-
-require("rubygems");
-require("optparse");
-require("hashie");
-
-class OptionParshie < OptionParser
-  def initialize()
-    super;
-    @mash = Hashie::Mash.new();
-  end
-
-  def hash_key_sanitize(switch)
-    return switch.gsub(/^-+/,"").gsub(/\W/,"_");
-  end
-
-  def hash_sw_add(sw,val)
-    (sw.short+sw.long).each { |switch| @mash.send(hash_key_sanitize(switch)+"=",val); }
-  end
-
-  def parse(*argv)
-    @mash.clear();
-    top.list.each { |sw| hash_sw_add(sw,nil); }
-    argv = super;
-    
-    return @mash;
-  end
-  
-  def parse!(*argv)
-    @mash.clear();
-    top.list.each { |sw| hash_sw_add(sw,nil); }
-    argv = super;
-    
-    return [ argv,@mash ];
-  end
-
-  # ----------------------------------------------------------------------------
-  # Borrowed from optparse.rb
-  #   (author of optparse.rb is Nobu Nakada-san, thanks!)
-  # ----------------------------------------------------------------------------
-  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
-    opt, arg, val, rest = nil
-    nonopt ||= proc {|a| throw :terminate, a}
-    argv.unshift(arg) if arg = catch(:terminate) {
-      while arg = argv.shift
-        case arg
-        # long option
-        when /\A--([^=]*)(?:=(.*))?/m
-          opt, rest = $1, $2
-          begin
-            sw, = complete(:long, opt, true)
-          rescue ParseError
-            raise $!.set_option(arg, true)
-          end
-          begin
-            opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            
-            # ------------------------------------------------------------------
-            # optparshie code by l.p.m.11
-            # ------------------------------------------------------------------
-            hash_sw_add(sw,val);
-            
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
-          rescue ParseError
-            raise $!.set_option(arg, rest)
-          end
-
-        # short option
-        when /\A-(.)((=).*|.+)?/m
-          opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
-          begin
-            sw, = search(:short, opt)
-            unless sw
-              begin
-                sw, = complete(:short, opt)
-                # short option matched.
-                val = arg.sub(/\A-/, '')
-                has_arg = true
-              rescue InvalidOption
-                # if no short options match, try completion with long
-                # options.
-                sw, = complete(:long, opt)
-                eq ||= !rest
-              end
-            end
-          rescue ParseError
-            raise $!.set_option(arg, true)
-          end
-          begin
-            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
-            raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
-
-            # ------------------------------------------------------------------
-            # optparshie code by l.p.m.11
-            # ------------------------------------------------------------------
-            hash_sw_add(sw,val);
-            
-            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
-            val = cb.call(val) if cb
-            setter.call(sw.switch_name, val) if setter
-          rescue ParseError
-            raise $!.set_option(arg, arg.length > 2)
-          end
-
-        # non-option argument
-        else
-          catch(:prune) do
-            visit(:each_option) do |sw0|
-              sw = sw0
-              sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
-            end
-            nonopt.call(arg)
-          end
-        end
-      end
-
-      nil
-    }
-
-    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
-
-    argv
-  end
-
-  def method_missing(name,*args)
-    return @mash.send(name);
-  end
-
-  attr_reader :mash;
-  private :hash_key_sanitize, :hash_sw_add;
-end
+#!/bin/env ruby
+#-*- coding: utf-8 -*-
+require("rubygems");
+require("optparse");
+
+class OptionParshie < OptionParser
+  def initialize()
+    super;
+    hash_init();
+  end
+
+  def hash_init()
+    @opt_hash = Hash.new();
+    @opt_key = Hash.new();
+  end
+
+  def hash_key_sanitize(switch)
+    return switch.gsub(/^-+/,"").gsub(/\W/,"_");
+  end
+
+  def hash_sw_add(sw,val)
+    keys = (sw.short + sw.long).map { |x| hash_key_sanitize(x); };
+    primary_key = keys.first;
+    keys.each { |key| @opt_key[key] = primary_key; }
+    
+    @opt_hash[primary_key] = val;
+  end
+
+  def parse(*argv)
+    hash_init();
+    top.list.each { |sw| hash_sw_add(sw,nil); }
+    x = super;
+    
+    return x;
+  end
+  
+  def parse!(*argv)
+    hash_init();
+    top.list.each { |sw| hash_sw_add(sw,nil); }
+    x = super;
+    
+    return x;
+  end
+
+  # ----------------------------------------------------------------------------
+  # Borrowed from optparse.rb
+  #   (author of optparse.rb is Nobu Nakada-san, thanks!)
+  # ----------------------------------------------------------------------------
+  def parse_in_order(argv = default_argv, setter = nil, &nonopt)  # :nodoc:
+    opt, arg, val, rest = nil
+    nonopt ||= proc {|a| throw :terminate, a}
+    argv.unshift(arg) if arg = catch(:terminate) {
+      while arg = argv.shift
+        case arg
+        # long option
+        when /\A--([^=]*)(?:=(.*))?/m
+          opt, rest = $1, $2
+          begin
+            sw, = complete(:long, opt, true)
+          rescue ParseError
+            raise $!.set_option(arg, true)
+          end
+          begin
+            opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+            
+            # ------------------------------------------------------------------
+            # optparshie code by l.p.m.11
+            # ------------------------------------------------------------------
+            hash_sw_add(sw,val);
+            
+            val = cb.call(val) if cb
+            setter.call(sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, rest)
+          end
+
+        # short option
+        when /\A-(.)((=).*|.+)?/m
+          opt, has_arg, eq, val, rest = $1, $3, $3, $2, $2
+          begin
+            sw, = search(:short, opt)
+            unless sw
+              begin
+                sw, = complete(:short, opt)
+                # short option matched.
+                val = arg.sub(/\A-/, '')
+                has_arg = true
+              rescue InvalidOption
+                # if no short options match, try completion with long
+                # options.
+                sw, = complete(:long, opt)
+                eq ||= !rest
+              end
+            end
+          rescue ParseError
+            raise $!.set_option(arg, true)
+          end
+          begin
+            opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+            raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
+
+            # ------------------------------------------------------------------
+            # optparshie code by l.p.m.11
+            # ------------------------------------------------------------------
+            hash_sw_add(sw,val);
+            
+            argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
+            val = cb.call(val) if cb
+            setter.call(sw.switch_name, val) if setter
+          rescue ParseError
+            raise $!.set_option(arg, arg.length > 2)
+          end
+
+        # non-option argument
+        else
+          catch(:prune) do
+            visit(:each_option) do |sw0|
+              sw = sw0
+              sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
+            end
+            nonopt.call(arg)
+          end
+        end
+      end
+
+      nil
+    }
+
+    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
+
+    argv
+  end
+
+  def method_missing(name,*args)
+    name = name.to_s();
+    subst = !(name.gsub!(/=$/,"").nil?);
+    raise if (!@opt_key.key?(name));
+
+    if (!subst)
+      return @opt_hash[@opt_key[name]];
+    else
+      return @opt_hash[@opt_key[name]] = args.first;
+    end
+  end
+
+  attr_reader :opt_hash;
+  private :hash_key_sanitize, :hash_sw_add, :hash_init;
+end

data/optparshie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "optparshie"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpm11"]
-  s.date = "2011-11-17"
+  s.date = "2012-10-03"
   s.description = "OptionParser with Hashie::Mash like accessibility."
   s.email = "lpm11r@gmail.com"
   s.extra_rdoc_files = [
@@ -28,36 +28,31 @@ Gem::Specification.new do |s|
     "lib/optparshie.rb",
     "optparshie.gemspec",
     "spec/optparshie_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "test/test1.rb"
   ]
   s.homepage = "http://github.com/lpm11/optparshie"
   s.licenses = ["WTFPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "OptionParser with Hashie::Mash like accessibility."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hashie>, [">= 1.2.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
     else
-      s.add_dependency(%q<hashie>, [">= 1.2.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.3.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     end
   else
-    s.add_dependency(%q<hashie>, [">= 1.2.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.3.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
   end
 end
 

data/test/test1.rb

@@ -0,0 +1,43 @@
+#!/bin/env ruby
+#-*- coding: utf-8 -*-
+require("test/unit");
+require("../lib/optparshie");
+
+class TestCase_Main < Test::Unit::TestCase
+  def test_fundamental()
+    argv = "--exp --wa -a 2 ADDITION".split(/\s+/);
+    
+    opt = OptionParshie.new();
+    opt.on("-a","--a-value=VAL");
+    opt.on("--exp");
+    opt.on("-w","--waros");
+    opt.on("-k");
+    opt.parse(argv);
+    
+    assert_equal(opt.a, "2");
+    assert_equal(opt.a_value, "2");
+    assert(opt.exp);
+    assert(opt.w);
+    assert(opt.waros);
+    assert(!opt.k);
+  end
+  
+  def test_reference()
+    argv = "--test=128 --example".split(/\s+/);
+    
+    opt = OptionParshie.new();
+    opt.on("-t","--test=VAL",Integer);
+    opt.on("-e","--example");
+    opt.parse(argv);
+    
+    assert_equal(opt.t, 128);
+    assert_equal(opt.test, 128);
+    assert(opt.e);
+    opt.t = 129;
+    assert_equal(opt.t, 129);
+    assert_equal(opt.test, 129);
+    opt.e = "exp";
+    assert_equal(opt.e, "exp");
+    assert_equal(opt.example, "exp");
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparshie
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,63 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &4220220 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
+        version: 2.3.0
+  type: :development
   prerelease: false
-  version_requirements: *4220220
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &3801980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *3801980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3798960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *3798960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &3919400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *3919400
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &3913560 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *3913560
+        version: 1.6.4
 description: OptionParser with Hashie::Mash like accessibility.
 email: lpm11r@gmail.com
 executables: []
@@ -86,6 +79,7 @@ files:
 - optparshie.gemspec
 - spec/optparshie_spec.rb
 - spec/spec_helper.rb
+- test/test1.rb
 homepage: http://github.com/lpm11/optparshie
 licenses:
 - WTFPL
@@ -101,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4175335511657504025
+      hash: -2936163973672300385
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OptionParser with Hashie::Mash like accessibility.