s3backup 0.5.1 → 0.6.1

data/History.txt

@@ -1,4 +1,4 @@
-=== 0.0.1 2009-10-21
-
-* 1 major enhancement:
-  * Initial release
+=== 0.0.1 2009-10-21
+
+* 1 major enhancement:
+  * Initial release

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/s3backup.rb
 lib/s3backup/backup.rb
 lib/s3backup/cli.rb
 lib/s3backup/crypt.rb
+lib/s3backup/manager.rb
 lib/s3backup/restore.rb
 lib/s3backup/s3log.rb
 lib/s3backup/s3wrapper.rb

data/PostInstall.txt

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

data/lib/s3backup/backup.rb

@@ -1,7 +1,6 @@
-require 'cgi'
 require 's3backup/s3wrapper'
 require 's3backup/s3log'
-require 's3backup/tree_info'
+require 's3backup/manager'
 module S3backup
   class Backup
     def initialize(config)
@@ -9,21 +8,16 @@ module S3backup
       directories = config["directories"]
       @directories = directories.map{|d| d=~/\/$/ ? d.chop : d}
       begin
-        @s3_obj = S3Wrapper.new(config)
+        @s3_obj = S3Wrapper.new(config,true)
       rescue => err
         S3log.error(err.backtrace.join("\n")+"\n"+err.message)
         exit -1
       end
-      @target_infos = {:attributes=> [],:tree_infos => []}
-      @directories.each do |dir|
-        @target_infos[:tree_infos].push(TreeInfo.new(dir))
-        S3log.debug("tree_info=#{@target_infos[:tree_infos].inspect}")
-        @target_infos[:attributes].push({:base => dir,:update_date => Date.today})
-      end
+      @manager = Manager.new(@s3_obj,config)
     end
     def check_config(config)
       unless config["directories"]
-        S3log.error("directories doesn't exist in #{config_file}.")
+        S3log.error("directories doesn't exist in config file.")
         exit -1
       end
       unless config["directories"].class == Array 
@@ -45,27 +39,8 @@ module S3backup
     def start
       begin
       first_flg=false
-      unless @s3_obj.bucket_exist? 
-        first_flg = true
-        @s3_obj.create_bucket
-      end
-      @target_infos[:attributes].each_with_index do |attribute,i|
-        base = CGI.escape(attribute[:base])
-        tree_file_name = "tree_"+base+".yml"
-        tree_data = nil
-        unless first_flg
-          #前回のファイル・ツリーをAWS S3から取得
-          tree_data = @s3_obj.get(tree_file_name)
-        end
-        #前回と今回のファイル・ツリーを比較
-        diff_info = @target_infos[:tree_infos][i].diff(TreeInfo.new(tree_data))
-        S3log.debug("diff_info=#{diff_info.inspect}")
-        #更新されたディレクトリをAWS S3にアップロード
-        @s3_obj.store_directories(diff_info[:directory][:add] + diff_info[:directory][:modify])
-        #削除されたディレクトリをAWS S3からdelete
-        @s3_obj.delete_directories(diff_info[:directory][:remove])
-        #今回のファイル・ツリーをAWS S3に登録
-        @s3_obj.post(tree_file_name,@target_infos[:tree_infos][i].dump_yaml)
+      @directories.each do |dir|
+        @manager.differential_copy(dir)
       end
       rescue => err
         S3log.error(err.backtrace.join("\n")+"\n"+err.message)

data/lib/s3backup/manager.rb

@@ -0,0 +1,232 @@
+require 'cgi'
+require 'tempfile'
+require 'fileutils'
+require 's3backup/s3log'
+require 's3backup/tree_info'
+module S3backup
+  class Manager
+    DEFAULT_BUF_READ_SIZE=1024*1024*128
+    def initialize(target,config)
+      @target = target
+      set_config(config)
+    end
+    def set_config(config)
+      if config["password"] and config["password"] != ""
+        unless config["salt"] 
+          raise "salt doesn't exist in config file.\n"
+        end
+        unless config["salt"] =~ /[0-9A-Fa-f]{16}/
+          raise "salt format shoud be HexString and length should be 16.\n"
+        end
+        if config["BUF_SIEZE"]
+          size=config["BUF_SIEZE"]
+          if size > 1000*1000*1000*5
+            raise "BUF_SIZE must be less than 5G"
+          end
+        else
+          @buf_size = DEFAULT_BUF_READ_SIZE
+        end
+        @aes = Crypt.new(config["password"],config["salt"])
+      end
+    end
+    #指定されたディレクトリをtar gzip形式で圧縮する
+    def to_tgz(path,dir)
+      #サブディレクトリを圧縮の対象外にする。
+      sub_dir = []
+      Dir.foreach(dir) do |file|
+        next if /^\.+$/ =~ file 
+        sub_dir.push(file) if File.directory?(dir+"/"+file)
+      end
+      exclude = ""
+      exclude = exclude + " --exclude=" + sub_dir.join("  --exclude=") if sub_dir.length != 0
+      cmd = "(cd #{File.dirname(dir)};tar -czvf #{path} #{exclude} #{File.basename(dir)} > /dev/null 2>&1)"
+      S3log.debug(cmd)
+      system(cmd) 
+      unless $?.success?
+        raise "feiled #{cmd} execute. #{$?.inspect}"
+      end
+    end
+    def from_tgz(path,dir)
+      cmd = "tar -xzvf #{path} -C #{dir} > /dev/null 2>&1"
+      S3log.debug(cmd)
+      system(cmd) 
+      unless $?.success?
+        raise "feiled #{cmd} execute. #{$?.inspect}"
+      end
+    end
+    def get_chain(key)
+      data = nil
+      data_set = nil
+      i=1
+      if @aes
+        key = @aes.encrypt(key)
+      end
+      while 1
+        key_name = i.to_s()+"_"+key
+        data = @target.get(key_name)
+        if data == nil
+          break
+        end
+        if i==1
+          data_set = ''
+        end
+        if @aes
+          data = @aes.decrypt(data)
+        end
+        data_set += data
+        i+=1
+      end
+      return data_set
+    end
+    def get_directory(dir,out_dir)
+      data = get_chain(dir)
+      tmp = Tempfile.open("s3backup")
+      tmp.write(data)
+      tmp.close
+      #tgzのファイルをcur_dirに展開
+      from_tgz(tmp.path,out_dir)
+      tmp.close(true)
+    end
+    def get_directories(dirs,prefix,output_dir)
+      prefix_len = prefix.length
+      dirs.each do |dir|
+        parent = File.dirname(dir)
+        p_len = parent.length
+        relative_path = parent.slice(prefix_len,p_len - prefix_len)
+        cur_dir = output_dir + relative_path
+        get_directory(dir,cur_dir)
+      end
+    end
+    def store_directory(dir)
+      tmp = Tempfile.open("s3backup")
+      tmp.close
+      #tgzのファイルをtmp.pathに作成
+      to_tgz(tmp.path,dir)
+      #S3にディレクトリの絶対パスをキーにして、圧縮したデータをストア
+      i=1
+      key = nil
+      if @aes
+        key = @aes.encrypt(dir)
+      else
+        key = dir
+      end
+      #前回のバックアップデータ削除
+      cnt = 1
+      while @target.exists?(cnt.to_s() + "_" + key)
+        @target.delete(cnt.to_s() + "_" + key)
+        cnt+=1
+      end
+      f = File.open(tmp.path,"r")
+      begin
+        while 1
+          key_name = i.to_s()+"_"+key
+          data = f.readpartial(@buf_size)
+          if @aes
+            data = @aes.encrypt(data)
+          end
+          @target.post(key_name,data)
+          i+=1
+        end
+      rescue EOFError
+      end
+      tmp.close(true)
+    end
+    def delete_direcory(dir)
+      if @aes
+        dir = @aes.encrypt(dir)
+      end
+      i=1
+      while @target.delete("#{i}_#{dir}")
+        i+=1
+      end
+    end
+    def differential_copy(dir)
+      #現在のファイル・ツリーを比較
+      tree_info = TreeInfo.new(dir)
+
+      target_tree_name = "tree_"+dir+".yml"
+      tree_data = nil
+      #前回のファイル・ツリーを取得
+      old_tree = TreeInfo.new(@target.get(target_tree_name))
+
+      #前回と今回のファイル・ツリーを比較
+      diff_info = tree_info.diff(old_tree)
+      S3log.debug("diff_info=#{diff_info.inspect}")
+
+      update_dir = diff_info[:directory][:add] + diff_info[:directory][:modify]
+      #更新されたディレクトリをアップロード
+      update_dir.each do |udir|
+        store_directory(udir)
+        udir_info = tree_info.get_dir_info(udir)
+        #前回のファイル・ツリー情報のうち、今回アップデートしたディレクトリ情報ファイル情報を更新
+        old_tree.update_dir(udir,udir_info)
+        #更新したファイル・ツリー情報をアップロード(途中で失敗しても、resumeできるようにするため。)
+        @target.post(target_tree_name,old_tree.dump_yaml)
+      end
+      diff_info[:directory][:remove].each do |rm_dir|
+        delete_direcory(rm_dir)
+      end
+    end
+    def get_target_tree(dir)
+      base_dir = dir
+      tree_data = nil
+      before_base=""
+      #バックアップしたディレクトリよりも下位のディレクトリが指定されることがあるため
+      while 1
+        base = base_dir
+        if base == before_base
+          break
+        end
+        tree_file_name = "tree_"+base+".yml"
+        tree_data = @target.get(tree_file_name)
+        if tree_data
+          break
+        end
+        before_base = base
+        base_dir = File.dirname(base_dir)
+      end
+      unless tree_data
+        return nil
+      end
+      return TreeInfo.new(tree_data)
+    end
+    def get_target_bases
+      files = @target.find(/^tree_.*\.yml/)
+      dirs = files.map do |d| 
+        m=/tree_(.*)\.yml/.match(d)
+        next nil unless m
+        m[1]
+      end
+      return dirs.compact
+    end
+    def expand_tree(dir,tree_info,output_dir)
+      tree = tree_info.hierarchie(dir)
+      top = tree[0].keys[0]
+      top_dir = File.dirname(top)
+      tmp_dir = CGI.escape(top_dir)
+      output_dir = output_dir+"/"+tmp_dir
+      FileUtils.mkdir_p(output_dir)
+      tree.each do |node|
+        get_directories(node.keys,top_dir,output_dir)
+      end
+      top_dir_len = top_dir.length
+      (tree.length - 1).downto(0){|n|
+        tree[n].each do |k,v|
+          dir_len = k.length
+          relative_path = k.slice(top_dir_len,dir_len - top_dir_len)
+          dir = output_dir + relative_path
+          File.utime(v[:atime],v[:mtime],dir)
+        end
+      }
+    end
+    def restore(dir,output_dir)
+      tree = get_target_tree(dir)
+      unless tree
+        S3log.warn("#{dir} isn't find in AWS S3. ignore")
+        return
+      end
+      expand_tree(dir,tree,output_dir)
+      S3log.debug("expand_tree=#{tree.inspect}")
+    end
+  end
+end

data/lib/s3backup/restore.rb

@@ -1,8 +1,6 @@
-require 'cgi'
 require 's3backup/s3wrapper'
 require 's3backup/s3log'
-require 's3backup/tree_info'
-require 'fileutils'
+require 's3backup/manager'
 module S3backup
   class Restore
     def initialize(output_dir,config)
@@ -10,12 +8,12 @@ module S3backup
       @output_dir = output_dir
       @directories = config["directories"]
       begin
-        @s3_obj = S3Wrapper.new(config)
+        @s3_obj = S3Wrapper.new(config,false)
       rescue => err
         S3log.error(err.backtrace.join("\n")+"\n"+err.message)
         exit -1
       end
-      @target_infos = {:attributes=> [],:tree_infos => []}
+      @manager = Manager.new(@s3_obj,config)
     end
     def check_config(config)
       if config["directories"] 
@@ -27,67 +25,11 @@ module S3backup
         config["directories"] = config["directories"].map{|d| d=~/\/$/ ? d.chop : d}
       end
     end
-    def get_tree(dir)
-      base_dir = dir
-      tree_data = nil
-      while 1
-        base = CGI.escape(base_dir)
-        tree_file_name = "tree_"+base+".yml"
-        tree_data = @s3_obj.get(tree_file_name)
-        if tree_data or base_dir == "/"
-          break
-        end
-        base_dir = File.dirname(base_dir)
-      end
-      unless tree_data
-        return nil
-      end
-      tree_info = TreeInfo.new(tree_data)
-      return tree_info.hierarchie(dir)
-    end
-    def get_bases
-      files = @s3_obj.find(/^tree_.*\.yml/)
-      dirs = files.map do |d| 
-        m=/tree_(.*)\.yml/.match(d)
-        next nil unless m
-        CGI.unescape(m[1])
-      end
-      return dirs.compact
-    end
-    def expand_tree(tree)
-      top = tree[0].keys[0]
-      top_dir = File.dirname(top)
-      tmp_dir = CGI.escape(top_dir)
-      output_dir = @output_dir+"/"+tmp_dir
-      FileUtils.mkdir_p(output_dir)
-      tree.each do |node|
-        @s3_obj.get_directories(node.keys,top_dir,output_dir)
-      end
-      top_dir_len = top_dir.length
-      (tree.length - 1).downto(0){|n|
-        tree[n].each do |k,v|
-          dir_len = k.length
-          relative_path = k.slice(top_dir_len,dir_len - top_dir_len)
-          dir = output_dir + relative_path
-          File.utime(v[:atime],v[:mtime],dir)
-        end
-      }
-    end
     def start
       begin
-        unless @s3_obj.bucket_exist? 
-          S3log.error("bucket: #{@s3_obj.bucket} isn't found!")
-          exit -1
-        end
-        @directories = get_bases unless @directories
+        @directories = @manager.get_target_bases unless @directories
         @directories.each do |dir|
-          tree = get_tree(dir)
-          unless tree
-            s3log.warn("#{dir} isn't find in AWS S3. ignore")
-            next
-          end
-          puts tree.inspect
-          expand_tree(tree)
+          @manager.restore(dir,@output_dir)
         end
       rescue => err
         S3log.error(err.backtrace.join("\n")+"\n"+err.message)

data/lib/s3backup/s3wrapper.rb

@@ -1,13 +1,15 @@
+require 'cgi'
 require 'aws/s3'
-require 'tempfile'
 require 's3backup/crypt'
 module S3backup
   class S3Wrapper
-    BUF_READ_SIZE=1024*1024*128
     attr_reader :bucket
-    def initialize(config)
+    def initialize(config,create_flg)
+      @bucket= nil
+      @s3objects =nil
       #設定ファイルの内容をメンバ変数にセット
       set_config(config)
+      #設定ファイルの内容をメンバ変数にセット
       args = {
         :access_key_id     => @access_key_id, 
         :secret_access_key => @secret_access_key
@@ -17,77 +19,43 @@ module S3backup
       end
       #AWS S3に接続
       AWS::S3::Base.establish_connection!(args)
-    end
-    def bucket_exist?()
-      #AWS S3にあがっているすべてのBucketを取得
-      buckets = AWS::S3::Service.buckets
-      #すべてのBuckeから指定されたBucketの検索
-      first_flg = true
-      buckets.each do |bucket|
-        if bucket.name == @bucket
-          return true
+      if create_flg
+        begin
+          @bucket = AWS::S3::Bucket.find(@bucket_name)
+        rescue AWS::S3::NoSuchBucket
+          @bucket = create_bucket
         end
+      else
+        @bucket = AWS::S3::Bucket.find(@bucket_name)
       end
-      return false
     end
     def create_bucket()
-      S3log.info("Bucket.create(#{@bucket})")
+      S3log.info("Bucket.create(#{@bucket_name})")
       #Bucket作成
-      ret = AWS::S3::Bucket.create(@bucket) 
+      ret = AWS::S3::Bucket.create(@bucket_name) 
       unless ret
         raise "AWS::S3::Bucket create error"
       end
     end
+    def rename(orig,dest)
+      AWS::S3::S3Object.rename(orig,dest,@bucket_name) 
+    end
+    def exists?(key)
+      key=CGI.escape(key)
+      ret = AWS::S3::S3Object.exists? key,@bucket_name
+    end
     def get(key)
       key_name = CGI.escape(key)
       data = nil
-      if AWS::S3::S3Object.exists? key_name,@bucket
-        data =  AWS::S3::S3Object.value(key_name,@bucket)
-        if @aes 
-          data = @aes.decrypt(data)
-        end
+      if AWS::S3::S3Object.exists? key_name,@bucket_name
+        data =  AWS::S3::S3Object.value(key_name,@bucket_name)
       end
       return data
     end 
-    def store_directories(dirs)
-      dirs.each do |dir|
-        store_directory(dir)
-      end
-    end
-    def get_directory(dir,out_dir)
-      data = get_chain(dir)
-      tmp = Tempfile.open("s3backup")
-      tmp.write(data)
-      tmp.close
-      #tgzのファイルをcur_dirに展開
-      from_tgz(tmp.path,out_dir)
-      tmp.close(true)
-    end
-    def get_directories(dirs,prefix,output_dir)
-      prefix_len = prefix.length
-      dirs.each do |dir|
-        parent = File.dirname(dir)
-        p_len = parent.length
-        relative_path = parent.slice(prefix_len,p_len - prefix_len)
-        cur_dir = output_dir + relative_path
-        get_directory(dir,cur_dir)
-      end
-    end
-    def delete_directories(dirs)
-      dirs.each do |dir|
-        delete_chain(dir)
-      end
-    end
     def post(key,val)
-      if val.length > BUF_READ_SIZE
-        raise "max size = #{BUF_READ_SIZE} but size = #{val.size}"
-      end
       key_name = CGI.escape(key)
-      if @aes
-        val = @aes.encrypt(val)
-      end
-      AWS::S3::S3Object.store(key_name,val,@bucket)
       S3log.info("S3Object.store(#{key_name})")
+      AWS::S3::S3Object.store(key_name,val,@bucket_name)
     end
     def set_config(config)
       err_msg = "" 
@@ -107,109 +75,35 @@ module S3backup
       @proxy[:port] = config["proxy_port"] if config["proxy_port"]
       @proxy[:user] = config["proxy_user"] if config["proxy_user"]
       @proxy[:password] = config["proxy_password"] if config["proxy_password"]
-      @bucket = config["bucket"]
-      if config["password"] and config["password"] != ""
-        if config["salt"] 
-          if config["salt"] =~ /[0-9A-Fa-f]{16}/
-            @aes = Crypt.new(config["password"],config["salt"])
-          else
-            err_msg += "salt format shoud be HexString and length should be 16.\n"
-          end
-        else
-          err_msg += "salt doesn't exist in config file.\n"
-        end
-      end
+      @bucket_name = config["bucket"]
       if err_msg != ""
         raise err_msg
       end
     end
-    #指定されたディレクトリをtar gzip形式で圧縮する
-    def to_tgz(path,dir)
-      #サブディレクトリを圧縮の対象外にする。
-      sub_dir = []
-      Dir.foreach(dir) do |file|
-        next if /^\.+$/ =~ file 
-        sub_dir.push(file) if File.directory?(dir+"/"+file)
-      end
-      exclude = ""
-      exclude = exclude + " --exclude=" + sub_dir.join("  --exclude=") if sub_dir.length != 0
-      cmd = "(cd #{File.dirname(dir)};tar -czvf #{path} #{exclude} #{File.basename(dir)} > /dev/null 2>&1)"
-      S3log.info(cmd)
-      system(cmd) 
-      unless $?.success?
-        raise "feiled #{cmd} execute. #{$?.inspect}"
-      end
-    end
-    def from_tgz(path,dir)
-      cmd = "tar -xzvf #{path} -C #{dir} > /dev/null 2>&1"
-      S3log.info(cmd)
-      system(cmd) 
-      unless $?.success?
-        raise "feiled #{cmd} execute. #{$?.inspect}"
-      end
-    end
     def delete(key)
-      if @aes
-        key_name = CGI.escape(@aes.encrypt(key))
-      else
-        key_name = CGI.escape(key)
-      end
-      if AWS::S3::S3Object.exists? key_name
-        S3log.info("S3Object.delete(#{key_name})")
-        AWS::S3::S3Object.delete(key_name,@bucket)
+      if exists? key
+        S3log.info("S3Object.delete(#{CGI.escape(key)})")
+        AWS::S3::S3Object.delete(CGI.escape(key),@bucket_name)
         return true
       end
       return false
     end
-    def delete_chain(key)
-      i=1
-      while delete(i.to_s + "_" + key)
-        i+=1
-      end
-    end
-    def post_chain(key,f)
-      i=1
-      begin
-        while 1
-          key_name = i.to_s()+"_"+key
-          if @aes
-            key_name = @aes.encrypt(key_name)
+    def find(dest)
+      @s3objects = @backet.objects unless @s3objects
+      find_obj=[]
+      keys=@s3objects.map { |o| CGI.unescape(CGI.unescape(o.key.sub("#{@bucket_name}/","")))}
+      keys.each do |key|
+        if dest.class == Regexp
+          if key =~ dest
+            find_obj.push(key)
+          end
+        else
+          if key == dest
+            find_obj.push(key)
           end
-          post(key_name,f.readpartial(BUF_READ_SIZE))
-          i+=1
-        end
-      rescue EOFError
-      end
-    end
-    def get_chain(key)
-      data = nil
-      data_set = nil
-      i=1
-      while 1
-        key_name = i.to_s()+"_"+key
-        if @aes
-          key_name = @aes.encrypt(key_name)
-        end
-        data = get(key_name)
-        if data == nil
-          break
-        end
-        if i==1
-          data_set = ''
         end
-        data_set += data
-        i+=1
       end
-      return data_set
-    end
-    def store_directory(dir)
-      tmp = Tempfile.open("s3backup")
-      tmp.close
-      #tgzのファイルをtmp.pathに作成
-      to_tgz(tmp.path,dir)
-      #S3にディレクトリの絶対パスをキーにして、圧縮したデータをストア
-      post_chain(dir,File.open(tmp.path,"r"))
-      tmp.close(true)
+      return find_obj
     end
   end
 end

data/lib/s3backup/tree_info.rb

@@ -3,17 +3,25 @@ module S3backup
   class TreeInfo
     attr_reader :fileMap
     def initialize(target)
+      @dir_map={}
+      @orig = nil
       if target.nil?
         @fileMap = {:file => Hash.new,:symlink => Hash.new,:directory => Hash.new}
       elsif File.directory?(target)
+        @orig = {:type=>"directory",:target=>target}
         @fileMap = {:file => Hash.new,:symlink => Hash.new,:directory => Hash.new}
         stat = File.stat(target)
         @fileMap[:directory][target] = {:mtime => stat.mtime, :atime => stat.atime}
+        @dir_map[target] = {:mtime => stat.mtime, :atime => stat.atime,:file=>{},:symlink=>{}}
         makeFileMap(target)
       elsif File.file?(target)
+        @orig = {:type=>"file",:target=>target}
         load_yaml(File.read(target))
+        make_dir_map
       else
+        @orig = {:type=>"data",:target=>""}
         load_yaml(target)
+        make_dir_map
       end
     end
     def makeFileMap(dir)
@@ -24,16 +32,70 @@ module S3backup
         name = dir + "/" + e
         if File.directory?(name)
           stat = File.stat(name)
+          @dir_map[name] = {:mtime => stat.mtime, :atime => stat.atime,:file=>{},:symlink=>{}}
           @fileMap[:directory][name] = {:mtime => stat.mtime, :atime => stat.atime}
           makeFileMap(name)
         elsif File.symlink?(name)
+          @dir_map[dir][:symlink][name] = {:source => File.readlink(name)}
           @fileMap[:symlink][name] = {:source => File.readlink(name)}
         else
           stat = File.stat(name)
+          @dir_map[dir][:file][name] ={:size => stat.size,:date => stat.mtime}
           @fileMap[:file][name] = {:size => stat.size,:date => stat.mtime}
         end
       end
     end
+    def make_dir_map
+      @fileMap[:directory].each do |k,v|
+        @dir_map[k] = {:mtime => v[:mtime], :atime => v[:atime],:file=>{},:symlink=>{}}
+      end
+      @fileMap[:file].each do |k,v|
+        target = @dir_map[File.dirname(k)]
+        #不整合だけど適当に作る
+        unless target
+          S3log.warn("Tree Data isn't correct.#{@orig.inspect}")
+          target = {:mtime => DateTime.now.to_s,:atime => DateTime.now.to_s,:file=>{},:symlink=>{}}
+          @dir_map[File.dirname(k)] = target
+        end
+        target[:file][k] = {:size => v[:size], :date => v[:date]}
+      end
+      @fileMap[:symlink].each do |k,v|
+        target = @dir_map[File.dirname(k)]
+        #不整合だけど適当に作る
+        unless target
+          S3log.warn("Tree Data isn't correct.#{@orig.inspect}")
+          target = {:mtime => DateTime.now.to_s,:atime => DateTime.now.to_s,:file=>{},:symlink=>{}}
+          @dir_map[File.dirname(k)] = target
+        end
+        target[:symlink][k] = {:source => v[:source]}
+      end
+    end
+    def get_dir_info(name)
+      return @dir_map[name]
+    end
+    def update_dir_map(name,dir_info)
+      @dir_map[name][:file] = dir_info[:file]
+      @dir_map[name][:symlink] = dir_info[:symlink]
+      @dir_map[name][:mtime] = dir_info[:mtime]
+      @dir_map[name][:atime] = dir_info[:atime]
+    end
+    def update_dir(name,dir_info)
+      @dir_map[name] = {:file => {},:symlink=>{}} unless @dir_map[name]
+      @dir_map[name][:file].each do |k,v|
+        @fileMap[:file].delete(k)
+      end
+      @dir_map[name][:symlink].each do |k,v|
+        @fileMap[:symlink].delete(k)
+      end
+      @fileMap[:directory][name] = {:mtime => dir_info[:mtime],:atime =>dir_info[:atime]}
+      dir_info[:file].each do |k,v|
+        @fileMap[:file][k] = v
+      end
+      dir_info[:symlink].each do |k,v|
+        @fileMap[:symlink][k] = v
+      end
+      update_dir_map(name,dir_info)
+    end
     def load_yaml(data)
       @fileMap = YAML.load(data)
     end

data/lib/s3backup.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module S3backup
-  VERSION = '0.5.1'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3backup
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Takeshi Morita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 +09:00
+date: 2009-10-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ files:
 - lib/s3backup/backup.rb
 - lib/s3backup/cli.rb
 - lib/s3backup/crypt.rb
+- lib/s3backup/manager.rb
 - lib/s3backup/restore.rb
 - lib/s3backup/s3log.rb
 - lib/s3backup/s3wrapper.rb
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: s3backup
-rubygems_version: 1.3.5
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: S3Backup is a backup tool to local directory to Amazon S3.