getopt-declare 1.30 → 1.31

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 32dd881f507e3cc2dc55780ba052ca6b09789396
+  data.tar.gz: 19e4fc6b1ece3315fbd9383b4ac5f0fd86d65427
+SHA512:
+  metadata.gz: 0b5d5c07014591e5e929c6f6026a16dde339cde8c4adbfb4f8ade9e48c6cf2cd90cfc2aa4640e9c8571119495b281228f0a8aff3253b1046cc35bfe65111dda1
+  data.tar.gz: e1c8b0a43a262962aa16a3e21eeb80d0eaf6b12e698d76ab86dd2e71f35670698e256ca508aaa7c66734ce9191ccc49b41e0d8055c6812910c53eae0a987a8dc

data/getopt-declare.gemspec

@@ -1,23 +1,24 @@
 require "rubygems"
 
-spec = Gem::Specification.new do |spec|
+sp = Gem::Specification.new do |spec|
 	spec.name = "getopt-declare"
-	spec.version = '1.30'
+	spec.version = '1.31'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/getoptdeclare/'
 	spec.summary = 'A regex command-line parsing library.'
+	spec.license = 'GPL'
 	spec.require_path = "lib"
 	spec.files = 
 		     ['getopt-declare.gemspec'] +
                      Dir.glob("lib/Getopt/*.rb") + 
 		     Dir.glob("samples/*.rb") + Dir.glob("test/*.rb")
-	spec.description = <<-EOF
-	A command-line parser using regular expressions.
-EOF
 	spec.extra_rdoc_files = ["Manifest.txt", "README.txt"] + 
 				Dir.glob("docs/*/*")
 	spec.has_rdoc = true
 	spec.rubyforge_project = 'getopt-declare'
 	spec.required_ruby_version = '>= 1.8.0'
+	spec.description = <<-EOF
+	A command-line parser using regular expressions.
+EOF
 end

data/lib/Getopt/Declare.rb

@@ -1,3 +1,4 @@
+# -*- coding: iso-8859-1 -*-
 #
 #  Getopt::Declare - Declaratively Expressed Command-Line Arguments via Regular Expressions
 #
@@ -306,44 +307,44 @@ EOS
 	  end
 
 	code << "		  #{@name} = _VAL_\n"
-     end
+      end
 
      # Based on parameter type, default conversion to apply
-     def conversion
-       pat = @@stdtype[@type] ? @@stdtype[@type][:pattern] : ''
-       [ @type, pat ].each { |t|
-	 case t
-	 when /^\:0?(\+)?i$/
-	   return '.to_i'
-	 when /^\:0?(\+)?n$/
-	   return '.to_f'
-	 end
-       }
-       return nil
-     end
-
-     # Return string with code to cache argument in Getopt::Declare's cache
-     def cachecode(ownerflag, itemcount)
-       if itemcount > 1
-	 "		  @cache['#{ownerflag}']['<#{@name}>'] = #{@name}\n"
-       else
-	 "		  @cache['#{ownerflag}'] = #{@name}\n"
-       end
-     end
-
-     # Helps build regex that matches parameters of flags 
-     def trailer 
-       nil	# MEANS TRAILING PARAMETER VARIABLE (in Perl,was '')
-     end
-     
-     # Helps build regex that matches parameters of flags 
-     # Wraps parameter passed for #$1, etc. matching
-     def ows(g)
-       return '[\s|\0]*(' + g + ')' unless @nows
-       '('+ g +')'
-     end
-
-   end  # ScalarArg
+      def conversion
+        pat = @@stdtype[@type] ? @@stdtype[@type][:pattern] : ''
+        [ @type, pat ].each { |t|
+          case t
+          when /^\:0?(\+)?i$/
+            return '.to_i'
+          when /^\:0?(\+)?n$/
+            return '.to_f'
+          end
+        }
+        return nil
+      end
+      
+      # Return string with code to cache argument in Getopt::Declare's cache
+      def cachecode(ownerflag, itemcount)
+        if itemcount > 1
+          "		  @cache['#{ownerflag}']['<#{@name}>'] = #{@name}\n"
+        else
+          "		  @cache['#{ownerflag}'] = #{@name}\n"
+        end
+      end
+      
+      # Helps build regex that matches parameters of flags 
+      def trailer 
+        nil	# MEANS TRAILING PARAMETER VARIABLE (in Perl,was '')
+      end
+      
+      # Helps build regex that matches parameters of flags 
+      # Wraps parameter passed for #$1, etc. matching
+      def ows(g)
+        return '[\s|\0]*(' + g + ')' unless @nows
+        return '(' + g + ')'
+      end
+      
+    end  # ScalarArg
 
 
    # Class used to handle array arguments
@@ -644,12 +645,12 @@ EOS
 	code << ' and !_lastprefix'
       end
 
-      code <<'
+      code << '
               begin
                 catch(:param) do
                   _pos = _nextpos if _args
                   _PUNCT_ = {}
-             '
+              '
 
       if flag != ''
         # This boundary is to handle -- option, so that if user uses
@@ -684,20 +685,20 @@ EOS
       if @args
 	code << "\n"+'                 _args && _pos = gindex( _args, /\G'
 
-	@args.each_with_index { |arg, i|
-	  code << arg.ows(arg.matcher(trailer[i]))
+	@args.each_with_index { |arg, j|
+	  code << arg.ows(arg.matcher(trailer[j]))
 	}
 
 	code << '/x' + nocasei + ", _pos ) or throw(:paramout)\n"
       end # if @args
 
-      @args.each_with_index { |arg, i|
-	code << arg.code(i,mod)	#, $flag ????
+      @args.each_with_index { |arg, j|
+	code << arg.code(j,mod)	#, $flag ????
       }
 
       if flag
 	mutexlist = owner.mutex[flag] ? 
-	(  owner.mutex[flag].map {|i| "'#{i}'"} ).join(',') : ''
+	(  owner.mutex[flag].map {|j| "'#{j}'"} ).join(',') : ''
 
 	code << "
                   if _invalid.has_key?('#{flag}')
@@ -872,8 +873,6 @@ EOS
     if desc =~ /\[\s*no\s*case\s*\]/i
       if arg
 	arg.nocase = true
-      else 
-	nocase = true
       end
     end
 
@@ -1101,10 +1100,10 @@ EOS
 
         # Check for GNU spec line like:  -d, --debug
         arg = nil
-        if spec =~ /(-[\w_\d]+),\s+(--?[\w_\d]+)(\s+.*)?/
+        if spec =~ /(-[\w]+),\s+(--?[\w]+)(\s+.*)?/
           specs = ["#$1#$3", "#$2#$3"]
-          specs.each { |spec|
-            arg = Arg.new(spec,desc,ditto)
+          specs.each { |sp|
+            arg = Arg.new(sp,desc,ditto)
             _args.push( arg )
             _infer(desc, arg, _mutex)
             ditto = arg
@@ -1430,7 +1429,7 @@ EOS
     
     header << "Options:\n" unless decfirst && decfirst == 1
     
-    usage.sub!(/[\s\n]+\Z/m, '')
+    usage.sub!(/[\s]+\Z/m, '')
 
     pager = $stdout
 
@@ -1656,7 +1655,7 @@ end
 ## cannot just assign unused to ARGV in ruby
 unless @source != ''
   ARGV.clear
-  @unused.map { |i| ARGV.push(i) }
+  @unused.map { |j| ARGV.push(j) }
 end
 
 unless _errors > 0
@@ -1734,6 +1733,6 @@ end
   attr :clump
   attr :source
 
- end # class Declare
+  end # class Declare
 
 end # module Getopt

data/lib/Getopt/DelimScanner.rb

@@ -109,6 +109,7 @@ class DelimScanner
     def self.def_casting_delegators( *methods )
         methods.each {|methodName|
             class_eval( <<-EOF, "(--def_casting_delegators--)", 1 )
+                undef :#{methodName}
                 def #{methodName}( pattern )
                     pattern = pattern.to_s.to_re unless pattern.is_a?( Regexp )
                     @scanner.#{methodName}( pattern )
@@ -731,7 +732,7 @@ class DelimScanner
                  failmode.inspect, bad.inspect, ignore.inspect
 
         rdelspec = ''
-        openTagPos, textPos, paraPos, closeTagPos, endPos = ([nil] * 5)
+        openTagPos, textPos, paraPos, closeTagPos, = ([nil] * 5)
         match = nil
 
         # Look for the prefix
@@ -854,7 +855,7 @@ class DelimScanner
             startPos, prefix.inspect, matchRawRegex.inspect
 
         # Init position markers
-        rval = oppos = preldpos = ldpos = strpos = rdpos = modpos = nil
+        rval = oppos = ldpos = strpos = rdpos = modpos = nil
 
         # Look for the prefix
         raise MatchFailure, "Did not find prefix: /#{prefix.inspect}/" unless

data/samples/requires.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+
+require "Getopt/Declare"
+
+
+spec = Getopt::Declare.new <<EOF
+	-i <iterations:+i>	iteration count	
+	-q	add new task [requires: -i]	
+EOF
+

metadata

@@ -1,103 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: getopt-declare
-version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: 
-  segments: 
-  - 1
-  - 30
-  version: "1.30"
+version: !ruby/object:Gem::Version
+  version: '1.31'
 platform: ruby
-authors: 
+authors:
 - Gonzalo Garramuno
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-17 00:00:00 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies: []
-
 description: "\tA command-line parser using regular expressions.\n"
 email: ggarra13@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- Manifest.txt
+- README.txt
+files:
 - Manifest.txt
 - README.txt
-files: 
 - getopt-declare.gemspec
 - lib/Getopt/Declare.rb
-- lib/Getopt/DelimScanner.rb
 - lib/Getopt/Declare2.rb
+- lib/Getopt/DelimScanner.rb
+- samples/cmdline_array.rb
 - samples/cmdline_basic.rb
-- samples/cmdline_usage.rb
-- samples/cmdline_regex.rb
-- samples/demo_cmdline.rb
 - samples/cmdline_code.rb
-- samples/demo_csv.rb
-- samples/demo_shell.rb
-- samples/cmdline_pvtype.rb
-- samples/demo_interp.rb
+- samples/cmdline_defer.rb
+- samples/cmdline_file.rb
+- samples/cmdline_finish.rb
+- samples/cmdline_inlines.rb
+- samples/cmdline_mid.rb
 - samples/cmdline_noargv.rb
 - samples/cmdline_parameters.rb
+- samples/cmdline_pvtype.rb
 - samples/cmdline_pvtype2.rb
-- samples/cmdline_inlines.rb
-- samples/cmdline_file.rb
-- samples/cmdline_defer.rb
-- samples/cmdline_array.rb
-- samples/cmdline_mid.rb
+- samples/cmdline_regex.rb
 - samples/cmdline_singles.rb
-- samples/cmdline_finish.rb
-- test/test_cmdline_mid.rb
-- test/test_cmdline_pvtype.rb
-- test/test_cmdline_basic.rb
+- samples/cmdline_usage.rb
+- samples/demo_cmdline.rb
+- samples/demo_csv.rb
+- samples/demo_interp.rb
+- samples/demo_shell.rb
+- samples/requires.rb
 - test/test_cluster_singles.rb
-- test/test_cmdline_regex.rb
-- test/test_cmdline_require.rb
-- test/test_cmdline_pvtype2.rb
 - test/test_cmdline_array.rb
+- test/test_cmdline_basic.rb
 - test/test_cmdline_cmdline.rb
-- test/test_demo_csv.rb
 - test/test_cmdline_finish.rb
+- test/test_cmdline_mid.rb
 - test/test_cmdline_parameters.rb
-- Manifest.txt
-- README.txt
+- test/test_cmdline_pvtype.rb
+- test/test_cmdline_pvtype2.rb
+- test/test_cmdline_regex.rb
+- test/test_cmdline_require.rb
+- test/test_demo_csv.rb
 homepage: http://www.rubyforge.org/projects/getoptdeclare/
-licenses: []
-
+licenses:
+- GPL
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 55
-      segments: 
-      - 1
-      - 8
-      - 0
+    - !ruby/object:Gem::Version
       version: 1.8.0
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: getopt-declare
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A regex command-line parsing library.
 test_files: []
-