clasp-ruby 0.10.3 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e007bbed01cc21eac912ca3b1b9bb469c7d43374
-  data.tar.gz: 4150fa56767e91625f28ab54e79a4c1be191a10a
+  metadata.gz: a8da53dd37696e2528150ea2194a0b3455df79ce
+  data.tar.gz: 531aa7eb5a3f7fac55f024c021f22aefe84b5d75
 SHA512:
-  metadata.gz: 61b42dbcd038db45a01c41aa9d6bb9cd1eb1f01477aace59a0ea8d7a0b645fd8df61d980484b33c16b68b54a9c9d0c83a8bf3a7fe37c761a70b19abe3a8fe8dd
-  data.tar.gz: 68f0d1dab2deb640869437ec1e1de6958717593f12dd2a89ab8d69f515caaf42802f0493846fa7592b08c0dfe30cf2829dcec7e1fdb8202d4fa7e8a8b1b0f979
+  metadata.gz: 182e5db95920e7adbd62786d608d8a8de0c29f85e266d4a3ab481ed24a5c7665fe51c9e1a6a498e78d43d08b3597f145a05bf464fa5c44013001685f849a0e33
+  data.tar.gz: 72372e9151b6f1acf8efe591b9b1d9213acf52c5a042fd442d69c090908ba4f42d091297e6e709a5b18d317ba6f73d568448ce7c8a8a7749c6d720cf9f420513

data/lib/clasp/arguments.rb

@@ -6,7 +6,7 @@
 #               CLASP.Ruby
 #
 # Created:      14th February 2014
-# Updated:      11th June 2016
+# Updated:      16th July 2016
 #
 # Home:         http://github.com/synesissoftware/CLASP.Ruby
 #
@@ -46,6 +46,7 @@
 
 
 
+require 'clasp/util/immutable_array'
 
 =begin
 =end
@@ -178,50 +179,25 @@ class Arguments
 		end
 	end
 
-	class ImmutableArray #:nodoc: all
-
-		include Enumerable
-
-		#:nodoc:
-		def initialize(a)
-
-			@a = a
-		end
-
-		#:nodoc:
-		def each
+	#:startdoc:
 
-			@a.each { |i| yield i }
-		end
+	class ImmutableArray < ::CLASP::Util::ImmutableArray
 
-		#:nodoc:
-		def size
+		def initialize a
 
-			@a.size
+			super a
 		end
 
-		#:nodoc:
-		def empty?
+		# returns truthy if the given flag/option is found or the
+		# given block is truthy
+		def specified? id = nil
 
-			@a.empty?
-		end
-
-		#:nodoc:
-		def [](index)
+			return find(id) { |o| yield o } if block_given?
 
-			@a[index]
-		end
-
-		#:nodoc:
-		def ==(rhs)
-
-			return rhs == @a if rhs.is_a? self.class
-			@a == rhs
+			find { |item| item == id }
 		end
 	end
 
-	#:startdoc:
-
 	# ######################
 	# Construction
 
@@ -431,37 +407,37 @@ class Arguments
 
 	# unchanged copy of the original array of arguments passed to new
 	attr_reader :argv_original_copy
-end
 
-# ######################################################################## #
-# module
 
-end # module CLASP
+	# finds the first unknown flag or option; +nil+ if all used
+	def find_first_unknown options = {}
 
-# ######################################################################## #
-# extensions
+		option	=	{} if options.nil?
 
-#:nodoc:
-class Array
+		raise ArgumentError, "options must be nil or Hash - #{option.class} given" unless options.is_a? ::Hash
 
-	# Monkey-patched Array#== in order to handle comparison with
-	# ImmutableArray
-	#
-	# NOTE: do not do so for +eql?+
+		aliases	=	options[:aliases] || @aliases
 
-	#:nodoc:
-	alias_method :old_equal, :==
+		raise ArgumentError, "aliases may not be nil" if aliases.nil?
 
-	undef :==
+		flags.each do |f|
 
-	#:nodoc:
-	def ==(rhs)
+			return f unless aliases.any? { |al| al.is_a?(::CLASP::Flag) && al.name == f.name }
+		end
+
+		options.each do |o|
 
-		return rhs == self if rhs.is_a? CLASP::Arguments::ImmutableArray
+			return o unless aliases.any? { |al| al.is_a?(::CLASP::Option) && al.name == o.name }
+		end
 
-		old_equal rhs
+		nil
 	end
 end
 
+# ######################################################################## #
+# module
+
+end # module CLASP
+
 # ############################## end of file ############################# #
 

data/lib/clasp/util/immutable_array.rb

@@ -0,0 +1,169 @@
+
+# ######################################################################## #
+# File:         clasp/util/immutable_array.rb
+#
+# Purpose:      Definition of the CLASP::Util::ImmutableArray class
+#
+# Created:      14th February 2014
+# Updated:      16th July 2016
+#
+# Home:         http://github.com/synesissoftware/CLASP.Ruby
+#
+# Author:       Matthew Wilson
+#
+# Copyright (c) 2014-2016, Matthew Wilson and Synesis Software
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the names of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# ######################################################################## #
+
+
+
+
+=begin
+=end
+
+module CLASP
+module Util
+
+# ######################################################################## #
+# classes
+
+# An immutable array
+class ImmutableArray
+
+	include Enumerable
+
+	#:nodoc:
+	def initialize(a)
+
+		raise ArgumentError, "must supply array" if a.nil?
+		raise TypeError, "must supply instance of #{::Array}; #{a.class} given" unless a.is_a? ::Array
+
+		@a = a
+	end
+
+	# Calls the block once for each element in the array
+	def each
+
+		return @a.each unless block_given?
+
+		@a.each { |i| yield i }
+	end
+
+	# Alias for +length+
+	def size
+
+		@a.size
+	end
+
+	# Indicates whether the immutable array has no elements
+	def empty?
+
+		@a.empty?
+	end
+
+	# Same semantics as +Enumerable#find+ for the underlying array
+	def find ifnone = nil
+
+		return @a.find(ifnone) { |o| yield o } if block_given?
+
+		@a.find ifnone
+	end
+
+	# The number of elements in the immutable array
+	def length
+
+		@a.length
+	end
+
+	# Same semantics as +Array#slice+
+	def slice *args
+
+		case args.length
+		when 1
+			case args[0]
+			when ::Integer
+				return @a.slice args[0]
+			end
+		when 2
+		else
+		end
+
+		self.class.new @a.slice(*args)
+	end
+
+	# Same semantics as +Array#[]+
+	def [] *args
+
+		slice(*args)
+	end
+
+	# Determines whether +rhs+ is each to the receiver
+	def == rhs
+
+		return rhs == @a if rhs.is_a? self.class
+
+		@a == rhs
+	end
+end
+
+# ######################################################################## #
+# module
+
+end # module Util
+end # module CLASP
+
+# ######################################################################## #
+# extensions
+
+#:nodoc:
+class Array
+
+	# Monkey-patched Array#== in order to handle comparison with
+	# ImmutableArray
+	#
+	# NOTE: do not do so for +eql?+
+
+	#:nodoc:
+	alias_method :old_equal, :==
+
+	undef :==
+
+	#:nodoc:
+	def ==(rhs)
+
+		return rhs == self if rhs.is_a? CLASP::Arguments::ImmutableArray
+
+		old_equal rhs
+	end
+end
+
+# ############################## end of file ############################# #
+

data/lib/clasp/version.rb

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

data/test/unit/tc_immutable_array.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+require 'clasp'
+
+require 'test/unit'
+
+class Test_ImmutableArray < Test::Unit::TestCase
+
+	ImmutableArray = ::CLASP::Arguments::ImmutableArray
+
+	def test_empty
+
+		ia = ImmutableArray.new []
+
+		assert ia.empty?
+		assert_equal 0, ia.size
+		assert_equal 0, ia.length
+		assert_equal 0, ia.count
+		assert_equal 0, ia.count(:abc)
+		assert_equal 0, ia.count { |o| !o.nil? }
+		assert (ia.find { |o| !o.nil? }).nil?
+		assert_equal ImmutableArray.new([]), ia
+		assert_not_equal ImmutableArray.new([ :def ]), ia
+		assert_not_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert ia[0].nil?
+		assert ia[1].nil?
+		assert_equal ImmutableArray.new([]), ia[0..1]
+	end
+
+	def test_one_item
+
+		ia = ImmutableArray.new [ :def ]
+
+		assert !ia.empty?
+		assert_equal 1, ia.size
+		assert_equal 1, ia.length
+		assert_equal 1, ia.count
+		assert_equal 0, ia.count(:abc)
+		assert_equal 1, ia.count { |o| !o.nil? }
+		assert !(ia.find { |o| !o.nil? }).nil?
+		assert_not_equal ImmutableArray.new([]), ia
+		assert_equal ImmutableArray.new([ :def ]), ia
+		assert_not_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert_equal :def, ia[0]
+		assert ia[1].nil?
+		assert_equal ImmutableArray.new([ :def ]), ia[0..1]
+	end
+
+	def test_two_items
+
+		ia = ImmutableArray.new [ :abc, :def ]
+
+		assert !ia.empty?
+		assert_equal 2, ia.size
+		assert_equal 2, ia.length
+		assert_equal 2, ia.count
+		assert_equal 1, ia.count(:abc)
+		assert_equal 2, ia.count { |o| !o.nil? }
+		assert !(ia.find { |o| !o.nil? }).nil?
+		assert_not_equal ImmutableArray.new([]), ia
+		assert_not_equal ImmutableArray.new([ :def ]), ia
+		assert_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert_equal :abc, ia[0]
+		assert_equal :def, ia[1]
+		assert_equal ImmutableArray.new([ :abc, :def ]), ia[0..1]
+	end
+end
+
+# ############################## end of file ############################# #
+

data/test/unit/tc_util_immutable_array.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '../..', 'lib')
+
+require 'clasp'
+
+require 'test/unit'
+
+class Test_Util_ImmutableArray < Test::Unit::TestCase
+
+	include ::CLASP::Util
+
+	def test_empty
+
+		ia = ImmutableArray.new []
+
+		assert ia.empty?
+		assert_equal 0, ia.size
+		assert_equal 0, ia.length
+		assert_equal 0, ia.count
+		assert_equal 0, ia.count(:abc)
+		assert_equal 0, ia.count { |o| !o.nil? }
+		assert (ia.find { |o| !o.nil? }).nil?
+		assert_equal ImmutableArray.new([]), ia
+		assert_not_equal ImmutableArray.new([ :def ]), ia
+		assert_not_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert ia[0].nil?
+		assert ia[1].nil?
+		assert_equal ImmutableArray.new([]), ia[0..1]
+	end
+
+	def test_one_item
+
+		ia = ImmutableArray.new [ :def ]
+
+		assert !ia.empty?
+		assert_equal 1, ia.size
+		assert_equal 1, ia.length
+		assert_equal 1, ia.count
+		assert_equal 0, ia.count(:abc)
+		assert_equal 1, ia.count { |o| !o.nil? }
+		assert !(ia.find { |o| !o.nil? }).nil?
+		assert_not_equal ImmutableArray.new([]), ia
+		assert_equal ImmutableArray.new([ :def ]), ia
+		assert_not_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert_equal :def, ia[0]
+		assert ia[1].nil?
+		assert_equal ImmutableArray.new([ :def ]), ia[0..1]
+	end
+
+	def test_two_items
+
+		ia = ImmutableArray.new [ :abc, :def ]
+
+		assert !ia.empty?
+		assert_equal 2, ia.size
+		assert_equal 2, ia.length
+		assert_equal 2, ia.count
+		assert_equal 1, ia.count(:abc)
+		assert_equal 2, ia.count { |o| !o.nil? }
+		assert !(ia.find { |o| !o.nil? }).nil?
+		assert_not_equal ImmutableArray.new([]), ia
+		assert_not_equal ImmutableArray.new([ :def ]), ia
+		assert_equal ImmutableArray.new([ :abc, :def ]), ia
+		assert_equal :abc, ia[0]
+		assert_equal :def, ia[1]
+		assert_equal ImmutableArray.new([ :abc, :def ]), ia[0..1]
+	end
+end
+
+# ############################## end of file ############################# #
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clasp-ruby
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.1
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-16 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies: []
 description: |
   Command-Line Argument Sorting and Parsing library that provides a powerful
@@ -29,6 +29,7 @@ files:
 - lib/clasp/cli.rb
 - lib/clasp/doc_.rb
 - lib/clasp/old_module.rb
+- lib/clasp/util/immutable_array.rb
 - lib/clasp/version.rb
 - test/scratch/test_aliases.rb
 - test/scratch/test_list_command_line.rb
@@ -41,7 +42,9 @@ files:
 - test/unit/tc_arguments_3.rb
 - test/unit/tc_defaults_1.rb
 - test/unit/tc_examples_Arguments.rb
+- test/unit/tc_immutable_array.rb
 - test/unit/tc_usage.rb
+- test/unit/tc_util_immutable_array.rb
 - test/unit/ts_all.rb
 homepage: http://github.com/synesissoftware/CLASP.Ruby
 licenses: