fileman 0.1.30646 → 0.1.32104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febf89801ec699944102973dcad88b0fa961a31c
-  data.tar.gz: 32d397a79ee25dd9794480af74a84bf7faec60ac
+  metadata.gz: bc7e6ea25aa65085ca2533678d88e224b2e7645f
+  data.tar.gz: e3519620666ff6a33bf6ebcb3bc46169a054b1ef
 SHA512:
-  metadata.gz: b323254d9bb0b9f00ed6310ee43fc58598d6cd89eb8b82e7db143477c886d986df47d72da8834902ad3152fdbab651030718afb285d049704ae4540a89124e39
-  data.tar.gz: df382817c7b46163957c1876ee8d8aabc1a578bdf780567d0c88afe504de031cba5a01d7648c667aa2c6b717e80416cc7b5bdfafce335b84bd77fb5d682c5e20
+  metadata.gz: c4653d4d441f9b0b751a6821b205aaa7b9f77e33ed74bd6b14feb2bf6a4c8179f1c9cda7664a5e4fcd5543be37f5d8f28b6d588e18acf53157fe272f70e05d58
+  data.tar.gz: 90a3e93d990cd04b519f1fdb6cb77a3cfde980fe23ee332cd4a7ed4d046a6e554f2a5a0f65ba7d2f17ac42699c9523df518d68cea5b60e0adecee23ae151b2b3

data/lib/fileman/delete.rb

@@ -5,8 +5,7 @@ module Fileman
 	module_function
 
 	def remove(folder_path)
-		new_name = Fileman.rename_r(folder_path, 'a', {:include_files => true, :ignore_ext => true})
-		new_path = File.expand_path("../#{new_name}", folder_path)
+		new_path = Fileman.rename(folder_path, 'a', {:include_files => true, :ignore_ext => true, :recursive => true})
 		FileUtils.remove_dir new_path, true
 	end
 end

data/lib/fileman/rename.rb

@@ -3,53 +3,74 @@ require 'fileutils'
 module Fileman
 	module_function
 
-	# Rename folder and all its subfolders
+	# Rename file or folder. If the item is a folder, subfolders and files can optionally
+	# be recursively renamed to. 
 	#
 	# Arguments:
 	# ----------
-	# +folder_path+			Folder's path
-	# +new_name+			New name that is used to rename the folder and all its subfolder.
-	# 						If there is multiple subfolders, then a incremetal number is appened
+	# +item_path+			Item's path
+	# +new_name+			New name that is used to rename the item. If the item is a folder,
+	# 						subfolders and files can optionally be recursively renamed to. 
+	# 						If there is multiple subfolders, then an incremetal number is appened
 	# 						straight after the 'new_name'(e.g. if new_name is 'a', and there are
 	#						2 subfolder 'subf_a' and 'subf_b', then the new names will respectively 
 	# 						be 'a1' and 'a2')
 	# +options+				Optional parameters defined as follow:
-	# 	+:include_files+	If true, all files will also be renamed. Extensions will be removed. 
-	# 						Default is false 
-	#   +:ignore_ext+		If true, and if 'include_files' is also true, then file's extensions
-	# 						are ignored. Default is false
+	# 	+:recursive+		Default is false. If true, and if the item is a folder, then all the
+	# 						folder's content is also renamed
+	# 	+:include_files+	Default is false. If true, all files will also be renamed. In that case
+	# 						the 'recursive' option is implicitly set to true
+	#   +:ignore_ext+		Default is false. If true, and if 'include_files' is also true, then 
+	# 						file's extensions are removed. 
 	# 
 	# Returns the new name of the root folder
-	def rename_r(folder_path, new_name, options={})
+	def rename(item_path, new_name, options={})
 		include_files = !options[:include_files].nil? && options[:include_files]
+		recursive = include_files ? true : (!options[:recursive].nil? && options[:recursive])
 		ignore_ext = !options[:ignore_ext].nil? && options[:ignore_ext]
 		increment_name = lambda { |inc| inc == 0 ? new_name : "#{new_name}#{inc}" }
 
-		rename_item = lambda { |f|
-			parent_folder = File.expand_path("../", f)
-			file_ext = ignore_ext ? '' : File.extname(f)
-			counter = 0
-			while File.exists?(File.join(parent_folder, "#{increment_name.call(counter)}#{file_ext}")) do 
-				counter+=1 
+		try_rename_item = lambda { |counter, file, parent_folder, file_ext|
+			final_name = nil
+			begin
+				while File.exists?(File.join(parent_folder, "#{increment_name.call(counter)}#{file_ext}")) do 
+					counter+=1 
+				end
+				final_name = increment_name.call(counter)
+				final_name = "#{final_name}#{file_ext}" unless ignore_ext
+				FileUtils.mv file, File.join(parent_folder, final_name)
+			rescue Errno::EACCES => eaccess # permission denied
+				final_name = nil
+			rescue Exception => e
+				raise e
 			end
-			final_name = increment_name.call(counter)
-			final_name = "#{final_name}#{file_ext}" unless ignore_ext
-			FileUtils.mv f, File.join(parent_folder, final_name)
 			final_name
 		}
 
-		final_root_folder_new_name = new_name
-		all_items = Dir.glob("#{folder_path}/**/*", File::FNM_DOTMATCH) - %w[. ..]
-		items_per_folder = all_items.group_by { |x| File.expand_path('../',x)}
-		
-		sorted_items = items_per_folder.map { |k,v| v.sort_by{|y| y}.reverse }.flatten.reverse 
-		(sorted_items << folder_path).each { |f|
-			if File.directory?(f)
-				final_root_folder_new_name = rename_item.call(f)
-			elsif include_files && File.file?(f)
-				rename_item.call(f)
+		rename_item = lambda { |i|
+			parent_folder = File.expand_path("../", i)
+			file_ext = ignore_ext ? '' : File.extname(i)
+			counter = 0
+			final_name = nil
+			while final_name == nil
+				final_name = try_rename_item.call(counter, i, parent_folder, file_ext)
+				counter += 1
+			end
+			File.join(parent_folder, final_name)
+		}
+
+		recursively_rename_item = lambda { |i|
+			item_is_dir = File.directory? i
+			new_item_path = rename_item.call(i) unless !item_is_dir && !include_files # rename current item
+
+			if item_is_dir && recursive # if current is a folder, rename all its children
+				all_folder_children = Dir.glob("#{new_item_path}/*", File::FNM_DOTMATCH) - ["#{new_item_path}/.", "#{new_item_path}/.."]
+				all_folder_children.each { |c| recursively_rename_item.call(c) }
 			end
+
+			new_item_path
 		}
-		return final_root_folder_new_name
+
+		return recursively_rename_item.call(item_path)
 	end
 end

data/lib/fileman/scripts/core.rb

@@ -18,8 +18,9 @@ def rename_help(rename_command)
 	text = "usage: fileman #{rename_command} <path> <new-name> [<args>]\n" +
 	"\n" +
 	"Optional arguments are:\n" +
-	" -i\t Include files so they are also renamed\n" +
-	" -e\t Remove files extension. Only valid if -i option is also specified" 
+	" -r\t Recursive rename. That means that if the path points to a folder, all its content will also be renamed\n" +
+	" -i\t Include files so they are also renamed. This option implicitly uses recursive rename(no need to use the -r option)\n" +
+	" -e\t Remove files extension. Only valid if the -i option is also specified" 
 	puts text.colorize(:yellow)
 end
 
@@ -55,6 +56,8 @@ def get_rename_options
 					options[:include_files] = true
 				when 'e'
 					options[:ignore_ext] = true
+				when 'r'
+					options[:recursive] = true
 				end
 			}
 		}
@@ -71,6 +74,7 @@ def get_rename_arguments
 	options = get_rename_options
 	arguments[:include_files] = options[:include_files]
 	arguments[:ignore_ext] = options[:ignore_ext]
+	arguments[:recursive] = options[:recursive]
 	
 	return arguments
 end
@@ -87,7 +91,8 @@ def rename
 		options = {}
 		options[:include_files] = true if args[:include_files]
 		options[:ignore_ext] = true if args[:ignore_ext]
-		Fileman.rename_r(args[:path], args[:name], options) unless args[:error]
+		options[:recursive] = true if args[:recursive]
+		Fileman.rename(args[:path], args[:name], options) unless args[:error]
 	end
 end
 

data/lib/fileman/version.rb

@@ -1 +1 @@
-module Fileman
  VERSION ="0.1.30646"
+module Fileman
  VERSION ="0.1.32104"

data/test/unit/rename_recursively_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-describe "#Fileman.rename_r" do
+describe "#Fileman.rename" do
 	let(:folder_name) { "TestFolder" }
 	let(:new_folder_name) { "a" }
 
@@ -20,7 +20,7 @@ describe "#Fileman.rename_r" do
 
 	describe 'rename folder' do
 
-		it 'rename the folder and all its subfolders recursively' do
+		it 'rename the folder' do
 			File.directory?(folder_name).must_equal true
 			File.directory?("#{folder_name}/SubFolder_1").must_equal true
 			File.directory?("#{folder_name}/SubFolder_2").must_equal true
@@ -28,7 +28,25 @@ describe "#Fileman.rename_r" do
 			File.file?("#{folder_name}/SubFolder_1/test_file_1.txt").must_equal true
 			File.file?("#{folder_name}/SubFolder_2/test_file.txt").must_equal true
 
-			Fileman.rename_r folder_name, new_folder_name
+			Fileman.rename folder_name, new_folder_name
+
+			File.directory?("a").must_equal true
+			File.directory?("a/SubFolder_1").must_equal true
+			File.directory?("a/SubFolder_2").must_equal true
+			File.file?("a/SubFolder_1/test_file.txt").must_equal true
+			File.file?("a/SubFolder_1/test_file_1.txt").must_equal true
+			File.file?("a/SubFolder_2/test_file.txt").must_equal true
+		end
+
+		it 'rename the folder and all its subfolders recursively if the :recursive option is true' do
+			File.directory?(folder_name).must_equal true
+			File.directory?("#{folder_name}/SubFolder_1").must_equal true
+			File.directory?("#{folder_name}/SubFolder_2").must_equal true
+			File.file?("#{folder_name}/SubFolder_1/test_file.txt").must_equal true
+			File.file?("#{folder_name}/SubFolder_1/test_file_1.txt").must_equal true
+			File.file?("#{folder_name}/SubFolder_2/test_file.txt").must_equal true
+
+			Fileman.rename folder_name, new_folder_name, {:recursive => true}
 
 			File.directory?("a").must_equal true
 			File.directory?("a/a").must_equal true
@@ -38,7 +56,7 @@ describe "#Fileman.rename_r" do
 			File.file?("a/a1/test_file.txt").must_equal true
 		end
 
-		it 'rename the folder and all its subfolders recursively, including all files ' +
+		it 'rename the folder and all its subfolders recursively, including all files, if both the :include_files and :recursive options are true' +
 		'if option :include_files is true' do
 			File.directory?(folder_name).must_equal true
 			File.directory?("#{folder_name}/SubFolder_1").must_equal true
@@ -47,7 +65,7 @@ describe "#Fileman.rename_r" do
 			File.file?("#{folder_name}/SubFolder_1/test_file_1.txt").must_equal true
 			File.file?("#{folder_name}/SubFolder_2/test_file.txt").must_equal true
 
-			Fileman.rename_r folder_name, new_folder_name, {:include_files => true}
+			Fileman.rename folder_name, new_folder_name, {:include_files => true, :recursive => true}
 
 			File.directory?("a").must_equal true
 			File.directory?("a/a").must_equal true
@@ -58,7 +76,7 @@ describe "#Fileman.rename_r" do
 		end
 
 		it 'rename the folder and all its subfolders recursively, including all files ' +
-		'WITHOUT their extensions if both options :include_files and :ignore_ext are true' do
+		'WITHOUT their extensions if options :include_files, :ignore_ext, and :recursive are true' do
 			File.directory?(folder_name).must_equal true
 			File.directory?("#{folder_name}/SubFolder_1").must_equal true
 			File.directory?("#{folder_name}/SubFolder_2").must_equal true
@@ -66,7 +84,7 @@ describe "#Fileman.rename_r" do
 			File.file?("#{folder_name}/SubFolder_1/test_file_1.txt").must_equal true
 			File.file?("#{folder_name}/SubFolder_2/test_file.txt").must_equal true
 
-			Fileman.rename_r folder_name, new_folder_name, {:include_files => true, :ignore_ext => true}
+			Fileman.rename folder_name, new_folder_name, {:include_files => true, :ignore_ext => true, :recursive => true}
 
 			File.directory?("a").must_equal true
 			File.directory?("a/a").must_equal true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileman
 version: !ruby/object:Gem::Version
-  version: 0.1.30646
+  version: 0.1.32104
 platform: ruby
 authors:
 - nicolasdao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler