mass_renamer 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46b3031201bc4a0331b657ffed062873c5e3ede
-  data.tar.gz: e4de33fa45fe4d9fdd0e3adcd42073256f281f4d
+  metadata.gz: 3257e201ad3cb42e4ccebbf0a58630293c9cfd2b
+  data.tar.gz: 28761b844a71a4167214732aa50b1f8ff15f2ec3
 SHA512:
-  metadata.gz: 9c4e30e093954d32783d73861a5c1cc49a03d4e3d6b11f81ecf1942ad73119a99b31de8110efcd9bc051c5c47904a3e59d913f8ab7ec3f19d5d8c09d767366bd
-  data.tar.gz: bdeca266b0c0bdb21374b51d1e205c58c3b9f252cdb1f90ab9b93b560162c2a34e2b77093fb5ee52d97effe1d651c28fa75d06b5e5d80b2109ab5e991bc72410
+  metadata.gz: 9b8838efa35da98760cc9f3dfe8ba5cb7b6e0e615433becdeb3a7b25e3f968b08ed5001c2824fe7c9c89f0f9745950a0d33089f72d003004a6d3db2fb6494617
+  data.tar.gz: 4b2ffea33edd18d6ec0358e59e9afcb742dfcc1064ba24866b39996b3c6be8bef44ef0aa68c3af793da020148921f581fb9a9cc2f7f11141b38332336e04563a

data/lib/renamer/command_line.rb

@@ -37,7 +37,10 @@ module Renamer
 				opt.on('-r', '--recursive', 'Recurse into subdirectories') do
 					opts[:recursive] = true
 				end
-				opt.on('-D', '--no-delete', 'Complete disables delete function') do
+				opt.on('-F', '--force', 'Don\'t ask if target exists') do
+					opts[:force] = true
+				end
+				opt.on('-D', '--no-delete', 'Completely disables delete function') do
 					opts[:no_delete] = true
 				end
 				opt.on('-v', '--verify', 'Ask for consent before doing each action') do

data/lib/renamer/driver.rb

@@ -5,11 +5,12 @@ module Renamer
 
 	class Filesystem_Driver
 
-		def initialize ask: , dry:, verbose:, no_delete:
+		def initialize ask: , dry:, verbose:, no_delete:, force:
 			@ask = ask
 			@dry = dry
 			@verbose = verbose
 			@no_delete = no_delete
+			@force = force
 		end
 
 		def ask msg, from, to = nil
@@ -17,6 +18,25 @@ module Renamer
 			gets.chomp.downcase == ?y
 		end
 
+		def overwrite to
+			loop do
+				print "Overwrite #{to}? [Y(es)/N(o)/A(bort)]: "
+				case gets.chomp.downcase
+				when ?a
+					puts "Aborting."
+					return :abort
+				when ?y
+					return :yes
+				when ?n
+					puts "Not overwriting, skipping."
+					return :no
+				else
+					puts "Unexpected answer, try again."
+				end
+			end
+
+		end
+
 		def remove! from
 			raise "Deletes were disables." if @no_delete
 			begin
@@ -39,6 +59,15 @@ module Renamer
 					return unless ask("Copy", from, to)
 				end
 				return if @dry
+				if File.exist?(to) and not @force
+					case overwrite(to)
+					when :abort
+						exit 1
+					when :no
+						return
+					when :yes
+					end
+				end
 				FileUtils.mkdir_p File.dirname(to)
 				FileUtils.copy_entry from, to, preserve: true, remove_destination: true
 			rescue StandardError => e
@@ -54,6 +83,15 @@ module Renamer
 					return unless ask("Move", from, to)
 				end
 				return if @dry
+				if File.exist?(to) and not @force
+					case overwrite(to)
+					when :abort
+						exit 1
+					when :no
+						return
+					when :yes
+					end
+				end
 				FileUtils.mkdir_p File.dirname(to)
 				File.rename from, to
 			rescue StandardError => e
@@ -87,7 +125,8 @@ module Renamer
 				ask: @opts[:ask],
 				dry: @opts[:dry],
 				verbose: @opts[:verbose],
-				no_delete: @opts[:no_delete]
+				no_delete: @opts[:no_delete],
+				force: @opts[:force]
 			)
 
 			renames.each do |from, to|
@@ -103,8 +142,8 @@ module Renamer
 						next if from == to
 						fd.move! from, to
 					else
-						to.each { |to| fd.copy! from, to }
-						fd.remove! from
+						to.each { |to| fd.copy! from, to unless from == to }
+						fd.remove! from unless to.include? from
 					end
 				rescue
 					next if @opts[:keep_going]

data/lib/renamer/free.rb

@@ -58,7 +58,7 @@ module Renamer
 		end
 
 		def parse_renames str
-			lines = str.lines.map(&:chomp)
+			lines = str.lines.map(&:chomp).reject { |l| l[/^\s*$/] }
 			renames = []
 			until lines.empty?
 				filename = lines.shift

data/lib/renamer/version.rb

@@ -1,3 +1,3 @@
 module Renamer
-	VERSION = '0.9.1'
+	VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mass_renamer
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Gray Wolf