six-rsync 0.1.0 → 0.1.2

data/Rakefile

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

data/lib/six/rsync/lib.rb

@@ -110,7 +110,7 @@ module Six
         end
 
         def update(cmd, x_opts = [], opts = {})
-          @logger.info "Checking for updates..."
+          @logger.debug "Checking for updates..."
           @config = load_config
           unless @config
             @logger.error "Not an Rsync repository!"
@@ -126,9 +126,9 @@ module Six
 
           # FIXME: This does not work when not forced, as host is sampled in comparesums :)
           host = config[:hosts].sample
-          @logger.info "Trying: #{host}, please wait..."
 
           if opts[:force]
+            @logger.info "Trying: #{host}, please wait..."
             arr_opts = []
             arr_opts << PARAMS
             arr_opts += x_opts
@@ -232,7 +232,8 @@ module Six
               @logger.info "Packing #{i}/#{@repos_local[:wd].size}: #{key}"
               file = File.join(@rsync_work_dir, key)
               file[REGEX_FOLDER]
-              folder = $2
+              folder = $1
+              folder.gsub!(@rsync_work_dir, '')
               gzip(file)
               @repos_local[:pack]["#{key}.gz"] = md5("#{file}.gz")
               FileUtils.mkdir_p pack_path(folder) if folder
@@ -445,11 +446,10 @@ module Six
             b = false
             while hosts.size > 0 && !done do
               # FIXME: Nasty
-              if b
-                host = hosts.sample
-              end
+              host = hosts.sample if b
               b = true
               hosts -= [host]
+              @logger.info "Trying #{host}"
 
               begin
                 verbose = @verbose
@@ -466,7 +466,7 @@ module Six
                 end
                 done = true
               rescue
-                @logger.info "Failed #{host}, trying next.."
+                @logger.info "Failed!"
               end
             end
             # TODO: CLEANUP, Should depricate in time.
@@ -533,6 +533,7 @@ module Six
         end
 
         def calc
+          @logger.info "Calculating checksums"
           [:pack, :wd].each { |t| @repos_local[t] = calc_sums(t) }
         end
 

data/lib/six/rsync.rb

@@ -28,7 +28,7 @@ module Six
     end
 
     module Rsync
-      VERSION = '0.0.1'
+      VERSION = '0.1.1'
       BASE_PATH = Dir.pwd
       TOOLS_PATH = File.join(BASE_PATH, 'tools')
       FOLDER = /(.*)\/(.*)/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: six-rsync
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sickboy