optparshie 1.0.4 → 1.1.0

data/Gemfile

@@ -2,6 +2,7 @@ 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.

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/example/example1.rb

@@ -2,15 +2,19 @@
 #-*- coding: utf-8 -*-
 require("../lib/optparshie");
 
-argv = "--test --wa -a 2 --on".split(/\s+/);
+argv = "--exp --wa -a 2 --on ADDITION".split(/\s+/);
 puts("test argv: #{argv}");
 
 opt = OptionParshie.new();
 opt.on("-a","--a-value=VAL");
-opt.on("--test");
+opt.on("--exp");
 opt.on("-w","--waros");
 opt.on("-o","--on");
-opt.parse(argv);
+
+# parse returns mash
+puts("opt.parse => #{opt.parse(argv)}");
+# parse! returns [argv, mash]
+puts("opt.parse! => #{opt.parse!(argv)}");
 
 # access with short option
 puts("opt.a => #{opt.a}");
@@ -19,10 +23,10 @@ puts("opt.o => #{opt.o}");
 
 # access with long option
 puts("opt.a_value => #{opt.a_value}");
-puts("opt.test => #{opt.test}");
+puts("opt.exp => #{opt.exp}");
 puts("opt.waros => #{opt.waros}");
-# Oops! This is already defined method....
+# Oops! It's already defined method....
 # opt.on => Usage: example1 (blah blah blah)
 
 # instead of you can access through hash
-puts("opt.hash['on'] => #{opt.hash['on']}");
+puts("opt.mash.on => #{opt.mash.on}");

data/lib/optparshie.rb

@@ -2,11 +2,12 @@
 #-*- coding: utf-8 -*-
 require("rubygems");
 require("optparse");
+require("hashie");
 
 class OptionParshie < OptionParser
   def initialize()
     super;
-    @hash = {};
+    @mash = Hashie::Mash.new();
   end
 
   def hash_key_sanitize(switch)
@@ -14,24 +15,28 @@ class OptionParshie < OptionParser
   end
 
   def hash_sw_add(sw,val)
-    (sw.short+sw.long).each { |switch| @hash[hash_key_sanitize(switch)] = val; }
+    (sw.short+sw.long).each { |switch| @mash.send(hash_key_sanitize(switch)+"=",val); }
   end
 
   def parse(*argv)
-    @hash = {};
+    @mash.clear();
     top.list.each { |sw| hash_sw_add(sw,nil); }
-    super;
+    argv = super;
+    
+    return @mash;
   end
   
   def parse!(*argv)
-    @hash = {};
+    @mash.clear();
     top.list.each { |sw| hash_sw_add(sw,nil); }
-    super;
+    argv = super;
+    
+    return [ argv,@mash ];
   end
 
   # ----------------------------------------------------------------------------
   # Borrowed from optparse.rb
-  #   (author of optparse.rb is Nobu Nakada-san, thank you!)
+  #   (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
@@ -119,14 +124,9 @@ class OptionParshie < OptionParser
   end
 
   def method_missing(name,*args)
-    name = name.to_s();
-    if (@hash.key?(name))
-      return @hash[name];
-    else
-      super;
-    end
+    return @mash.send(name);
   end
 
-  attr_reader :hash;
+  attr_reader :mash;
   private :hash_key_sanitize, :hash_sw_add;
 end

data/optparshie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "optparshie"
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["lpm11"]
-  s.date = "2011-11-02"
+  s.date = "2011-11-17"
   s.description = "OptionParser with Hashie::Mash like accessibility."
   s.email = "lpm11r@gmail.com"
   s.extra_rdoc_files = [
@@ -40,17 +40,20 @@ Gem::Specification.new do |s|
     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"])
     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"])
     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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparshie
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &4219380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *4219380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11248460 !ruby/object:Gem::Requirement
+  requirement: &3800500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *11248460
+  version_requirements: *3800500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11247980 !ruby/object:Gem::Requirement
+  requirement: &3797220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11247980
+  version_requirements: *3797220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11247500 !ruby/object:Gem::Requirement
+  requirement: &3915680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *11247500
+  version_requirements: *3915680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &11247020 !ruby/object:Gem::Requirement
+  requirement: &3865940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11247020
+  version_requirements: *3865940
 description: OptionParser with Hashie::Mash like accessibility.
 email: lpm11r@gmail.com
 executables: []
@@ -90,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1411168550154607844
+      hash: -1667869224629055928
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: