six-updater 0.19.3-x86-mingw32 → 0.19.4-x86-mingw32

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.3'
+  s.version = '0.19.4'
   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.3'
+  s.version = '0.19.4'
   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.3'
+  s.version = '0.19.4'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/cleanup.rb

@@ -8,13 +8,13 @@ require 'yaml'
 module Six
   class Cleanup
     def self.md5sum(target)
-      target[/(.*)\/(.*)/]
-      folder, file = $1, $2
+      folder, file = File.dirname(target), File.basename(target)
       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")
@@ -31,10 +31,10 @@ module Six
                   f = e[0].clone
                   f.sub!(/\.gz$/, "")
 
-                  target = if f[/(.*)\/(.*)/]
-                    "#{$1}/#{$2.downcase}"
-                  else
+                  target = if File.dirname(f) == "."
                     f.downcase
+                  else
+                    "#{File.dirname(f)}/#{File.basename(f).downcase}"
                   end
                   rename(f, target)
                   system "gzip --rsyncable --best \"#{target}\""

data/lib/six/updater.rb

@@ -39,10 +39,9 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.19.3'
+    VERSION = '0.19.4'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
-    FOLDER = /(.*)\/(.*)/
                       
     # Configuration
     case RUBY_PLATFORM
@@ -223,7 +222,14 @@ module Six
         exit
       end
 
-      File.open(config) { |file| @config.merge!(YAML::load(file)) }
+      cfg = YAML::load_file(config)
+      unless cfg
+        log.error "ERROR: #{config} seems to be invalid!"
+        wait if @config[:wait]
+        exit
+      end
+
+      @config.merge!(cfg)
       @config[:folders] = [] unless @config[:folders]
       @config[:server][:folders] = [] unless @config[:server][:folders]
 
@@ -392,11 +398,7 @@ module Six
     end
 
     def process_name
-      if @config[:app_exe][FOLDER]
-        $2
-      else
-        @config[:app_exe]
-      end
+      @process_name ||= File.basename(@config[:app_exe])
     end
 
     def sure?
@@ -420,7 +422,6 @@ module Six
 
     def startgame(cmd = nil)
       log.info "Starting the game with #{@config[:app_params]} -mod=#{@mods}#{cmd}"
-      #system "\"#{@config[:app_exe]}\" #{@config[:app_params]} -mod=#{@mods}"
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
           begin
@@ -467,7 +468,7 @@ module Six
           log.info "Created shortcut (in #{path}): #{name}"
           Dir.chdir cwd
         else
-        log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"
+          log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"
       end
     end
 
@@ -488,7 +489,7 @@ module Six
             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}"
+          log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"
       end
     end
 

data/lib/six/updater/mod.rb

@@ -66,20 +66,12 @@ module Six
       end
 
       def get_repositories
-        cfg = File.join(@path, '.repositories.yml')
-        @repositories = if FileTest.exist?(cfg)
-          File.open(cfg) { |file| YAML::load(file) }
-        elsif @modconfig[:repository].class == Array
-          @modconfig[:repository]
-        else
-          [@modconfig[:repository]]
-        end
+        @repositories ||= @modconfig[:repository].is_a?(Array) ? @modconfig[:repository] : [@modconfig[:repository]]
       end
 
       def write_version
-        @modconfig[:versionfile][/(.*)\/(.*)/]
-        folder = $1
-        FileUtils.mkdir_p folder unless FileTest.exists? folder
+        folder = File.dirname(@modconfig[:versionfile])
+        FileUtils.mkdir_p folder unless File.exists? folder
         begin
           File.open(@modconfig[:versionfile], 'w') { |file| file.puts @stat[:current] }
           true
@@ -120,7 +112,7 @@ module Six
 
       # UPDATE Process
       def update
-       if self.skip?
+        if self.skip?
           begin
             userconfig(false)
           rescue => e
@@ -132,7 +124,7 @@ module Six
           return if self.disabled?
         end
 
-       return unless self.installed?
+        return unless self.installed?
 
         @stat[:previous] = @repository.version
         log.info "Current Version: #{@stat[:previous]}, checking for updates..."
@@ -148,7 +140,7 @@ module Six
         end
 
         if @stat[:previous] == @stat[:current]
-          log.info "No updates found"
+          log.info "No updates found (Current version: #{@stat[:current]})"
           write_version # DO this always incase previous version.txt failed for whatever reason!
         else
           log.info "Applied version: #{@stat[:current]}"
@@ -184,76 +176,79 @@ module Six
         if self.installed?
           log.info "Already installed, trying to update..."
           update
-        else
-          if FileTest.exist?(@path)
-            log.warn "WARNING: Folder already exists but seems incompatible. Not installing."
-            log.info "If you want the software to install this mod, please delete the modfolder"
-          else
-            log.info "Installing... This might take a while, please wait."
-            folder = ''
-            if @modconfig[:folder][/(.*)\/(.*)/]
-              basepath, subfolder = $1, $2
-              basepath = File.join(@config[:app_modpath], basepath)
-              FileUtils.mkdir_p basepath unless FileTest.exist?(basepath)
-            end
+          return
+        end
+        if File.exists?(@path)
+          log.warn "WARNING: Folder already exists but seems incompatible. Not installing."
+          log.info "If you want the software to install this mod, please delete the modfolder"
+          return
+        end
+        log.info "Installing... This might take a while, please wait."
+        unless File.dirname(@modconfig[:folder]) == "."
+          basepath, subfolder = File.dirname(@modconfig[:folder]), File.basename(@modconfig[:folder])
+          basepath = File.join(@config[:app_modpath], basepath)
+          FileUtils.mkdir_p basepath unless File.exists?(basepath)
+        end
 
-            file = File.join(DATA_PATH, "#{@folder_str}.7z")
-            file = File.join(BASE_PATH, "#{@folder_str}.7z") unless File.exists?(file)
-            if File.exists?(file)
-              log.info "Found #{@folder_str}.7z, using it"
-              #Six::Updater.zipcheck
-              FileUtils.mkdir_p @path
-              log.debug unpack(file, @path)
-
-              if File.exists?(File.join(@path, ".rsync", "config.yml"))
-                begin
-                  @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
-                  @installed = true
-                  get_repositories
-                  update
-                rescue => e
-                  @installed = false
-                  FileUtils::rm_rf(@path) if FileTest.exist?(@path)
-                end
-              else
-                log.warn "WARNING: Failed to open the repository, the #{@folder_str}.7z does not seem to be correct"
-                log.warn "Installing from rsync network instead"
-                log.debug "#{$!}"
-                FileUtils::rm_rf(@path) if FileTest.exist?(@path)
-              end
+        file = File.join(DATA_PATH, "#{@folder_str}.7z")
+        file = File.join(BASE_PATH, "#{@folder_str}.7z") unless File.exists?(file)
+        if File.exists?(file)
+          log.info "Found #{@folder_str}.7z, using it"
+          #Six::Updater.zipcheck
+          FileUtils.mkdir_p @path
+          log.debug unpack(file, @path)
+
+          if File.exists?(File.join(@path, ".rsync", "config.yml"))
+            begin
+              @repository = RsyncRepo.new(@modconfig[:repository], @path, :log => log)
+              @installed = true
+              get_repositories
+              update
+            rescue => e
+              @installed = false
+              #FileUtils::rm_rf(@path) if File.exists?(@path)
             end
+          else
+            log.warn "WARNING: Failed to open the repository, the #{@folder_str}.7z does not seem to be correct"
+            log.warn "Installing from rsync network instead"
+            log.debug "#{$!}"
+            FileUtils::rm_rf(@path) if File.exists?(@path)
+          end
+        end
 
-            unless @installed
-              @repository = RsyncRepo.new(@repositories, @path)
-              opts = {}
-              opts.merge!({:log => log}) if @config[:verbose]
-              @installed = @repository.clone(opts)
-              unless @installed
-                log.warn "WARNING: Failed to download the repository! This could be due to a server / connection problem. Please try again later"
-              end
-            end
+        unless @installed
+          @repository = RsyncRepo.new(@repositories, @path)
+          opts = {}
+          opts.merge!({:log => log}) if @config[:verbose]
+          begin
+            @repository.clone(opts)
+            @installed = true
+          rescue => e
+            log.warn "WARNING: Failed to download the repository! This could be due to a server / connection problem. Please try again later"
+            log.debug "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
+          end
+        end
 
-            if @installed
-              @changed = true
-              @stat[:previous] = nil
-              begin
-                @stat[:current] = @repository.version
-                write_version
-              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 "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
-                FileUtils::rm_rf(@path) if FileTest.exist?(@path)
-              end
-              begin
-                userconfig
-              rescue => e
-                log.warn 'WARNING: Userconfig processing is unable to complete.'
-                log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
-              end
-            else
-              FileUtils::rm_rf(@path) if FileTest.exist?(@path)
-            end
+        if @installed
+          @changed = true
+          @stat[:previous] = nil
+          begin
+            @stat[:current] = @repository.version
+            log.info "Current version: #{@stat[:current]}"
+            write_version
+          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 "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+            #FileUtils::rm_rf(@path) if File.exists?(@path)
           end
+          begin
+            userconfig
+          rescue => e
+            log.warn 'WARNING: Userconfig processing is unable to complete.'
+            log.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+          end
+        else
+          # FileUtils::rm_rf(@path) if File.exists?(@path)
         end
       end
 
@@ -281,7 +276,7 @@ module Six
       def uninstall
         return if self.disabled?
 
-        if FileTest.exist?(@path)
+        if File.exists?(@path)
           log.warn "###########"
           log.warn "# WARNING #"
           log.warn "###########"
@@ -295,19 +290,18 @@ module Six
 
       # Process keys
       def keys(force = true)
-        return if self.disabled? 
+        return if self.disabled?
         return unless self.installed?
 
         path = File.join(@path, 'store', 'keys.tar')
         path = File.join(@path, 'store', 'keys') unless File.exists?(path)
-        path = File.join(@path, 'keys') unless File.directory?(path)         
+        path = File.join(@path, 'keys') unless File.directory?(path)
         if File.exists?(path)
           log.info "Found keys, processing..."
           k_path = File.join(@config[:app_path], 'keys')
           if File.directory? path
             Dir[File.join(path, '*.bikey')].each do |key|
-              key[/(.*)\/(.*)/]
-              path, file = $1, $2
+              path, file = File.dirname(key), File.basename(key)
               file[/(.*)_(.*)\.bikey/]
               prefix, suffix = $1, $2
               if suffix && prefix
@@ -337,11 +331,11 @@ module Six
         f.gsub!('@', '')
         path = File.join(@path, 'store', 'userconfig.tar')
         path = File.join(@path, 'store', 'userconfig') unless File.exists?(path)
-        path = File.join(@path, 'userconfig') unless File.exists?(path)         
+        path = File.join(@path, 'userconfig') unless File.exists?(path)
         if File.exists?(path)
           uconfig = File.join(@config[:app_path], 'userconfig')
           uconfigpath = File.join(uconfig, f)
-          if !force && FileTest.exist?(uconfigpath)
+          if !force && File.exists?(uconfigpath)
             log.debug "Userconfig folder already found, skipping"
             return
           end

data/lib/six/updater/rsyncrepo.rb

@@ -16,11 +16,8 @@ module Six
 
       def version
         f = File.join(@path, '.rsync', '.repository.yml')
-        if FileTest.exist?(f)
-          File.open(f) {|file| YAML::load(file)[:version] }
-        else
-          nil
-        end
+        cfg = File.exists?(f) ? YAML::load_file(f) : nil
+        cfg ? cfg[:version] : nil 
       end
 
       def open(opts = {})
@@ -41,32 +38,21 @@ module Six
 
       def clone(opts = {})
         done = false
-        @path[/(.*)\/(.*)/]
-        opts = {:path => $1, :depth => @depth, :log => log}
-        #begin
-        @repository = Rsync.clone(@repositories, $2, opts)
-        # FIXME: Update needs to be fixed
-        done = true
-        # rescue
-        #   log.warn "WARNING: Failed, was unable to clone!" unless done
-        #log.debug "WARNING: Failed, trying other mirrors if available"
-        # end
-        done
+        opts = {:path => File.dirname(@path), :depth => @depth, :log => log}
+        @repository = Rsync.clone(@repositories, File.basename(@path), opts)
+        true
       end
 
       def update(opts = {})
-        cfg = nil
-        File.open(File.join(@path, '.rsync/config.yml')) { |file| cfg = YAML::load(file) }
+        # Update the config file with our hosts list
+        file = File.join(@path, '.rsync/config.yml')
+        cfg = YAML::load_file(file)
         cfg[:hosts] = @repositories
-        File.open(File.join(@path, '.rsync/config.yml'), 'w') { |file| file.puts cfg.to_yaml }
+        File.open(file, 'w') { |file| file.puts cfg.to_yaml }
 
-        # begin
+        # Update!
         repository.update
-        done = true
-        #  rescue
-        #   log.warn "WARNING: Failed, was unable to update!" unless done
-        #  end
-        done
+        true
       end
     end
   end

metadata

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