libclimate-ruby 0.14.0.1 → 0.15.0

data/lib/libclimate/version.rb

@@ -43,7 +43,7 @@
 module LibCLImate
 
 	# Current version of the libCLImate.Ruby library
-	VERSION					=	'0.14.0.1'
+	VERSION					=	'0.15.0'
 
 	private
 	VERSION_PARTS_			=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/tc_minimal.rb

@@ -250,7 +250,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 			bl = false#proc { is_verbose = true }
 
 			cl.add_flag('--succinct', alias: '-s', help: 'operates succinctly')
-			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely', extras: { :handle => proc { is_verbose = true }})
+			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely') { is_verbose = true }
 		end
 
 		argv = %w{ --help --verbose --succinct }
@@ -308,7 +308,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 			cl.stdout = str
 			cl.exit_on_usage = false
 
-			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely', extras: { handle: proc { is_verbose = true }})
+			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely') { is_verbose = true }
 		end
 
 		argv = %w{ --verbose }
@@ -353,7 +353,7 @@ class Test_Climate_minimal < Test::Unit::TestCase
 			cl.stdout = str
 			cl.exit_on_usage = false
 
-			cl.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', extras: { handle: proc { |o| verbosity = o.value }})
+			cl.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation') { |o| verbosity = o.value }
 		end
 
 		argv = %w{ -v 2 }

data/test/unit/tc_minimal_CLASP.rb

@@ -222,7 +222,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 			cl.exit_on_usage = false
 
 			cl.add_flag('--succinct', alias: '-s', help: 'operates succinctly')
-			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely', extras: { :handle => proc { is_verbose = true }})
+			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely') { is_verbose = true }
 		end
 
 		argv = %w{ --help --verbose --succinct }
@@ -279,7 +279,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 			cl.stdout = str
 			cl.exit_on_usage = false
 
-			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely', extras: { handle: proc { is_verbose = true }})
+			cl.add_flag('--verbose', alias: '-v', help: 'operates verbosely') { is_verbose = true }
 		end
 
 		argv = %w{ --verbose }
@@ -323,7 +323,7 @@ class Test_Climate_minimal_CLASP < Test::Unit::TestCase
 			cl.stdout = str
 			cl.exit_on_usage = false
 
-			cl.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation', extras: { handle: proc { |o| verbosity = o.value }})
+			cl.add_option('--verbosity', alias: '-v', help: 'determines level of verbose operation') { |o| verbosity = o.value }
 		end
 
 		argv = %w{ -v 2 }

data/test/unit/tc_parse.rb

@@ -0,0 +1,171 @@
+#!/usr/bin/env ruby
+#
+# test version inference
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+
+require 'libclimate'
+
+require 'xqsr3/extensions/test/unit'
+
+require 'test/unit'
+
+require 'stringio'
+
+class Test_Climate_parse < Test::Unit::TestCase
+
+	class VerifyException < RuntimeError; end
+
+	class MissingRequiredException < VerifyException; end
+	class UnrecognisedArgumentException < VerifyException; end
+	class UnusedArgumentException < VerifyException; end
+
+	def test_empty_specs_empty_args
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+		]
+
+		r = climate.parse argv
+
+		assert_eql climate, r.climate
+		assert_equal 0, r.flags.size
+		assert_equal 0, r.options.size
+		assert_equal 0, r.values.size
+
+		r.verify()
+	end
+
+	def test_one_flag_with_block
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		debug	=	false
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_flag('--debug', alias: '-d') { debug = true }
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+
+			'-d',
+		]
+
+		r = climate.parse argv
+
+		assert_false debug
+
+		assert_eql climate, r.climate
+		assert_equal 1, r.flags.size
+		assert_equal 0, r.options.size
+		assert_equal 0, r.values.size
+
+		flag0 = r.flags[0]
+
+		assert_equal '-d', flag0.given_name
+		assert_equal '--debug', flag0.name
+
+		r.verify()
+
+		assert_true debug
+	end
+
+	def test_one_option_with_block
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		verb	=	nil
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_option('--verbosity', alias: '-v') do |o, s|
+
+				verb = o.value
+			end
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+
+			'-v',
+			'chatty',
+		]
+
+		r = climate.parse argv
+
+		assert_nil verb
+
+		assert_eql climate, r.climate
+		assert_equal 0, r.flags.size
+		assert_equal 1, r.options.size
+		assert_equal 0, r.values.size
+
+		option0 = r.options[0]
+
+		assert_equal '-v', option0.given_name
+		assert_equal '--verbosity', option0.name
+
+		r.verify()
+
+		assert_equal 'chatty', verb
+	end
+
+	def test_one_required_flag_that_is_missing
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_option('--verbosity', alias: '-v', required: true) do |o, s|
+
+				verb = o.value
+			end
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+		]
+
+		r = climate.parse argv
+
+		assert_eql climate, r.climate
+		assert_equal 0, r.flags.size
+		assert_equal 0, r.options.size
+		assert_equal 0, r.values.size
+
+		assert_raise_with_message(MissingRequiredException, /.*verbosity.*not specified/) { r.verify(raise_on_required: MissingRequiredException) }
+	end
+end
+

data/test/unit/tc_parse_and_verify.rb

@@ -0,0 +1,157 @@
+#!/usr/bin/env ruby
+#
+# test version inference
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+
+require 'libclimate'
+
+require 'xqsr3/extensions/test/unit'
+
+require 'test/unit'
+
+require 'stringio'
+
+class Test_Climate_parse_and_verify < Test::Unit::TestCase
+
+	class VerifyException < RuntimeError; end
+
+	class MissingRequiredException < VerifyException; end
+	class UnrecognisedArgumentException < VerifyException; end
+	class UnusedArgumentException < VerifyException; end
+
+	def test_empty_specs_empty_args
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+		]
+
+		r = climate.parse_and_verify argv
+
+		assert_eql climate, r.climate
+		assert_equal 0, r.flags.size
+		assert_equal 0, r.options.size
+		assert_equal 0, r.values.size
+	end
+
+	def test_one_flag_with_block
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		debug	=	false
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_flag('--debug', alias: '-d') { debug = true }
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+
+			'-d',
+		]
+
+		r = climate.parse_and_verify argv
+
+		assert_true debug
+
+		assert_eql climate, r.climate
+		assert_equal 1, r.flags.size
+		assert_equal 0, r.options.size
+		assert_equal 0, r.values.size
+
+		flag0 = r.flags[0]
+
+		assert_equal '-d', flag0.given_name
+		assert_equal '--debug', flag0.name
+	end
+
+	def test_one_option_with_block
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		verb	=	nil
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_option('--verbosity', alias: '-v') do |o, s|
+
+				verb = o.value
+			end
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+
+			'-v',
+			'chatty',
+		]
+
+		r = climate.parse_and_verify argv
+
+		assert_equal 'chatty', verb
+
+		assert_eql climate, r.climate
+		assert_equal 0, r.flags.size
+		assert_equal 1, r.options.size
+		assert_equal 0, r.values.size
+
+		option0 = r.options[0]
+
+		assert_equal '-v', option0.given_name
+		assert_equal '--verbosity', option0.name
+	end
+
+	def test_one_required_flag_that_is_missing
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.add_option('--verbosity', alias: '-v', required: true) do |o, s|
+
+				verb = o.value
+			end
+
+			cl.stdout = $stdout
+			cl.stderr = $stderr
+		end
+
+		assert $stdout.equal? climate.stdout
+		assert $stderr.equal? climate.stderr
+
+		argv = [
+		]
+
+		assert_raise_with_message(MissingRequiredException, /.*verbosity.*not specified/) do
+
+			climate.parse_and_verify argv, raise_on_required: MissingRequiredException
+		end
+	end
+end
+

data/test/unit/tc_values.rb

@@ -87,6 +87,58 @@ class Test_Climate_values_constraints < Test::Unit::TestCase
 		assert_match /wrong number of values.*3 given.*2 required.*/, stderr.string
 	end
 
+	def test_constrain_with_integer_and_names
+
+		stdout	=	StringIO.new
+		stderr	=	StringIO.new
+
+		climate = LibCLImate::Climate.new do |cl|
+
+			cl.exit_on_missing	=	false
+
+			cl.stdout	=	stdout
+			cl.stderr	=	stderr
+
+			cl.constrain_values = 2
+			cl.value_names = [
+
+				'input-path',
+				'output-path',
+			]
+		end
+
+		stdout.string = ''
+		stderr.string = ''
+		r = climate.run [ ]
+		assert_equal 0, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+		assert_match /input-path not specified.*#{climate.usage_help_suffix}/, stderr.string
+
+		stdout.string = ''
+		stderr.string = ''
+		r = climate.run [ 'value-1' ]
+		assert_equal 1, r.values.size
+		assert_empty stdout.string
+		assert_not_empty stderr.string
+		assert_match /output-path not specified.*#{climate.usage_help_suffix}/, stderr.string
+
+		stdout.string = ''
+		stderr.string = ''
+		r = climate.run [ 'value-1', 'value-2' ]
+		assert_equal 2, r.values.size
+		assert_empty stdout.string
+		assert_empty stderr.string
+
+		stdout.string = ''
+		stderr.string = ''
+		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