six-rsync 0.4.13 → 0.5.1

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-rsync'
-  s.version = '0.4.13'
+  s.version = '0.5.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/rsync/lib.rb

@@ -255,7 +255,13 @@ module Six
           end
         end
 
+        def rename(entry, newentry)
+          FileUtils.mv(entry, "#{entry}_tmp")
+          FileUtils.mv("#{entry}_tmp", newentry)
+        end
+
         def commit
+          cfg = CONFIG[:commit] ? CONFIG[:commit] : Hash.new
           @logger.info "Committing changes on #{@rsync_work_dir}"
           @config = load_config
           unless @config
@@ -271,6 +277,26 @@ module Six
           load_repos(:local)
           load_repos(:remote)
 
+
+=begin
+  # TODO: Rewrite
+          if cfg[:force_downcase]
+            # Run through all files, only in the working folder!, and downcase those which are not
+            Dir.glob(File.join(@rsync_work_dir, '**', '*')).each do |entry|
+              dirname, base = File.dirname(entry), File.basename(entry)
+              if base[/[A-Z]/]
+                part = entry.sub("#{@rsync_work_dir}", '')
+                part.sub!(/^\//, "")
+                if @repos_local[:wd][part]
+                  @repos_local[:wd].delete part
+                  @repos_local[:wd][]
+                end
+                rename(entry, File.join(dirname, base.downcase))
+              end
+            end
+          end
+=end
+
           @logger.info "Calculating Checksums..."
           @repos_local[:wd] = calc_sums(:wd)
           # Added or Changed files
@@ -785,11 +811,30 @@ module Six
           # Does nicely display error output in logwindow though
           io = IO.popen(rsync_cmd)
           io.sync = true
-          io.each do |buffer|
-            process_msg buffer
-            out << buffer
+
+          #io.each do |buffer|
+          #  process_msg buffer
+          #  out << buffer
+          #end
+
+          buff = []
+          io.each_byte do |buffer|
+            buffer = buffer.chr
+            buff << buffer
+            if ["\n", "\r"].include?(buffer)
+              b = buff.join("")
+              process_msg b
+              out << b
+              buff = []
+            end
           end
 
+          unless buff.empty?
+            b = buff.join("")
+            process_msg b
+            out << b
+          end        
+
           out[/rsync error: .* \(code ([0-9]*)\)/]
           status = $1 ? $1.to_i : 0
 
@@ -806,9 +851,9 @@ module Six
         end
 
         def process_msg(msg)
-          if msg[/[k|m|g]?B\/s/i]
-            msg.gsub!("\n", '')
-            print "#{msg}\r" if @verbose
+          if msg[/\r/] #msg[/[k|m|g]?B\/s/i]
+            #msg.gsub!("\n", '')
+            print msg if @verbose
           else
             @logger.debug msg
             print msg if @verbose

data/lib/six/rsync.rb

@@ -31,7 +31,7 @@ module Six
 
     module Rsync
       COMPONENT = 'six-rsync'
-      VERSION = '0.4.13'
+      VERSION = '0.5.1'
       FOLDER = /(.*)\/(.*)/
 
       case RUBY_PLATFORM

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 13
-  version: 0.4.13
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency