rbsync 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/rbsync.rb

@@ -96,9 +96,11 @@ class RbSync
       files = Dir.glob "./**/*", File::FNM_DOTMATCH
       exclude_files =[]
       exclude_files = excludes.map{|g| Dir.glob "./**/#{g}",File::FNM_DOTMATCH } 
+      #files.each{|e|pp [e, File.directory?(e)]  }
+      files = files.reject{|e| File.directory?(e)  }
       files = files - exclude_files.flatten
     }
-    files.reject{|e| [".",".."].any?{|s| s== File::basename(e)  }}
+    files = files.reject{|e| [".",".."].any?{|s| s== File::basename(e)  }}
   end
   # compare two directory by name and FileUtis,cmp
   def find_files(src,dest,options)
@@ -299,7 +301,6 @@ class RbSync
     self.copy_r(files)
   end
   def copy_r(files)
-    ##todo 進捗を調べる．
     if(@conf[:progress])
       puts ("copy #{files.size} files")
       $stdout.flush
@@ -312,6 +313,7 @@ class RbSync
       end
       #main
       copy_thread = Thread.start{
+        FileUtils.mkdir_p File.dirname(e[1]) unless File.exists?(File.dirname(e[1]))
         FileUtils.copy( e[0] , e[1] ,{:preserve=>self.preserve?,:verbose=>self.verbose? } )
       }
       #progress of each file
@@ -467,3 +469,25 @@ class ProgressBar
   end
 end
 
+
+
+if __FILE__ == $0
+require 'tmpdir'
+require 'find'
+require 'pp'
+    Dir.mktmpdir('goo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("new")
+        open("./old/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        time1 = Time.local(2008, 1, 1, 1, 1, 1)
+        File::utime( time1 , time1, "./old/test.txt")
+        rsync = RbSync.new
+        rsync.sync("old","new",{:update=>true})
+        # timestamp is preserved?
+        p File.mtime("./new/test.txt") == time1
+        p File.atime("./new/test.txt") == time1
+      end
+    end
+  puts :END
+end

data/rbsync.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbsync}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["takuya"]

data/test/test_rbsync.rb

@@ -166,5 +166,87 @@ class TestRbsync < Test::Unit::TestCase
       end
     end
   end
+  def test_sync_old_to_new_twice
+    Dir.mktmpdir('foo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("new")
+        open("./old/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        rsync = RbSync.new
+        rsync.sync("old","new")
+        rsync.sync("old","new")
+        assert FileUtils.cmp("old/test.txt","new/test.txt")
+        files = Dir.glob "./new/**/*"
+        assert files.size == 1
+      end
+    end
+  end
+  def test_sync_old_to_new_sub_dir
+    Dir.mktmpdir('foo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("old/dir1")
+        Dir.mkdir("new")
+        open("./old/dir1/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        rsync = RbSync.new
+        rsync.sync("old","new")
+        assert FileUtils.cmp("old/dir1/test.txt","new/dir1/test.txt")
+        files = Dir.glob "./new/**/*"
+        files = files.reject{|e| File.directory?(e) }
+        assert files.size == 1
+      end
+    end
+  end
+  def test_sync_old_to_new_sub_dir2
+    Dir.mktmpdir('foo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("old/dir1")
+        Dir.mkdir("new")
+        open("./old/dir1/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        open("./old/dir1/test2.txt", "w+"){|f| 10.times{f.puts("test")}}
+        rsync = RbSync.new
+        rsync.sync("old","new")
+        assert FileUtils.cmp("old/dir1/test.txt","new/dir1/test.txt")
+        files = Dir.glob "./new/**/*"
+        files = files.reject{|e| File.directory?(e) }
+        assert files.size == 2
+      end
+    end
+  end
+  def test_sync_preserve_time_stamp_1
+    Dir.mktmpdir('goo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("new")
+        open("./old/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        open("./new/test.txt", "w+"){|f| 10.times{f.puts("different")}}
+        time1 = Time.local(2018, 1, 1, 1, 1, 1)
+        time2 = Time.local(2008, 1, 1, 1, 1, 1)
+        # //old/test.txt is more newer than ./new/test.txt
+        File::utime( time1 , time1, "./old/test.txt")
+        File::utime( time2 , time2, "./new/test.txt")
+        rsync = RbSync.new
+        rsync.sync("old","new",{:update=>true})
+        assert File.atime("./new/test.txt") == time1
+      end
+    end
+  end
+  def test_sync_preserve_time_stamp_2
+    Dir.mktmpdir('goo') do |dir|
+      Dir.chdir dir do 
+        Dir.mkdir("old")
+        Dir.mkdir("new")
+        open("./old/test.txt", "w+"){|f| 10.times{f.puts("test")}}
+        time1 = Time.local(2008, 1, 1, 1, 1, 1)
+        File::utime( time1 , time1, "./old/test.txt")
+        rsync = RbSync.new
+        rsync.sync("old","new",{:update=>true})
+        # timestamp is preserved?
+        assert File.mtime("./new/test.txt") == time1
+        assert File.atime("./new/test.txt") == time1
+      end
+    end
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbsync
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - takuya