remotebackup 0.51.1 → 0.70.0

data/{History.txt → ChangeLog}

@@ -1,3 +1,10 @@
+== 0.70.0 
+*	build tool change to Jeweler
+*	change config file format xml to yaml
+*	accept debian system
+*	you can use utf-8 file name
+*	you can use key base authenticity
+
 == 0.50.1 2008-06-23
 
 * 1 major enhancement:

data/Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+gem "net-scp"
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.6.4"
+  gem "rcov", ">= 0"
+end

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Takeshi Morita
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -0,0 +1,88 @@
+RemoteBackupとは？
+1.リモートホスト上にあるディレクトリをローカルにscpでコピーすることでバックアップする
+2.ファイルの更新日時を見て、更新されているファイルだけをコピー
+3.リストアする際は日付を指定して、指定された日付の状態をリストアすることができる。
+１．に関しては、対象のリモートホスト上にsshデーモンが動作してさえすれば、リモートホストはなにもインストールする必要がないという利点があります。
+２．に関しては、必要なファイルのみ取得するので、バックアップの時間の節約や、容量の節約ができます。
+３．に関しては、リモートサーバのバックアップはrsyncが一般的だと思いますが、過去のデータを取り出すような機能はないため、間違ってサーバのファイルをいじった後に同期が取られた場合は元に戻せません。その点RemoteBackupは過去をさかのぼって、指定された日付のファイルツリーを復元することができます。
+cronにRemoteBackupを登録することで、定期的なバックアップが容易にできます。
+
+インストール手順
+shellで下記のコマンドを実行
+　sudo gem install remotebackup
+
+バックアップ手順
+1. 下記のフォーマットでバックアップを行うための設定ファイルを作成します。
+バックアップ名（適当な英数字):
+  server: ホスト名
+  user: ホストにログインできるユーザ名
+  password:  ユーザのパスワード
+  key:  秘密鍵のパス
+  passphrase:  秘密鍵のパスフレーズ
+  path: バックアップしたいディレクトリのフルパス</path>
+  ignore_list:
+    - 無視したいディレクトリおよびファイルの正規表現
+                      :
+:
+
+例)サーバ192.168.0.10のホストにtakesyというユーザ（パスワードが openthesesami）で/www配下を.svnや.bkというディレクトリもしくはファイル以外をバックアップし、さらにサーバ192.168.0.12のホストにbkuserというユーザ（公開鍵認証）で/export配下をバックアップする場合。
+web:
+  server: 192.168.0.10
+  user: takesy
+  password: openthesesami 
+  path: /www
+  ignore_list:
+    - \.svn
+    - \.bk
+
+nfs:
+  server: 192.168.0.12
+  user: bkuser
+  key: /home/morita/.ssh/id_rsa
+  path: /export
+
+2. 下記のコマンドを実行することにより、バックアップ開始.
+
+remote_backup [-f 1.で作成した設定ファイル。デフォルトはbacup.yml] [-o 出力したいディレクトリ　デフォルトはカレントディレクトリ] [-v　どのファイルをコピーしているか等の情報を表示] 
+
+上記実行により、レポジトリとしてカレントディレクトリもしくは-oで指定したディレクトリに１．で設定したnameの名前でディレクトリが作成されます。 
+上記例だとwebとnfsという名前のディレクトリができます。
+バックアップされたファイルは、ファイル名＋バックアップ日時の名前で保存され、さらにファイル情報として、実行日時.ymlというバックアップしたファイルの属性等が記述されたファイルが作成されます。このファイルはリストアする時に使用します。
+また、前回のバックアップ時と比較して変更がなかった場合は作成されません。
+------------------------------------------------------------------------------
+リストア手順
+
+1.リストアするためには下記のコマンドを実行する。 
+
+restore_backup -f file -o output_dir [-v vervose] 
+
+fileには、バックアップで作成された日付+ymlを指定します。
+output_dirにはリストアしたいディレクトリのパスを指定します。 
+例:
+restore_backup -f ./web/2008_06_25_06_40.yml -o /tmp/www
+
+------------------------------------------------------------------------------
+RemoteBackup処理概要
+
+１．sshを使用し、リモートサーバ上でls -laを再帰的に実行し、下記のツリー情報を作成する。
+directory:
+- バックアップ対象ディレクトリからの相対パス
+（複数ある場合は上記フォーマットが続く）
+
+symbolic:
+  バックアップ対象ディレクトリからの相対パス＋シンボリックファイル名:
+    　source: シンボリック元のパス
+（複数ある場合は上記フォーマットが続く）
+
+file:
+  バックアップ対象ディレクトリからの相対パス＋ファイル名:
+    size: ファイルのサイズ
+    file_name: ファイル名＋バックアップ日時
+    date: ファイルの更新日付
+　（複数ある場合は上記フォーマットが続く）
+
+２．　前回バックアップした際のツリー情報と今回のツリー情報と比べてファイルの更新日付が新しくなっているファイル（初回時はすべて)をリモートサーバからscpでコピーし、file_nameに設定されているファイル名で保存。
+
+３．　今回のツリー情報を保存。
+
+４．リストアする際はツリー情報に基づいて、ディレクトリ、symbolicファイルを作成し、ファイルをfile_nameに設定されているファイル名＋バックアップ日時からファイル名にリネームすることで、ツリー状態を復元する。

data/README.rdoc

@@ -21,40 +21,36 @@ remote ssh backup is backup files on remote server with ssh. It's not required a
 == 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
+To use remotebackup,you should prepare backup configuretion by yaml such below.
+
+name:
+  server: server_name
+  user: user
+  password:  password(option)
+  key: secret key path(option)
+  passphrase:  secret key passphrase(option)
+  path: path for backup
+  ignore_list:
+    - regular expression for not backup 
+                      :
+:
+
+name
+	mandatory. backup name
+server
 	mandatory. remote host address.
-/backups/backup/user
+user
 	mandatory.  login name to remote host .
-/backups/backup/password
-	mandatory.  login password to remote host .
-/backups/backup/path
+password
+	option.  login password to remote host .
+key
+	option.  private key path
+passphrase
+	option.  private key passphrase
+path
 	mandatory.  path for begin to backup on remote host.
-/backups/backup/ignore_list
+ignore_list
 	option.  parent of ignore entity.
-/backups/backup/ignore
-	option.  don't wish file or directory name under backup path.
 
 command:
 
@@ -62,7 +58,7 @@ command:
 
 
 	filename:
-		file name written backup information. if not specified default is ./backup.xml
+		file name written backup information. if not specified default is ./backup.yml
 
 	output_dir:
 		repository directory.  if not specified default is .(current directory)

data/Rakefile

@@ -1,27 +1,49 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/remotebackup'
-
-# 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]
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "remotebackup"
+  gem.homepage = "http://github.com/takeshy/remotebackup"
+  gem.license = "MIT"
+  gem.summary = %Q{version backup tool using scp.}
+  gem.description = %Q{version backup tool using scp.}
+  gem.email = "laten@nifty.com"
+  gem.authors = ["Takeshi Morita"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "MasterRecord #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.70.0

data/bin/remote_backup

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require "optparse"
+require "fileutils"
 require 'logger'
 require 'remotebackup'
 
@@ -14,7 +15,7 @@ def opt_parse()
 	begin 
 		parser = OptionParser.new do |opt|
 			opt.banner = "Usage: #{File.basename($0)} [Option]"
-			opt.on("-f","--file config",String,'location config file. default ./backup.xml') {|o|
+			opt.on("-f","--file config",String,'location config file. default ./backup.yml') {|o|
 				$config_file = o
 			}
 			opt.on("-o","--outputdir Output Directory",String,"Directory for output. Default #{ENV['HOME']}") {|o|
@@ -34,12 +35,13 @@ def opt_parse()
 		exit 1
 	end
 	unless $config_file 
-		$config_file = "./backup.xml"
+		$config_file = "./backup.yml"
 	end
 	unless $config_out_dir
 		$config_out_dir = "."
 	end
-    $config_out_dir = File::expand_path($config_out_dir)
+  $config_out_dir = File::expand_path($config_out_dir)
+  FileUtils.mkdir_p($config_out_dir)
 	if !File.file?($config_file)
 		$stderr.puts "config #{$config_file} is not exist."
 		$stderr.puts parser.help

data/lib/node.rb

@@ -0,0 +1,91 @@
+module Remotebackup
+  class Node
+    attr_accessor :ftype,:name,:make_map
+    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}
+    LS_INFO = {
+      :redhat => {
+        :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+(.*)/,
+        :position => 
+          {:access=>1,:link_num=>2,:user=>3,:group=>4,:size=>5,:month=>6,:day=>7,:yt=>8,:name=>9,:arrow=>10,:source=>11}
+      },
+      :debian => {
+        :ls_file => /([-a-z]*)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\d*)\s+([-0-9]*)\s+([\d:]*)\s+(.*)/,
+        :ls_link => /([-a-z]*)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\d*)\s+([-0-9]*)\s+([\d:]*)\s+(.*)\s+->\s+(.*)/,
+        :position => 
+          {:access=>1,:link_num=>2,:user=>3,:group=>4,:size=>5,:day =>6,:time =>7,:name=>8,:arrow=>9,:source=>10}
+      }
+    }
+
+    def self.build(out)
+      LS_INFO.each do|key,val|
+        if val[:ls_file].match(out)
+          return Node.new(key,out)
+        end
+      end
+      nil
+    end
+
+    def to_date_time(match)
+      if @type == :redhat
+        month = Month[match[position[:month]]]
+        day = match[position[:day]].to_i
+        hour = 0
+        minute = 0
+        tmp_time = match[position[:yt]]
+        if t = /(.*):(.*)/.match(tmp_time)
+          year = DateTime.now.year
+          hour = t[1].to_i
+          minute = t[2].to_i
+        else
+          year = tmp_time.to_i
+        end
+        DateTime.new(year,month,day,hour,minute).to_s
+      else
+        DateTime.parse(match[position[:time]]).to_s
+      end
+    end
+
+    def ls_file
+      LS_INFO[@type][:ls_file]
+    end
+
+    def ls_link
+      LS_INFO[@type][:ls_link]
+    end
+
+    def position
+      LS_INFO[@type][:position]
+    end
+
+    def initialize(type,out)
+      @type = type
+      case out
+      when /^-/
+        if m = ls_file.match(out)
+          @ftype = :file
+          @name = m[position[:name]]
+          @size = m[position[:size]].to_i
+          @date = to_date_time(m)
+          @make_map = lambda{ return {"size" => @size, "date" => @date}}
+        end
+      when /^l/
+        if m = ls_link.match(out)
+          @ftype = :symbolic
+          @name = m[position[:name]]
+          @source = m[position[:source]]
+          @make_map = lambda{ return {"source" => @source}}
+        end
+      when /^d/
+        if m = ls_file.match(out)
+          @ftype = :directory
+          @name = m[position[:name]]
+        end
+      else
+        @ftype = :special
+        $log.error("#{out} is not regular file. ignore.")
+      end
+    end
+  end
+end

data/lib/remotebackup.rb

@@ -1,97 +1,44 @@
-$:.unshift(File.dirname(__FILE__)) unless
-$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 require 'rubygems'
 require 'net/ssh'
 require 'net/scp'
 require "stringio"
 require "fileutils"
-require "rexml/document"
 require "date"
 require 'logger'
 require 'yaml'
+require 'node'
 module Remotebackup
-  VERSION='0.51.1'
-  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)
-      if out =~ /[^\x20-\x7E]/
-        $log.error("#{out} includes irregular char. ignore.")
-        return
-      end
-      case out
-      when /^-/
-        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/
-        if LS_LINK.match(out)
-          @name = $9
-          @ftype = :symbolic
-          @source = $10
-          @makeMap = lambda{ return {"source" => @source}}
-        end
-      when /^d/
-        if LS_FILE.match(out)
-          @name = $9
-          @ftype = :directory
-        end
-      else
-        @ftype = :special
-        $log.error("#{out} is not regular file. ignore.")
-      end
-    end
-  end
   class BackupInfo
-    attr_accessor :fileMap,:mod,:last_file
-    def initialize(name,server,user,password,path,ignore_list)
+    attr_accessor :file_map,:mod,:last_file
+    def initialize(args)
       @mod = false
-      @name = name
-      @server = server
-      @user = user
-      @password = password
-      @path = path
-      @ignore_list = ignore_list
+      @name = args["name"] || args["server"]
+      @server = args["server"]
+      @user = args["user"]
+      @options = {}
+      @options[:port] = args["port"].to_i if args["port"]
+      @options[:password] = args["password"] if args["password"]
+      @options[:passphrase] = args["passphrase"] if args["passphrase"]
+      if args["key"]
+        @options[:keys] = [File.expand_path(args["key"])] 
+      end
+      @path = args["path"]
+      @ignore_list = args["ignore_list"] || []
       @nowTime = DateTime.now
-      @fileMap = {"file" => Hash.new,"symbolic" => Hash.new,"directory"=>Array.new}
-      Net::SSH.start(@server,@user,:password=>@password) { |session|
-        makeFileMapList(session,"")
+      @file_map = {"file" => Hash.new,"symbolic" => Hash.new,"directory"=>Array.new}
+      Net::SSH.start(@server,@user,@options) { |session|
+        make_file_map_list(session,"")
       }
     end
     def ignore_check(target)
-      if @ignore_list
-        @ignore_list.each do |ignore|
-          if target =~ /#{ignore}/
-            return false
-          end
+      @ignore_list.each do |ignore|
+        if target =~ /#{ignore}/
+          return false
         end
       end
       return true
     end
-    def makeFileMapList(session,target)
+    def make_file_map_list(session,target)
       if target != ""
         target_path = @path +"/"+target
       else
@@ -115,24 +62,22 @@ module Remotebackup
         return
       end
       lines = StringIO.new(out).readlines
-      if lines[0].split().length < 9
-        @fileMap["directory"].push target unless target == ""
+      if !Node.build(lines[0].chomp)
+        @file_map["directory"].push target unless target == ""
         makeFileMap(session,target,lines)
       else
-        node = Node.new(lines[0].chomp)
+        node = Node.build(lines[0].chomp)
         if node.ftype == :symbolic
-          @fileMap["symbolic"][File.basename(@path)] = node.makeMap.call
+          @file_map["symbolic"][File.basename(@path)] = node.make_map.call
         elsif node.ftype == :file
-          @fileMap["file"][File.basename(@path)] = node.makeMap.call
+          @file_map["file"][File.basename(@path)] = node.make_map.call
         end
       end
     end
     def makeFileMap(session,target,lines)
       lines.each do |line|
-        if line.split().length < 9
-          next
-        end
-        node = Node.new(line.chomp)
+        node = Node.build(line.chomp)
+        next unless node
         if  not node.name or node.name == "." or node.name == ".." 
           next
         end
@@ -146,13 +91,13 @@ module Remotebackup
         end
         case node.ftype
         when :directory
-          makeFileMapList(session,target_name)
+          make_file_map_list(session,target_name)
         when :special
           next
         when :file
-          @fileMap["file"][target_name] = node.makeMap.call
+          @file_map["file"][target_name] = node.make_map.call
         when :symbolic
-          @fileMap["symbolic"][target_name] = node.makeMap.call
+          @file_map["symbolic"][target_name] = node.make_map.call
         end
       end
     end
@@ -160,7 +105,7 @@ module Remotebackup
       output_dir = out_dir + "/" + @name
       f = output_dir + "/" + date_to_filename + ".yml"
       File.open(f,"w") do |f|
-        f.write YAML.dump(@fileMap)
+        f.write YAML.dump(@file_map)
       end
     end
     def cleanFileInfo()
@@ -183,32 +128,33 @@ module Remotebackup
     def differencial_copy(out_dir)
       output_dir = out_dir + "/" + @name
       FileUtils.mkdir_p(output_dir)
-      oldFileInfoMap = load_last_yaml(output_dir)
-      @fileMap["directory"].each do |dir|
-        unless oldFileInfoMap["directory"].include?(dir)
+      old_file_info_map = load_last_yaml(output_dir)
+      @file_map["directory"].each do |dir|
+        unless old_file_info_map["directory"].include?(dir)
           @mod = true
           msg_out "create directory:#{dir}"
           FileUtils.mkdir_p(output_dir + "/" + dir)
         end
       end
-      oldFileMap = oldFileInfoMap["symbolic"]
-      @fileMap["symbolic"].each do |key,val|
-        if !oldFileMap[key] || oldFileMap[key]["source"] != val["source"]
+      old_file_map = old_file_info_map["symbolic"]
+      @file_map["symbolic"].each do |key,val|
+        if !old_file_map[key] || old_file_map[key]["source"] != val["source"]
           @mod = true
-          if !oldFileMap[key]  
+          if !old_file_map[key]  
             msg_out "create symbolic:#{key}"
           else
             msg_out "modified symbolic:#{key}"
           end
         end
       end
-      oldFileMap = oldFileInfoMap["file"]
-      Net::SSH.start(@server, @user, :password => @password) do |ssh|
-        @fileMap["file"].each do |key,val|
-          if !oldFileMap[key] || oldFileMap[key]["date"] != val["date"] 
+      old_file_map = old_file_info_map["file"]
+      Net::SSH.start(@server, @user,@options) do |ssh|
+        @file_map["file"].each do |key,val|
+          key = key.dup.force_encoding("utf-8")
+          if !old_file_map[key] || old_file_map[key]["date"] != val["date"] 
             @mod = true
             file_name = output_dir + "/" + key + date_to_filename
-            orig = "#{@path}/#{key}".gsub(/ /,"\\ ").gsub(/\(/,"\\(").gsub(/\)/,"\\)").gsub(/&/,"\\\\&").gsub(/\=/,"\\=")
+            orig = "#{@path}/#{key}"
             msg_out "scp #{orig} #{file_name}"
             begin
               ssh.scp.download!(orig,file_name)
@@ -217,13 +163,13 @@ module Remotebackup
               next
             end
             val["file_name"] = file_name
-            if !oldFileMap[key]
+            if !old_file_map[key]
               msg_out "create file:#{key}"
             else
               msg_out "modified file:#{key}"
             end
           else
-            val["file_name"] = oldFileMap[key]["file_name"]
+            val["file_name"] = old_file_map[key]["file_name"]
           end
         end
       end
@@ -243,33 +189,15 @@ module Remotebackup
     def initialize(config_file,config_out_dir)
       @config_file = config_file
       @config_out_dir = config_out_dir
-      @doc = REXML::Document.new(File.open(@config_file))
-      @top = @doc.elements["/backups"]
+      @doc = YAML.load_file(@config_file)
       @conf_backups = Array.new
-      unless @top
-        oops("/backups is not set in #{@config_file}.")
-      end
-      @top.each_element do |backup|
-        bkup_info = Hash.new
-        backup.each_element do |elem|
-          if elem.name == "ignore_list"
-            ignores = Array.new
-            elem.each_element do |ignore|
-              if ignore.text
-                ignores.push(ignore.text)
-              end
-            end
-            bkup_info["ignore_list"] = ignores
-          else
-            bkup_info[elem.name] = elem.text
-          end
-        end
-        @conf_backups.push(bkup_info)
+      @doc.each do |key,val|
+        @conf_backups.push(val.merge(:name => key))
       end
     end
     def start
       @conf_backups.each do |conf|
-        bkup = BackupInfo.new(conf["name"],conf["server"],conf["user"],conf["password"],conf["path"],conf["ignore_list"])
+        bkup = BackupInfo.new(conf)
         msg_out "--------------------------------"
         msg_out "Backup start #{conf['name']}"
         msg_out "--------------------------------"

data/remotebackup.gemspec

@@ -0,0 +1,67 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "remotebackup"
+  s.version = "0.70.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Takeshi Morita"]
+  s.date = "2011-12-27"
+  s.description = "version backup tool using scp."
+  s.email = "laten@nifty.com"
+  s.executables = ["remote_backup", "restore_backup"]
+  s.extra_rdoc_files = [
+    "ChangeLog",
+    "LICENSE.txt",
+    "README",
+    "README.rdoc"
+  ]
+  s.files = [
+    "ChangeLog",
+    "Gemfile",
+    "LICENSE.txt",
+    "README",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/remote_backup",
+    "bin/restore_backup",
+    "lib/node.rb",
+    "lib/remotebackup.rb",
+    "pkg/remotebackup-0.70.0.gem",
+    "remotebackup.gemspec"
+  ]
+  s.homepage = "http://github.com/takeshy/remotebackup"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "version backup tool using scp."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<net-scp>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<net-scp>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-scp>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

metadata

@@ -1,111 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remotebackup
-version: !ruby/object:Gem::Version 
-  version: 0.51.1
+version: !ruby/object:Gem::Version
+  version: 0.70.0
+  prerelease: 
 platform: ruby
-authors: 
-- takeshi morita
+authors:
+- Takeshi Morita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-12-03 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-scp
+  requirement: &10185040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
+  prerelease: false
+  version_requirements: *10185040
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &10183620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *10183620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &10182360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *10182360
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &10181140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+  prerelease: false
+  version_requirements: *10181140
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &10196620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-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.
-email: 
-- takeshimorita76@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: *10196620
+description: version backup tool using scp.
+email: laten@nifty.com
+executables:
 - remote_backup
 - restore_backup
 extensions: []
-
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
+extra_rdoc_files:
+- ChangeLog
+- LICENSE.txt
+- README
 - README.rdoc
-files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
+files:
+- ChangeLog
+- Gemfile
+- LICENSE.txt
+- README
 - README.rdoc
 - Rakefile
-- lib/remotebackup.rb
-- script/console
-- script/destroy
-- script/generate
+- VERSION
 - bin/remote_backup
 - bin/restore_backup
-- test/test_helper.rb
-- test/test_remotebackup.rb
-has_rdoc: true
-homepage: http://net-ssh.rubyforge.org/remotebackup
+- lib/node.rb
+- lib/remotebackup.rb
+- pkg/remotebackup-0.70.0.gem
+- remotebackup.gemspec
+homepage: http://github.com/takeshy/remotebackup
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -238872459189926738
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: remotebackup
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 2
-summary: remote ssh backup is backup files on remote server with ssh
-test_files: 
-- test/test_remotebackup.rb
-- test/test_helper.rb
+specification_version: 3
+summary: version backup tool using scp.
+test_files: []

data/Manifest.txt

@@ -1,13 +0,0 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-lib/remotebackup.rb
-script/console
-script/destroy
-script/generate
-bin/remote_backup
-bin/restore_backup
-test/test_helper.rb
-test/test_remotebackup.rb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on remotebackup, see http://remotebackup.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-

data/script/console

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/remotebackup.rb'}"
-puts "Loading remotebackup gem"
-exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/test/test_helper.rb

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

data/test/test_remotebackup.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestRemotebackup < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end