remotebackup 0.5.1 → 0.50.2

data/History.txt

@@ -1,4 +1,11 @@
-== 0.0.1 2008-06-23
+== 0.50.1 2008-06-23
 
 * 1 major enhancement:
   * Initial release
+
+== 0.50.2 2008-11-19
+
+*  bug modified such below:
+ * can't copy when file name includes space
+ * can't copy when much file in one directory
+

data/Manifest.txt

@@ -1,27 +1,13 @@
 History.txt
-License.txt
 Manifest.txt
 PostInstall.txt
-README.txt
+README.rdoc
 Rakefile
-config/hoe.rb
-config/requirements.rb
 lib/remotebackup.rb
-lib/remotebackup/version.rb
-bin/remote_backup
-bin/restore_backup
 script/console
 script/destroy
 script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
+bin/remote_backup
+bin/restore_backup
 test/test_helper.rb
 test/test_remotebackup.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb

data/{README.txt → README.rdoc}

@@ -1,162 +1,162 @@
-= remote_backup
-
-* http://net-ssh.rubyforge.org/remotebackup
-
-== DESCRIPTION:
-
-remote ssh backup is backup files on remote server with ssh. It's not required any program on remote server.Only download files which changed size or mday. And you can restore not only last version but also past version. 
-
-== FEATURES/PROBLEMS:
-* Transfer files or entire directory trees  from a remote host via SCP
-* Configurete server,path,user,password and ignore directory or files  by xml. 
-* remote_backup makes backup file tree information by yaml named yyyymmdd.yml in repository + backup name
-* restore_backup read backup file tree information and reconstruct from repository to outputdir.
-* Make backup file tree information when more than one files are changed on remote server from last backup.
-* Download  files  changed size or mday from last backup.
-* backup target are file,symbolic link and directory (not device,socket,pipe)
-* restore whichever version by specified backup file tree information.
-* Only Linux or BSD (not windows)
-
-
-== SYNOPSIS:
-
-In a nutshell:
-To use remote_backup,you should prepare backup configuretion by xml such below.
-<backups>
-	<backup>
-		<name>backup name</name>
-		<server>server name</server>
-		<user>login name</user>
-		<password>login password</password>
-		<path>path for backup</path>
-		<ignore_list>
-			<ignore>regular expression for not backup </ignore>
-											:
-		</ignore_list>
-	</backup>
-				:
-</backups>
-
-/backups 
-	mandatory. root directory. It has children of backup informations
-/backups/backup
-	mandatory. unit of backup information
-/backups/backup/name
-	mandatory. backup information name
-/backups/backup/server
-	mandatory. remote host address.
-/backups/backup/user
-	mandatory.  login name to remote host .
-/backups/backup/password
-	mandatory.  login password to remote host .
-/backups/backup/path
-	mandatory.  path for begin to backup on remote host.
-/backups/backup/ignore_list
-	option.  parent of ignore entity.
-/backups/backup/ignore
-	option.  don't wish file or directory name under backup path.
-
-command:
-
-	remote_backup [-f filename] [-o output_dir] [-v verbos]
-
-
-	filename:
-		file name written backup information. if not specified default is ./backup.xml
-
-	output_dir:
-		repository directory.  if not specified default is .(current directory)
-		Backup file is stored and  backup file tree information yaml is maked in repository directory 
-		+ backup name.  
-
-	verbos
-		print progress to stdout  
-
-
-	restore_backup -f filename -o output directory [-v verbos]
-
-
-		filename:
-			backup file tree information yaml which locate repository directory + backup name + yyyy_mm_dd_hh_mm.yaml
-
-		output directory:
-			directory you want to make backup tree. 
-
-		verbos
-			print progress to stdout  
-
-== REQUIREMENTS:
-
-* Net::SSH 2
-* Net::SCP
-
-== INSTALL:
-
-* gem install remote-backup (might need sudo privileges)
-
-Or, you can do it the hard way (without Rubygems):
-
-* tar xzf net-backup-*.tgz
-* cd remote-backup-*
-* ruby setup.rb config
-* ruby setup.rb install (might need sudo privileges)
-
-== LICENSE:
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING.txt file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
+= remote_backup
+
+* http://net-ssh.rubyforge.org/remotebackup
+
+== DESCRIPTION:
+
+remote ssh backup is backup files on remote server with ssh. It's not required any program on remote server.Only download files which changed size or mday. And you can restore not only last version but also past version. 
+
+== FEATURES/PROBLEMS:
+* Transfer files or entire directory trees  from a remote host via SCP
+* Configurete server,path,user,password and ignore directory or files  by xml. 
+* remote_backup makes backup file tree information by yaml named yyyymmdd.yml in repository + backup name
+* restore_backup read backup file tree information and reconstruct from repository to outputdir.
+* Make backup file tree information when more than one files are changed on remote server from last backup.
+* Download  files  changed size or mday from last backup.
+* backup target are file,symbolic link and directory (not device,socket,pipe)
+* restore whichever version by specified backup file tree information.
+* Only Linux or BSD (not windows)
+
+
+== SYNOPSIS:
+
+In a nutshell:
+To use remotebackup,you should prepare backup configuretion by xml such below.
+<backups>
+	<backup>
+		<name>backup name</name>
+		<server>server name</server>
+		<user>login name</user>
+		<password>login password</password>
+		<path>path for backup</path>
+		<ignore_list>
+			<ignore>regular expression for not backup </ignore> 
+											:
+		</ignore_list>
+	</backup>
+				:
+</backups>
+
+/backups 
+	mandatory. root directory. It has children of backup informations
+/backups/backup
+	mandatory. unit of backup information
+/backups/backup/name
+	mandatory. backup information name
+/backups/backup/server
+	mandatory. remote host address.
+/backups/backup/user
+	mandatory.  login name to remote host .
+/backups/backup/password
+	mandatory.  login password to remote host .
+/backups/backup/path
+	mandatory.  path for begin to backup on remote host.
+/backups/backup/ignore_list
+	option.  parent of ignore entity.
+/backups/backup/ignore
+	option.  don't wish file or directory name under backup path.
+
+command:
+
+	remote_backup [-f filename] [-o output_dir] [-v verbos]
+
+
+	filename:
+		file name written backup information. if not specified default is ./backup.xml
+
+	output_dir:
+		repository directory.  if not specified default is .(current directory)
+		Backup file is stored and  backup file tree information yaml is maked in repository directory 
+		+ backup name.  
+
+	verbos
+		print progress to stdout  
+
+
+	restore_backup -f filename -o output directory [-v verbos]
+
+
+		filename:
+			backup file tree information yaml which locate repository directory + backup name + yyyy_mm_dd_hh_mm.yaml
+
+		output directory:
+			directory you want to make backup tree. 
+
+		verbos
+			print progress to stdout  
+
+== REQUIREMENTS:
+
+* Net::SSH 2
+* Net::SCP
+
+== INSTALL:
+
+* gem install remote-backup (might need sudo privileges)
+
+Or, you can do it the hard way (without Rubygems):
+
+* tar xzf net-backup-*.tgz
+* cd remote-backup-*
+* ruby setup.rb config
+* ruby setup.rb install (might need sudo privileges)
+
+== LICENSE:
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+

data/Rakefile

@@ -1,4 +1,27 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/remotebackup'
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.new('remotebackup', Remotebackup::VERSION) do |p|
+  p.developer('takeshi morita', 'takeshimorita76@gmail.com')
+  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.rubyforge_name       = p.name # TODO this is default value
+   p.extra_deps         = [
+     ['net-ssh','>= 2.0.4'],
+     ['net-scp','>= 1.0.1'],
+   ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+# task :default => [:spec, :features]

data/lib/remotebackup.rb

@@ -10,40 +10,58 @@ require "date"
 require 'logger'
 require 'yaml'
 module Remotebackup
+    VERSION='0.50.2'
 	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+(.*)/
+        LS_LINK = /([-a-z]*)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\d*)\s+([A-Z][a-z]*)\s+(\d+)\s+([\d:]*)\s+(.*)\s+->\s+(.*)/
 		Result = {:access=>0,:link_num=>1,:user=>2,:group=>3,:size=>4,:month=>5,:day=>6,:yt=>7,:name=>8,:arrow=>9,:source=>10}
 		Month = {"Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8,
 							"Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12}
+        
 		def initialize(out)
-			result = out.split();
-			@name = result[Result[:name]]
-			case result[Result[:access]] 
+            @name=""
+            if out !~ /^[[:print:]]*$/
+                $log.error("#{out} includes irregular char. ignore.")
+            end
+			case out
 			when /^-/
-				@ftype = :file
-				@size = result[Result[:size]].to_i
-				year = DateTime.now.year
-				month = Month[result[Result[:month]]]
-				day = result[Result[:day]].to_i
-				hour = 0
-				minute = 0
-				if result[Result[:yt]] =~ /(.*):(.*)/
-					hour = $1.to_i
-					minute = $2.to_i
-				else
-					year = result[Result[:yt]].to_i
-				end
-				@date = DateTime.new(year,month,day,hour,minute).to_s
-				@makeMap = lambda{ return {"size" => @size, "date" => @date}}
+                if LS_FILE.match(out)
+                    @name = $9
+                    @ftype = :file
+                    @size = $5.to_i
+                    month = Month[$6]
+                    day = $7.to_i
+                    hour = 0
+                    minute = 0
+                    tmpTime = $8
+                    if tmpTime =~ /(.*):(.*)/
+                        year = DateTime.now.year
+                        hour = $1.to_i
+                        minute = $2.to_i
+                    else
+                        year = tmpTime.to_i
+                    end
+                    @date = DateTime.new(year,month,day,hour,minute).to_s
+                    @makeMap = lambda{ return {"size" => @size, "date" => @date}}
+                else
+                    $log.error("#{out} is not recognized. ignore.")
+                end
 			when /^l/
-				@ftype = :symbolic
-				@source = result[Result[:source]]
-				@makeMap = lambda{ return {"source" => @source}}
+                if LS_LINK.match(out)
+                    @name = $9
+                    @ftype = :symbolic
+                    @source = $10
+                    @makeMap = lambda{ return {"source" => @source}}
+                end
 			when /^d/
-				@ftype = :directory
+                if LS_FILE.match(out)
+                    @name = $9
+                    @ftype = :directory
+                end
 			else
 				@ftype = :special
-				$log.error("#{@name} is not regular file. ignore.")
+				$log.error("#{out} is not regular file. ignore.")
 			end
 		end
 	end
@@ -84,7 +102,7 @@ module Remotebackup
 			channel = session.open_channel do |ch|
 				ch.exec cmd do |ch,success|
 					ch.on_data do |c,data|
-						out = data
+						out += data
 					end
 				end
 			end
@@ -98,7 +116,7 @@ module Remotebackup
 			end
 			lines = StringIO.new(out).readlines
 			if lines[0].split().length < 9
-				@fileMap["directory"]. push target unless target == ""
+				@fileMap["directory"].push target unless target == ""
 				makeFileMap(session,target,lines)
 			else
 				node = Node.new(lines[0].chomp)
@@ -138,14 +156,22 @@ module Remotebackup
 				end
 			end
 		end
-		def write_to_yaml(out_dir)
+		def outputFileInfo(out_dir)
 			output_dir = out_dir + "/" + @name
 			FileUtils.mkdir_p(output_dir)
-			file_name = output_dir + "/" + date_to_filename + ".yml"
-			File.open(file_name ,"w") do |f|
+			@outputFile = output_dir + "/" + date_to_filename + ".txt"
+			File.open(@outputFile,"w") do |f|
 				f.write YAML.dump(@fileMap)
 			end
 		end
+        def outputYaml()
+            newFile = @outputFile.sub(/.txt$/,".yml")
+            FileUtils.mv(@outputFile,newFile)
+        end
+        def cleanFileInfo()
+            FileUtils.rm(@outputFile)
+            FileUtils.touch([@last_file])
+        end
 		def load_last_yaml(output_dir)
 			files = Array.new
 			if FileTest.directory?(output_dir)
@@ -186,9 +212,11 @@ module Remotebackup
 				if !oldFileMap[key] || oldFileMap[key]["size"] != val["size"] || oldFileMap[key]["date"] != val["date"] 
 					@mod = true
 					file_name = output_dir + "/" + key + date_to_filename
-					msg_out "scp #{@user}@#{@server}:#{@path}/#{key} #{file_name} #password=#{@password}"
+                    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!  "#{@path}/#{key}",file_name
+						ssh.scp.download!(orig,file_name)
 					end
 					val["file_name"] = file_name
 					if !oldFileMap[key]
@@ -228,7 +256,9 @@ module Remotebackup
 					if elem.name == "ignore_list"
 						ignores = Array.new
 						elem.each_element do |ignore|
-							ignores.push(ignore.text)
+                            if ignore.text
+                                ignores.push(ignore.text)
+                            end
 						end
 						bkup_info["ignore_list"] = ignores
 					else
@@ -245,11 +275,12 @@ module Remotebackup
 				msg_out "--------------------------------"
 				msg_out "Backup start #{conf['name']}"
 				msg_out "--------------------------------"
+                bkup.outputFileInfo(@config_out_dir)
 				bkup.differencial_copy(@config_out_dir)
 				if bkup.mod
-					bkup.write_to_yaml(@config_out_dir)
+                   bkup.outputYaml()
 				else
-					FileUtils.touch([bkup.last_file])
+                   bkup.cleanFileInfo()
 				end
 			end
 		end

data/test/test_helper.rb

@@ -1,2 +1,3 @@
+require 'stringio'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/remotebackup'