six-updater 0.19.2 → 0.19.3

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.platform = "x86-mingw32"
   s.name = 'six-updater'
-  s.version = '0.19.2'
+  s.version = '0.19.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -35,7 +35,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.19.2'
+  s.version = '0.19.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -56,7 +56,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.19.2'
+  s.version = '0.19.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/bin/six-updater

@@ -10,8 +10,8 @@ rescue => e
       path = File.join(Six::Updater::DATA_PATH, 'logs')
       FileUtils.mkdir_p path unless File.exists?(path)
       File.open(File.join(path, "six-updater-error.log"), 'w') {|f| f.puts e.class, e.message, e.backtrace.join("\n")}
-  rescue
-      puts "ERROR: #{$!}"
+  rescue => e
+      puts "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
   end
   sleep 10
 end

data/lib/six/cleanup.rb

@@ -7,6 +7,14 @@ require 'yaml'
 
 module Six
   class Cleanup
+    def self.md5sum(target)
+      target[/(.*)\/(.*)/]
+      folder, file = $1, $2
+      r = Dir.chdir(folder) do
+        %x[md5sum "#{file}"]
+      end
+      r[/\A\w*/]
+    end
     def self.check_dir(dir, repack = false)
       if File.directory?(dir)
         entry = File.join(dir, ".repository.yml")
@@ -18,8 +26,8 @@ module Six
             config[typ].each do |e|
               sum = if repack && e[0] =~ /.*[A-Z].*\.gz$/
                 Dir.chdir(dir) do
-                  #puts "Repacking #{e[0]} to #{e[0].downcase}"
-                  system "gunzip \"#{e[0]}\""
+                  puts "Repacking #{e[0]} to #{e[0].downcase} in #{dir}"
+                  system "gzip -d \"#{e[0]}\""
                   f = e[0].clone
                   f.sub!(/\.gz$/, "")
 
@@ -30,8 +38,7 @@ module Six
                   end
                   rename(f, target)
                   system "gzip --rsyncable --best \"#{target}\""
-                  r = %x[md5sum "#{target}.gz"]
-                  r[/\A\w*/]
+                  md5sum(File.join(dir, "#{target}.gz"))
                 end
               else
                 e[1]
@@ -60,7 +67,7 @@ module Six
       base = File.basename(entry)
   
       if File.directory?(entry)
-        check_dir(File.join(entry, ".rsync"), repack)
+        check_dir(File.join(entry, ".rsync"), false)
         check_dir(File.join(entry, ".rsync/.pack"), repack)
         check_dir(File.join(entry, ".pack"), repack)
       end
@@ -91,7 +98,7 @@ module Six
 
     def self.process(dir, repack = false)
       if File.directory?(dir)
-        check_dir(File.join(dir, ".rsync"), repack)
+        check_dir(File.join(dir, ".rsync"), false)
         check_dir(File.join(dir, ".rsync/.pack"), repack)
         check_dir(File.join(dir, ".pack"), repack)
 
@@ -107,6 +114,6 @@ if $0 == __FILE__
   unless ARGV.empty?
     dir = ARGV[0]
     ARGV.shift
-    Six::Cleanup.process(dir, true)
+    Six::Cleanup.process(dir)#, true)
   end
 end

data/lib/six/updater-app.rb

@@ -37,9 +37,9 @@ module Six
                 end
               end
           end
-        rescue
+        rescue => e
           log.warn "Failed checking tasklist for #{pid}"
-          log.debug "#{$!}"
+          log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
         end
 
         if found

data/lib/six/updater.rb

@@ -39,7 +39,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.19.2'
+    VERSION = '0.19.3'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
     FOLDER = /(.*)\/(.*)/
@@ -384,9 +384,9 @@ module Six
               end
             end
         end
-      rescue
+      rescue => e
         log.warn "Failed checking tasklist for #{name}"
-        log.debug "#{$!}"
+        log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
       end
       pids
     end
@@ -434,9 +434,9 @@ module Six
               :inherit          => false
               #:environment      => ""
             )
-          rescue
+          rescue => e
             log.warn "WARNING: Something went wrong starting the app: #{@config[:app_exe]}"
-            log.debug "#{$!}"
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
         else
           Dir.chdir(@config[:app_path]) do
@@ -484,8 +484,8 @@ module Six
               desktop.sub!("%#{$1}%", ENV[$1])
             end
             shortcut desktop if File.directory? desktop
-          rescue
-            log.warn "WARNING: Problem while creating shortcut! #{$!}"
+          rescue => e
+            log.warn "WARNING: Problem while creating shortcut! ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
         else
         log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"

data/lib/six/updater/gitrepo.rb

@@ -39,9 +39,9 @@ module Six
             Git.clone(rep, @path, opts)
             Git.open(@path).config("core.autocrlf", "false")
             done = true
-          rescue
+          rescue => e
             log.debug "WARNING: Failed, trying other mirrors if available"
-            log.debug "#{$!}"
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
         end
         log.warn "WARNING: Failed, was unable to clone!" unless done
@@ -74,9 +74,9 @@ module Six
             repository.config("core.autocrlf", "false")
             repository.pull_legacy
             done = true
-          rescue
+          rescue => e
             log.debug "WARNING: Failed, trying other mirrors if available"
-            log.debug "#{$!}"
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
         end
         log.warn "WARNING: Failed, was unable to update!" unless done

data/lib/six/updater/mod.rb

@@ -83,9 +83,9 @@ module Six
         begin
           File.open(@modconfig[:versionfile], 'w') { |file| file.puts @stat[:current] }
           true
-        rescue
+        rescue => e
           log.warn "WARNING: Unable to write version.txt file, please make sure everything arma is closed, etc"
-          log.debug "#{$!}"
+          log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           false
         end
       end
@@ -123,9 +123,9 @@ module Six
        if self.skip?
           begin
             userconfig(false)
-          rescue
+          rescue => e
             log.warn 'WARNING: Userconfig processing is unable to complete.'
-            log.debug "#{$!}"
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
           return
         else
@@ -141,9 +141,9 @@ module Six
 
         begin
           @repository.status(true)
-        rescue
+        rescue => e
           log.warn 'WARNING: Update seems to have completed but there was a status error..'
-          log.debug "#{$!}"
+          log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           log_status
         end
 
@@ -165,9 +165,9 @@ module Six
         # TODO: Detect missing / out of date config files, and notify user
         begin
           userconfig(false)
-        rescue
+        rescue => e
           log.warn 'WARNING: Userconfig processing is unable to complete.'
-          log.debug "#{$!}"
+          log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
         end
 
         unless done
@@ -211,7 +211,7 @@ module Six
                   @installed = true
                   get_repositories
                   update
-                rescue
+                rescue => e
                   @installed = false
                   FileUtils::rm_rf(@path) if FileTest.exist?(@path)
                 end
@@ -239,16 +239,16 @@ module Six
               begin
                 @stat[:current] = @repository.version
                 write_version
-              rescue
+              rescue => e
                 log.warn 'WARNING: Post installation was unable to complete. This could be due to a server / connection problem. Please try again later'
-                log.debug "#{$!}"
+                log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
                 FileUtils::rm_rf(@path) if FileTest.exist?(@path)
               end
               begin
                 userconfig
-              rescue
+              rescue => e
                 log.warn 'WARNING: Userconfig processing is unable to complete.'
-                log.debug "#{$!}"
+                log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
               end
             else
               FileUtils::rm_rf(@path) if FileTest.exist?(@path)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 19
-  - 2
-  version: 0.19.2
+  - 3
+  version: 0.19.3
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency