libclimate-ruby 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca1b0b3762f52fff8e5bd7d819cace47cc2a525c
-  data.tar.gz: 1eba780dd077d680573355accb035e7b016a83a1
+  metadata.gz: 508db783549ec969fcfaca95ac11cebcbc29a340
+  data.tar.gz: 4cb1d7eb161c1992e94500daded0068a6b018f41
 SHA512:
-  metadata.gz: d52935c271d5e5ac6fb6a703962d353f5435e1f3c968bf018c40781eb7999351fdb0f1c74f2f53d7117cb482ffc1e1d2e3e5f50e97cdc944fe381877629932ec
-  data.tar.gz: 4ac5853b341fa530eb67536889b174bd05177b2bee3ea84e01f5558d5a369a24bec3505c7f235cb333467a81b4bc7ea5dc97ecb7d83523dca2256375d34b06cb
+  metadata.gz: beffffe172884c20114e2cb3d705e504f555980393f33ddc246eed5966714b645d0bed9e6a08d6cba6b592782ab215865cfd6178a9a332bfe08364e4d1334df8
+  data.tar.gz: e4a0c48f13a41c88ea2feb1a0b213e31e23dfdb69a503715820eea8d6b835f1352cf0a1aa5909daf632985487f509145940b64201ce9a2601a38c63f54fc63ea

data/lib/libclimate/climate.rb

@@ -5,13 +5,13 @@
 # Purpose:      Definition of the ::LibCLImate::Climate class
 #
 # Created:      13th July 2015
-# Updated:      16th March 2017
+# Updated:      1st January 2018
 #
 # Home:         http://github.com/synesissoftware/libCLImate.Ruby
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2015-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,9 @@ require 'clasp'
 require 'xqsr3/extensions/io'
 require 'xqsr3/quality/parameter_checking'
 
+=begin
+=end
+
 if !defined? Colcon
 
 	begin
@@ -128,10 +131,35 @@ module LibCLImate
 
 # Class used to gather together the CLI specification, and execute it
 #
+# The standard usage pattern is as follows:
+#
+#   PROGRAM_VERSION = [ 0, 1, 2 ]
+#
+#   program_options = {}
+#
+#   climate = LibCLImate::Climate.new do |cl|
+#
+#     cl.add_flag('--verbose', alias: '-v', help: 'Makes program output verbose') { program_options[:verbose] = true }
+#
+#     cl.add_option('--flavour', alias: '-f', help: 'Specifies the flavour') do |o, a|
+#
+#       program_options[:flavour] = check_flavour(o.value) or cl.abort "Invalid flavour '#{o.value}'; use --help for usage"
+#     end
+#
+#     cl.usage_value = '<value-1> [ ... <value-N> ]'
 #
+#     cl.info_lines = [
+#
+#       'ACME CLI program (using libCLImate)',
+#       :version,
+#       'An example program',
+#     ]
+#   end
 #
 class Climate
 
+	include ::Xqsr3::Quality::ParameterChecking
+
 	#:stopdoc:
 
 	private
@@ -147,9 +175,51 @@ class Climate
 
 	def show_version_
 
-		ver = version || []
+		CLASP.show_version aliases, stream: stdout, program_name: program_name, version: version, exit: exit_on_usage ? 0 : nil
+	end
+
+	def infer_version_ ctxt
+
+		# algorithm:
+		#
+		# 1. PROGRAM_VERSION: loaded from ctxt / global
+		# 2. PROGRAM_VER(SION)_(MAJOR|MINOR|REVISION|BUILD): loaded from
+		#    ctxt / global
+
+		if ctxt
+
+			ctxt = ctxt.class unless ::Class === ctxt
+
+			return ctxt.const_get(:PROGRAM_VERSION) if ctxt.const_defined? :PROGRAM_VERSION
+
+			ver = []
+
+			if ctxt.const_defined? :PROGRAM_VER_MAJOR
+
+				ver << ctxt.const_get(:PROGRAM_VER_MAJOR)
+
+				if ctxt.const_defined? :PROGRAM_VER_MINOR
+
+					ver << ctxt.const_get(:PROGRAM_VER_MINOR)
+
+					if ctxt.const_defined? :PROGRAM_VER_REVISION
+
+						ver << ctxt.const_get(:PROGRAM_VER_REVISION)
+
+						if ctxt.const_defined? :PROGRAM_VER_BUILD
+
+							ver << ctxt.const_get(:PROGRAM_VER_BUILD)
+						end
+					end
+				end
+
+				return ver
+			end
+		else
 
-		if ver.empty?
+			return PROGRAM_VERSION if defined? PROGRAM_VERSION
+
+			ver = []
 
 			if defined? PROGRAM_VER_MAJOR
 
@@ -162,14 +232,20 @@ class Climate
 					if defined? PROGRAM_VER_REVISION
 
 						ver << PROGRAM_VER_REVISION
+
+						if defined? PROGRAM_VER_BUILD
+
+							ver << PROGRAM_VER_BUILD
+						end
 					end
 				end
+
+				return ver
 			end
 		end
 
-		CLASP.show_version aliases, stream: stdout, program_name: program_name, version: version, exit: exit_on_usage ? 0 : nil
+		nil
 	end
-
 	#:startdoc:
 
 	public
@@ -184,6 +260,8 @@ class Climate
 	# * *Options*:
 	#   - +:no_help_flag+:: Prevents the use of the CLASP::Flag.Help flag-alias
 	#   - +:no_version_flag+:: Prevents the use of the CLASP::Version.Help flag-alias
+	#   - +:version+:: A version specification. If not specified, this is
+	#     inferred
 	#
 	# * *Block*:: An optional block which receives the constructing instance, allowing the user to modify the attributes.
 	def initialize(options={}) # :yields: climate
@@ -200,13 +278,15 @@ class Climate
 
 		@aliases			=	[]
 		@exit_on_unknown	=	true
+		@exit_on_missing	=	true
 		@exit_on_usage		=	true
 		@info_lines			=	nil
 		@program_name		=	program_name
 		@stdout				=	$stdout
 		@stderr				=	$stderr
 		@usage_values		=	usage_values
-		@version			=	[]
+		version_context		=	options[:version_context]
+		@version			=	options[:version] || infer_version_(version_context)
 
 		@aliases << CLASP::Flag.Help(handle: proc { show_usage_ }) unless options[:no_help_flag]
 		@aliases << CLASP::Flag.Version(handle: proc { show_version_ }) unless options[:no_version_flag]
@@ -217,6 +297,12 @@ class Climate
 	# An array of aliases attached to the climate instance, whose contents should be modified by adding (or removing) CLASP aliases
 	# @return [Array] The aliases
 	attr_reader :aliases
+	# Indicates whether exit will be called (with non-zero exit code) when a
+	# required command-line option is missing
+	# @return [Boolean]
+	# @return *true* exit(1) will be called
+	# @return *false* exit will not be called
+	attr_accessor :exit_on_missing
 	# Indicates whether exit will be called (with non-zero exit code) when an unknown command-line flag or option is encountered
 	# @return [Boolean]
 	# @return *true* exit(1) will be called
@@ -234,7 +320,7 @@ class Climate
 	attr_accessor :stderr
 	# @return [String] Optional string to describe the program values, eg \<xyz "[ { <<directory> | &lt;file> } ]"
 	attr_accessor :usage_values
-	# @return [String, Array] A version string or an array of integers representing the version components
+	# @return [String, Array] A version string or an array of integers representing the version component(s)
 	attr_accessor :version
 
 	# Executes the prepared Climate instance
@@ -264,7 +350,7 @@ class Climate
 				given:		flags,
 				handled:	[],
 				unhandled:	[],
-				unknown:	[]
+				unknown:	[],
 			},
 
 			options: {
@@ -272,10 +358,12 @@ class Climate
 				given:		options,
 				handled:	[],
 				unhandled:	[],
-				unknown:	[]
+				unknown:	[],
 			},
 
-			values:	values
+			values:	values,
+
+			missing_option_aliases: [],
 		}
 
 		flags.each do |f|
@@ -289,7 +377,7 @@ class Climate
 
 				selector	=	:unhandled
 
-				# see if it has a :action attribute (which will have been
+				# see if it has an :action attribute (which will have been
 				# monkey-patched to CLASP.Flag()
 
 				if al.respond_to?(:action) && !al.action.nil?
@@ -346,7 +434,7 @@ class Climate
 
 				selector	=	:unhandled
 
-				# see if it has a :action attribute (which will have been
+				# see if it has an :action attribute (which will have been
 				# monkey-patched to CLASP.Option()
 
 				if al.respond_to?(:action) && !al.action.nil?
@@ -392,6 +480,41 @@ class Climate
 			end
 		end
 
+
+			# now police any required options
+
+			required_aliases = aliases.select do |a|
+
+				a.kind_of?(::CLASP::Option) && a.required?
+			end
+
+			required_aliases = Hash[required_aliases.map { |a| [ a.name, a ] }]
+
+			given_options = Hash[results[:options][:given].map { |o| [ o.name, o ]}]
+
+			required_aliases.each do |k, a|
+
+				unless given_options.has_key? k
+
+					message = a.required_message
+
+					if exit_on_missing
+
+						self.abort message
+					else
+
+						if program_name && !program_name.empty?
+
+							message = "#{program_name}: #{message}"
+						end
+
+						stderr.puts message
+					end
+
+					results[:missing_option_aliases] << a
+				end
+		end
+
 		def results.flags
 
 			self[:flags]
@@ -473,7 +596,7 @@ class Climate
 	#   - +:extras+:: 
 	def add_flag(name, options={}, &block)
 
-		::Xqsr3::Quality::ParameterChecking.check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
 
 		aliases << CLASP.Flag(name, **options, &block)
 	end
@@ -488,7 +611,7 @@ class Climate
 	#   - +:extras+:: 
 	def add_option(name, options={}, &block)
 
-		::Xqsr3::Quality::ParameterChecking.check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
 
 		aliases << CLASP.Option(name, **options, &block)
 	end
@@ -533,7 +656,7 @@ class Climate
 	# +climate.add_alias('--verbosity=verbose', '-v')+
 	def add_alias(name, *aliases)
 
-		::Xqsr3::Quality::ParameterChecking.check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
 		raise ArgumentError, "must supply at least one alias" if aliases.empty?
 
 		self.aliases << CLASP.Option(name, aliases: aliases)

data/lib/libclimate/libclimate.rb

@@ -4,11 +4,11 @@
 # Purpose:      Main file for libclimate.Ruby library
 #
 # Created:      13th July 2015
-# Updated:      12th June 2016
+# Updated:      9th June 2017
 #
 # Home:         http://github.com/synesissoftware/libCLImate.Ruby
 #
-# Copyright (c) 2015-2016, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2017, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,9 @@
 require 'libclimate/climate'
 require 'libclimate/version'
 
+=begin
+=end
+
 # Main module for libCLImate.Ruby library
 module LibCLImate
 

data/lib/libclimate/version.rb

@@ -4,11 +4,11 @@
 # Purpose:      Version for libclimate.Ruby library
 #
 # Created:      13th July 2015
-# Updated:      5th July 2016
+# Updated:      3rd January 2018
 #
 # Home:         http://github.com/synesissoftware/libCLImate.Ruby
 #
-# Copyright (c) 2015-2016, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,10 +37,13 @@
 # ######################################################################## #
 
 
+=begin
+=end
+
 module LibCLImate
 
 	# Current version of the libCLImate.Ruby library
-	VERSION					=	'0.6.2'
+	VERSION					=	'0.7.2'
 
 	private
 	VERSION_PARTS_			=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/scratch/blankzeroes.rb

@@ -3,10 +3,10 @@
 #############################################################################
 # File:         test/scratch/blankzeroes.rb
 #
-# Purpose:      COMPLETE_ME
+# Purpose:      This filter program converts 0 values in a TSV into blanks
 #
-# Created:      14 05 2016
-# Updated:      14 05 2016
+# Created:      14th May 2016
+# Updated:      1st January 2018
 #
 # Author:       Matthew Wilson
 #
@@ -24,14 +24,19 @@ require 'libclimate'
 
 PROGRAM_VER_MAJOR               =   0
 PROGRAM_VER_MINOR               =   1
-PROGRAM_VER_REVISION            =   2
+PROGRAM_VER_REVISION            =   3
+PROGRAM_VER_BUILD               =   5
 
 # ##########################################################
 # command-line parsing
 
-LibCLImate::Climate.new do |climate|
+LibCLImate::Climate.new do |cl|
 
-	climate.version = [ PROGRAM_VER_MAJOR, PROGRAM_VER_MINOR, PROGRAM_VER_REVISION ]
+	cl.info_lines = [
+
+		:version,
+		'converts 0 values into blanks',
+	]
 end.run
 
 # ##########################################################

data/test/unit/tc_infer_version.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-
 #
+# test version inference
 
 $:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
 
@@ -23,19 +23,21 @@ class Test_Climate_infer_version_3_22 < Test::Unit::TestCase
 
 		strout = StringIO.new
 
-		climate = LibCLImate::Climate.new do |climate|
+		climate = LibCLImate::Climate.new(version_context: self) do |cl|
+
+			cl.program_name		=	'myprog'
+			cl.stdout			=	strout
 
-			climate.program_name	=	'myprog'
-			climate.stdout			=	strout
+			cl.exit_on_usage	=	false
 		end.run [ 'myprog', '--version' ]
 
 		s = strout.string
 
-		assert_equal "myprog 3.22", s
+		assert_equal "myprog 3.22", s.chomp
 	end
 end
 
-class Test_Climate_infer_version_3_2 < Test::Unit::TestCase
+class Test_Climate_infer_version_3_2_99 < Test::Unit::TestCase
 
 	PROGRAM_VER_MINOR		=	2
 	PROGRAM_VER_REVISION	=	99
@@ -44,15 +46,39 @@ class Test_Climate_infer_version_3_2 < Test::Unit::TestCase
 
 		strout = StringIO.new
 
-		climate = LibCLImate::Climate.new do |climate|
+		climate = LibCLImate::Climate.new(version_context: self) do |cl|
+
+			cl.program_name		=	'myprog'
+			cl.stdout			=	strout
+
+			cl.exit_on_usage	=	false
+		end.run [ 'myprog', '--version' ]
+
+		s = strout.string
+
+		assert_equal "myprog 3.2.99", s.chomp
+	end
+end
+
+class Test_Climate_infer_PROGRAM_VERSION_as_array < Test::Unit::TestCase
+
+	PROGRAM_VERSION	=	[ 11, 12, 13 ]
+
+	def test_inference_of_version
+
+		strout = StringIO.new
+
+		climate = LibCLImate::Climate.new(version_context: self) do |cl|
+
+			cl.program_name		=	'myprog'
+			cl.stdout			=	strout
 
-			climate.program_name	=	'myprog'
-			climate.stdout			=	strout
+			cl.exit_on_usage	=	false
 		end.run [ 'myprog', '--version' ]
 
 		s = strout.string
 
-		assert_equal "myprog 3.2.99", s
+		assert_equal "myprog 11.12.13", s.chomp
 	end
 end
 

data/test/unit/tc_minimal.rb

@@ -55,7 +55,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -103,7 +103,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -233,7 +233,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert argv.equal? r.argv
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
@@ -291,7 +291,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert argv.equal? r.argv
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
@@ -336,7 +336,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert argv.equal? r.argv
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
@@ -359,7 +359,198 @@ class Test_Climate_minimal < Test::Unit::TestCase
 		assert_equal 0, lines.size
 		assert_equal '2', verbosity
 	end
+
+	def test_one_custom_option_that_is_required
+
+		str = StringIO.new
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.program_name = 'program'
+
+			climate.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', required: true)
+		end
+
+		assert climate.aliases[2].required?
+
+		r = climate.run %w{ -v 2 }
+
+		assert_not_nil r
+		assert_kind_of ::Hash, r
+		assert 3 <= r.size
+		assert_not_nil r[:flags]
+		assert_not_nil r[:options]
+		assert_not_nil r[:values]
+		assert_equal 4, r[:flags].size
+		assert_equal 0, r[:flags][:given].size
+		assert_equal 0, r[:flags][:handled].size
+		assert_equal 0, r[:flags][:unhandled].size
+		assert_equal 0, r[:flags][:unknown].size
+		assert_equal 4, r[:options].size
+		assert_equal 1, r[:options][:given].size
+		assert_equal 0, r[:options][:handled].size
+		assert_equal 1, r[:options][:unhandled].size
+		assert_equal 0, r[:options][:unknown].size
+		assert_equal 0, r[:values].size
+		assert_equal 0, r[:missing_option_aliases].size
+		lines	=	str.string.split(/\n/)
+		lines	=	lines.reject { |line| line.chomp.strip.empty? }
+		lines	=	lines.map { |line| line.chomp.strip }
+
+		assert_equal 0, lines.size
+	end
+
+	def test_one_custom_option_that_is_required_and_missing
+
+		str = StringIO.new
+		stre = StringIO.new
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.program_name = 'program'
+			climate.stdout = str
+			climate.stderr = stre
+			climate.exit_on_usage = false
+			climate.exit_on_missing = false
+
+			climate.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', required: true)
+		end
+
+		r = climate.run %w{ }
+
+		assert climate.aliases[2].required?
+
+		assert_not_nil r
+		assert_kind_of ::Hash, r
+		assert 3 <= r.size
+		assert_not_nil r[:flags]
+		assert_not_nil r[:options]
+		assert_not_nil r[:values]
+		assert_equal 4, r[:flags].size
+		assert_equal 0, r[:flags][:given].size
+		assert_equal 0, r[:flags][:handled].size
+		assert_equal 0, r[:flags][:unhandled].size
+		assert_equal 0, r[:flags][:unknown].size
+		assert_equal 4, r[:options].size
+		assert_equal 0, r[:options][:given].size
+		assert_equal 0, r[:options][:handled].size
+		assert_equal 0, r[:options][:unhandled].size
+		assert_equal 0, r[:options][:unknown].size
+		assert_equal 0, r[:values].size
+		assert_equal 1, r[:missing_option_aliases].size
+		lines	=	str.string.split(/\n/)
+		lines	=	lines.reject { |line| line.chomp.strip.empty? }
+		lines	=	lines.map { |line| line.chomp.strip }
+		elines	=	stre.string.split(/\n/)
+		elines	=	elines.reject { |line| line.chomp.strip.empty? }
+		elines	=	elines.map { |line| line.chomp.strip }
+
+		assert_equal 0, lines.size
+		assert_equal 1, elines.size
+		assert_equal "program: '--verbosity' not specified; use --help for usage", elines[0]
+	end
+
+	def test_one_custom_option_that_is_required_and_missing_with_required_message_custom
+
+		str = StringIO.new
+		stre = StringIO.new
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.program_name = 'program'
+			climate.stdout = str
+			climate.stderr = stre
+			climate.exit_on_usage = false
+			climate.exit_on_missing = false
+
+			climate.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', required: true, required_message: 'Verbosity not specified')
+		end
+
+		r = climate.run %w{ }
+
+		assert climate.aliases[2].required?
+
+		assert_not_nil r
+		assert_kind_of ::Hash, r
+		assert 3 <= r.size
+		assert_not_nil r[:flags]
+		assert_not_nil r[:options]
+		assert_not_nil r[:values]
+		assert_equal 4, r[:flags].size
+		assert_equal 0, r[:flags][:given].size
+		assert_equal 0, r[:flags][:handled].size
+		assert_equal 0, r[:flags][:unhandled].size
+		assert_equal 0, r[:flags][:unknown].size
+		assert_equal 4, r[:options].size
+		assert_equal 0, r[:options][:given].size
+		assert_equal 0, r[:options][:handled].size
+		assert_equal 0, r[:options][:unhandled].size
+		assert_equal 0, r[:options][:unknown].size
+		assert_equal 0, r[:values].size
+		assert_equal 1, r[:missing_option_aliases].size
+		lines	=	str.string.split(/\n/)
+		lines	=	lines.reject { |line| line.chomp.strip.empty? }
+		lines	=	lines.map { |line| line.chomp.strip }
+		elines	=	stre.string.split(/\n/)
+		elines	=	elines.reject { |line| line.chomp.strip.empty? }
+		elines	=	elines.map { |line| line.chomp.strip }
+
+		assert_equal 0, lines.size
+		assert_equal 1, elines.size
+		assert_equal "program: Verbosity not specified", elines[0]
+	end
+
+	def test_one_custom_option_that_is_required_and_missing_with_required_message_name
+
+		str = StringIO.new
+		stre = StringIO.new
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.program_name = 'program'
+			climate.stdout = str
+			climate.stderr = stre
+			climate.exit_on_usage = false
+			climate.exit_on_missing = false
+
+			climate.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', required: true, required_message: "\0Verbosity")
+		end
+
+		r = climate.run %w{ }
+
+		assert climate.aliases[2].required?
+
+		assert_not_nil r
+		assert_kind_of ::Hash, r
+		assert 3 <= r.size
+		assert_not_nil r[:flags]
+		assert_not_nil r[:options]
+		assert_not_nil r[:values]
+		assert_equal 4, r[:flags].size
+		assert_equal 0, r[:flags][:given].size
+		assert_equal 0, r[:flags][:handled].size
+		assert_equal 0, r[:flags][:unhandled].size
+		assert_equal 0, r[:flags][:unknown].size
+		assert_equal 4, r[:options].size
+		assert_equal 0, r[:options][:given].size
+		assert_equal 0, r[:options][:handled].size
+		assert_equal 0, r[:options][:unhandled].size
+		assert_equal 0, r[:options][:unknown].size
+		assert_equal 0, r[:values].size
+		assert_equal 1, r[:missing_option_aliases].size
+		lines	=	str.string.split(/\n/)
+		lines	=	lines.reject { |line| line.chomp.strip.empty? }
+		lines	=	lines.map { |line| line.chomp.strip }
+		elines	=	stre.string.split(/\n/)
+		elines	=	elines.reject { |line| line.chomp.strip.empty? }
+		elines	=	elines.map { |line| line.chomp.strip }
+
+		assert_equal 0, lines.size
+		assert_equal 1, elines.size
+		assert_equal "program: Verbosity not specified; use --help for usage", elines[0]
+	end
 end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_minimal_CLASP.rb

@@ -55,7 +55,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -103,7 +103,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -233,7 +233,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -290,7 +290,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]
@@ -334,7 +334,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 
 		assert_not_nil r
 		assert_kind_of ::Hash, r
-		assert_equal 3, r.size
+		assert 3 <= r.size
 		assert_not_nil r[:flags]
 		assert_not_nil r[:options]
 		assert_not_nil r[:values]

data/test/unit/tc_test_aliases.rb

@@ -36,7 +36,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 
 			assert_not_nil r
 			assert_kind_of ::Hash, r
-			assert_equal 3, r.size
+			assert 3 <= r.size
 			assert_equal 0, r.flags[:given].size
 
 			assert_equal 1, options.size

data/test/unit/ts_all.rb

@@ -2,7 +2,6 @@
 #
 # executes all other tests
 
-this_file   =   File.expand_path(__FILE__)
 this_dir    =   File.expand_path(File.dirname(__FILE__))
 
 # all tc_*rb in current directory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libclimate-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clasp-ruby
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.12.1
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.12.1
     - - <
       - !ruby/object:Gem::Version
         version: '1.0'