libclimate-ruby 0.7.5 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5143c5a832e476919e0a314035a5127ec1edd1831f9f66711e798a76eb15bdd3
-  data.tar.gz: 8189d0bae8d271ec54207b499d7bb8efe99779ce46c45ddbd6268f4f9c01a0bb
+SHA1:
+  metadata.gz: 353fcd858d3ab427e53c1a9413dd95b84a51ce60
+  data.tar.gz: 4e6800354074160420024c735c9c74c25479b61e
 SHA512:
-  metadata.gz: 8bda6e0339bb494fab974079653b777602f4874301cd8fb00f8f3455d9e4866c7c5c43605120f31c3e1d80ad509fe1d3fe5a4b590737ce2bc9b8135abbfc43e4
-  data.tar.gz: ad7f3d2ed6dd854927c6cb4ef75bd3639dcd47cc313c5b34c37c75ed388e1f6c89d16df30aefb6813382b7e5b1441c35a0bcf2f71aab5eb664b7da16926d4924
+  metadata.gz: 66435e1e61927c1c2cb3f8deeff70622ef6fe11d7829597fcdebf3e4310fde56c3d80d084cf29261f82f8914d344d97168e51a1de274f1c1a44560e44e411a10
+  data.tar.gz: 56b07a2b44395c8e0c72e7c6c553285a2f4de427a1cfc2268c49b7e8ac33ab9978de755f9c188eb0e4504f19d054b00db3ffd0c5b54c3fda40e33a99b958ce64

data/README.md

@@ -1,28 +1,70 @@
 # libCLImate.Ruby
-libCLImate for Ruby
+libCLImate, for Ruby
 
 [![Gem Version](https://badge.fury.io/rb/libclimate-ruby.svg)](https://badge.fury.io/rb/libclimate-ruby)
 
-## Installation & usage
+## Introduction
 
-Install using `gem install libclimate-ruby` or add it to your `Gemfile`.
+**libCLImate** is a portable, lightweight mini-framework that encapsulates the common aspects of **C**ommand-**L**ine **I**nterface boilerplate, including:
 
-## Description
+- command-line argument parsing and sorting;
+- provision of de-facto standard CLI facilities, such as responding to '--help' and '--version';
 
-TODO
+**libCLImate.Ruby** is the Ruby version.
 
-## Where to get help
+## Table of Contents
+
+1. [Introduction](#introduction)
+2. [Installation](#installation)
+3. [Components](#components)
+4. [Project Information](#project-information)
+
+## Installation
+
+Install via **gem** as in:
+
+```
+	gem install libclimate-ruby
+```
+
+or add it to your `Gemfile`.
+
+Use via **require***, as in:
+
+```Ruby
+require 'libclimate-ruby'
+```
+
+## Components
+
+T.B.C.
+
+## Project Information
+
+### Where to get help
 
 [GitHub Page](https://github.com/synesissoftware/libCLImate.Ruby "GitHub Page")
 
-## Contribution guidelines
+### Contribution guidelines
 
 Defect reports, feature requests, and pull requests are welcome on https://github.com/synesissoftware/libCLImate.Ruby.
 
-## Related projects
+### Dependencies
+
+**libCLImate.Ruby** depends on:
+
+* the [**CLASP.Ruby**](https://github.com/synesissoftware/CLASP.Ruby) library; and
+* the [**xqsr3**](https://github.com/synesissoftware/xqsr3) library.
+
+### Related projects
 
-**libCLImate.Ruby** uses the **[clasp.Ruby](https://github.com/synesissoftware/clasp.Ruby)** and **[xqsr3](https://github.com/synesissoftware/xqsr3)** libraries.
+* [**libCLImate C/C++](https://github.com/synesissoftware/libCLImate.Ruby)
+* [**CLASP**](https://github.com/synesissoftware/CLASP/)
+* [**CLASP.Go**](https://github.com/synesissoftware/CLASP.Go/)
+* [**CLASP.js**](https://github.com/synesissoftware/CLASP.js/)
+* [**CLASP.Ruby**](https://github.com/synesissoftware/CLASP.Ruby/)
+* [xqsr3](https://github.com/synesissoftware.com/libCLImate.Ruby-xml/)
 
-## License
+### License
 
-**libCLImate.Ruby** is released under the 3-clause BSD license. See LICENSE for details.
+**libCLImate.Ruby** is released under the 3-clause BSD license. See [LICENSE](./LICENSE) for details.

data/lib/libclimate/climate.rb

@@ -5,13 +5,13 @@
 # Purpose:      Definition of the ::LibCLImate::Climate class
 #
 # Created:      13th July 2015
-# Updated:      4th February 2018
+# Updated:      12th March 2019
 #
 # Home:         http://github.com/synesissoftware/libCLImate.Ruby
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2015-2018, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -146,7 +146,7 @@ module LibCLImate
 #       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.usage_values = '<value-1> [ ... <value-N> ]'
 #
 #     cl.info_lines = [
 #
@@ -169,6 +169,7 @@ class Climate
 		options.merge! stream: stdout, program_name: program_name, version: version, exit: exit_on_usage ? 0 : nil
 		options[:info_lines] = info_lines if info_lines
 		options[:values] = usage_values if usage_values
+		options[:flags_and_options] = flags_and_options if flags_and_options
 
 		CLASP.show_usage aliases, options
 	end
@@ -183,7 +184,7 @@ class Climate
 		# algorithm:
 		#
 		# 1. PROGRAM_VERSION: loaded from ctxt / global
-		# 2. PROGRAM_VER(SION)_(MAJOR|MINOR|REVISION|BUILD): loaded from
+		# 2. PROGRAM_VER(SION)_(MAJOR|MINOR|(PATCH|REVISION)|BUILD): loaded from
 		#    ctxt / global
 
 		if ctxt
@@ -202,9 +203,15 @@ class Climate
 
 					ver << ctxt.const_get(:PROGRAM_VER_MINOR)
 
-					if ctxt.const_defined? :PROGRAM_VER_REVISION
+					if ctxt.const_defined?(:PROGRAM_VER_REVISION) || ctxt.const_defined?(:PROGRAM_VER_PATCH)
 
-						ver << ctxt.const_get(:PROGRAM_VER_REVISION)
+						if ctxt.const_defined?(:PROGRAM_VER_PATCH)
+
+							ver << ctxt.const_get(:PROGRAM_VER_PATCH)
+						else
+
+							ver << ctxt.const_get(:PROGRAM_VER_REVISION)
+						end
 
 						if ctxt.const_defined? :PROGRAM_VER_BUILD
 
@@ -229,9 +236,15 @@ class Climate
 
 					ver << PROGRAM_VER_MINOR
 
-					if defined? PROGRAM_VER_REVISION
+					if defined?(PROGRAM_VER_REVISION) || defined?(PROGRAM_VER_PATCH)
+
+						if defined?(PROGRAM_VER_PATCH)
 
-						ver << PROGRAM_VER_REVISION
+							ver << PROGRAM_VER_PATCH
+						else
+
+							ver << PROGRAM_VER_REVISION
+						end
 
 						if defined? PROGRAM_VER_BUILD
 
@@ -258,12 +271,16 @@ class Climate
 	#   - +options:+:: An options hash, containing any of the following options.
 	#
 	# * *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
-	#   - +:program_name+:: [ ::String ] An explicit program-name, which is
+	#   - +:no_help_flag+:: (boolean) Prevents the use of the
+	#     +CLASP::Flag.Help+ flag-alias
+	#   - +:no_version_flag+:: (boolean) Prevents the use of the
+	#     +CLASP::Flag.Version+ flag-alias
+	#   - +:program_name+:: (::String) An explicit program-name, which is
 	#     inferred from +$0+ if this is +nil+
 	#   - +:version+:: A version specification. If not specified, this is
 	#     inferred
+	#   - +:version_context+:: Object or class that defines a context for
+	#     searching the version. Ignored if +:version+ is specified
 	#
 	# * *Block*:: An optional block which receives the constructing instance, allowing the user to modify the attributes.
 	def initialize(options={}) # :yields: climate
@@ -272,6 +289,8 @@ class Climate
 
 		options ||=	{}
 
+		check_option options, :no_help_flag, type: :boolean, allow_nil: true
+		check_option options, :no_version_flag, type: :boolean, allow_nil: true
 		check_option options, :program_name, type: ::String, allow_nil: true
 
 		pr_name		=	options[:program_name]
@@ -279,10 +298,11 @@ class Climate
 		unless pr_name
 
 			pr_name	=	File.basename($0)
-			pr_name	=	(pr_name =~ /\.rb$/) ? "#$`(#$&)" : pr_name
+			pr_name	=	(pr_name =~ /\.(?:bat|cmd|rb|sh)$/) ? "#$`(#$&)" : pr_name
 		end
 
 		@aliases			=	[]
+		@ignore_unknown		=	false
 		@exit_on_unknown	=	true
 		@exit_on_missing	=	true
 		@exit_on_usage		=	true
@@ -290,7 +310,10 @@ class Climate
 		set_program_name pr_name
 		@stdout				=	$stdout
 		@stderr				=	$stderr
+		@constrain_values	=	nil
+		@flags_and_options	=	flags_and_options
 		@usage_values		=	usage_values
+		@value_names		=	[]
 		version_context		=	options[:version_context]
 		@version			=	options[:version] || infer_version_(version_context)
 
@@ -300,43 +323,66 @@ class Climate
 		yield self if block_given?
 	end
 
+	# [DEPRECATED] This method is now deprecated. Instead use
+	#  +program_name=+
+	#
+	# @deprecated
 	def set_program_name name
 
-		if defined? Colcon
-
-			name = "#{::Colcon::Decorations::Bold}#{name}#{::Colcon::Decorations::Unbold}"
-		end
-
 		@program_name	=	name
 	end
 
 	# An array of aliases attached to the climate instance, whose contents should be modified by adding (or removing) CLASP aliases
-	# @return [Array] The 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 (boolean)
 	# @return *true* exit(1) will be called
 	# @return *false* exit will not be called
 	attr_accessor :exit_on_missing
+	# Indicates whether unknown flags or options will be ignored. This
+	# overrides +:exit_on_unknown+
+	attr_accessor :ignore_unknown
 	# Indicates whether exit will be called (with non-zero exit code) when an unknown command-line flag or option is encountered
-	# @return [Boolean]
+	# @return (boolean)
 	# @return *true* exit(1) will be called
 	# @return *false* exit will not be called
 	attr_accessor :exit_on_unknown
-	# @return [Boolean] Indicates whether exit will be called (with zero exit code) when usage/version is requested on the command-line
+	# @return (boolean) Indicates whether exit will be called (with zero exit code) when usage/version is requested on the command-line
 	attr_accessor :exit_on_usage
-	# @return [Array] Optional array of string of program-information that will be written before the rest of the usage block when usage is requested on the command-line
+	# @return (::Array) Optional array of string of program-information that will be written before the rest of the usage block when usage is requested on the command-line
 	attr_accessor :info_lines
-	# @return [String] A program name; defaults to the name of the executing script
-	attr_accessor :program_name
-	# @return [IO] The output stream for normative output; defaults to $stdout
+	# @return (::String) A program name; defaults to the name of the executing script
+	def program_name
+
+		name = @program_name
+
+		if defined?(Colcon) && @stdout.tty?
+
+			name = "#{::Colcon::Decorations::Bold}#{name}#{::Colcon::Decorations::Unbold}"
+		end
+
+		name
+	end
+	attr_writer :program_name
+	# @return (::IO) The output stream for normative output; defaults to $stdout
 	attr_accessor :stdout
-	# @return [IO] The output stream for contingent output; defaults to $stderr
+	# @return (::IO) The output stream for contingent output; defaults to $stderr
 	attr_accessor :stderr
-	# @return [String] Optional string to describe the program values, eg \<xyz "[ { <<directory> | &lt;file> } ]"
+	# @return (::Integer, ::Range) Optional constraint on the values that
+	#  must be provided to the program
+	attr_accessor :constrain_values
+	# @return (::String) Optional string to describe the flags and options
+	# section
+	attr_accessor :flags_and_options
+	# @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 component(s)
+	# @return (::Array) Zero-based array of names for values to be used when
+	#  that value is not present (according to the +:constrain_values+
+	#  attribute)
+	attr_accessor :value_names
+	# @return (::String, ::Array) A version string or an array of integers representing the version component(s)
 	attr_accessor :version
 
 	# Executes the prepared Climate instance
@@ -422,7 +468,12 @@ class Climate
 
 				message = "unrecognised flag '#{f}'; use --help for usage"
 
-				if exit_on_unknown
+				if false
+
+				elsif ignore_unknown
+
+					;
+				elsif exit_on_unknown
 
 					self.abort message
 				else
@@ -479,7 +530,12 @@ class Climate
 
 				message = "unrecognised option '#{o}'; use --help for usage"
 
-				if exit_on_unknown
+				if false
+
+				elsif ignore_unknown
+
+					;
+				elsif exit_on_unknown
 
 					self.abort message
 				else
@@ -497,40 +553,107 @@ class Climate
 		end
 
 
-			# now police any required options
+		# 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
 
-			required_aliases = aliases.select do |a|
+				if exit_on_missing
 
-				a.kind_of?(::CLASP::Option) && a.required?
+					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
 
-			required_aliases = Hash[required_aliases.map { |a| [ a.name, a ] }]
+		# now police the values
 
-			given_options = Hash[results[:options][:given].map { |o| [ o.name, o ]}]
+		values_constraint	=	constrain_values
+		values_constraint	=	values_constraint.begin if ::Range === values_constraint && values_constraint.end == values_constraint.begin
+		val_names			=	::Array === value_names ? value_names : []
 
-			required_aliases.each do |k, a|
+		case values_constraint
+		when nil
 
-				unless given_options.has_key? k
+			;
+		when ::Integer
 
-					message = a.required_message
+			unless values.size == values_constraint
 
-					if exit_on_missing
+				if name = val_names[values.size]
 
-						self.abort message
-					else
+					message = name + ' not specified; use --help for usage'
+				else
 
-						if program_name && !program_name.empty?
+					message = "wrong number of values: #{values.size} given, #{values_constraint} required; use --help for usage"
+				end
 
-							message = "#{program_name}: #{message}"
-						end
+				if exit_on_unknown
 
-						stderr.puts message
+					self.abort message
+				else
+
+					if program_name && !program_name.empty?
+
+						message = "#{program_name}: #{message}"
 					end
 
-					results[:missing_option_aliases] << a
+					stderr.puts message
+				end
+			end
+		when ::Range
+
+			unless values_constraint.include? values.size
+
+				if name = val_names[values.size]
+
+					message = name + ' not specified; use --help for usage'
+				else
+
+					message = "wrong number of values: #{values.size} givens, #{values_constraint.begin} - #{values_constraint.end - (values_constraint.exclude_end? ? 1 : 0)} required; use --help for usage"
+				end
+
+				if exit_on_unknown
+
+					self.abort message
+				else
+
+					if program_name && !program_name.empty?
+
+						message = "#{program_name}: #{message}"
+					end
+
+					stderr.puts message
 				end
+			end
+		else
+
+			warn "value of 'constrain_values' attribute - '#{constrain_values}' (#{constrain_values.class}) - of wrong type : must be #{::Integer}, #{::Range}, or nil"
 		end
 
+
+
 		def results.flags
 
 			self[:flags]
@@ -602,7 +725,7 @@ class Climate
 	# === Signature
 	#
 	# * *Parameters*
-	#   - +name+:: The flag name
+	#   - +name_or_flag+:: The flag name or instance of CLASP::Flag
 	#   - +options+:: An options hash, containing any of the following options.
 	#
 	# * *Options*
@@ -610,13 +733,26 @@ class Climate
 	#   - +:alias+:: 
 	#   - +:aliases+:: 
 	#   - +:extras+:: 
-	def add_flag(name, options={}, &block)
+	def add_flag(name_or_flag, options={}, &block)
+
+		check_parameter name_or_flag, 'name_or_flag', allow_nil: false, types: [ ::String, ::Symbol, ::CLASP::Flag ]
 
-		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		if ::CLASP::Flag === name_or_flag
 
-		aliases << CLASP.Flag(name, **options, &block)
+			aliases << name_or_flag
+		else
+
+			aliases << CLASP.Flag(name_or_flag, **options, &block)
+		end
 	end
 
+	# Adds an option to +aliases+
+	#
+	# === Signature
+	#
+	# * *Parameters*
+	#   - +name_or_option+:: The option name or instance of CLASP::Option
+	#   - +options+:: An options hash, containing any of the following options.
 	#
 	# * *Options*
 	#   - +:alias+:: 
@@ -625,19 +761,25 @@ class Climate
 	#   - +:values_range+:: 
 	#   - +:default_value+:: 
 	#   - +:extras+:: 
-	def add_option(name, options={}, &block)
+	def add_option(name_or_option, options={}, &block)
+
+		check_parameter name_or_option, 'name_or_option', allow_nil: false, types: [ ::String, ::Symbol, ::CLASP::Option ]
 
-		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		if ::CLASP::Option === name_or_option
 
-		aliases << CLASP.Option(name, **options, &block)
+			aliases << name_or_option
+		else
+
+			aliases << CLASP.Option(name_or_option, **options, &block)
+		end
 	end
 
-	# Adds a flag to +aliases+
+	# Adds an alias to +aliases+
 	#
 	# === Signature
 	#
 	# * *Parameters*
-	#   - +name+:: The flag/option name or the valued option
+	#   - +name_or_alias+:: The flag/option name or the valued option
 	#   - +aliases+:: One or more aliases
 	#
 	# === Examples
@@ -670,12 +812,22 @@ class Climate
 	# +climate.add_option('--verbosity')+
 	# +climate.add_alias('--verbosity=succinct', '-s')+
 	# +climate.add_alias('--verbosity=verbose', '-v')+
-	def add_alias(name, *aliases)
+	def add_alias(name_or_alias, *aliases)
 
-		check_parameter name, 'name', allow_nil: false, types: [ ::String, ::Symbol ]
+		check_parameter name_or_alias, 'name_or_alias', allow_nil: false, types: [ ::String, ::Symbol, ::CLASP::Flag, ::CLASP::Option ]
 		raise ArgumentError, "must supply at least one alias" if aliases.empty?
 
-		self.aliases << CLASP.Alias(name, aliases: aliases)
+		case name_or_alias
+		when ::CLASP::Flag
+
+			self.aliases << name_or_alias
+		when ::CLASP::Option
+
+			self.aliases << name_or_alias
+		else
+
+			self.aliases << CLASP.Alias(name_or_alias, aliases: aliases)
+		end
 	end
 end # class Climate
 

data/lib/libclimate/version.rb

@@ -4,11 +4,11 @@
 # Purpose:      Version for libclimate.Ruby library
 #
 # Created:      13th July 2015
-# Updated:      23rd February 2018
+# Updated:      12th March 2019
 #
 # Home:         http://github.com/synesissoftware/libCLImate.Ruby
 #
-# Copyright (c) 2015-2018, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 module LibCLImate
 
 	# Current version of the libCLImate.Ruby library
-	VERSION					=	'0.7.5'
+	VERSION					=	'0.11.0'
 
 	private
 	VERSION_PARTS_			=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/tc_abort.rb

@@ -84,3 +84,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_infer_version.rb

@@ -82,6 +82,29 @@ class Test_Climate_infer_PROGRAM_VERSION_as_array < Test::Unit::TestCase
 	end
 end
 
+class Test_Climate_infer_version_3_2_99_via_PATCH < Test::Unit::TestCase
+
+	PROGRAM_VER_MINOR	=	7
+	PROGRAM_VER_PATCH	=	101
+
+	def test_inference_of_version
+
+		strout = StringIO.new
+
+		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.7.101", s.chomp
+	end
+end
+
 # ############################## end of file ############################# #
 
 

data/test/unit/tc_minimal_CLASP.rb

@@ -360,3 +360,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_test_aliases.rb

@@ -87,3 +87,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_values.rb

@@ -0,0 +1,141 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+
+require 'libclimate'
+
+require 'xqsr3/extensions/test/unit'
+require 'test/unit'
+
+require 'stringio'
+
+class Test_Climate_values_constraints < Test::Unit::TestCase
+
+	def test_constrain_with_no_constraint
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.exit_on_unknown	=	false
+
+			cl.stdout	=	stdout
+			cl.stderr	=	stderr
+		end
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ ]
+		assert_equal 0, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1' ]
+		assert_equal 1, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+	end
+
+	def test_constrain_with_integer
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.exit_on_unknown	=	false
+
+			cl.stdout	=	stdout
+			cl.stderr	=	stderr
+
+			cl.constrain_values = 2
+		end
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ ]
+		assert_equal 0, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+		assert_match /wrong number of values.*0 given.*2 required.*/, stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1' ]
+		assert_equal 1, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+		assert_match /wrong number of values.*1 given.*2 required.*/, stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1', 'value-2' ]
+		assert_equal 2, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1', 'value-2', 'value-3' ]
+		assert_equal 3, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+		assert_match /wrong number of values.*3 given.*2 required.*/, stderr.string
+	end
+
+	def test_constrain_with_simple_range
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.exit_on_unknown	=	false
+
+			cl.stdout	=	stdout
+			cl.stderr	=	stderr
+
+			cl.constrain_values = 0..2
+		end
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ ]
+		assert_equal 0, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1' ]
+		assert_equal 1, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1', 'value-2' ]
+		assert_equal 2, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1', 'value-2', 'value-3' ]
+		assert_equal 3, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+
+		stdout.truncate(0)
+		stderr.truncate(0)
+		r = climate.run [ 'value-1', 'value-2', 'value-3', 'value-4' ]
+		assert_equal 4, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+	end
+end
+

data/test/unit/tc_with_blocks.rb

@@ -50,3 +50,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_with_blocks_CLASP.rb

@@ -50,3 +50,4 @@ end
 
 # ############################## end of file ############################# #
 
+

metadata

@@ -1,55 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: libclimate-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.11.0
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-23 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clasp-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.13.2
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: xqsr3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.31'
 description: |2+
 
 email: matthew@synesis.com.au
@@ -57,12 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.md
-- lib/libclimate.rb
 - lib/libclimate/climate.rb
 - lib/libclimate/libclimate.rb
 - lib/libclimate/version.rb
+- lib/libclimate.rb
 - test/scratch/aliases.rb
 - test/scratch/blankzeroes.rb
 - test/unit/tc_abort.rb
@@ -70,9 +56,12 @@ files:
 - test/unit/tc_minimal.rb
 - test/unit/tc_minimal_CLASP.rb
 - test/unit/tc_test_aliases.rb
+- test/unit/tc_values.rb
 - test/unit/tc_with_blocks.rb
 - test/unit/tc_with_blocks_CLASP.rb
 - test/unit/ts_all.rb
+- README.md
+- LICENSE
 homepage: http://www.libclimate.org/
 licenses:
 - Modified BSD
@@ -83,9 +72,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -93,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: libCLImate.Ruby