six-rsync 0.4.3 → 0.4.4

data/Rakefile

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

data/lib/six/rsync/lib.rb

@@ -3,14 +3,10 @@
 module Six
   module Repositories
     module Rsync
-      # TODO: Configure somewhere!
-      KEY = "C:/users/sb/documents/keys/id_rsa.ppk"
-      # TODO: Linux
-      RSH = "-r --rsh=\"'#{File.join(BASE_PATH, "tools", "bin", "cygnative.exe")}' plink.exe -i #{KEY}\""
-
+      REGEX_FOLDER = /(.*)[\\|\/](.*)/
       DIR_RSYNC = '.rsync'
       DIR_PACK = File.join(DIR_RSYNC, '.pack')
-      REGEX_FOLDER = /(.*)[\\|\/](.*)/
+
       class RsyncExecuteError < StandardError; end
       class RsyncError < StandardError; end
 
@@ -34,6 +30,15 @@ module Six
           @verbose = true
           @logger = logger
 
+          case RUBY_PLATFORM
+            when /-mingw32$/, /-mswin32$/
+              key = CONFIG[:key] ? CONFIG[:key] : ""
+              @rsh = "-r --rsh=\"'cygnative.exe' plink.exe#{" -i #{key}" unless key.empty?}\""
+              puts @rsh
+            else
+              @rsh = ""
+          end
+
           @repos_local = {:pack => Hash.new, :wd => Hash.new, :version => 0}
           @repos_remote = {:pack => Hash.new, :wd => Hash.new, :version => 0}
 
@@ -92,7 +97,7 @@ module Six
           end
           if File.exists? @rsync_work_dir
             unless Dir[File.join(@rsync_work_dir, '*')].empty?
-              @logger.error "Seems to already be a folder, Aborting!"
+              @logger.error "Folder not empty, Aborting!"
               raise RsyncError
             end
           end
@@ -173,7 +178,7 @@ module Six
                 arr_opts << PARAMS
                 arr_opts += x_opts
                 if host[/\A(\w)*\@/]
-                  arr_opts << RSH #"-e ssh"
+                  arr_opts << @rsh #"-e ssh"
                 end
                 arr_opts << esc(File.join(host, '.pack/.'))
                 arr_opts << esc(pack_path)
@@ -350,7 +355,7 @@ module Six
 
           # Upload .pack changes
           if host[/\A(\w)*\@/]
-            arr_opts << RSH
+            arr_opts << @rsh
           end
           arr_opts << esc(pack_path('.'))
           arr_opts << esc(File.join(host, '.pack'))
@@ -405,7 +410,7 @@ module Six
                         arr_opts = []
                         arr_opts << PARAMS
                         if host[/\A(\w)*\@/]
-                          arr_opts << RSH
+                          arr_opts << @rsh
                         end
 
                         arr_opts << esc(File.join(host, '.pack/.'))
@@ -421,7 +426,7 @@ module Six
                         end
                         arr_opts = []
                         arr_opts << PARAMS
-                        arr_opts << RSH if host[/\A(\w)*\@/]
+                        arr_opts << @rsh if host[/\A(\w)*\@/]
 
                         cyg_slist = "\"#{slist}\""
 
@@ -545,7 +550,7 @@ module Six
           arr_opts = []
           arr_opts << PARAMS
           if host[/\A(\w)*\@/]
-            arr_opts << RSH
+            arr_opts << @rsh
           end
           arr_opts << esc(File.join(host, path))
           arr_opts << esc(rsync_path(folder))
@@ -666,13 +671,19 @@ module Six
         def zip7(file)
           out = %x[7z x #{esc(file)} -y]
           @logger.debug out
+          raise RsyncError if $? != 0
           out
         end
 
         def gzip(file)
+          unless @gzip_installed ||= begin; %x[gzip --rsyncable]; $? == 0; rescue; false; end
+            puts "gzip command not found, or doesn't support --rsyncable"
+            raise RsyncError
+          end
           @logger.debug "Gzipping #{file}"
           out = %x[gzip -f --best --rsyncable --keep #{esc(file)}]
           @logger.debug out
+          raise RsyncError if $? != 0
         end
 
         def unpack_file(file, path)

data/lib/six/rsync.rb

@@ -30,12 +30,11 @@ module Six
     end
 
     module Rsync
-      VERSION = '0.4.3'
+      VERSION = '0.4.4'
       FOLDER = /(.*)\/(.*)/
 
       case RUBY_PLATFORM
-        when "i386-mingw32"
-          HOME_PATH = File.join(ENV['APPDATA'])
+        when /-mingw32$/, /-mswin32$/
           TEMP_PATH = if ENV['TEMP']
             if ENV['TEMP'].size > 0
               if File.directory?(ENV['TEMP'])
@@ -49,29 +48,29 @@ module Six
           else
             BASE_PATH
           end
-
-          TOOLS_PATH = File.join(BASE_PATH, 'tools')
-          ENV['PATH'] = "#{TOOLS_PATH};#{File.join(TOOLS_PATH, 'bin')};#{ENV['PATH']}"
-
-          etc = File.join(TOOLS_PATH, 'etc')
-          FileUtils.mkdir_p etc
-          fstab = File.join(etc, 'fstab')
-          str = ""
-          str = File.open(fstab) {|file| file.read} if File.exists?(fstab)
-          unless str[/cygdrive/]
-            str += "\nnone /cygdrive cygdrive user,noacl,posix=0 0 0\n"
-            File.open(fstab, 'w') {|file| file.puts str}
-          end
+          HOME_PATH = File.exists?(File.join(ENV['APPDATA'])) ? File.join(ENV['APPDATA']) : TEMP_PATH
         else
           HOME_PATH = '~'
           TEMP_PATH = '/tmp'
       end
       DATA_PATH = File.join(HOME_PATH, 'six-rsync')
+      CONFIG_FILE = File.join(DATA_PATH, 'config.yml')
+      if File.exists?(DATA_PATH)
+        unless File.directory?(DATA_PATH)
+          puts "#{DATA_PATH} is a file instead of folder"
+          raise StandardError
+        end
+      else
+        FileUtils.mkdir_p DATA_PATH
+      end
+      config = File.exists?(CONFIG_FILE) ? YAML::load_file(CONFIG_FILE) : nil 
+      CONFIG = config ? config : Hash.new
 
+      # which rsync - should return on linux the bin location
       rsync_installed = begin; %x[rsync --version]; true; rescue; false; end
       unless rsync_installed
         puts "rsync command not found"
-        Process.exit
+        raise RsyncError
       end
 
       # No meaning on Cygwin 1.7

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Sickboy