clasp-ruby 0.22.0.1 → 0.23.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bdf2add70e2d8e134e6759718fabde89ecb5c158
-  data.tar.gz: dcf9e41a17a28f53406daef64bdba1f614f2a080
+SHA256:
+  metadata.gz: 1e021c90f3ea92340418a827f98a4fcb3c3f1369b023b0374f90e224acb8f01c
+  data.tar.gz: 62ed469712505ebbf289e7b642e48525f37f21dc1223cf8f13dca107f3b1a1f4
 SHA512:
-  metadata.gz: d329ce03d0057446f877425faec12da111253f0bb51dbcd0d1e619d0f3e7f5dcc781b20b18ffbb65eb796011b3021d208e1d391881754ec3ecd61e6efad49186
-  data.tar.gz: 63873b0a897f4d854d6f4c80e5605cd68ebecdb4591361662cfa075292ac9c4a69ae8aa8f09ab97446db675fe5611cca41bc7ea83f01853bafb55722b5093fee
+  metadata.gz: 462eca92c73b9eefd0846cb64567d1b2071570789c0beb6cc0802e443e1e6a3c762ec39f57e438781d0b53e8d31310dc765a8e108d77ff989795d24bae7c1239
+  data.tar.gz: e7b1b47f51ea4e724412e2ffa634a1e8e47118f00f32b133735656c98f0e9b18c3286b1b77ba7e409545340e248b50c187c1939e6275a34ee36025ad17eb7b81

data/lib/clasp/arguments.rb

@@ -6,12 +6,13 @@
 #               CLASP.Ruby
 #
 # Created:      14th February 2014
-# Updated:      20th April 2019
+# Updated:      24th July 2022
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
 # Author:       Matthew Wilson
 #
+# Copyright (c) 2019-2022, Matthew Wilson and Synesis Information Systems
 # Copyright (c) 2014-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
@@ -418,7 +419,7 @@ class Arguments
 
 		specifications		=	nil if specifications and specifications.empty?
 
-		flags, options, values = Arguments.parse_(argv, specifications)
+		flags, options, values, double_slash_index = Arguments.parse_(argv, specifications)
 
 		[ flags, options, values ].each do |ar|
 
@@ -455,6 +456,8 @@ class Arguments
 		@options	=	options.freeze
 		@values		=	values.freeze
 
+		@double_slash_index = double_slash_index
+
 		# do argv-mutation, if required
 		if init_opts[:mutate_argv]
 
@@ -484,6 +487,8 @@ class Arguments
 		options	=	[]
 		values	=	[]
 
+		double_slash_index = nil
+
 		forced_value		=	false
 		pending_option		=	nil
 
@@ -495,6 +500,9 @@ class Arguments
 
 					# all subsequent arguments are values
 					forced_value = true
+
+					double_slash_index = index if double_slash_index.nil?
+
 					next
 				end
 
@@ -575,7 +583,7 @@ class Arguments
 							# convert to argv and invoke
 							flags_argv = flag_aliases.map { |s| s.name }
 
-							grp_flags, grp_options, grp_value = Arguments.parse_(flags_argv, specifications)
+							grp_flags, grp_options, grp_value, grp_double_slash_index = Arguments.parse_(flags_argv, specifications)
 
 							grp_flags.map! { |f| FlagArgument.new(arg, index, given_name, f.name, f.argument_specification, hyphens.size, given_label, argument_spec ? argument_spec.extras : nil) }
 							grp_options.map! { |o| OptionArgument.new(arg, index, given_name, o.name, o.argument_specification, hyphens.size, given_label, o.value, argument_spec ? argument_spec.extras : nil) }
@@ -640,7 +648,7 @@ class Arguments
 
 		end
 
-		return flags, options, values
+		return flags, options, values, double_slash_index
 	end
 
 	# ######################
@@ -662,6 +670,9 @@ class Arguments
 	# (Array) a frozen array of values
 	attr_reader :values
 
+	# (Integer, +nil+) index of the first '--', if present; +nil+ otherwise
+	attr_reader :double_slash_index
+
 	# (Array) the (possibly mutated) array of arguments instance passed to new
 	attr_reader :argv
 

data/lib/clasp/version.rb

@@ -5,13 +5,13 @@
 # Purpose:      Version for CLASP.Ruby library
 #
 # Created:      16th November 2014
-# Updated:      22nd August 2020
+# Updated:      1st December 2023
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2019-2020, Matthew Wilson and Synesis Information Systems
+# Copyright (c) 2019-2023, Matthew Wilson and Synesis Information Systems
 # Copyright (c) 2014-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
@@ -52,7 +52,7 @@
 module CLASP
 
 	# Current version of the CLASP.Ruby library
-	VERSION				=	'0.22.0.1'
+	VERSION				=	'0.23.0.1'
 
 	private
 	# @!visibility private

data/test/unit/tc_arguments_1.rb

@@ -17,6 +17,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 0, args.options.size
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_one_value
@@ -29,6 +31,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_two_values
@@ -42,6 +46,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 2, args.values.size
 		assert_equal 'value1', args.values[0]
 		assert_equal 'val2', args.values[1]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_ten_values
@@ -58,6 +64,8 @@ class Test_Arguments < Test::Unit::TestCase
 		(0 ... argv.size).each do |n|
 			assert_equal argv[n], args.values[n]
 		end
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_one_flag
@@ -77,6 +85,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 0, args.options.size
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_two_flags
@@ -104,6 +114,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 0, args.options.size
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_three_flags
@@ -139,6 +151,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 0, args.options.size
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_one_option
@@ -159,6 +173,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal Hash.new, args.options[0].extras
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_two_options
@@ -186,6 +202,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal Hash.new, args.options[1].extras
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_three_options
@@ -221,6 +239,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal Hash.new, args.options[2].extras
 
 		assert_equal 0, args.values.size
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_one_flag_and_one_option_and_one_value
@@ -247,6 +267,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_double_hyphen_1
@@ -267,6 +289,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 2, args.values.size
 		assert_equal 'value1', args.values[0]
 		assert_equal '-f2', args.values[1]
+
+		assert_equal 2, args.double_slash_index
 	end
 
 	def test_double_hyphen_2
@@ -289,6 +313,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal '-f2', args.values[1]
 		assert_equal '--', args.values[2]
 		assert_equal '--option1=v1', args.values[3]
+
+		assert_equal 2, args.double_slash_index
 	end
 
 	def test_double_hyphen_3
@@ -320,6 +346,8 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 2, args.values.size
 		assert_equal 'value1', args.values[0]
 		assert_equal 'value2', args.values[1]
+
+		assert_equal 3, args.double_slash_index
 	end
 
 	def test_flag_specifications_1
@@ -355,6 +383,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_flag_specifications_2
@@ -392,6 +422,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_flag_specifications_3
@@ -436,6 +468,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_specifications_1
@@ -463,6 +497,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_specifications_2
@@ -492,6 +528,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_specifications_3
@@ -522,6 +560,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_default_specifications_1
@@ -572,6 +612,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_default_specifications_2
@@ -633,6 +675,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 
 	def test_option_default_specifications_3
@@ -694,6 +738,8 @@ class Test_Arguments < Test::Unit::TestCase
 
 		assert_equal 1, args.values.size
 		assert_equal 'value1', args.values[0]
+
+		assert_nil args.double_slash_index
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clasp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.22.0.1
+  version: 0.23.0.1
 platform: ruby
 authors:
 - Matt Wilson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-22 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xqsr3
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.38'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.30'
+        version: '0.38'
 description: |
   Command-Line Argument Sorting and Parsing library that provides a powerful
   abstraction of command-line interpretation facilities. CLASP.Ruby is a Ruby port of the popular CLASP (C/C++) library, and provides declarative specification of command-line flags and options, aliasing, flag combination, UNIX de-facto standard flag processing, and a number of utility functions for expressing usage and version information.
@@ -77,7 +77,7 @@ homepage: http://github.com/synesissoftware/CLASP.Ruby
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,15 +86,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.5
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: CLASP.Ruby
 test_files: []