getopt-declare 1.31 → 1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32dd881f507e3cc2dc55780ba052ca6b09789396
-  data.tar.gz: 19e4fc6b1ece3315fbd9383b4ac5f0fd86d65427
+  metadata.gz: 9f756b7c73f03f47078ec705e96b26f18e8ff369
+  data.tar.gz: 553b0ec0a4d39bc1ccd2035ec2196425400b8143
 SHA512:
-  metadata.gz: 0b5d5c07014591e5e929c6f6026a16dde339cde8c4adbfb4f8ade9e48c6cf2cd90cfc2aa4640e9c8571119495b281228f0a8aff3253b1046cc35bfe65111dda1
-  data.tar.gz: e1c8b0a43a262962aa16a3e21eeb80d0eaf6b12e698d76ab86dd2e71f35670698e256ca508aaa7c66734ce9191ccc49b41e0d8055c6812910c53eae0a987a8dc
+  metadata.gz: bb52eeff9ded0b89f4ab3937273b268a60b6f9e569669e4f3fe1284bf51d6f53036992fbc1d820932f39d0464001f55b66a0a41161433588a37f72110591a6e3
+  data.tar.gz: 2280346006e7015ee25a0c1548a554db615d0022e3aa80c087920607f91ec37dd04429953d94c4a60f91869d1ea53ab980aedc73d6f784868805cdd31e70cb43

data/getopt-declare.gemspec

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

data/lib/Getopt/Declare.rb

@@ -71,7 +71,7 @@ module Getopt
   # Main Class
   class Declare
 
-    VERSION = '1.28'
+    VERSION = '1.32'
 
     # For debugging, use [debug] and it will output the ruby code as .CODE.rb
     @@debug = false
@@ -1617,6 +1617,8 @@ end
 if _FOUND_['% + arg.name + %q%'] && !(% + arg.found_requires +
 	      %q%)
    $stderr.puts "Error#{@source}: parameter '% + arg.name + %q%' can only be specified with '% + arg.requires + %q%'"
+   _FOUND_['% + arg.name + %q%'] = nil
+   @args['% + arg.name + %q%'] = nil
    _errors += 1
 end
             %

data/test/test_cmdline_array.rb

@@ -49,15 +49,5 @@ EOF
     assert_equal( ['crapola'], @args.unused )
   end
 
-  def test_usage
-    usage = @args.usage
-    # We don't check first lines, as they contain date
-    usage.sub!(/.*Options:\n/m, '')
-    assert_equal( <<"EOF", usage )
-                -v <value> [etc]        One or more values
-                <infile>                Input file
-                -o <outfiles>...        Output files
-EOF
-  end
 
 end

data/test/test_cmdline_mid.rb

@@ -22,8 +22,8 @@ class TC_Mid < Test::Unit::TestCase
 		e <w:i>x<h:i>	Expand image to height <h> and width <w>
   					{ }
 		-F <file>...	Process named file(s)
-  					{ defer { file.each {|i| 
-                                                  process(i) } } }
+  					{ defer { file.each {|j| 
+                                                  process(j) } } }
 		=getrand [<n:i>]	Get a random number
 				(or, optionally, <n> of them)
   					{ n = 1 unless n }

data/test/test_cmdline_regex.rb

@@ -27,7 +27,10 @@ class TC_Regex < Test::Unit::TestCase
 -file <name:/\w*\.[A-Z]{3}/>	File name must have a three-
 				capital-letter extension
 -find <what:/(%T.)+/> ;	        look ahead test
+                              
 EOPARAM
+
+
   end
 
   def test_ar

data/test/test_cmdline_require.rb

@@ -22,6 +22,7 @@ class TC_Require < Test::Unit::TestCase
 
   def setup
     @args = Getopt::Declare.new(<<EOF, :build)
+    [debug]
 	-i <iterations:+i>	iteration count	
 	-q	add new task [ requires: -i ]	
 EOF
@@ -30,7 +31,7 @@ EOF
   def test_q_without_i
     begin
       @args.parse('-q')
-      assert_equal( nil, "Parsing of -q did not fail" )
+      assert_equal( nil, @args['-q'] )
     rescue
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: getopt-declare
 version: !ruby/object:Gem::Version
-  version: '1.31'
+  version: '1.32'
 platform: ruby
 authors:
 - Gonzalo Garramuno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies: []
 description: "\tA command-line parser using regular expressions.\n"
 email: ggarra13@gmail.com
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: getopt-declare
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A regex command-line parsing library.