six-rsync 0.5.3 → 0.6.0

data/Rakefile

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

data/bin/six-rsync

@@ -13,5 +13,5 @@ rescue => e
   rescue => e
       puts "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
   end
-  sleep 10
+  sleep 5
 end

data/bin/six-rsync-mirror

@@ -13,5 +13,5 @@ rescue => e
   rescue => e
       puts "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
   end
-  sleep 10
+  sleep 5
 end

data/lib/six/rsync/lib.rb

@@ -59,11 +59,7 @@ module Six
 
         def status
           @logger.info "Showing changes on #{@rsync_work_dir}"
-          @config = load_config
-          unless @config
-            @logger.error "Not an Rsync repository!"
-            return
-          end
+          handle_config
 
           load_repos(:local)
           load_repos(:remote)
@@ -113,101 +109,6 @@ module Six
           save_repos(:remote)
         end
 
-        def clone(repository, name, opts = {})
-          @path = opts[:path] || '.'
-          @rsync_work_dir = opts[:path] ? File.join(@path, name) : name
-
-          # TODO: Solve logger mess completely.
-          @logger = opts[:log] if opts[:log]
-
-          case repository
-          when Array
-            config[:hosts] += repository
-          when String
-            config[:hosts] << repository
-          end
-
-          begin
-            init
-
-            # TODO: Eval move to update?
-            arr_opts = []
-            arr_opts << "-I" if opts[:force]
-            begin
-              update('', arr_opts)
-            rescue RsyncError => e
-              @logger.error "Unable to sucessfully update, aborting... (#{e.class}: #{e.message})"
-              @logger.debug e.backtrace.join("\n") 
-              FileUtils.rm_rf @rsync_work_dir if File.exists?(@rsync_work_dir)
-            end
-          rescue RsyncError => e
-            @logger.error "Unable to initialize (#{e.class}: #{e.message})"
-            @logger.debug e.backtrace.join("\n")
-          end
-
-          opts[:bare] ? {:repository => @rsync_work_dir} : {:working_directory => @rsync_work_dir}
-        end
-
-        def update(cmd, x_opts = [], opts = {})
-          @logger.debug "Checking for updates..."
-          @config = load_config
-          unless @config
-            @logger.error "Not an Rsync repository!"
-            raise RsyncError
-          end
-
-          unless config[:hosts].size > 0
-            @logger.error "No hosts configured!"
-            raise RsyncError
-          end
-
-          load_repos(:local)
-          load_repos(:remote)
-
-          hosts = config[:hosts].clone
-          host = hosts.sample
-
-          if opts[:force]
-            done = false
-            b = false
-            verbose = @verbose
-            @verbose = false
-            while hosts.size > 0 && !done do
-              # FIXME: Nasty
-              host = hosts.sample if b
-              b = true
-              hosts -= [host]
-              @logger.info "Trying #{host}"
-              begin
-                arr_opts = []
-                arr_opts << PARAMS
-                arr_opts += x_opts
-                if host[/\A(\w)*\@/]
-                  arr_opts << @rsh #"-e ssh"
-                end
-                arr_opts << esc(File.join(host, '.pack/.'))
-                arr_opts << esc(pack_path)
-                command(cmd, arr_opts)
-                calc
-                save_repos
-                done = true
-              rescue => e
-                @logger.warn "#{e.class}: #{e.message}"
-                @logger.debug e.backtrace.join("\n")
-              end
-            end
-            @verbose = verbose
-            raise RsyncError if !done
-          else
-            #reset(:hard => true)
-            calc
-            save_repos
-
-            # fetch latest sums and only update when changed
-            compare_sums(true, host)
-          end          
-        end
-
         # TODO: Allow local-self healing, AND remote healing. reset and fetch?
         def reset(opts = {})
           @logger.info "Resetting!"
@@ -230,18 +131,16 @@ module Six
             ar = Dir[File.join(@rsync_work_dir, '/**/*')]
 
             change = false
-            i = 0
-            ar.each do |file|
-              i += 1
-              unless file[/\.gz\Z/]
+            ar.each_with_index do |file, i|
+              unless file[/\.gz$/]
                 relative = file.clone
                 relative.gsub!(@rsync_work_dir, '')
-                relative.gsub!(/\A[\\|\/]/, '')
+                relative.gsub!(/^[\\|\/]/, '')
 
                 checksum = md5(file)
                 if checksum != @repos_remote[:wd][relative]
                   change = true
-                  @logger.info "Packing #{i}/#{ar.size}: #{file}"
+                  @logger.info "Packing #{i + 1}/#{ar.size}: #{file}"
                   gzip(file)
                   @repos_remote[:wd][relative] = checksum
                   @repos_remote[:pack]["#{relative}.gz"] = md5("#{file}.gz")
@@ -255,29 +154,15 @@ 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
-            @logger.error "Not an Rsync repository!"
-            return
-          end
-
-          unless config[:hosts].size > 0
-            @logger.error "No hosts configured!"
-            return
-          end
+          handle_config
+          handle_hosts
 
           load_repos(:local)
           load_repos(:remote)
 
-
 =begin
   # TODO: Rewrite
           if cfg[:force_downcase]
@@ -379,14 +264,16 @@ module Six
 
         def push(host = nil)
           @logger.info "Pushing..."
-          @config = load_config
+          handle_config
+          handle_hosts
+
           host = config[:hosts].sample unless host
           # TODO: UNCLUSTERFUCK
           arr_opts = []
           arr_opts << PARAMS
 
           # Upload .pack changes
-          if host[/\A(\w)*\@/]
+          if host[/^(\w)*\@/]
             arr_opts << @rsh
           end
           arr_opts << esc(pack_path('.'))
@@ -395,10 +282,147 @@ module Six
           command('', arr_opts)
         end
 
-        def compare_set(typ, host, online = true)
+        def clone(repository, name, opts = {})
+          @path = opts[:path] || '.'
+          @rsync_work_dir = opts[:path] ? File.join(@path, name) : name
+
+          # TODO: Solve logger mess completely.
+          @logger = opts[:log] if opts[:log]
+
+          case repository
+          when Array
+            config[:hosts] += repository
+          when String
+            config[:hosts] << repository
+          end
+
+          # TODO: Eval move to update?
+          arr_opts = []
+          arr_opts << "-I" if opts[:force]
+
+          begin
+            init
+            begin
+              update('', arr_opts)
+            rescue RsyncError => e
+              @logger.error "Unable to sucessfully update... (#{e.class}: #{e.message})"
+              @logger.debug e.backtrace.join("\n")
+            end
+          rescue => e
+            @logger.error "Unable to initialize (#{e.class}: #{e.message})"
+            @logger.debug e.backtrace.join("\n")
+            FileUtils.rm_rf @rsync_work_dir if File.exists?(@rsync_work_dir)
+            raise RsyncError
+          end
+
+          opts[:bare] ? {:repository => @rsync_work_dir} : {:working_directory => @rsync_work_dir}
+        end
+
+        def update(cmd, x_opts = [], opts = {})
+          @logger.debug "Checking for updates..."
+
+          handle_config
+          handle_hosts
+
           load_repos(:local)
           load_repos(:remote)
 
+          hosts = config[:hosts].clone
+          host = hosts.sample
+
+          if opts[:force]
+            done = false
+            b = false
+            verbose = @verbose
+            @verbose = false
+            until hosts.empty? || done do
+              # FIXME: Nasty
+              host = hosts.sample if b
+              b = true
+              hosts -= [host]
+              @logger.info "Trying #{host}"
+              begin
+                arr_opts = []
+                arr_opts << PARAMS
+                arr_opts += x_opts
+                arr_opts << @rsh if host[/^(\w)*\@/]
+                arr_opts << esc(File.join(host, '.pack/.'))
+                arr_opts << esc(pack_path)
+                command(cmd, arr_opts)
+                calc
+                save_repos
+                done = true
+              rescue => e
+                @logger.warn "#{e.class}: #{e.message}"
+                @logger.debug e.backtrace.join("\n")
+              end
+            end
+            @verbose = verbose
+            raise RsyncError if !done
+          else
+            #reset(:hard => true)
+            calc
+            save_repos
+
+            # fetch latest sums and only update when changed
+            compare_sums(true, host)
+          end
+        end
+
+        def compare_sums(online = true, host = config[:hosts].sample)
+          load_repos(:local)
+          done = false
+
+          if online
+            hosts = config[:hosts].clone
+            b = false
+            verbose = @verbose
+            @verbose = false
+
+            until hosts.empty? || done do
+              # FIXME: Nasty
+              host = hosts.sample if b
+              b = true
+              hosts -= [host]
+              @logger.info "Trying #{host}"
+
+              begin
+                FileUtils.cp(pack_path(".repository.yml"), rsync_path(".repository-pack.yml")) if File.exists?(pack_path(".repository.yml"))
+                fetch_file(".pack/.repository.yml", host)
+                load_repos(:remote)
+
+                if @repos_local[:version] > @repos_remote[:version] # && !force
+                  @logger.warn "WARNING, version on server is OLDER, aborting!"
+                  raise RsyncError
+                end
+                done = true
+              rescue => e
+                @logger.warn "#{e.class}: #{e.message}"
+                @logger.debug e.backtrace.join("\n")
+                FileUtils.cp(rsync_path(".repository-pack.yml"), pack_path(".repository.yml")) if File.exists?(rsync_path(".repository-pack.yml"))
+              ensure
+                FileUtils.rm(rsync_path(".repository-pack.yml")) if File.exists?(rsync_path(".repository-pack.yml"))
+              end
+            end
+            @verbose = verbose
+          else
+            load_repos(:remote)
+          end
+
+          if done && online
+            @logger.info "Verifying Packed files..."
+            compare_set(:pack, host)
+
+            @logger.info "Verifying Unpacked files..."
+            compare_set(:wd, host)
+
+            # Bump version and make final save
+            @repos_local[:version] = @repos_remote[:version]
+            save_repos
+          end
+        end
+
+        def compare_set(typ, host, online = true)
           #if local[typ][:md5] == remote[typ][:md5]
           #  @logger.info "#{typ} Match!"
           #else
@@ -426,7 +450,7 @@ module Six
                 ## Pack
                 if online
                   b = false
-                  while hosts.size > 0 && !done do
+                  until hosts.empty? || done do
                     # FIXME: Nasty
                     if b
                       host = hosts.sample
@@ -435,44 +459,30 @@ module Six
                     slist = nil
                     b = true
                     hosts -= [host]
+
+                    # TODO: Progress bar
+                    arr_opts = []
+                    arr_opts << PARAMS
+                    arr_opts << @rsh if host[/^(\w)*\@/]
+
+                    if mismatch.size > (@repos_remote[typ].size / 2)
+                      # Process full folder
+                      @logger.info "Many files mismatched (#{mismatch.size}), running full update on .pack folder"
+                    else
+                      # Process only selective
+                      @logger.info "Fetching #{mismatch.size} files... Please wait"
+                      slist = File.join(TEMP_PATH, ".six-rsync_#{rand 9999}-list")
+                      slist.gsub!("\\", "/")
+                      File.open(slist, 'w') { |f| mismatch.each { |e| f.puts e } }
+
+                      arr_opts << "--files-from=#{win2cyg("\"#{slist}\"")}"
+                    end
+
                     begin
-                      # TODO: Progress bar
-                      if mismatch.size > (@repos_remote[typ].size / 2)
-                        @logger.info "Many files mismatched (#{mismatch.size}), running full update on .pack folder"
-                        arr_opts = []
-                        arr_opts << PARAMS
-                        if host[/\A(\w)*\@/]
-                          arr_opts << @rsh
-                        end
-
-                        arr_opts << esc(File.join(host, '.pack/.'))
-                        arr_opts << esc(pack_path)
-                        command('', arr_opts)
-                      else
-                        c = mismatch.size
-                        @logger.info "Fetching #{mismatch.size} files... Please wait"
-                        slist = File.join(TEMP_PATH, ".six-rsync_#{rand 9999}-list")
-                        slist.gsub!("\\", "/")
-                        File.open(slist, 'w') do |f|
-                          mismatch.each { |e| f.puts e }
-                        end
-                        arr_opts = []
-                        arr_opts << PARAMS
-                        arr_opts << @rsh if host[/\A(\w)*\@/]
-
-                        cyg_slist = "\"#{slist}\""
-
-                        while cyg_slist[WINDRIVE] do
-                          drive = cyg_slist[WINDRIVE]
-                          cyg_slist.gsub!(drive, "\"/cygdrive/#{$1}")
-                        end
-                        arr_opts << "--files-from=#{cyg_slist}"
-
-                        arr_opts << esc(File.join(host, '.pack/.'))
-                        arr_opts << esc(pack_path)
-
-                        command('', arr_opts)
-                      end
+                      arr_opts << esc(File.join(host, '.pack/.'))
+                      arr_opts << esc(pack_path)
+                      command('', arr_opts)
+
                       done = true
                     rescue => e
                       @logger.warn "Failure"
@@ -497,60 +507,45 @@ module Six
             del_file(key, typ) unless config[:exclude].include?(key) || !@repos_remote[typ][key].nil?
           end
 
