recls-ruby 2.8.2 → 2.11.0

data/lib/recls/stat.rb

@@ -4,11 +4,11 @@
 # Purpose:      Defines the Recls.stat() method for the recls.Ruby library.
 #
 # Created:      24th July 2012
-# Updated:      22nd June 2017
+# Updated:      14th March 2019
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,15 +39,90 @@
 require 'recls/entry'
 require 'recls/flags'
 
+=begin
+=end
+
+class Object; end # :nodoc:
+
 module Recls
 
-	# USAGE:
+	# Equivalent to a Recls::stat() but only returns (a non-+nil+ value) if the
+	# path exists _and_ represents a directory
+	#
+	# This has two advantages over +File.directory?+: it obtains a
+	# Recls::Entry in the case where the path represents a directory; and
+	# it does '~' interpretation
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +path+ (String, Recls::Entry) The path
+	#
+	# === Return
+	# (Recls::Entry, nil) The entry if +path+ exists and is a directory; +nil+ otherwise
+	def self.directory?(path, *args)
+
+		fe = self.stat(path, *args)
+
+		if fe
+
+			return nil unless fe.directory?
+		end
+
+		fe
+	end
+
+	# Equivalent to a Recls::stat() but only returns (a non-+nil+ value) if the
+	# path exists _and_ represents a file
+	#
+	# This has two advantages over +File.file?+: it obtains a
+	# Recls::Entry in the case where the path represents a file; and
+	# it does '~' interpretation
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +path+ (String, Recls::Entry) The path
+	#
+	# === Return
+	# (Recls::Entry, nil) The entry if +path+ exists and is a file; +nil+ otherwise
+	def self.file?(path, *args)
+
+		fe = self.stat(path, *args)
+
+		if fe
+
+			return nil unless fe.file?
+		end
+
+		fe
+	end
+
+	# Obtains a single Recls::Entry instance from a path, according to the
+	# given arguments, which can be any combination of search-root and
+	# flags, as discussed below
+	#
+	# === Signature
 	#
-	#  - stat(path)
-	#  - stat(path, flags)
-	#  - stat(path, search_root)
-	#  - stat(path, search_root, flags)
-	#  - stat(path, flags, search_root)
+	# * *Parameters:*
+	#   - +path+ (String) A path to evaluate. May not be +nil+
+	#   - +search_root+ (String, Recls::Entry) A directory from which the returned Entry instance's search-relative attributes are evaluated
+	#   - +flags+ (Integer) A bit-combined set of flags (such as Recls::DIRECTORIES, Recls::FILES, Recls::RECURSIVE, Recls::DETAILS_LATER, and so on)
+	#
+	# ==== Parameter Ordering
+	#
+	# The parameters may be expressed in any of the following permutations:
+	# - +path+
+	# - +path+, +flags+
+	# - +path+, +search_root+
+	# - +path+, +flags+, +search_root+
+	# - +path+, +search_root+, +flags+
+	#
+	# === Return
+	# (Recls::Entry) An entry representing the path on the file-system, or
+	# +nil+ if the path does not refer to an existing entity. If the
+	# Recls::DETAILS_LATER flag is included, then an entry is returned
+	# regardless of its existence
 	def self.stat(path, *args)
 
 		flags		=	0
@@ -58,50 +133,47 @@ module Recls
 
 		case	args.size
 		when	0
+
 			;
 		when	1
+
 			case	args[0]
 			when	::Integer
+
 				flags = args[0]
 			when	::String
+
 				search_root = args[0]
 			else
+
 				message = "argument '#{args[0]}' (#{args[0].class}) not valid"
 			end
 		when	2
+
 			if false
 			elsif ::Integer === args[0] && ::String === args[1]
+
 				flags		=	args[0]
 				search_root	=	args[1]
 			elsif ::String === args[0] && ::Integer === args[1]
+
 				search_root	=	args[0]
 				flags		=	args[1]
 			else
+
 				message = "invalid combination of arguments"
 			end
 		else
+
 			message = "too many arguments"
 		end
 
 		raise ArgumentError, "#{message}: Recls.stat() takes one (path), two (path+flags or path+search_root), or three (path+search_root+flags) arguments" if message
 
-		begin
-
-			Recls::Entry.new(path, Recls::Ximpl::FileStat.stat(path), search_root, flags)
-		rescue Errno::ENOENT => x
-
-			x = x # suppress warning
-
-			if 0 != (flags & Recls::DETAILS_LATER)
-
-				Recls::Entry.new(path, nil, search_root, flags)
-			else
-
-				nil
-			end
-		end
+		Recls::Ximpl.stat_prep(path, search_root, flags)
 	end 
-end
+end # module Recls
 
 # ############################## end of file ############################# #
 
+

data/lib/recls/util.rb

@@ -4,11 +4,11 @@
 # Purpose:      Utility module functions for recls library
 #
 # Created:      17th February 2014
-# Updated:      25th January 2018
+# Updated:      14th April 2019
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2018, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,61 +36,112 @@
 # ######################################################################### #
 
 
+require 'recls/stat'
 require 'recls/ximpl/util'
 require 'recls/ximpl/os'
 
+=begin
+=end
+
+class Object; end # :nodoc:
+
 module Recls
 
 	# Obtains the absolute form of the given path
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +path+ (String, Recls::Entry) The path
+	#
+	# === Return
+	# (String) The absolute form of the path
 	def self.absolute_path(path)
 
-		return Recls::Ximpl.absolute_path path
+		return path.path if 'Recls::Entry' === path.class.to_s
+
+		Recls::Ximpl.absolute_path path
 	end
 
 	# Canonicalises the given path, by removing dots ('.' and '..')
 	# directories
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +path+ (String, Recls::Entry) The path
+	#
+	# === Return
+	# (String) The canonical form of the path
 	def self.canonicalise_path(path)
 
-		return Recls::Ximpl.canonicalise_path path
+		path = path.path if 'Recls::Entry' === path.class.to_s
+
+		Recls::Ximpl.canonicalise_path path
 	end
 
 	# Derives a given path relative to an origin, unless the path is
 	# absolute
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +origin+ (String, Recls::Entry) The path against which +path+ will be evaluated
+	#   - +path+ (String, Recls::Entry) The path to evaluate
+	#
+	# === Return
+	# (String) The relative form of the path
 	def self.derive_relative_path(origin, path)
 
-		return Recls::Ximpl.derive_relative_path origin, path
+		Recls::Ximpl.derive_relative_path origin, path
 	end
+end # module Recls
+
+if RUBY_VERSION >= '2'
+
+	require 'recls/combine_paths_2plus'
+else
+
+	require 'recls/combine_paths_1'
+end
+
+module Recls
 
-	# Combines paths, optionally canonicalising them
+	# Indicates whether the given path exists, obtaining a Recls::Entry
+	# instance if so
 	#
 	# === Signature
 	#
 	# * *Parameters:*
-	#   - +paths+:: [ [ ::String, ::Recls::Entry ] ] Array of 1 or more path
-	#     elements to be combined
-	#   - +options+:: [::Hash] Options that moderate the combination
+	#   - +path+ (String, Recls::Entry) The path
+	#
+	# === Return
+	# (Recls::Entry, nil) The entry if +path+ exists; +nil+ otherwise
+	def self.exist?(path)
+
+		return nil if path.nil?
+
+		Recls.stat(path)
+	end
+
+	# Indicates whether the given path is absolute
+	#
+	# === Signature
 	#
 	# * *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
+	#   - +path+ (String, Recls::Entry) The path
 	#
 	# === Return
-	#  The combined path
-	def self.combine_paths(*paths, **options)
+	# (boolean) +true+ if +path+ is absolute; +false+ otherwise
+	def self.absolute_path?(path)
 
-		paths	=	paths.reject { |p| p.nil? }
+		return nil if path.nil?
 
-		raise ArgumentError, 'must specify one or more path elements' if paths.empty?
+		return true if 'Recls::Entry' === path.class.to_s
 
-		return Recls::Ximpl.combine_paths paths, options
+		Recls::Ximpl.absolute_path? path
 	end
-end
+end # module Recls
 
 # ############################## end of file ############################# #
 

data/lib/recls/version.rb

@@ -4,11 +4,12 @@
 # Purpose:      Version for recls library
 #
 # Created:      14th February 2014
-# Updated:      5th February 2018
+# Updated:      25th May 2020
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2018, Matthew Wilson and Synesis Software
+# Copyright (c) 2019-2020, Matthew Wilson and Synesis Information Systems
+# Copyright (c) 2012-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,10 +37,15 @@
 # ######################################################################### #
 
 
+=begin
+=end
+
+class Object; end # :nodoc:
+
 module Recls
 
 	# Current version of the recls.Ruby library
-	VERSION				=	'2.8.2'
+	VERSION				=	'2.11.0'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:
@@ -47,7 +53,7 @@ module Recls
 	VERSION_MAJOR		=	VERSION_PARTS_[0] # :nodoc:
 	VERSION_MINOR		=	VERSION_PARTS_[1] # :nodoc:
 	VERSION_REVISION	=	VERSION_PARTS_[2] # :nodoc:
-end
+end # module Recls
 
 # ############################## end of file ############################# #
 

data/lib/recls/ximpl/os.rb

@@ -1,15 +1,15 @@
 # ######################################################################### #
-# File:        recls/ximpl/os.rb
+# File:         recls/ximpl/os.rb
 #
-# Purpose:     Operating system internal implementation constructs for the
-#              recls library.
+# Purpose:      Operating system internal implementation constructs for the
+#               recls library.
 #
-# Created:     16th February 2014
-# Updated:     27th August 2015
+# Created:      16th February 2014
+# Updated:      14th April 2019
 #
-# Author:      Matthew Wilson
+# Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2015, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,21 +37,31 @@
 # ######################################################################### #
 
 
-module Recls
+=begin
+=end
 
-	module Ximpl
+module Recls # :nodoc:
 
-		module OS
+# :stopdoc:
 
+	module Ximpl # :nodoc: all
+
+		module OS # :nodoc: all
+
+			# @!visibility private
 			OS_IS_WINDOWS = (RUBY_PLATFORM =~ /(mswin|mingw|bccwin|wince)/i) ? true : false
 
+			# @!visibility private
 			PATH_NAME_SEPARATOR = OS_IS_WINDOWS ? '\\' : '/'
 
+			# @!visibility private
 			PATH_SEPARATOR = OS_IS_WINDOWS ? ';' : ':'
 
+			# @!visibility private
 			WILDCARDS_ALL = OS_IS_WINDOWS ? '*' : '*'
 
-			def OS.get_number_of_dots_dir_(p)
+			# @!visibility private
+			def OS.get_number_of_dots_dir_(p) # :nodoc:
 
 				if p
 					if ?. == p[0]
@@ -69,7 +79,8 @@ module Recls
 				return 0
 			end
 
-			def OS.is_root_dir_(p)
+			# @!visibility private
+			def OS.is_root_dir_(p) # :nodoc:
 
 				return nil if not p
 				return true if '/' == p
@@ -77,9 +88,12 @@ module Recls
 
 				return false
 			end
-		end
-	end
-end
+		end # module OS
+	end # module Ximpl
+
+# :startdoc:
+
+end # module Recls
 
 # ############################## end of file ############################# #
 

data/lib/recls/ximpl/unix.rb

@@ -1,14 +1,14 @@
 # ######################################################################### #
-# File:        recls/ximpl/unix.rb
+# File:         recls/ximpl/unix.rb
 #
-# Purpose:     UNIX-specific constructs for the recls library.
+# Purpose:      UNIX-specific constructs for the recls library.
 #
-# Created:     19th February 2014
-# Updated:     27th August 2015
+# Created:      19th February 2014
+# Updated:      14th April 2019
 #
-# Author:      Matthew Wilson
+# Author:       Matthew Wilson
 #
-# Copyright (c) 2012-2015, Matthew Wilson and Synesis Software
+# Copyright (c) 2012-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,14 +38,21 @@
 
 require 'recls/ximpl/util'
 
-module Recls
+=begin
+=end
 
-	module Ximpl
+module Recls # :nodoc:
 
-		class FileStat < File::Stat
+# :stopdoc:
+
+	module Ximpl # :nodoc: all
+
+		# @!visibility private
+		class FileStat < File::Stat # :nodoc:
 
 			private
-			def initialize(path)
+			# @!visibility private
+			def initialize(path) # :nodoc:
 
 				@path = path
 
@@ -53,9 +60,11 @@ module Recls
 			end
 
 			public
-			attr_reader :path
+			# @!visibility private
+			attr_reader :path # :nodoc:
 
-			def hidden?
+			# @!visibility private
+			def hidden? # :nodoc:
 
 				basename = File.basename @path
 
@@ -68,14 +77,18 @@ module Recls
 			end
 
 			public
-			def FileStat.stat(path)
+			# @!visibility private
+			def FileStat.stat(path) # :nodoc:
 
 				Recls::Ximpl::FileStat.new(path)
 
 			end
-		end
-	end
-end
+		end # class FileStat
+	end # module Ximpl
+
+# :startdoc:
+
+end # module Recls
 
 # ############################## end of file ############################# #