clasp-ruby 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7715986763c851922433b19a5b08fd761f700bf9b65dfaf74c338e105d3188
-  data.tar.gz: 998e0fe0365c4ca7b11d2ae29269ea5d84fbf3cb65bab70cbe590072a339250c
+  metadata.gz: f92b789f37af02b75b9644ff0d68c2f8dc1fb37bed7372f85a2e3076bda3318c
+  data.tar.gz: 915b038fa26a675ff5adef533286ed89dd1637cab521d9d187eb2cc28eb60405
 SHA512:
-  metadata.gz: ea17e88ca07b892f2e20083e63c2973eb8c3d11a66a0d02f338b57dde312e807189178cc603fd1d4965fc53189656734ea024ade3d6229c7f4c438cfa1168de9
-  data.tar.gz: 5ca6e41aa2757ae84a8824737aae0d0baac6654c0c7b026f7c4159d0ad2edc8766643216d1e9448f53f6a2c10f5b9759988d289d803911889c8534e4ac34a0b0
+  metadata.gz: 14b4ed81618a5564af21068ed04f8443cb0e699763f3489d91deae285bf3e7b2e5a8b77e0331185cec751659772ddd6d54a3a93ac1ee98aaf05f0a11c12d78b4
+  data.tar.gz: 90b82b5a6b1553c540f8904dbc4c2b3fe7257a0c177fbb4cacc4004af9e46470f5f0af8e119a635cf25062ab1b41a7bee54c9c4a512e74a48807b9cda4da4779

data/lib/clasp/arguments.rb

@@ -491,6 +491,17 @@ class Arguments
 
 								resolved_name	=	"#$1#$2"
 								value			||=	$'
+
+								# now find the underlying (option) specification
+								specifications.each do |t|
+
+									if t.name == resolved_name or t.aliases.include? resolved_name
+
+										argument_spec	=	t
+
+										break
+									end
+								end
 							end
 
 							break

data/lib/clasp/specifications.rb

@@ -97,7 +97,7 @@ class FlagSpecification
 		case rhs
 		when self.class
 
-			;
+			return true if equal?(rhs)
 		else
 
 			return false
@@ -230,7 +230,7 @@ class OptionSpecification
 		case rhs
 		when self.class
 
-			;
+			return true if equal?(rhs)
 		else
 
 			return false
@@ -241,7 +241,7 @@ class OptionSpecification
 		return false unless help == rhs.help
 		return false unless values_range == rhs.values_range
 		return false unless default_value == rhs.default_value
-		return false unless required == rhs.required
+		return false unless required? == rhs.required?
 		return false unless required_message == rhs.required_message
 		return false unless extras == rhs.extras
 

data/lib/clasp/version.rb

@@ -51,7 +51,7 @@
 module CLASP
 
 	# Current version of the CLASP.Ruby library
-	VERSION				=	'0.20.0'
+	VERSION				=	'0.20.1'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/tc_arguments_1.rb

@@ -518,6 +518,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal '-o', args.options[0].given_name
 		assert_equal 1, args.options[0].given_hyphens
 		assert_equal Hash.new, args.options[0].extras
+		assert_equal specifications[0], args.options[0].argument_specification
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
@@ -541,6 +542,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal Hash.new, args.flags[0].extras
 
 		assert_equal 3, args.options.size
+		assert_equal 2, args.options[0].given_index
 		assert_equal '--option=value', args.options[0].to_s
 		assert_equal '--option', args.options[0].name
 		assert_equal 'o', args.options[0].given_label
@@ -548,6 +550,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal '-o', args.options[0].given_name
 		assert_equal 1, args.options[0].given_hyphens
 		assert_equal Hash.new, args.options[0].extras
+		assert_equal specifications[0], args.options[0].argument_specification
+		assert_equal 4, args.options[1].given_index
 		assert_equal '--option=special-value', args.options[1].to_s
 		assert_equal '--option', args.options[1].name
 		assert_equal 's', args.options[1].given_label
@@ -555,6 +559,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal '-s', args.options[1].given_name
 		assert_equal 1, args.options[1].given_hyphens
 		assert_equal Hash.new, args.options[1].extras
+		assert_equal specifications[0], args.options[1].argument_specification
+		assert_equal 5, args.options[2].given_index
 		assert_equal '--option=explicit-value', args.options[2].to_s
 		assert_equal '--option', args.options[2].name
 		assert_equal 's', args.options[2].given_label
@@ -562,6 +568,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal '-s', args.options[2].given_name
 		assert_equal 1, args.options[2].given_hyphens
 		assert_equal Hash.new, args.options[2].extras
+		assert_equal specifications[0], args.options[2].argument_specification
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clasp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Matt Wilson