recls-ruby 2.7.5 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95854b93012f09220089014356ec0360436865eb
-  data.tar.gz: 9059a6ec0fe372902124c497b8155edd67608b2d
+  metadata.gz: fd3873b6ab2b854777d003cfefd78240322da3ec
+  data.tar.gz: 35234197d743227278a98b4bb6d645f5c895a452
 SHA512:
-  metadata.gz: 309026753993dd26ef59312bb5a92c1e3a27b41e237a2dc10b66c9756b82ad037f4fbab60e912321bbd0faba6a4702562506bad3ee0578dd1e30c09f1626b3c7
-  data.tar.gz: f859efe6be5cd292f455796451026c9ec17afb21fd31b45a933669536ab2810f28941d451a838b08ff5f80cfba8f5a54c5b4e97b4992222b83b0ea4b418cf01b
+  metadata.gz: 62d7e2ee09b3b4ed8f8908a4ecbc5fb4c82b3c0cc6c553310913384c4573bebca95a8dd6c960f57c7555511fc954541c6542ef11a5d328cd4abed411ccae2689
+  data.tar.gz: a7609496ada38d41d30b054603fbf28300961eae8f3b18012ab3ff68ac41d294b378a32c2d3093e50065bd1ee783b9287dac4f70cb5d5d709d7ad8ee0ebc3136

data/README.md

@@ -26,3 +26,9 @@ Defect reports, feature requests, and pull requests are welcome on https://githu
 ## License
 
 **recls.Ruby** is released under the 3-clause BSD license. See LICENSE for details.
+
+## Compatibility
+
+From v2.8 onwards, recls.Ruby is compatible only with Ruby 2.0+
+
+

data/lib/recls/util.rb

@@ -4,11 +4,11 @@
 # Purpose:      Utility module functions for recls library
 #
 # Created:      17th February 2014
-# Updated:      27th August 2015
+# Updated:      25th January 2018
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2015, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -63,11 +63,35 @@ module Recls
 
 	# Combines paths, optionally canonicalising them
 	#
-	def self.combine_paths(origin, path, options={})
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +paths+:: [ [ ::String, ::Recls::Entry ] ] Array of 1 or more path
+	#     elements to be combined
+	#   - +options+:: [::Hash] Options that moderate the combination
+	#
+	# * *Parameters:*
+	#   - +:canonicalise+:: [boolean] Causes the evaluated path to be
+	#     canonicalised - with +Recls.canonicalise_path+ - before it is
+	#     returned
+	#   - +:clean+:: [boolean] Causes the evaluated path to be cleaned
+	#     (i.e. sent to +cleanpath+) before it is returned. Ignored if
+	#     +:canonicalise+ is specified
+	#   - +:clean_path+:: [boolean] Equivalent to +:clean+, but deprecated
+	#     and may be removed in a future version
+	#
+	# === Return
+	#  The combined path
+	def self.combine_paths(*paths, **options)
 
-		return Recls::Ximpl.combine_paths origin, path, options
+		paths	=	paths.reject { |p| p.nil? }
+
+		raise ArgumentError, 'must specify one or more path elements' if paths.empty?
+
+		return Recls::Ximpl.combine_paths paths, options
 	end
 end
 
 # ############################## end of file ############################# #
 
+

data/lib/recls/version.rb

@@ -4,11 +4,11 @@
 # Purpose:      Version for recls library
 #
 # Created:      14th February 2014
-# Updated:      22nd June 2017
+# Updated:      5th February 2018
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
 module Recls
 
 	# Current version of the recls.Ruby library
-	VERSION				=	'2.7.5'
+	VERSION				=	'2.8.2'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:
@@ -51,3 +51,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/lib/recls/ximpl/util.rb

@@ -4,11 +4,11 @@
 # Purpose:     Internal implementation constructs for the recls library.
 #
 # Created:     24th July 2012
-# Updated:     22nd June 2017
+# Updated:     25th January 2018
 #
 # Author:      Matthew Wilson
 #
-# Copyright (c) 2012-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,7 @@ module Recls
 				return true if ?/ == c
 
 				if Recls::Ximpl::OS::OS_IS_WINDOWS
+
 					return true if ?\\ == c
 				end
 
@@ -126,6 +127,7 @@ module Recls
 					#
 					# NOTE: this works for both rooted and unrooted paths
 					if p =~ /^([a-zA-Z]:)/
+
 						return [ $1, $' ]
 					end
 
@@ -133,18 +135,22 @@ module Recls
 					#
 					# NOTE: there are several permutations ...
 					if p =~ /^(\\\\[^\\\/:*?<>|]+\\[^\\\/:*?<>|]+)([\\\/].*)$/
+
 						# \\server\share{\{... rest of path}}
 						return [ $1, $2 ]
 					end
 					if p =~ /^(\\\\[^\\\/:*?<>|]+\\[^\\\/:*?<>|]+)$/
+
 						# \\server\share
 						return [ $1, nil ]
 					end
 					if p =~ /^(\\\\[^\\\/:*?<>|]+\\)$/
+
 						# \\server\
 						return [ $1, nil ]
 					end
 					if p =~ /^(\\\\[^\\\/:*?<>|]+)$/
+
 						# \\server
 						return [ $1, nil ]
 					end
@@ -167,10 +173,13 @@ module Recls
 				parts << wr if wr
 
 				until rem.nil? || rem.empty?
+
 					if rem =~ /^([^\\\/]*[\\\/])/
+
 						parts << $1
 						rem = $'
 					else
+
 						parts << rem
 						rem = ''
 					end
@@ -199,15 +208,19 @@ module Recls
 				remainder = nil if not remainder or remainder.empty?
 
 				if not remainder or remainder.empty?
+
 					f2_directory = nil
 					f3_basename = nil
 					f4_nameonly = nil
 					f5_extension = nil
 				else
+
 					if remainder =~ /^(.*[\\\/])([^\\\/]*)$/
+
 						f2_directory = $1
 						f3_basename = $2
 					else
+
 						f2_directory = nil
 						f3_basename = remainder
 						f4_nameonly = nil
@@ -218,18 +231,23 @@ module Recls
 					f3_basename = nil if not f3_basename or f3_basename.empty?
 
 					if f3_basename
+
 						# special case: treat '.' and '..' as file-name only
 						if '.' == f3_basename or '..' == f3_basename
+
 							f4_nameonly = f3_basename
 							f5_extension = nil
 						elsif f3_basename =~ /^(.*)(\.[^.]*)$/
+
 							f4_nameonly = $1
 							f5_extension = $2
 						else
+
 							f4_nameonly = f3_basename
 							f5_extension = nil
 						end
 					else
+
 						f4_nameonly = nil
 						f5_extension = nil
 					end
@@ -270,11 +288,14 @@ module Recls
 					next if part.empty?
 
 					if path_is_rooted.nil?
+
 						path_is_rooted = self.is_path_name_separator(part[0])
 					end
 
 					if ?. == part[0]
+
 						if self.is_path_name_separator(part[1])
+
 							# single dots, so ...
 
 							# ... remember the last instance, and ...
@@ -283,7 +304,9 @@ module Recls
 							# ... skip to leave this out of the result
 							next
 						elsif ?. == part[1]
+
 							if self.is_path_name_separator(part[2])
+
 								# double dots, so ...
 								# ... skip this and pop prior from the new list iff:
 								#
@@ -291,26 +314,34 @@ module Recls
 								# 2. the last element in the new list is not the root directory; AND
 								# 3. the last element in the list is not a dots directory
 								if not newParts.empty? # 1.
+
 									priorPart = newParts[-1]
 									if 1 == newParts.size and OS.is_root_dir_(priorPart)
+
 										# 2.
 										next
 									else
+
 										dirtype = OS.get_number_of_dots_dir_(priorPart)
 										if 0 == dirtype # 3.
+
 											if newParts.pop
+
 												next
 											end
 										end
 									end
 								end
 							else
+
 								# it's a ..X part
 							end
 						else
+
 							# it's a .X part
 						end
 					else
+
 						# it's a non-dots part
 					end
 
@@ -320,25 +351,35 @@ module Recls
 				consume_basename = false
 
 				if basename
+
 					if ?. == basename[0]
+
 						if 1 == basename.size
+
 							# single dots
 							if newParts.empty?
+
 								lastSingleDots = false
 							else
+
 								consume_basename = true
 							end
 						elsif ?. == basename[1] and 2 == basename.size
+
 							# double dots, so ...
 							#
 							# ... pop unless we already have some outstanding double dots
 							if newParts.empty?
+
 								newParts << '..'
 								consume_basename = true
 							elsif 1 == newParts.size && 1 == newParts[0].size && Util.is_path_name_separator(newParts[0][0])
+
 								consume_basename = true
 							else
+
 								if 2 != OS.get_number_of_dots_dir_(newParts[-1])
+
 									newParts.pop
 									consume_basename = true
 								end
@@ -352,23 +393,30 @@ module Recls
 				newParts << lastSingleDots if lastSingleDots and newParts.empty?
 
 				if not newParts.empty?
+
 					if 2 == OS.get_number_of_dots_dir_(newParts[-1])
+
 						# the last element is the double-dots directory, but
 						# need to determine whether to ensure/remote a
 						# trailing slash
 						if basename and not basename.empty?
+
 							if not consume_basename
+
 								# leave as is
 							else
+
 								# 
 								newParts[-1] = '..'
 							end
 						end
 					end
 				else
+
 					# handle case where all (double)-dots have eliminated
 					# all regular directories
 					if not basename or basename.empty? or consume_basename
+
 						newParts << '.'
 					end
 				end
@@ -395,8 +443,10 @@ module Recls
 			dummy3 = dummy3
 
 			if not f2_directory
+
 				canonicalised_directory = nil
 			else
+
 				canonicalised_directory, consume_basename = Util.canonicalise_parts(directory_parts, f3_basename)
 				f3_basename = nil if consume_basename
 			end
@@ -414,6 +464,7 @@ module Recls
 			when ::Recls::Entry
 				path = path.to_s
 			else
+
 				raise TypeError, "parameter path ('#{path}') is of type #{path.class} must be an instance of #{::String} or #{::Recls::Entry}"
 			end
 
@@ -430,6 +481,7 @@ module Recls
 			dummy6 = dummy6
 
 			if f2_directory =~ /^[\\\/]/
+
 				return path
 			end
 
@@ -438,8 +490,10 @@ module Recls
 			trailing_slash = Util.get_trailing_slash(path)
 
 			if '.' == path
+
 				return Util.trim_trailing_slash cwd
 			elsif 2 == path.size and trailing_slash
+
 				return Util.append_trailing_slash(cwd, path[1..1])
 			end
 
@@ -450,8 +504,10 @@ module Recls
 			path = canonicalise_path path
 
 			if trailing_slash
+
 				path = Util.append_trailing_slash path, trailing_slash
 			else
+
 				path = Util.trim_trailing_slash path
 			end
 
@@ -475,25 +531,31 @@ module Recls
 			# detecting the last (back)slash
 
 			if Recls::Ximpl::OS::OS_IS_WINDOWS
+
 				wr, rem = Util.get_windows_root(path)
 
 				# suppress unused warning
 				wr = wr
 
 				if not rem
+
 					return ''
 				else
+
 					path = rem
 				end
 			end
 
 			if not path.is_a? String
+
 				path = path.to_s
 			end
 
 			if path =~ /^.*[\/\\](.*)/
+
 				$1
 			else
+
 				path
 			end
 		end
@@ -510,21 +572,28 @@ module Recls
 			use_split_path = false
 
 			if Recls::Ximpl::OS::OS_IS_WINDOWS
+
 				if path.include? ?\\
+
 					use_split_path = true
 				end
 			end
 
 			if path.include? ?/
+
 				use_split_path = true
 			end
 
 			if use_split_path
+
 				ext = Util.split_path(path)[4]
 			else
+
 				if path =~ /^.*(\.[^.]*)$/
+
 					ext = $1
 				else
+
 					ext = nil
 				end
 			end
@@ -552,10 +621,13 @@ module Recls
 			directory_parts = []
 
 			until directory.empty?
+
 				if directory =~ /^([^\\\/]*[\\\/])/
+
 					directory_parts << $1
 					directory = $'
 				else
+
 					directory_parts << directory
 					directory = ''
 				end
@@ -581,6 +653,7 @@ module Recls
 
 			# if different windows root, then cannot provide relative
 			if path_splits[0] and origin_splits[0]
+
 				return path if path_splits[0] != origin_splits[0]
 			end
 
@@ -598,14 +671,17 @@ module Recls
 				origin_part	=	origin_parts[0]
 
 				if 1 == path_parts.size || 1 == origin_parts.size
+
 					path_part	=	Util.append_trailing_slash(path_part)
 					origin_part	=	Util.append_trailing_slash(origin_part)
 				end
 
 				if path_part == origin_part
+
 					path_parts.shift
 					origin_parts.shift
 				else
+
 					break
 				end
 			end
@@ -620,25 +696,46 @@ module Recls
 		end
 
 
-		def self.combine_paths(origin, path, options)
+		def self.combine_paths(paths, options)
 
-			dummy1, f2_directory, dummy2, dummy3, dummy4, dummy5, dummy6 = Util.split_path(path)
+			paths	=	[ paths ] unless ::Array === paths
+			abs_ix	=	0
 
-			# suppress unused warnings
-			dummy1 = dummy1
-			dummy2 = dummy2
-			dummy3 = dummy3
-			dummy4 = dummy4
-			dummy5 = dummy5
-			dummy6 = dummy6
+			paths.each_with_index do |path, index|
+
+				dummy1, f2_directory, dummy2, dummy3, dummy4, dummy5, dummy6 = Util.split_path(path)
+
+				# suppress unused warnings
+				dummy1 = dummy1
+				dummy2 = dummy2
+				dummy3 = dummy3
+				dummy4 = dummy4
+				dummy5 = dummy5
+				dummy6 = dummy6
 
-			return path if f2_directory && Util.is_path_name_separator(f2_directory[0])
+				if f2_directory && Util.is_path_name_separator(f2_directory[0])
 
-			r	=	File.join origin, path
+					abs_ix = index
+				end
+			end
+
+			paths	=	paths[abs_ix..-1]
+
+			r		=	File.join *paths
+
+			cap	=	options[:canonicalise] || options[:canonicalize]
+
+			if cap
 
-			if options[:clean_path]
+				r = Recls.canonicalise_path r
+			else
+
+				clp	=	options[:clean] || options[:clean_path]
+
+				if clp
 
-				r = Pathname.new(r).cleanpath
+					r = Pathname.new(r).cleanpath.to_s
+				end
 			end
 
 			r
@@ -665,6 +762,7 @@ module Recls
 				$stderr.puts "exception (#{x.class}): #{x}" if $DEBUG
 
 				if(0 != (STOP_ON_ACCESS_FAILURE & flags))
+
 					raise
 				end
 
@@ -676,3 +774,4 @@ end
 
 # ############################## end of file ############################# #
 
+

data/test/unit/tc_recls_util.rb

@@ -9,150 +9,223 @@ require 'recls/util'
 
 require 'test/unit'
 
+class Test_combine_paths < Test::Unit::TestCase
+
+	def test_nil_nil
+
+		assert_raise(::ArgumentError) { Recls.combine_paths(nil, nil) }
+	end
+
+	def test_origin_nil
+
+		strings = [
+
+			'abc',
+			'abc/def',
+			'abc/def/ghi.ext',
+		]
+
+		strings.each do |s|
+
+			assert_equal s, Recls.combine_paths(nil, s)
+		end
+	end
+
+	def test_path_nil
+
+		strings = [
+
+			'abc',
+			'abc/def',
+			'abc/def/ghi.ext',
+		]
+
+		strings.each do |s|
+
+			assert_equal s, Recls.combine_paths(s, nil)
+		end
+	end
+
+	def test_both_relative
+
+		assert_equal 'abc/def', Recls.combine_paths('abc', 'def')
+		assert_equal 'abc/def', Recls.combine_paths('abc/', 'def')
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/def', 'ghi')
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/def/', 'ghi')
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc', 'def/ghi')
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/', 'def/ghi')
+		assert_equal 'abc/./def/ghi', Recls.combine_paths('abc/.', 'def/ghi')
+		assert_equal 'abc/./def/ghi', Recls.combine_paths('abc/./', 'def/ghi')
+		assert_equal 'abc/./def/ghi', Recls.combine_paths('abc/.', 'def/ghi', clean_path: false)
+		assert_equal 'abc/./def/ghi', Recls.combine_paths('abc/./', 'def/ghi', clean: false)
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/.', 'def/ghi', clean_path: true)
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/./', 'def/ghi', clean: true)
+		assert_equal 'abc/def/ghi', Recls.combine_paths('abc/./.', 'def/ghi', clean_path: true)
+		assert_equal 'abc/../def/ghi', Recls.combine_paths('abc/..', 'def/ghi')
+		assert_equal 'def/ghi', Recls.combine_paths('abc/..', 'def/ghi', clean_path: true)
+	end
+
+	def test_multiple_relative
+
+		assert_equal 'a/b/c/d/e/f/g', Recls.combine_paths('a', 'b', 'c', 'd/e/f/', 'g', clean: false)
+		assert_equal 'a/b/c/d/e/f/g', Recls.combine_paths('a', 'b', 'c', 'd/e/f/', 'g', clean: true)
+
+		assert_equal 'a/b/c/../d/e/f/g', Recls.combine_paths('a', 'b', 'c', '..', 'd/e/f/', 'g', clean: false)
+		assert_equal 'a/b/d/e/f/g', Recls.combine_paths('a', 'b', 'c', '..', 'd/e/f/', 'g/', clean: true)
+		assert_equal 'a/b/d/e/f/g/', Recls.combine_paths('a', 'b', 'c', '..', 'd/e/f/', 'g/', canonicalise: true)
+	end
+
+	def test_various_absolute_placings
+
+		assert_equal '/a/b/c/d/e/f/g', Recls.combine_paths('/', 'a', 'b', 'c', 'd/e', 'f/g')
+
+		assert_equal '/b/c/d/e/f/g', Recls.combine_paths('/', 'a', '/b', 'c', 'd/e', 'f/g')
+
+		assert_equal '/c/d/e/f/g', Recls.combine_paths('/', 'a', 'b', '/c', 'd/e', 'f/g')
+
+		assert_equal '/d/e/f/g', Recls.combine_paths('/', 'a', 'b', 'c', '/d/e', 'f/g')
+
+		assert_equal '/f/g', Recls.combine_paths('/', 'a', 'b', 'c', 'd/e', '/f/g')
+		assert_equal '/f/g/', Recls.combine_paths('/', 'a', 'b', 'c', 'd/e', '/f/g/')
+		assert_equal '/f/g', Recls.combine_paths('/', 'a', 'b', 'c', 'd/e', '/f/g/', clean: true)
+		assert_equal '/f/g/', Recls.combine_paths('/', 'a', 'b', 'c', 'd/e', '/f/g/', canonicalise: true)
+	end
+end
+
 class Test_canonicalise_path < Test::Unit::TestCase
 
 	def test_nil
 
-		assert_nil(Recls::canonicalise_path(nil))
-
+		assert_nil(Recls.canonicalise_path(nil))
 	end
 
 	def test_empty
 
-		assert_equal('', Recls::canonicalise_path(''))
-
+		assert_equal('', Recls.canonicalise_path(''))
 	end
 
 	def test_dots_directories
 
-		assert_equal('.', Recls::canonicalise_path('.'))
-		assert_equal('./', Recls::canonicalise_path('./'))
-		assert_equal('.', Recls::canonicalise_path('././.'))
-		assert_equal('./', Recls::canonicalise_path('./././'))
-
-		assert_equal('..', Recls::canonicalise_path('..'))
-		assert_equal('../', Recls::canonicalise_path('../'))
-		assert_equal('..', Recls::canonicalise_path('../.'))
-		assert_equal('../', Recls::canonicalise_path('.././'))
+		assert_equal('.', Recls.canonicalise_path('.'))
+		assert_equal('./', Recls.canonicalise_path('./'))
+		assert_equal('.', Recls.canonicalise_path('././.'))
+		assert_equal('./', Recls.canonicalise_path('./././'))
 
+		assert_equal('..', Recls.canonicalise_path('..'))
+		assert_equal('../', Recls.canonicalise_path('../'))
+		assert_equal('..', Recls.canonicalise_path('../.'))
+		assert_equal('../', Recls.canonicalise_path('.././'))
 	end
 
 	def test_files_only
 
-		assert_equal('a', Recls::canonicalise_path('a'))
-		assert_equal('file', Recls::canonicalise_path('file'))
-		assert_equal('file.ext', Recls::canonicalise_path('file.ext'))
-
+		assert_equal('a', Recls.canonicalise_path('a'))
+		assert_equal('file', Recls.canonicalise_path('file'))
+		assert_equal('file.ext', Recls.canonicalise_path('file.ext'))
 	end
 
 	def test_zero_parts
 
 		if Recls::Ximpl::OS::OS_IS_WINDOWS
 
-			assert_equal('H:', Recls::canonicalise_path('H:'))
-
-			assert_equal('\\\\server', Recls::canonicalise_path('\\\\server'))
-			assert_equal('\\\\server\\', Recls::canonicalise_path('\\\\server\\'))
-			assert_equal('\\\\server\\share', Recls::canonicalise_path('\\\\server\\share'))
-			assert_equal('\\\\server\\share/', Recls::canonicalise_path('\\\\server\\share/'))
+			assert_equal('H:', Recls.canonicalise_path('H:'))
 
+			assert_equal('\\\\server', Recls.canonicalise_path('\\\\server'))
+			assert_equal('\\\\server\\', Recls.canonicalise_path('\\\\server\\'))
+			assert_equal('\\\\server\\share', Recls.canonicalise_path('\\\\server\\share'))
+			assert_equal('\\\\server\\share/', Recls.canonicalise_path('\\\\server\\share/'))
 		end
-
 	end
 
 	def test_canonicalised_directories_one_level
 
-		assert_equal('abc', Recls::canonicalise_path('abc'))
-		assert_equal('abc/', Recls::canonicalise_path('abc/'))
-		assert_equal('/abc', Recls::canonicalise_path('/abc'))
-		assert_equal('/abc/', Recls::canonicalise_path('/abc/'))
-
-	end # test_canonicalised_directories_one_level
+		assert_equal('abc', Recls.canonicalise_path('abc'))
+		assert_equal('abc/', Recls.canonicalise_path('abc/'))
+		assert_equal('/abc', Recls.canonicalise_path('/abc'))
+		assert_equal('/abc/', Recls.canonicalise_path('/abc/'))
+	end
 
 	def test_canonicalised_directories_two_levels
 
-		assert_equal('abc/def', Recls::canonicalise_path('abc/def'))
-		assert_equal('abc/def/', Recls::canonicalise_path('abc/def/'))
-		assert_equal('/abc/def', Recls::canonicalise_path('/abc/def'))
-		assert_equal('/abc/def/', Recls::canonicalise_path('/abc/def/'))
-
-	end # test_canonicalised_directories_two_levels
+		assert_equal('abc/def', Recls.canonicalise_path('abc/def'))
+		assert_equal('abc/def/', Recls.canonicalise_path('abc/def/'))
+		assert_equal('/abc/def', Recls.canonicalise_path('/abc/def'))
+		assert_equal('/abc/def/', Recls.canonicalise_path('/abc/def/'))
+	end
 
 	def test_uncanonicalised_directories_one_level
 
-		assert_equal('.', Recls::canonicalise_path('.'))
-		assert_equal('./', Recls::canonicalise_path('./'))
-		assert_equal('/', Recls::canonicalise_path('/.'))
-		assert_equal('/', Recls::canonicalise_path('/./'))
-
-		assert_equal('..', Recls::canonicalise_path('..'))
-		assert_equal('../', Recls::canonicalise_path('../'))
-		assert_equal('/', Recls::canonicalise_path('/..'))
-		assert_equal('/', Recls::canonicalise_path('/../'))
+		assert_equal('.', Recls.canonicalise_path('.'))
+		assert_equal('./', Recls.canonicalise_path('./'))
+		assert_equal('/', Recls.canonicalise_path('/.'))
+		assert_equal('/', Recls.canonicalise_path('/./'))
 
-	end # def test_uncanonicalised_directories_one_level
+		assert_equal('..', Recls.canonicalise_path('..'))
+		assert_equal('../', Recls.canonicalise_path('../'))
+		assert_equal('/', Recls.canonicalise_path('/..'))
+		assert_equal('/', Recls.canonicalise_path('/../'))
+	end
 
 	def test_single_canonicalisation
 
-		assert_equal('dir.1/', Recls::canonicalise_path('dir.1/'))
-		assert_equal('dir.1/', Recls::canonicalise_path('dir.1/./'))
-		assert_equal('dir.1/', Recls::canonicalise_path('./dir.1/./'))
-		assert_equal('dir.1/', Recls::canonicalise_path('./dir.1/.'))
-
+		assert_equal('dir.1/', Recls.canonicalise_path('dir.1/'))
+		assert_equal('dir.1/', Recls.canonicalise_path('dir.1/./'))
+		assert_equal('dir.1/', Recls.canonicalise_path('./dir.1/./'))
+		assert_equal('dir.1/', Recls.canonicalise_path('./dir.1/.'))
 	end
 
 	def test_double_canonicalisation
 
-		assert_equal('dir.1/dir.2/', Recls::canonicalise_path('dir.1/dir.2/'))
-		assert_equal('dir.1/dir.2/', Recls::canonicalise_path('dir.1/dir.2/dir.3/../'))
-		assert_equal('dir.1/dir.2/', Recls::canonicalise_path('dir.1/dir.2/dir.3/../'))
-		assert_equal('dir.1/dir.2/', Recls::canonicalise_path('dir.1/dir.3/../dir.2/'))
-		assert_equal('dir.1/dir.2/', Recls::canonicalise_path('dir.3/../dir.1/dir.2/'))
+		assert_equal('dir.1/dir.2/', Recls.canonicalise_path('dir.1/dir.2/'))
+		assert_equal('dir.1/dir.2/', Recls.canonicalise_path('dir.1/dir.2/dir.3/../'))
+		assert_equal('dir.1/dir.2/', Recls.canonicalise_path('dir.1/dir.2/dir.3/../'))
+		assert_equal('dir.1/dir.2/', Recls.canonicalise_path('dir.1/dir.3/../dir.2/'))
+		assert_equal('dir.1/dir.2/', Recls.canonicalise_path('dir.3/../dir.1/dir.2/'))
 
-		assert_equal('../dir.1/dir.2/', Recls::canonicalise_path('../dir.1/dir.2/'))
-		assert_equal('../dir.4/', Recls::canonicalise_path('../dir.1/../dir.4/'))
+		assert_equal('../dir.1/dir.2/', Recls.canonicalise_path('../dir.1/dir.2/'))
+		assert_equal('../dir.4/', Recls.canonicalise_path('../dir.1/../dir.4/'))
 
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/dir.1/dir.2/'))
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/dir.1/dir.2/dir.3/../'))
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/dir.1/dir.2/dir.3/../'))
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/dir.1/dir.3/../dir.2/'))
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/dir.3/../dir.1/dir.2/'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/dir.1/dir.2/'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/dir.1/dir.2/dir.3/../'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/dir.1/dir.2/dir.3/../'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/dir.1/dir.3/../dir.2/'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/dir.3/../dir.1/dir.2/'))
 
-		assert_equal('/dir.1/dir.2/', Recls::canonicalise_path('/../dir.1/dir.2/'))
-		assert_equal('/dir.4/', Recls::canonicalise_path('/../dir.1/../dir.4/'))
+		assert_equal('/dir.1/dir.2/', Recls.canonicalise_path('/../dir.1/dir.2/'))
+		assert_equal('/dir.4/', Recls.canonicalise_path('/../dir.1/../dir.4/'))
 
-		assert_equal('/dir.14/', Recls::canonicalise_path('/dir.14/dir.2/..'))
-		assert_equal('/', Recls::canonicalise_path('/dir.14/dir.2/../..'))
-		assert_equal('/', Recls::canonicalise_path('/dir.14/dir.2/../../..'))
-		assert_equal('dir.14/', Recls::canonicalise_path('dir.14/dir.2/..'))
-		assert_equal('.', Recls::canonicalise_path('dir.14/dir.2/../..'))
-		assert_equal('..', Recls::canonicalise_path('dir.14/dir.2/../../..'))
+		assert_equal('/dir.14/', Recls.canonicalise_path('/dir.14/dir.2/..'))
+		assert_equal('/', Recls.canonicalise_path('/dir.14/dir.2/../..'))
+		assert_equal('/', Recls.canonicalise_path('/dir.14/dir.2/../../..'))
+		assert_equal('dir.14/', Recls.canonicalise_path('dir.14/dir.2/..'))
+		assert_equal('.', Recls.canonicalise_path('dir.14/dir.2/../..'))
+		assert_equal('..', Recls.canonicalise_path('dir.14/dir.2/../../..'))
 
 		if Recls::Ximpl::OS::OS_IS_WINDOWS
 
