clasp-ruby 0.18.0 → 0.18.1

data/examples/{flag_and_option_aliases.md → flag_and_option_specifications.md}

@@ -2,14 +2,14 @@
 
 ## Summary
 
-Example illustrating various kinds of *flag* and *option* aliases, including the combination of short-names.
+Example illustrating various kinds of *flag* and *option* specifications, including the combination of short-names.
 
 ## Source
 
 ```ruby
 #!/usr/bin/env ruby
 
-# examples/flag_and_option_aliases.rb
+# examples/flag_and_option_specifications.rb
 
 # requires
 
@@ -23,11 +23,11 @@ InfoLines = [
 
     'CLASP.Ruby examples',
     :version,
-    "Illustrates use of CLASP.Ruby's use of flags, options, and aliases",
+    "Illustrates use of CLASP.Ruby's use of flags, options, and specifications",
     '',
 ]
 
-# Specify aliases, parse, and checking standard flags
+# Specify specifications, parse, and checking standard flags
 
 Flag_Debug = CLASP.Flag('--debug', alias: '-d', help: 'runs in Debug mode')
 Option_Verbosity = CLASP.Option('--verbosity', alias: '-v', help: 'specifies the verbosity', values: [ 'terse', 'quiet', 'silent', 'chatty' ])
@@ -87,13 +87,13 @@ end
 If executed with no arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb
+    ruby examples/flag_and_option_specifications.rb
 ```
 
 or (in a Unix shell):
 
 ```
-    ./examples/flag_and_option_aliases.rb
+    ./examples/flag_and_option_specifications.rb
 ```
 
 it gives the output:
@@ -106,17 +106,17 @@ it gives the output:
 If executed with the arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb --help
+    ruby examples/flag_and_option_specifications.rb --help
 ```
 
 it gives the output:
 
 ```
 CLASP.Ruby examples
-flag_and_option_aliases.rb 0.0.1
+flag_and_option_specifications.rb 0.0.1
 Illustrates use of CLASP.Ruby's use of flags, options, and aliases
 
-USAGE: flag_and_option_aliases.rb [ ... flags and options ... ]
+USAGE: flag_and_option_specifications.rb [ ... flags and options ... ]
 
 flags/options:
 
@@ -146,7 +146,7 @@ flags/options:
 If executed with the arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb --debug --verbosity=silent
+    ruby examples/flag_and_option_specifications.rb --debug --verbosity=silent
 ```
 
 it gives the output:
@@ -161,7 +161,7 @@ Debug mode is specified
 If executed with the arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb -v silent -d
+    ruby examples/flag_and_option_specifications.rb -v silent -d
 ```
 
 it gives the (same) output:
@@ -176,7 +176,7 @@ Debug mode is specified
 If executed with the arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb -c -d
+    ruby examples/flag_and_option_specifications.rb -c -d
 ```
 
 it gives the output:
@@ -191,7 +191,7 @@ Debug mode is specified
 If executed with the arguments
 
 ```
-    ruby examples/flag_and_option_aliases.rb -dc
+    ruby examples/flag_and_option_specifications.rb -dc
 ```
 
 it gives the (same) output:

data/examples/{flag_and_option_aliases.rb → flag_and_option_specifications.rb}

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# examples/flag_and_option_aliases.rb
+# examples/flag_and_option_specifications.rb
 
 # requires
 
@@ -18,7 +18,7 @@ InfoLines = [
     '',
 ]
 
-# Specify aliases, parse, and checking standard flags
+# Specify specifications, parse, and checking standard flags
 
 Flag_Debug = CLASP.Flag('--debug', alias: '-d', help: 'runs in Debug mode')
 Option_Verbosity = CLASP.Option('--verbosity', alias: '-v', help: 'specifies the verbosity', values: [ 'terse', 'quiet', 'silent', 'chatty' ])

data/examples/show_usage_and_version.md

@@ -27,7 +27,7 @@ InfoLines = [
     '',
 ]
 
-# Specify aliases, parse, and checking standard flags
+# Specify specifications, parse, and checking standard flags
 
 Specifications = [
 

data/examples/show_usage_and_version.rb

@@ -18,7 +18,7 @@ InfoLines = [
     '',
 ]
 
-# Specify aliases, parse, and checking standard flags
+# Specify specifications, parse, and checking standard flags
 
 Specifications = [
 

data/lib/clasp/arguments.rb

@@ -6,7 +6,7 @@
 #               CLASP.Ruby
 #
 # Created:      14th February 2014
-# Updated:      10th April 2019
+# Updated:      11th April 2019
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
@@ -46,7 +46,7 @@
 
 
 
-require File.join(File.dirname(__FILE__), 'aliases.rb')
+require File.join(File.dirname(__FILE__), 'specifications.rb')
 
 require 'yaml'
 
@@ -575,7 +575,7 @@ class Arguments
 
 		raise ArgumentError, "options must be nil or Hash - #{option.class} given" unless options.is_a? ::Hash
 
-		specifications	=	options[:aliases] || @specifications
+		specifications	=	options[:specifications] || options[:aliases] || @specifications
 
 		raise ArgumentError, "specifications may not be nil" if specifications.nil?
 

data/lib/clasp/clasp.rb

@@ -5,13 +5,13 @@
 # Purpose:      Common 'require file' for CLASP.Ruby library
 #
 # Created:      14th February 2014
-# Updated:      16th April 2016
+# Updated:      11th April 2019
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2014-2016, Matthew Wilson and Synesis Software
+# Copyright (c) 2014-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46,9 +46,10 @@
 
 
 require 'clasp/arguments'
-require 'clasp/aliases'
+require 'clasp/specifications'
 require 'clasp/cli'
 require 'clasp/version'
 
 # ############################## end of file ############################# #
 
+

data/lib/clasp/cli.rb

@@ -5,7 +5,7 @@
 # Purpose:      Command-line interface
 #
 # Created:      27th July 2015
-# Updated:      10th April 2019
+# Updated:      11th April 2019
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
@@ -64,7 +64,7 @@ module CLI_helpers_
 
 	module Constants
 
-		VALID_ALIAS_TYPES			=	[ FlagSpecification, OptionSpecification, Specification ]
+		VALID_ALIAS_TYPES			=	[ FlagSpecification, OptionSpecification, AliasSpecification ]
 		VALID_ALIAS_TYPES_STRING	=	VALID_ALIAS_TYPES[0...-1].join(', ') + ', or ' + VALID_ALIAS_TYPES[-1].to_s
 	end # module Constants
 
@@ -188,7 +188,7 @@ def self.show_usage specifications, options={}
 
 	fas				=	{}
 
-	specifications.select { |a| Specification === a }.each do |a|
+	specifications.select { |a| AliasSpecification === a }.each do |a|
 
 		fas[a.name]	=	[] unless fas.has_key? $1
 		fas[a.name]	<<	a
@@ -208,7 +208,7 @@ def self.show_usage specifications, options={}
 		specifications.each do |a|
 
 			case a
-			when Specification
+			when AliasSpecification
 
 				next
 			when FlagSpecification

data/lib/clasp/doc_.rb

@@ -5,7 +5,7 @@
 # Purpose:      Documentation of the CLASP.Ruby modules
 #
 # Created:      11th June 2016
-# Updated:      14th February 2019
+# Updated:      11th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -51,7 +51,7 @@
 #
 # === Examples
 #
-# ==== Simple command-line, no aliases
+# ==== Simple command-line, no specifications
 #
 #     argv = %w{ --show-all=true infile -c outfile }
 #
@@ -82,7 +82,7 @@
 #
 # ==== Use of flag short forms
 #
-#     aliases = [
+#     specifications = [
 #
 #       CLASP.Flag('--verbose', alias: '-v'),
 #       CLASP.Flag('--trace-output', aliases: [ '-t', '--trace' ]),
@@ -90,7 +90,7 @@
 #
 #     argv = %w{ -trace -v }
 #
-#     args = CLASP::Arguments.new(argv, aliases)
+#     args = CLASP::Arguments.new(argv, specifications)
 #
 #     puts args.flags.size        # => 2
 #     puts args.flags[0].name     # => "--trace-output"
@@ -100,7 +100,7 @@
 #
 # ==== Use of flag single short forms combined
 #
-#     aliases = [
+#     specifications = [
 #
 #       CLASP.Flag('--expand', alias: '-x'),
 #       CLASP.Flag('--verbose', alias: '-v'),
@@ -109,7 +109,7 @@
 #
 #     argv = %w{ -tvx }
 #
-#     args = CLASP::Arguments.new(argv, aliases)
+#     args = CLASP::Arguments.new(argv, specifications)
 #
 #     puts args.flags.size        # => 3
 #     puts args.options.size      # => 0
@@ -117,14 +117,14 @@
 #
 # ==== Use of option short form
 #
-#     aliases = [
+#     specifications = [
 #
 #       CLASP.Option('--show-all', alias: '-a'),
 #     ]
 #
 #     argv = %w{ -c -a true infile outfile }
 #
-#     args = CLASP::Arguments.new(argv, aliases)
+#     args = CLASP::Arguments.new(argv, specifications)
 #
 #     puts args.flags.size         # => 1
 #     puts args.flags[0]           # => "#<CLASP::Arguments::FlagArgument:0x007f8593b0ddd8 @arg="-c", @given_index=0, @given_name="-c", @argument_alias=nil, @given_hyphens=1, @given_label="c", @name="-c", @extras={}>"

data/lib/clasp/{aliases.rb → specifications.rb}

@@ -1,6 +1,6 @@
 
 # ######################################################################## #
-# File:         clasp/aliases.rb
+# File:         clasp/specifications.rb
 #
 # Purpose:      Argument specification classes
 #
@@ -198,7 +198,7 @@ class OptionSpecification
 end
 
 # A class that represents an explicit alias for a flag or an option
-class Specification
+class AliasSpecification
 
 	def initialize(name, aliases)
 
@@ -379,13 +379,13 @@ def CLASP.Alias(name, *args)
 		aliases	=	args
 	end
 
-	CLASP::Specification.new name, aliases
+	CLASP::AliasSpecification.new name, aliases
 end
 
 # ######################################################################## #
 # backwards-compatible
 
-Alias		=	Specification
+Alias		=	AliasSpecification
 Flag		=	FlagSpecification
 FlagAlias	=	FlagSpecification
 Option		=	OptionSpecification

data/lib/clasp/version.rb

@@ -5,7 +5,7 @@
 # Purpose:      Version for CLASP.Ruby library
 #
 # Created:      16th November 2014
-# Updated:      10th April 2019
+# Updated:      11th April 2019
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
@@ -51,7 +51,7 @@
 module CLASP
 
 	# Current version of the CLASP.Ruby library
-	VERSION				=	'0.18.0'
+	VERSION				=	'0.18.1'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:
@@ -67,3 +67,4 @@ end # module CLASP
 
 # ############################## end of file ############################# #
 
+

data/test/scratch/{test_aliases.rb → test_specifications.rb}

@@ -8,13 +8,13 @@ Specifications = [
 
 	CLASP.Flag('--help', help: 'shows this help and quits'),
 	CLASP.Flag('--version', alias: '-v', help: 'shows this version and quits'),
-	CLASP.Specification('--version', aliases: [ '-ver', '-V' ]),
+	CLASP.Alias('--version', aliases: [ '-ver', '-V' ]),
 
 	CLASP.Option('--directory', alias: '-d', help: 'a directory within which to process'),
 	CLASP.Option('--patterns', alias: '-p', help: "one or more patterns against which the entries will be matched, separated by '|' or the platform-specific separator - ':' UNIX, ';' Windows"),
 
 	CLASP.Option('--case-sensitive', alias: '-c', help: 'determines whether case sensitive', values_range: %W{ yes no true false }, default_value: false),
-	CLASP.Specification('--case-sensitive=false', alias: '-I'),
+	CLASP.Alias('--case-sensitive=false', alias: '-I'),
 ]
 
 Arguments	=	CLASP::Arguments.new(ARGV, Specifications)

data/test/scratch/test_usage_from_DATA.rb

@@ -10,12 +10,12 @@ puts
 puts '*' * 40
 puts 'usage:'
 puts
-CLASP.show_usage(Arguments.aliases)
+CLASP.show_usage(Arguments.specifications)
 puts '*' * 40
 
 puts 'version:'
 puts
-CLASP.show_version Arguments.aliases, version: [ 1, 2, 3 ]
+CLASP.show_version Arguments.specifications, version: [ 1, 2, 3 ]
 puts '*' * 40
 
 __END__

data/test/unit/tc_ARGV_rewrite.rb

@@ -10,13 +10,13 @@ class Test_Arguments_4 < Test::Unit::TestCase
 
 	def test_ARGV_rewrite_1
 
-		aliases	=	nil
+		specifications	=	nil
 		argv	=	[ 'val1', '-f1', 'val2', '--' ]
 
 		assert_equal 'val1|-f1|val2|--', argv.join('|')
 
 		argv_c	=	argv.dup
-		args	=	CLASP::Arguments.new argv, aliases
+		args	=	CLASP::Arguments.new argv, specifications
 
 		assert_equal 'val1|-f1|val2|--', argv.join('|')
 
@@ -39,10 +39,10 @@ class Test_Arguments_4 < Test::Unit::TestCase
 
 	def test_ARGV_rewrite_2
 
-		aliases	=	nil
+		specifications	=	nil
 		argv	=	[ 'val1', '-f1', 'val2', '--' ]
 		argv_c	=	argv.dup
-		args	=	CLASP::Arguments.new argv, aliases, mutate_argv: false
+		args	=	CLASP::Arguments.new argv, specifications, mutate_argv: false
 
 		assert_equal 1, args.flags.size
 		assert_equal Hash.new, args.flags[0].extras

data/test/unit/tc_arguments_1.rb

@@ -293,11 +293,11 @@ class Test_Arguments < Test::Unit::TestCase
 
 	def test_double_hyphen_3
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--password', alias: '-p', extras: 'extra'),
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-p', '--', 'value2' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-p', '--', 'value2' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -322,11 +322,11 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value2', args.values[1]
 	end
 
-	def test_flag_aliases_1
+	def test_flag_specifications_1
 
-		aliases	=	[
+		specifications	=	[
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete' ], specifications
 
 		assert_equal 3, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -357,13 +357,13 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_flag_aliases_2
+	def test_flag_specifications_2
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Flag('--expand', alias: '-x')
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete' ], specifications
 
 		assert_equal 3, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -378,7 +378,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'x', args.flags[1].given_label
 		assert_equal '-x', args.flags[1].given_name
 		assert_equal 1, args.flags[1].given_hyphens
-		assert_equal aliases[0], args.flags[1].argument_alias
+		assert_equal specifications[0], args.flags[1].argument_alias
 		assert_equal Hash.new, args.flags[1].extras
 		assert_equal '--delete', args.flags[2].to_s
 		assert_equal '--delete', args.flags[2].name
@@ -394,13 +394,13 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_flag_aliases_3
+	def test_flag_specifications_3
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Flag('--expand', aliases: [ '-x', '--x' ], extras: %w{ e x t r a })
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete', '--x' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-x', '--delete', '--x' ], specifications
 
 		assert_equal 4, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -415,7 +415,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'x', args.flags[1].given_label
 		assert_equal '-x', args.flags[1].given_name
 		assert_equal 1, args.flags[1].given_hyphens
-		assert_equal aliases[0], args.flags[1].argument_alias
+		assert_equal specifications[0], args.flags[1].argument_alias
 		assert_equal [ 'e', 'x', 't', 'r', 'a' ], args.flags[1].extras
 		assert_equal '--delete', args.flags[2].to_s
 		assert_equal '--delete', args.flags[2].name
@@ -429,7 +429,7 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'x', args.flags[3].given_label
 		assert_equal '--x', args.flags[3].given_name
 		assert_equal 2, args.flags[3].given_hyphens
-		assert_equal aliases[0], args.flags[3].argument_alias
+		assert_equal specifications[0], args.flags[3].argument_alias
 		assert_equal [ 'e', 'x', 't', 'r', 'a' ], args.flags[3].extras
 
 		assert_equal 0, args.options.size
@@ -438,11 +438,11 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_aliases_1
+	def test_option_specifications_1
 
-		aliases	=	[
+		specifications	=	[
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o=value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o=value' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -465,13 +465,13 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_aliases_2
+	def test_option_specifications_2
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--option', aliases: [ '-o' ])
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o=value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o=value' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -494,13 +494,13 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_aliases_3
+	def test_option_specifications_3
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--option', aliases: [ '-o' ])
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -523,14 +523,14 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_default_aliases_1
+	def test_option_default_specifications_1
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--option', aliases: [ '-o' ]),
 			CLASP.Option('--option=special-value', alias: '-s')
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-s', '-s=explicit-value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-s', '-s=explicit-value' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-f1', args.flags[0].to_s
@@ -567,15 +567,15 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_default_aliases_2
+	def test_option_default_specifications_2
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--option', aliases: [ '-o' ]),
 			CLASP.Flag('--option=special-value', alias: '-s'),
 			CLASP.Flag('--verbose', alias: '-v'),
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-sv', '-s=explicit-value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-sv', '-s=explicit-value' ], specifications
 
 		assert_equal 2, args.flags.size
 		flag = args.flags[0]
@@ -628,15 +628,15 @@ class Test_Arguments < Test::Unit::TestCase
 		assert_equal 'value1', args.values[0]
 	end
 
-	def test_option_default_aliases_3
+	def test_option_default_specifications_3
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Option('--option', aliases: [ '-o' ]),
 			CLASP.Flag('--option=special-value', alias: '-s'),
 			CLASP.Flag('-v'),
 		]
-		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-sv', '-s=explicit-value' ], aliases
+		args	=	CLASP::Arguments.new [ '-f1', 'value1', '-o', 'value', '-sv', '-s=explicit-value' ], specifications
 
 		assert_equal 2, args.flags.size
 		flag = args.flags[0]

data/test/unit/tc_arguments_2.rb

@@ -10,9 +10,9 @@ class Test_Arguments_2 < Test::Unit::TestCase
 
 	def test_combined_flags_0
 
-		aliases	=	[
+		specifications	=	[
 		]
-		args	=	CLASP::Arguments.new [ '-abc' ], aliases
+		args	=	CLASP::Arguments.new [ '-abc' ], specifications
 
 		assert_equal 1, args.flags.size
 		assert_equal '-abc', args.flags[0].name
@@ -29,31 +29,31 @@ class Test_Arguments_2 < Test::Unit::TestCase
 
 	def test_combined_flags_1
 
-		aliases	=	[
+		specifications	=	[
 			CLASP.Flag('--a', alias: '-a'),
 			CLASP.Flag('--b', alias: '-b'),
 			CLASP.Flag('--c', alias: '-c'),
 		]
-		args	=	CLASP::Arguments.new [ '-abc' ], aliases
+		args	=	CLASP::Arguments.new [ '-abc' ], specifications
 
 		assert_equal 3, args.flags.size
 		assert_equal '--a', args.flags[0].name
 		assert_equal '--a', args.flags[0].to_s
 		assert_equal 'abc', args.flags[0].given_label
 		assert_equal 1, args.flags[0].given_hyphens
-		assert_equal aliases[0], args.flags[0].argument_alias
+		assert_equal specifications[0], args.flags[0].argument_alias
 		assert_equal Hash.new, args.flags[0].extras
 		assert_equal '--b', args.flags[1].name
 		assert_equal '--b', args.flags[1].to_s
 		assert_equal 'abc', args.flags[1].given_label
 		assert_equal 1, args.flags[1].given_hyphens
-		assert_equal aliases[1], args.flags[1].argument_alias
+		assert_equal specifications[1], args.flags[1].argument_alias
 		assert_equal Hash.new, args.flags[1].extras
 		assert_equal '--c', args.flags[2].name
 		assert_equal '--c', args.flags[2].to_s
 		assert_equal 'abc', args.flags[2].given_label
 		assert_equal 1, args.flags[2].given_hyphens
-		assert_equal aliases[2], args.flags[2].argument_alias
+		assert_equal specifications[2], args.flags[2].argument_alias
 		assert_equal Hash.new, args.flags[2].extras
 
 		assert_equal 0, args.options.size

data/test/unit/tc_cli.rb

@@ -14,9 +14,9 @@ class Test_CLI < Test::Unit::TestCase
 
 	def test_invalid_aliases_types
 
-		assert_raise_with_message(::TypeError, /each element in (?:aliases|specifications) array must be one of the types CLASP::FlagSpecification, CLASP::OptionSpecification, or CLASP::Specification/) { CLASP.show_usage([ 'abc', :def ]) }
+		assert_raise_with_message(::TypeError, /each element in (?:aliases|specifications) array must be one of the types CLASP::FlagSpecification, CLASP::OptionSpecification, or CLASP::AliasSpecification/) { CLASP.show_usage([ 'abc', :def ]) }
 
-		assert_raise_with_message(::TypeError, /each element in (?:aliases|specifications) array must be one of the types CLASP::FlagSpecification, CLASP::OptionSpecification, or CLASP::Specification/) { CLASP.show_version([ 'abc', :def ]) }
+		assert_raise_with_message(::TypeError, /each element in (?:aliases|specifications) array must be one of the types CLASP::FlagSpecification, CLASP::OptionSpecification, or CLASP::AliasSpecification/) { CLASP.show_version([ 'abc', :def ]) }
 	end
 end
 

data/test/unit/tc_examples_Arguments.rb

@@ -44,7 +44,7 @@ class Test_Examples < Test::Unit::TestCase
 
 	def test_UseOfFlagShortForms
 
-		aliases = [
+		specifications = [
 
 			CLASP.Flag('--verbose', alias: '-v'),
 			CLASP.Flag('--trace-output', aliases: [ '-t', '--trace' ]),
@@ -52,7 +52,7 @@ class Test_Examples < Test::Unit::TestCase
 
 		argv = %w{ --trace -v }
 
-		args = CLASP::Arguments.new(argv, aliases)
+		args = CLASP::Arguments.new(argv, specifications)
 
 		assert_equal 2, args.flags.size
 		flag = args.flags[0]
@@ -67,7 +67,7 @@ class Test_Examples < Test::Unit::TestCase
 
 	def test_UseOfFlagSingleShortFormsCombined
 
-		aliases = [
+		specifications = [
 
 			CLASP.Flag('--expand', alias: '-x'),
 			CLASP.Flag('--verbose', alias: '-v'),
@@ -76,7 +76,7 @@ class Test_Examples < Test::Unit::TestCase
 
 		argv = %w{ -tvx }
 
-		args = CLASP::Arguments.new(argv, aliases)
+		args = CLASP::Arguments.new(argv, specifications)
 
 		assert_equal 3, args.flags.size
 		flag = args.flags[0]
@@ -94,14 +94,14 @@ class Test_Examples < Test::Unit::TestCase
 
 	def test_UseOfOptionShortForm
 
-		aliases = [
+		specifications = [
 
 			CLASP.Option('--show-all', alias: '-a'),
 		]
 
 		argv = %w{ -c -a true infile outfile }
 
-		args = CLASP::Arguments.new(argv, aliases)
+		args = CLASP::Arguments.new(argv, specifications)
 
 		assert_equal 1, args.flags.size
 		flag = args.flags[0]
@@ -118,7 +118,7 @@ class Test_Examples < Test::Unit::TestCase
 
 	def test_UseOfFlagsAsSpecificationsForOption
 
-		aliases = [
+		specifications = [
 
 			CLASP.Flag('--dump-contents', alias: '-d'),
 			CLASP.Option('--log-level', alias: '-l'),
@@ -127,7 +127,7 @@ class Test_Examples < Test::Unit::TestCase
 
 		argv = %w{ myfile -dw }
 
-		args = CLASP::Arguments.new(argv, aliases)
+		args = CLASP::Arguments.new(argv, specifications)
 
 		assert_equal 1, args.flags.size
 		flag = args.flags[0]

data/test/unit/{tc_aliases.rb → tc_specifications.rb}

@@ -8,9 +8,9 @@ require 'test/unit'
 
 class Test_Specifications_1 < Test::Unit::TestCase
 
-	def test_option_with_two_flag_aliases
+	def test_option_with_two_flag_specifications
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP.Flag('--action=list', alias: '-l'),
             CLASP.Flag('--action=change', alias: '-c'),
@@ -21,7 +21,7 @@ class Test_Specifications_1 < Test::Unit::TestCase
 		begin
 
 			argv = []
-			args = CLASP::Arguments.new argv, aliases
+			args = CLASP::Arguments.new argv, specifications
 
 			assert_equal 0, args.flags.size
 			assert_equal 0, args.options.size
@@ -32,7 +32,7 @@ class Test_Specifications_1 < Test::Unit::TestCase
 		begin
 
 			argv = %w{ --action=action1 }
-			args = CLASP::Arguments.new argv, aliases
+			args = CLASP::Arguments.new argv, specifications
 
 			assert_equal 0, args.flags.size
 			assert_equal 1, args.options.size
@@ -46,7 +46,7 @@ class Test_Specifications_1 < Test::Unit::TestCase
 		begin
 
 			argv = %w{ -a action2 }
-			args = CLASP::Arguments.new argv, aliases
+			args = CLASP::Arguments.new argv, specifications
 
 			assert_equal 0, args.flags.size
 			assert_equal 1, args.options.size
@@ -60,7 +60,7 @@ class Test_Specifications_1 < Test::Unit::TestCase
 		begin
 
 			argv = %w{ -c }
-			args = CLASP::Arguments.new argv, aliases
+			args = CLASP::Arguments.new argv, specifications
 
 			assert_equal 0, args.flags.size
 			assert_equal 1, args.options.size

data/test/unit/tc_usage.rb

@@ -12,42 +12,42 @@ class Test_Usage < Test::Unit::TestCase
 
 	def test_empty_default
 
-		aliases	=	[]
+		specifications	=	[]
 
 		stream	=	StringIO.new
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog'
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog'
 
 		assert_equal "USAGE: myprog [ ... flags and options ... ]\n\n", stream.string
 	end
 
 	def test_empty_all
 
-		aliases	=	[]
+		specifications	=	[]
 
 		stream	=	StringIO.new
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog', flags_and_options: ''
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog', flags_and_options: ''
 
 		assert_equal "USAGE: myprog\n\n", stream.string
 	end
 
 	def test_empty_all_with_info_line_of_one_string
 
-		aliases	=	[]
+		specifications	=	[]
 
 		stream	=	StringIO.new
 
 		info	=	'myprog version'.freeze
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info
 
 		assert_equal "myprog version\nUSAGE: myprog\n\n", stream.string
 	end
 
 	def test_empty_all_with_info_lines
 
-		aliases	=	[]
+		specifications	=	[]
 
 		stream	=	StringIO.new
 
@@ -57,14 +57,14 @@ class Test_Usage < Test::Unit::TestCase
 			'version 1',
 		].freeze
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info_lines
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info_lines
 
 		assert_equal "Synesis Software My Program\nversion 1\nUSAGE: myprog\n\n", stream.string
 	end
 
 	def test_empty_all_with_info_lines_including_version
 
-		aliases	=	[]
+		specifications	=	[]
 
 		stream	=	StringIO.new
 
@@ -74,35 +74,35 @@ class Test_Usage < Test::Unit::TestCase
 			:version
 		].freeze
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info_lines, version: [ 1, 0, 1], version_prefix: 'v'
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog', flags_and_options: '', info_lines: info_lines, version: [ 1, 0, 1], version_prefix: 'v'
 
 		assert_equal "Synesis Software My Program\nmyprog v1.0.1\nUSAGE: myprog\n\n", stream.string
 	end
 
 	def test_one_alias_default
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP::Flag.Version
 		]
 
 		stream	=	StringIO.new
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog'
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog'
 
 		assert_equal "USAGE: myprog [ ... flags and options ... ]\n\nflags/options:\n\n\t--version\n\t\t#{CLASP::Flag.Version.help}\n\n", stream.string
 	end
 
 	def test_one_alias_all
 
-		aliases	=	[
+		specifications	=	[
 
 			CLASP::Flag.Version
 		]
 
 		stream	=	StringIO.new
 
-		CLASP.show_usage aliases, stream: stream, program_name: 'myprog', flags_and_options: ''
+		CLASP.show_usage specifications, stream: stream, program_name: 'myprog', flags_and_options: ''
 
 		assert_equal "USAGE: myprog\n\nflags/options:\n\n\t--version\n\t\t#{CLASP::Flag.Version.help}\n\n", stream.string
 	end

metadata

@@ -1,93 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: clasp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
+  prerelease: 
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xqsr3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.30'
-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.
+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.
+
+'
 email: matthew@synesis.com.au
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
 - examples/cr-example.rb
-- examples/flag_and_option_aliases.md
-- examples/flag_and_option_aliases.rb
+- examples/flag_and_option_specifications.md
+- examples/flag_and_option_specifications.rb
 - examples/show_usage_and_version.md
 - examples/show_usage_and_version.rb
-- lib/clasp-ruby.rb
-- lib/clasp.rb
-- lib/clasp/aliases.rb
 - lib/clasp/arguments.rb
 - lib/clasp/clasp.rb
 - lib/clasp/cli.rb
 - lib/clasp/doc_.rb
 - lib/clasp/old_module.rb
+- lib/clasp/specifications.rb
 - lib/clasp/version.rb
-- test/scratch/test_aliases.rb
+- lib/clasp-ruby.rb
+- lib/clasp.rb
 - test/scratch/test_list_command_line.rb
+- test/scratch/test_specifications.rb
 - test/scratch/test_usage.rb
 - test/scratch/test_usage_from_DATA.rb
-- test/scratch/test_usage_with_duplicate_aliases.rb
-- test/unit/tc_ARGV_rewrite.rb
-- test/unit/tc_aliases.rb
+- test/scratch/test_usage_with_duplicate_specifications.rb
 - test/unit/tc_arguments_1.rb
 - test/unit/tc_arguments_2.rb
 - test/unit/tc_arguments_3.rb
 - test/unit/tc_arguments_inspect.rb
+- test/unit/tc_ARGV_rewrite.rb
 - test/unit/tc_cli.rb
 - test/unit/tc_defaults_1.rb
 - test/unit/tc_examples_Arguments.rb
 - test/unit/tc_extras.rb
 - test/unit/tc_option_required.rb
+- test/unit/tc_specifications.rb
 - test/unit/tc_usage.rb
 - test/unit/ts_all.rb
+- README.md
+- LICENSE
 homepage: http://github.com/synesissoftware/CLASP.Ruby
 licenses:
 - BSD-3-Clause
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: CLASP.Ruby
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 119fcad10a9c01d575d47bc9f495fda5bb1869d1
-  data.tar.gz: 3a4c4edbf579ce92c968833ba2f13a857a7f69dd
-SHA512:
-  metadata.gz: e7aa695f6ef62302ac3fb64a815017e8f256130c29abcbf9b81aeb82f378cd4233f8435b0355acc91d2c24c35107809c6fa9fbcfb171f28c50b5ed5aa3018277
-  data.tar.gz: f0347ac65f0a4ba087c486ba2d5492890fd3f69240e547c1c3b7371d59c5c178417179fa86592a786b9816bc5b296af17bc23a23adba5d3ff85830c473751d66