rename2mac 0.9.6 → 0.9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b0752b15c305afb14b83b8794fead5fa50a94c2
-  data.tar.gz: b4e0469f9824096e2a13191eb93f24ba22345678
+  metadata.gz: 639308c32cb112d30ac7b62d9208da208c04d62c
+  data.tar.gz: 0e64ac5cf4deff332f95ee2b6a2b72f39bb3bd05
 SHA512:
-  metadata.gz: aa80f1b76e444d6abcdec66b09ad2f082c09844ef9e6ef357b769a78dc9de513299ec55b42515a772be1628578bffe761fef9d425904a3b265b948f1a2575764
-  data.tar.gz: 1299fc239123474762729e7d5e330f5c69ed0a6107f921b5ec8b1b626f1a46cf22346adcd80a593f587403533bf76a25cc1ca566c0522d6fa9618945f3d8e834
+  metadata.gz: 021f07d31b1029af76984e348973629d96b0701179d9b9124cc58ec8e6da99dbc5d0f88bf75159c429f9b338fe571966f234ce0b57e4724565a1391983453f96
+  data.tar.gz: 7bb51910102e72e041588dd366a0396fd9252500ff9f714c286f250433cec96fdd36e9ef71ac5869231720754c30f0bce44b60bfd0078a090a9de4693af3e121

data/README.md

@@ -19,7 +19,7 @@ rename2mac \[arguments\] \<directory\>
 
 #### Arguments: ####
     --noop       -n  Make no changes
-    --recursive  -r  Recursively rename
+    --local      -l  Scan local directory only, do not scan recursively.
     --force      -f  Force overwrite existing file if it exists
     --quiet      -q  Do not output individual results to screen
     --help       -h  Display current help message

data/bin/rename2mac

@@ -1,5 +1,10 @@
 #!/usr/bin/env ruby
-#encoding: utf-8
+# encoding: utf-8
+
+# making sure program runs in UTF-8 encoding in any environment
+# Encoding.default_external = Encoding::UTF_8
+# Encoding.default_internal = Encoding::UTF_8
+
 
 #
 # Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X use only.
@@ -7,6 +12,8 @@
 # License MIT
 #
 
+$LOAD_PATH << File.expand_path( File.dirname( File.expand_path( __FILE__ ) ) + '/../lib' )
+
 if RUBY_VERSION <= '1.9'
 	puts 'Require Ruby 1.9 or above.'
 	exit
@@ -19,85 +26,20 @@ end
 
 require 'getoptlong'
 require 'fileutils'
+require 'rename2mac/libs'
 require 'term/ansicolor'
 
 include Term::ANSIColor
 
-class String
-	# escape [] and {} character for Dir.glob to use
-	def glob_escape
-		self.gsub(/([\[\]\{\}\*\?\\])/, '\\\\\1')
-	end
-
-	def to_m
-		# convert string to UTF8-MAC format
-		self.encode('UTF8-MAC', 'UTF-8')
-
-		# convert with extra function of replace invalid character to null
-		#self.encode('UTF8-MAC', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
-	end
-
-	def to_u
-		# convert string to UTF-8 format
-		self.encode('UTF-8', 'UTF8-MAC')
-
-		# convert with extra function of replace invalid character to null
-		#self.encode('UTF-8', 'UTF8-MAC', invalid: :replace, undef: :replace, replace: '')
-	end
-
-	def dn
-		File.dirname( self )
-	end
-
-	def bn
-		File.basename( self )
-	end
-
-	def um_different?
-		# return if the string is different when converted to UTF8-MAC format
-		self.unpack('H*') != self.to_m.unpack('H*')
-	end
-
-	def print_diff
-		# highlight the character that is not UTF8-MAC compatible
-		print self.dn + '/'
-		self.bn.each_char { |c|
-			if c.um_different?
-				print c.red.bold
-			else
-				print c
-			end
-		}
-		puts
-	end
-end
-
-def Dir.restricted?( dir, excludes=[] )
-	rdirs = [
-		'.Trash', '.Trashes', '.fseventsd', '.Spotlight-V100', '.DocumentRevisions-V100',
-		'.$EXTEND',
-		'_SYNCAPP',
-		'Corrupted',
-		'System Volume Information', 'RECYCLER',
-		'.sparsebundle',
-		'.tmpdir', '.tmp7z',
-		'.AppleDouble'
-	]
-
-	for word in rdirs - excludes
-	    return true if dir.include?( word )
-    end
-    return false
-end
 
 def show_help
 	puts \
 %Q{Usage:
-rename2mac [arguments] <dir>
+rename2mac.rb [arguments] <dir>
 
 Arguments:
 --noop       -n  Make no changes
---recursive  -r  Recursively rename
+--local      -l  Scan local directory only, do not scan recursively.
 --force      -f  Force overwrite existing file if it exists
 --quiet      -q  Do not output individual results to screen
 --help       -h  Display current help message}
@@ -107,19 +49,20 @@ end
 
 opts = GetoptLong.new(
 	[ '--noop',      '-n', GetoptLong::NO_ARGUMENT ],
-	[ '--recursive', '-r', GetoptLong::NO_ARGUMENT ],
+	[ '--local',     '-l', GetoptLong::NO_ARGUMENT ],
 	[ '--force',     '-f', GetoptLong::NO_ARGUMENT ],
 	[ '--quiet',     '-q', GetoptLong::NO_ARGUMENT ],
 	[ '--help',      '-h', GetoptLong::NO_ARGUMENT ]
 )
 
-noop = recursive = force = quiet = false
+recursive = true
+noop = force = quiet = false
 
 opts.each do |opt, arg|
-	noop = true		 if opt == '--noop'
-	recursive = true if opt == '--recursive'
-	force = true 	 if opt == '--force'
-	quiet = true	 if opt == '--quiet'
+	noop = true		  if opt == '--noop'
+	recursive = false if opt == '--local'
+	force = true 	  if opt == '--force'
+	quiet = true	  if opt == '--quiet'
 
 	if opt == '--help'
 		show_help
@@ -158,10 +101,15 @@ while flag
 	total_files = 0
 	flag = false
 
-	Dir.glob(File.expand_path(src_dir).glob_escape + wildcard).delete_if { |fullpath|
+	Dir.glob(File.expand_path(src_dir).escape_glob + wildcard).delete_if { |fullpath|
 		Dir.restricted?( fullpath )
 	}.each { |fullpath|
 		next if fullpath.bn[0..0] == '.'
+		if File.extname( fullpath ) == '.rnm'
+			# resume the rename and remove the temporary extension
+			FileUtils.mv(fullpath, fullpath.gsub(/\.rnm$/,''), :noop => noop, :force => force)
+			next
+		end
 
 		total_files += 1
 
@@ -180,7 +128,15 @@ while flag
 				# rename directory or file
 				begin
 					# tell program to restart the rename from beginning after finish, because some files maybe revealed after rename
-					FileUtils.mv(fullpath, fullpath.dn.to_m + '/' + fullpath.bn.to_m, :noop => noop, :force => force)
+
+					new_fullpath = fullpath.dn.to_m + '/' + fullpath.bn.to_m
+					FileUtils.mv(fullpath, new_fullpath, :noop => noop, :force => force)
+
+					# making two step renaming, to go around yosemite bug where path of utf8 == utf8-mac when renaming file
+					# p fullpath == new_fullpath
+					# FileUtils.mv(fullpath, new_fullpath + '.rnm', :noop => noop, :force => force)
+					# FileUtils.mv(new_fullpath + '.rnm', new_fullpath, :noop => noop, :force => force)
+
 					fullpath.print_diff unless quiet
 					total_success += 1
 					flag = true unless noop

data/lib/rename2mac/libs.rb

@@ -0,0 +1,66 @@
+class String
+	# escape [] and {} character for Dir.glob to use
+	def escape_glob
+		self.gsub(/([\[\]\{\}\*\?\\])/, '\\\\\1')
+	end
+
+	def to_m
+		# convert string to UTF8-MAC format
+		self.encode('UTF8-MAC', 'UTF-8').force_encoding('UTF-8')
+
+		# convert with extra function of replace invalid character to null
+		#self.encode('UTF8-MAC', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
+	end
+
+	def to_u
+		# convert string to UTF-8 format
+		self.encode('UTF-8', 'UTF8-MAC')
+
+		# convert with extra function of replace invalid character to null
+		#self.encode('UTF-8', 'UTF8-MAC', invalid: :replace, undef: :replace, replace: '')
+	end
+
+	def dn
+		File.dirname( self )
+	end
+
+	def bn
+		File.basename( self )
+	end
+
+	def um_different?
+		# return if the string is different when converted to UTF8-MAC format
+		self.unpack('H*') != self.to_m.unpack('H*')
+	end
+
+	def print_diff
+		# highlight the character that is not UTF8-MAC compatible
+		print self.dn + '/'
+		self.bn.each_char { |c|
+			if c.um_different?
+				print c.red.bold
+			else
+				print c
+			end
+		}
+		puts
+	end
+end
+
+def Dir.restricted?( dir, excludes=[] )
+	rdirs = [
+		'.Trash', '.Trashes', '.fseventsd', '.Spotlight-V100', '.DocumentRevisions-V100',
+		'.$EXTEND',
+		'_SYNCAPP',
+		'Corrupted',
+		'System Volume Information', 'RECYCLER',
+		'.sparsebundle',
+		'.tmpdir', '.tmp7z',
+		'.AppleDouble'
+	]
+
+	for word in rdirs - excludes
+	    return true if dir.include?( word )
+    end
+    return false
+end

data/lib/rename2mac/version.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+module Rename2mac
+  VERSION = '0.9.8.1'
+end
+

data/rename2mac.gemspec

@@ -1,23 +1,25 @@
+# encoding: utf-8
+
+require File.expand_path('../lib/rename2mac/version', __FILE__)
+
+
 Gem::Specification.new do |s|
   s.name        = 'rename2mac'
-  s.version     = '0.9.6'
-  s.date        = '2013-11-15'
-  s.summary     = "rename2mac"
-  s.description = "Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X use only."
+  s.version     = Rename2mac::VERSION
+  s.summary     = "Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac OS X use only."
+  s.description = s.summary
   s.authors     = ["Mac Ma"]
   s.email       = 'comomac@runbox.com'
   s.homepage    = 'http://rubygems.org/gems/rename2mac'
   s.license     = 'MIT'
 
-  s.required_rubygems_version = '>= 2.0.3'
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.add_dependency 'term-ansicolor',   '>= 1.2.2'
 
   s.executable = 'rename2mac'
 
-  s.files = Dir.glob('*')
-  s.files.reject! { |fn| fn.include?( '._' ) }
-  s.files.reject! { |fn| fn.include?( '.DS_Store' ) }
-  s.files.reject! { |fn| fn.include?( '.git' ) }
-  s.files.reject! { |fn| fn.include?( '.sublime-' ) }
+  s.require_paths = ["lib"]
+  s.files = `git ls-files`.split($\)
+  s.executables = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rename2mac
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8.1
 platform: ruby
 authors:
 - Mac Ma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 description: Rename folderful of filenames to Mac OS X supported format (UTF8-MAC).
@@ -34,9 +34,10 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- rename2mac-0.9.5.gem
-- rename2mac.gemspec
 - bin/rename2mac
+- lib/rename2mac/libs.rb
+- lib/rename2mac/version.rb
+- rename2mac.gemspec
 homepage: http://rubygems.org/gems/rename2mac
 licenses:
 - MIT
@@ -47,18 +48,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.3
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: rename2mac
+summary: Rename folderful of filenames to Mac OS X supported format (UTF8-MAC). Mac
+  OS X use only.
 test_files: []