clasp-ruby 0.12.2 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e5001a6187f428a3cdfe4bc6b01774d0cfd5b94
-  data.tar.gz: efcc8d280ccbf5733a12a7979bc8725f1dd02fd9
+SHA256:
+  metadata.gz: 888f30cc9dbb790874262a1b63c79673fba947440f3c3d1d3d28f162c74326d4
+  data.tar.gz: 3c26abb10e9dc9194cd7bd25e0e6dcf8c84450f899ceb0d5ae6c2dcfe8b23242
 SHA512:
-  metadata.gz: f032b789fd1b19a34192ff7c1cc0b0324e9c8058ac04f07c10231b31083900c4046c7bd90cd3c3d167024f19baf93cb3064e91ba5ee7c275066667f5ba559301
-  data.tar.gz: 5fc26186f36d65c126320129149d040adfa67422c56e2116230e45d403adc1ea17866f96a45eaa38ae4b19eb5101f35e743bf6c70a553def5e22d6a7c4b927ac
+  metadata.gz: ab50428df60b73aae5963afef09b3bf68a9f6bd189bd8d3e09ce52e9b4e91cf51923a9211be14c6f4d7452ebac234f98293a9ce0589a4ec20ec8e6e55149f1e3
+  data.tar.gz: df63ce0472c547f49008fe732138993bfb1c932791c23eed131dc0ad2e837073cbd1e50b55d8e2b442b7086064176b38f96c762b5c503722c213f4f3cf4924d3

data/lib/clasp/aliases.rb

@@ -197,6 +197,33 @@ class Option
 	end
 end
 
+# A class that represents an explicit alias for a flag or an option
+class Alias
+
+	def initialize(name, aliases)
+
+		@name		=	name
+		@aliases	=	(aliases || []).select { |a| a and not a.empty? }
+		@extras		=	nil
+		@help		=	nil
+	end
+
+	# The alias' name string
+	attr_reader	:name
+	# The alias' aliases array
+	attr_reader	:aliases
+	# The flag's help string
+	attr_reader	:help
+	# The flag's extras
+	attr_reader :extras
+
+	# String form of the option
+	def to_s
+
+		"{#{name}; aliases=#{aliases.join(', ')}}"
+	end
+end
+
 # ######################################################################## #
 # functions
 
@@ -336,6 +363,25 @@ def CLASP.Option(name, options = {})
 	CLASP::Option.new(name, aliases, help, values_range, default_value, required, require_message, extras)
 end
 
+def CLASP.Alias(name, *args)
+
+	options	=	args.pop if args[-1].is_a?(::Hash)
+	options	||=	{}
+
+	if options[:alias]
+
+		aliases	=	[ options[:alias] ]
+	elsif options[:aliases]
+
+		aliases	=	options[:aliases]
+	else
+
+		aliases	=	args
+	end
+
+	CLASP::Alias.new name, aliases
+end
+
 # ######################################################################## #
 # module
 

data/lib/clasp/cli.rb

@@ -126,7 +126,7 @@ def self.show_usage aliases, options={}
 	raise ArgumentError, "aliases may not be nil" if aliases.nil?
 	raise TypeError, "aliases must be an array or must respond to each, reject and select" unless ::Array === aliases || (aliases.respond_to?(:each) && aliases.respond_to?(:reject) && aliases.respond_to?(:select))
 
-	aliases.each { |a| raise TypeError, "each element in aliases must be a Flag or an Option" unless a.is_a?(::CLASP::Flag) || a.is_a?(::CLASP::Option) }
+	aliases.each { |a| raise TypeError, "each element in aliases must be a Flag or an Option" unless [ ::CLASP::Alias, ::CLASP::Flag, ::CLASP::Option ].any? { |c| c === a } }
 
 	alias_dups = {}
 	aliases.each { |a| a.aliases.each { |aa| warn "WARNING: alias '#{aa}' is already used for alias '#{a}'" if alias_dups.has_key? aa; alias_dups[aa] = a; } }
@@ -175,6 +175,14 @@ def self.show_usage aliases, options={}
 		voas[$1]	<<	[ a, $2 ]
 	end
 
+	fas				=	{}
+
+	aliases.select { |a| Alias === a }.each do |a|
+
+		fas[a.name]	=	[] unless fas.has_key? $1
+		fas[a.name]	<<	a
+	end
+
 	aliases			=	aliases.reject { |a| a.name =~ /^-+[a-zA-Z0-3_-]+[=:].+/ }
 
 	info_lines.each { |info_line| stream.puts info_line } unless info_lines.empty?
@@ -189,8 +197,18 @@ def self.show_usage aliases, options={}
 		aliases.each do |a|
 
 			case a
+			when Alias
+
+				next
 			when Flag
 
+				if fas.has_key? a.name
+
+					fas[a.name].each do |fa|
+
+						fa.aliases.each { |al| stream.puts "\t#{al}" }
+					end
+				end
 				a.aliases.each { |al| stream.puts "\t#{al}" }
 				stream.puts "\t#{a.name}"
 				stream.puts "\t\t#{a.help}"

data/lib/clasp/version.rb

@@ -5,7 +5,7 @@
 # Purpose:      Version for CLASP.Ruby library
 #
 # Created:      16th November 2014
-# Updated:      7th February 2018
+# Updated:      23rd February 2018
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
@@ -51,7 +51,7 @@
 module CLASP
 
 	# Current version of the CLASP.Ruby library
-	VERSION				=	'0.12.2'
+	VERSION				=	'0.13.2'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/scratch/test_aliases.rb

@@ -8,12 +8,13 @@ Aliases = [
 
 	CLASP.Flag('--help', help: 'shows this help and quits'),
 	CLASP.Flag('--version', alias: '-v', help: 'shows this version and quits'),
+	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.Option('--case-sensitive=false', alias: '-I'),
+	CLASP.Alias('--case-sensitive=false', alias: '-I'),
 ]
 
 Arguments	=	CLASP::Arguments.new(ARGV, Aliases)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clasp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.2
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   Command-Line Argument Sorting and Parsing library that provides a powerful
@@ -68,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: CLASP.Ruby
 test_files: []
-has_rdoc: