rbsync 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/rbsync.rb

@@ -161,12 +161,6 @@ class RbSync
     ret = files.map{|e|
       FileTest.exist?(e[1])
     }
-    #ret = target.map{|key|
-        #e = src_files[key].first
-        #FileUtils.copy( File.expand_path(e,src) , File.expand_path(e,dest),
-                        #{:preserve=>self.preserve?,:verbose=>self.verbose? }) 
-        #FileTest.exist?(File.expand_path(e,dest))
-    #}
     puts "同期が終りました"     if ret.select{|e|!e}.size == 0 && self.debug?
     puts "同期に失敗したみたい" if ret.select{|e|!e}.size != 0 && self.debug?
   end
@@ -306,9 +300,40 @@ class RbSync
   end
   def copy_r(files)
     ##todo 進捗を調べる．
-    
-    files.each{|e|
-      FileUtils.copy( e[0] , e[1] ,{:preserve=>self.preserve?,:verbose=>self.verbose? } )
+    if(@conf[:progress])
+      puts ("copy #{files.size} files")
+      $stdout.flush
+    end
+    files.each_with_index{|e,i|
+      #show
+      if(@conf[:progress])
+        puts ("start #{i+1}/#{files.size}")
+        $stdout.flush
+      end
+      #main
+      copy_thread = Thread.start{
+        FileUtils.copy( e[0] , e[1] ,{:preserve=>self.preserve?,:verbose=>self.verbose? } )
+      }
+      #progress of each file
+      progress_thread = nil
+      if(@conf[:progress])
+        progress_thread = Thread.start{
+          bar = ProgressBar.new
+          bar.size = 30
+          src_size = File.size(e[0])
+          dst_size = -1
+          bar.start("copying #{e[0]} to #{e[1]}")
+          while(src_size!=dst_size)
+            src_size = File.size(e[0]).to_f
+            dst_size = File.size(e[1]).to_f
+            bar.progress(((dst_size/src_size)*100).to_int)
+            sleep 0.2
+          end
+          bar.end("done")
+        }
+      end
+      copy_thread.join
+      progress_thread.join if progress_thread 
     }
   end
   def sync(src,dest,options={})
@@ -405,14 +430,14 @@ class ProgressBar
   attr_accessor :size, :out, :bar_char_undone, :bar_char_done, :show_percent
   def initialize()
     @out = $stdout
-    @size = 11
+    @size = 10
     @bar_char_undone = "_"
     @bar_char_done   = "#"
     @show_percent    = true
-    @printend_max_size = @size
+    @printend_max_size = 0
   end
   def start(message="")
-    out.print message
+    out.puts message
     out.print bar_char_undone * size 
     out.flush
   end
@@ -442,62 +467,3 @@ class ProgressBar
   end
 end
 
-#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")}}
-        #open("./new/test.txt", "w+"){|f| 10.times{f.puts("different")}}
-        #rsync = RbSync.new
-        #rsync.sync("old","new",{:overwrite=>false,:check_hash=>true})
-        #p FileUtils.cmp("old/test.txt","new/test.txt") == false
-      #end
-    #end
-
-
-#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")}}
-    #rsync = RbSync.new
-    #rsync.sync("old","new")
-    #p FileUtils.cmp("old/test.txt","new/test.txt") == true
-    #open("./old/test.txt", "w+"){|f| 10.times{f.puts("changed")}}
-    #rsync.sync("old","new",{:rename => true})
-    #p FileUtils.cmp("old/test.txt","new/test.txt") == false
-    #p FileUtils.cmp("old/test.txt","new/test(1).txt") == true
-    #open("./old/test.txt", "w+"){|f| 10.times{f.puts("changed!!!")}}
-    #rsync.sync("old","new",{:rename => true})
-    #p FileUtils.cmp("old/test.txt","new/test(2).txt") == true
-  #end
-#end
-#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")}}
-    #old_content =open("./old/test.txt", "r").read
-    ## ミラーして
-    #rsync = RbSync.new
-    #rsync.sync("old","new")
-    #p FileUtils.cmp("old/test.txt","new/test.txt") == true
-    #open("./old/test.txt", "w+"){|f| 10.times{f.puts("changed")}}
-    ## バックアップ同期する
-    #rsync.sync("old","new",{:backup => true})
-    #p FileUtils.cmp("old/test.txt","new/test.txt") == true
-    ## バックアップしたファイルがどうなっているか見る
-    #files = Dir.glob "./new/**/*"
-    #p old_content == open((files - ["./new/test.txt"]).first).read
-  #end
-#end

data/rbsync.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rbsync}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["takuya"]
@@ -25,10 +25,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/rbsync.rb",
-    "new/test.txt",
-    "old/test.txt",
     "rbsync.gemspec",
     "test/helper.rb",
+    "test/test_progressbar.rb",
     "test/test_rbsync.rb"
   ]
   s.homepage = %q{http://github.com/takuya/rbsync}

data/test/test_progressbar.rb

@@ -0,0 +1,85 @@
+require 'helper'
+
+
+require 'stringio'
+class TestProgressBar < Test::Unit::TestCase
+  def test_progress_bar_start
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.show_percent = true
+    prg.size = 5
+    prg.start("downloading")
+    io.rewind
+    assert io.read == "downloading\n_____"
+  end
+  def test_progress_bar_end
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.size = 10
+    prg.show_percent = true
+    prg.end("done")
+    io.rewind
+    assert io.read =="\r          \r########## 100% done\n"
+  end
+  def test_progress_bar_progress_twice
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.show_percent = true
+    prg.size = 10
+    prg.progress(40, "40/100")
+    prg.progress(50, "50/100")
+    io.rewind
+    assert io.read == "\r          \r####______ 40% 40/100\r                      \r#####_____ 50% 50/100"
+  end
+  def test_progress_bar_progress_change_done_char
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.bar_char_done = "="
+    prg.show_percent = true
+    prg.size = 10
+    prg.progress(40, "40/100")
+    prg.progress(50, "50/100")
+    io.rewind
+    assert io.read == "\r          \r====______ 40% 40/100\r                      \r=====_____ 50% 50/100"
+  end
+  def test_progress_bar_progress_change_undone_char
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.bar_char_done = "="
+    prg.bar_char_undone = "-"
+    prg.show_percent = true
+    prg.size = 10
+    prg.progress(40, "40/100")
+    prg.progress(50, "50/100")
+    io.rewind
+    assert io.read == "\r          \r====------ 40% 40/100\r                      \r=====----- 50% 50/100"
+  end
+  def test_progress_bar_progress_out_range
+    begin
+      io = StringIO.new
+      prg= ProgressBar.new
+      prg.out = io
+      prg.progress(110, "110/100")
+    rescue => e
+      assert e.class == ArgumentError
+    end
+  end
+  def test_progress_bar_100_percent
+    io = StringIO.new
+    prg= ProgressBar.new
+    prg.out = io
+    prg.bar_char_done = "="
+    prg.bar_char_undone = "-"
+    prg.show_percent = true
+    prg.size = 5
+    prg.progress(100, "100/100")
+    io.rewind
+    assert io.read == "\r     \r===== 100% 100/100"
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbsync
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - takuya
@@ -96,10 +96,9 @@ files:
 - Rakefile
 - VERSION
 - lib/rbsync.rb
-- new/test.txt
-- old/test.txt
 - rbsync.gemspec
 - test/helper.rb
+- test/test_progressbar.rb
 - test/test_rbsync.rb
 has_rdoc: true
 homepage: http://github.com/takuya/rbsync

data/new/test.txt

@@ -1,10 +0,0 @@
-test
-test
-test
-test
-test
-test
-test
-test
-test
-test

data/old/test.txt

@@ -1,10 +0,0 @@
-test
-test
-test
-test
-test
-test
-test
-test
-test
-test