-			assert_equal('H:\\dir.1\\dir.2\\', Recls::canonicalise_path('H:\\dir.1\\dir.2\\'))
-			assert_equal('H:\\dir.1\\dir.2\\', Recls::canonicalise_path('H:\\dir.1\\dir.2\\dir.3\\..\\'))
-			assert_equal('H:\\dir.1\\dir.2\\', Recls::canonicalise_path('H:\\dir.1\\dir.2\\dir.3\\..\\'))
-			assert_equal('H:\\dir.1\\dir.2\\', Recls::canonicalise_path('H:\\dir.1\\dir.3\\..\\dir.2\\'))
-			assert_equal('H:\\dir.1\\dir.2\\', Recls::canonicalise_path('H:\\dir.3\\..\\dir.1\\dir.2\\'))
-
-			assert_equal('H:\\dir.43\\dir.5\\', Recls::canonicalise_path('H:\\..\\dir.43\\dir.5\\'))
-			assert_equal('H:\\dir.42\\', Recls::canonicalise_path('H:\\..\\dir.1\\..\\dir.42\\'))
+			assert_equal('H:\\dir.1\\dir.2\\', Recls.canonicalise_path('H:\\dir.1\\dir.2\\'))
+			assert_equal('H:\\dir.1\\dir.2\\', Recls.canonicalise_path('H:\\dir.1\\dir.2\\dir.3\\..\\'))
+			assert_equal('H:\\dir.1\\dir.2\\', Recls.canonicalise_path('H:\\dir.1\\dir.2\\dir.3\\..\\'))
+			assert_equal('H:\\dir.1\\dir.2\\', Recls.canonicalise_path('H:\\dir.1\\dir.3\\..\\dir.2\\'))
+			assert_equal('H:\\dir.1\\dir.2\\', Recls.canonicalise_path('H:\\dir.3\\..\\dir.1\\dir.2\\'))
 
+			assert_equal('H:\\dir.43\\dir.5\\', Recls.canonicalise_path('H:\\..\\dir.43\\dir.5\\'))
+			assert_equal('H:\\dir.42\\', Recls.canonicalise_path('H:\\..\\dir.1\\..\\dir.42\\'))
 		end
-
 	end
 
 	def test_complex_examples
 
-		assert_equal('../dir.11/dir.22/dir.33/file3.', Recls::canonicalise_path('abc/.././././.././dir.1/../dir.11/dir.22/dir.33/file3.'))
-		assert_equal('/dir.11/dir.22/dir.33/file3.', Recls::canonicalise_path('/abc/.././././.././dir.1/../dir.11/dir.22/dir.33/file3.'))
-		assert_equal('../dir.11/dir.22/dir.33/file3.', Recls::canonicalise_path('./././abc/.././././.././dir.1/../dir.11/dir.22/././dir.33/././file3.'))
+		assert_equal('../dir.11/dir.22/dir.33/file3.', Recls.canonicalise_path('abc/.././././.././dir.1/../dir.11/dir.22/dir.33/file3.'))
+		assert_equal('/dir.11/dir.22/dir.33/file3.', Recls.canonicalise_path('/abc/.././././.././dir.1/../dir.11/dir.22/dir.33/file3.'))
+		assert_equal('../dir.11/dir.22/dir.33/file3.', Recls.canonicalise_path('./././abc/.././././.././dir.1/../dir.11/dir.22/././dir.33/././file3.'))
 
 		if Recls::Ximpl::OS::OS_IS_WINDOWS
 
 		end
-
 	end
 end
 
+# ############################## end of file ############################# #
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recls-ruby
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.2
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   RECursive LS for Ruby