+          # Calculate new sums
           @repos_local[typ] = calc_sums(typ)
-          @repos_local[:version] = @repos_remote[:version]
+
+          # Save current progress, incase somewhere else goes wrong.
           save_repos
         end
 
-        def compare_sums(online = true, host = config[:hosts].sample)
-          hosts = config[:hosts].clone
-          done = false
 
-          ## Pack
-          if online
-            b = false
-            verbose = @verbose
-            @verbose = false
-            while hosts.size > 0 && !done do
-              # FIXME: Nasty
-              host = hosts.sample if b
-              b = true
-              hosts -= [host]
-              @logger.info "Trying #{host}"
+        private
+        def handle_config
+          @config = load_config
+          unless @config
+            @logger.error "Not an Rsync repository!"
+            raise RsyncError
+          end
+        end
 
-              begin
-                FileUtils.cp(pack_path(".repository.yml"), rsync_path(".repository-pack.yml"))
-                fetch_file(".pack/.repository.yml", host)
+        def handle_hosts
+          unless config[:hosts].size > 0
+            @logger.error "No hosts configured!"
+            raise RsyncError
+          end
+        end
 
-                load_repos(:remote)
-                load_repos(:local)
+        def rename(entry, newentry)
+          FileUtils.mv(entry, "#{entry}_tmp")
+          FileUtils.mv("#{entry}_tmp", newentry)
+        end
 
-                if @repos_local[:version] > @repos_remote[:version] # && !force
-                  @logger.warn "WARNING, version on server is OLDER, aborting!"
-                  FileUtils.cp(rsync_path(".repository-pack.yml"), pack_path(".repository.yml"))
-                  raise RsyncError
-                end
-                done = true
-              rescue => e
-                @logger.warn "#{e.class}: #{e.message}"
-                @logger.debug e.backtrace.join("\n") 
-              ensure
-                FileUtils.rm(rsync_path(".repository-pack.yml"))
-              end
-            end
-            @verbose = verbose
-          end
-          if done && online
-            # TODO: Don't do actions when not online
-            @logger.info "Verifying Packed files..."
-            compare_set(:pack, host)
-            @logger.info "Verifying Unpacked files..."
-            compare_set(:wd, host)
-            save_repos
+        def win2cyg(path)
+          path = path.clone
+          #path.gsub!(WINDRIVE) {|s| "\"/cygdrive/#{s}" }
+          while path[WINDRIVE]
+            drive = path[WINDRIVE]
+            path.gsub!(drive, "\"/cygdrive/#{$1}")
           end
+          path
         end
 
-        private
         def esc(val); "\"#{val}\""; end
         def escape(s); "\"" + s.to_s.gsub('\"', '\"\\\"\"') + "\""; end
 
@@ -563,14 +558,12 @@ module Six
 
         def rsync_path(path = '')
           p = File.join(@rsync_work_dir, DIR_RSYNC)
-          p = File.join(p, path) unless path.size == 0
-          p
+          path.size == 0 ? p : File.join(p, path)
         end
 
         def pack_path(path = '')
           p = File.join(@rsync_work_dir, DIR_PACK)
-          p = File.join(p, path) unless path.size == 0
-          p
+          path.size == 0 ? p : File.join(p, path)
         end
 
         def fetch_file(path, host)
@@ -582,9 +575,7 @@ module Six
           @logger.debug "Fetching #{path} from  #{host}"
           arr_opts = []
           arr_opts << PARAMS
-          if host[/\A(\w)*\@/]
-            arr_opts << @rsh
-          end
+          arr_opts << @rsh if host[/^(\w)*\@/]
           arr_opts << esc(File.join(host, path))
           arr_opts << esc(rsync_path(folder))
 
@@ -602,10 +593,10 @@ module Six
           reg = case typ
           when :pack
             ar = Dir[pack_path('**/*')]
-            /\A[\\|\/]\.rsync[\\|\/]\.pack[\\|\/]/
+            /^[\\|\/]\.rsync[\\|\/]\.pack[\\|\/]/
           when :wd
             ar = Dir[File.join(@rsync_work_dir, '/**/*')]
-            /\A[\\|\/]/
+            /^[\\|\/]/
           end
           h = Hash.new
           ar.each do |file|
@@ -613,8 +604,9 @@ module Six
             relative.gsub!(@rsync_work_dir, '')
             relative.gsub!(reg, '')
 
+            next if config[:exclude].include?(relative)
             sum = md5(file)
-            h[relative] = sum if sum && !config[:exclude].include?(relative)
+            h[relative] = sum if sum
           end
           h
         end
@@ -622,11 +614,7 @@ module Six
         def load_config; load_yaml(File.join(rsync_path, 'config.yml')); end
 
         def load_yaml(file)
-          if File.exists?(file)
-            YAML::load_file(file)
-          else
-            nil
-          end
+          File.exists?(file) ? YAML::load_file(file) : nil
         end
 
         def save_default_config
@@ -654,12 +642,11 @@ module Six
         end
 
         def load_repos(typ)
-          config = Hash.new
-          case typ
+          config = case typ
           when :local
-            File.open(rsync_path('.repository.yml')) { |file| config = YAML::load(file) }
+            YAML::load_file(rsync_path('.repository.yml'))
           when :remote
-            File.open(pack_path('.repository.yml')) { |file| config = YAML::load(file) }
+            YAML::load_file(pack_path('.repository.yml'))
           end
 
           [:wd, :pack].each do |t|
@@ -696,12 +683,11 @@ module Six
           end
 
           unless File.directory? path
-            path[/(.*)[\/|\\](.*)/]
-            folder, file = $1, $2
+            folder, file = File.dirname(path), File.basename(path)
             Dir.chdir(folder) do
               r = %x[md5sum #{esc(file)}]
               @logger.debug r
-              r[/\A\w*/]
+              r[/^\w*/]
             end
           end
         end
@@ -726,6 +712,7 @@ module Six
           out = %x[gzip -f --best --rsyncable --keep #{esc(file)}]
           @logger.debug out
           raise RsyncError if $? != 0
+          out
         end
 
         def unpack_file(file, path)
@@ -756,7 +743,7 @@ module Six
             unless File.directory? file
               relative = file.clone
               relative.gsub!(@rsync_work_dir, '')
-              relative.gsub!(/\A[\\|\/]\.rsync[\\|\/]\.pack[\\|\/]/, '')
+              relative.gsub!(/^[\\|\/]\.rsync[\\|\/]\.pack[\\|\/]/, '')
               fil = relative
               folder = "."
               folder, fil = $1, $2 if relative[/(.*)\/(.*)/]
@@ -780,24 +767,11 @@ module Six
           opts << "--timeout=#{DEFAULT_TIMEOUT}"
 
           opts = [opts].flatten.map {|s| s }.join(' ') # escape()
-          rsync_cmd = "rsync #{cmd} #{opts} #{redirect} 2>&1"
-
-          while rsync_cmd[WINDRIVE] do
-            drive = rsync_cmd[WINDRIVE]
-            rsync_cmd.gsub!(drive, "\"/cygdrive/#{$1}")
-          end
+          rsync_cmd = win2cyg("rsync #{cmd} #{opts} #{redirect} 2>&1")
 
-          if @logger
-            @logger.debug(rsync_cmd)
-          end
-
-          out = nil
-          if chdir && (Dir.getwd != path)
-            Dir.chdir(path) { out = run_command(rsync_cmd, &block) }
-          else
-            out = run_command(rsync_cmd, &block)
-          end
+          @logger.debug(rsync_cmd) if @logger
 
+          out = chdir && (Dir.getwd != path) ? Dir.chdir(path) { run_command(rsync_cmd, &block) } : run_command(rsync_cmd, &block) 
           out
         end
 

data/lib/six/rsync-app.rb

@@ -56,8 +56,12 @@ module Six
         end
 
         def self.clone(folder)
-          folder[/(.*)[\/|\\](.*)/]
-          pa, folder = $1, $2
+          pa = if folder[/[\/|\\]/]
+            folder = File.basename(folder) 
+            File.dirname(folder)
+          else
+            Dir.pwd
+          end
           @repo = Six::Repositories::Rsync.clone(Six::Repositories::Rsync.host, folder, :path => pa, :log => Six::Repositories::Rsync.logger)
         end
 

data/lib/six/rsync.rb

@@ -19,7 +19,7 @@ case RUBY_VERSION
 when /1\.8\.[0-9]/
   class Array
     def sample
-      self[rand self.size]
+      self[rand(self.size)]
     end
   end
 end
@@ -31,7 +31,7 @@ module Six
 
     module Rsync
       COMPONENT = 'six-rsync'
-      VERSION = '0.5.3'
+      VERSION = '0.6.0'
       FOLDER = /(.*)\/(.*)/
 
       case RUBY_PLATFORM

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 +02:00
+date: 2010-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency