remotebackup 0.50.2 → 0.50.4

data/lib/remotebackup.rb

@@ -10,7 +10,7 @@ require "date"
 require 'logger'
 require 'yaml'
 module Remotebackup
-    VERSION='0.50.2'
+    VERSION='0.50.4'
 	class Node
 		attr_accessor :ftype,:name,:makeMap
         LS_FILE = /([-a-z]*)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\d*)\s+([A-Z][a-z]*)\s+(\d+)\s+([\d:]*)\s+(.*)/
@@ -21,7 +21,7 @@ module Remotebackup
         
 		def initialize(out)
             @name=""
-            if out !~ /^[[:print:]]*$/
+            if out =~ /[^\x20-\x7E]/ 
                 $log.error("#{out} includes irregular char. ignore.")
             end
 			case out
@@ -208,26 +208,26 @@ module Remotebackup
 				end
 			end
 			oldFileMap = oldFileInfoMap["file"]
-			@fileMap["file"].each do |key,val|
-				if !oldFileMap[key] || oldFileMap[key]["size"] != val["size"] || oldFileMap[key]["date"] != val["date"] 
-					@mod = true
-					file_name = output_dir + "/" + key + date_to_filename
-                    orig = "#{@path}/#{key}".gsub(/ /,"\\ ")
-                    dest = file_name.gsub(/ /,"\\ ")
-					msg_out "scp #{@user}@#{@server}:#{orig} #{dest} #password=#{@password}"
-					Net::SSH.start(@server, @user, :password => @password) do |ssh|
-						ssh.scp.download!(orig,file_name)
-					end
-					val["file_name"] = file_name
-					if !oldFileMap[key]
-						msg_out "create file:#{key}"
-					else
-						msg_out "modified file:#{key}"
-					end
-				else
-					val["file_name"] = oldFileMap[key]["file_name"]
-				end
-			end
+            Net::SSH.start(@server, @user, :password => @password) do |ssh|
+                @fileMap["file"].each do |key,val|
+                    if !oldFileMap[key] || oldFileMap[key]["date"] != val["date"] 
+                        @mod = true
+                        file_name = output_dir + "/" + key + date_to_filename
+                        orig = "#{@path}/#{key}".gsub(/ /,"\\ ")
+                        dest = file_name.gsub(/ /,"\\ ")
+                        msg_out "scp #{@user}@#{@server}:#{orig} #{dest} #password=#{@password}"
+                        ssh.scp.download!(orig,file_name)
+                        val["file_name"] = file_name
+                        if !oldFileMap[key]
+                            msg_out "create file:#{key}"
+                        else
+                            msg_out "modified file:#{key}"
+                        end
+                    else
+                        val["file_name"] = oldFileMap[key]["file_name"]
+                    end
+                end
+            end
 		end
 		def zerosup(i)
 			if i < 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remotebackup
 version: !ruby/object:Gem::Version 
-  version: 0.50.2
+  version: 0.50.4
 platform: ruby
 authors: 
 - takeshi morita