libclimate-ruby 0.2.4 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f0e8e0239a415d2c396a07c97b040db5bc29c3
-  data.tar.gz: 9fd775fe9b0e5c64c0507d6fdb76a2208889a35a
+  metadata.gz: 8ddeb7a8f3fbcbe387ff00dc9c0413a2921a1573
+  data.tar.gz: 205642b3c90c1c34685163a87534b496e10b1e97
 SHA512:
-  metadata.gz: cdefc270711e796b5e26bf9e436ef44cddfe309a1120cc77aa463f0fb2f0ed36015bc75b2bd7cc35093f33b80d279ee49939c8b276dea862ee9b3660af62635a
-  data.tar.gz: fa9c99fc53a11004a1525771ab9cf51f25693abf685f076b8bb14260674ab11f0af89a9ce3f39af329ee03ebc402c88b9520d151051d461cdba1db61ced7a746
+  metadata.gz: 9fa38dafe06b342668e826492f9219904833f1e0a91feb11754f8731187bf42106fcad467ec08c7b8d360fb6ddeb4c9cf68c1bd63ba69aa54a206126a79c1a79
+  data.tar.gz: 3c8de16fba64582e4d4fc9ec9bf121c924de7b3a736972c413f2e28b86c47446bd9154daed06658e5d303e6c3f4c1946e66b57aebad730fac5e3809766d130cf

data/lib/libclimate/climate.rb

@@ -54,6 +54,75 @@ if !defined? Colcon
 	end
 end
 
+#:stopdoc:
+
+# We monkey-patch CLASP module's Flag and Option generator methods by
+# added in a 'action' attribute (but only if it does not exist)
+# and attaching the given block
+
+class << CLASP
+
+	alias_method :Flag_old, :Flag
+	alias_method :Option_old, :Option
+
+	def Flag(name, options={}, &blk)
+
+		f = self.Flag_old(name, options)
+
+		# anticipate this functionality being added to CLASP
+		return f if f.respond_to? :action
+
+		class << f
+
+			attr_accessor :action
+		end
+
+		if blk
+
+			case blk.arity
+			when 0, 1, 2
+			else
+
+				warn "wrong arity for flag"
+			end
+
+			f.action = blk
+		end
+
+		f
+	end
+
+	def Option(name, options={}, &blk)
+
+		o = self.Option_old(name, options)
+
+		# anticipate this functionality being added to CLASP
+		return o if o.respond_to? :action
+
+		class << o
+
+			attr_accessor :action
+		end
+
+		if blk
+
+			case blk.arity
+			when 0, 1, 2
+			else
+
+				warn "wrong arity for option"
+			end
+
+			o.action = blk
+		end
+
+		o
+	end
+end
+
+#:startdoc:
+
+
 module LibCLImate
 
 # Class used to gather together the CLI specification, and execute it
@@ -189,15 +258,26 @@ class Climate
 
 				selector	=	:unhandled
 
-				ex = al.extras
+				# see if it has a :action attribute (which will have been
+				# monkey-patched to CLASP.Flag()
+
+				if al.respond_to?(:action) && !al.action.nil?
+
+					al.action.call(f, al)
+
+					selector = :handled
+				else
 
-				case ex
-				when ::Hash
-					if ex.has_key? :handle
+					ex = al.extras
 
-						ex[:handle].call(f, al)
+					case ex
+					when ::Hash
+						if ex.has_key? :handle
 
-						selector = :handled
+							ex[:handle].call(f, al)
+
+							selector = :handled
+						end
 					end
 				end
 
@@ -229,15 +309,25 @@ class Climate
 
 				selector	=	:unhandled
 
-				ex = al.extras
+				# see if it has a :action attribute (which will have been
+				# monkey-patched to CLASP.Option()
+
+				if al.respond_to?(:action) && !al.action.nil?
+
+					al.action.call(o, al)
+
+					selector = :handled
+				else
+					ex = al.extras
 
-				case ex
-				when ::Hash
-					if ex.has_key? :handle
+					case ex
+					when ::Hash
+						if ex.has_key? :handle
 
-						ex[:handle].call(o, al)
+							ex[:handle].call(o, al)
 
-						selector = :handled
+							selector = :handled
+						end
 					end
 				end
 

data/lib/libclimate/version.rb

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

data/test/unit/tc_with_blocks.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/ruby
+#
+# test Recls entries
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+
+require 'libclimate'
+
+require 'xqsr3/extensions/test/unit'
+
+require 'test/unit'
+
+require 'stringio'
+
+class Test_Climate_with_blocks < Test::Unit::TestCase
+
+	def test_flag_with_block
+
+		is_verbose	=	false
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.aliases << CLASP.Flag('--verbose') { is_verbose = true }
+		end
+
+		argv = %w{ --verbose }
+
+		climate.run argv
+
+		assert is_verbose, "block associated with flag '--verbose' was not executed"
+	end
+
+	def test_option_with_block
+
+		flavour	=	nil
+
+		climate = LibCLImate::Climate.new do |climate|
+
+			climate.aliases << CLASP.Option('--flavour') { |o|  flavour = o.value }
+		end
+
+		argv = %w{ --flavour=blueberry }
+
+		climate.run argv
+
+		assert_equal 'blueberry', flavour
+	end
+end
+
+# ############################## end of file ############################# #
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libclimate-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Wilson
@@ -66,6 +66,7 @@ files:
 - test/scratch/blankzeroes.rb
 - test/unit/tc_minimal.rb
 - test/unit/tc_test_aliases.rb
+- test/unit/tc_with_blocks.rb
 - test/unit/ts_all.rb
 homepage: http://www.libclimate.org/
 licenses: