six-updater 0.22.0-x86-mswin32 → 0.22.1-x86-mswin32

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.22.0'
+  s.version = '0.22.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -26,7 +26,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('win32-shortcut', '>= 0.2.3')
   s.add_dependency('log4r', '>= 1.1.2')
   s.add_dependency('six-uac', '>= 0.1.0')
-  s.add_dependency('six-rsync', '>= 0.3.4')
+  s.add_dependency('six-rsync', '>= 0.7.0')
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,spec}/**/*") + Dir.glob("lib/*/**/*.rb")
   s.require_path = "lib"
   s.bindir = "bin"
@@ -36,7 +36,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.22.0'
+  s.version = '0.22.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -49,7 +49,7 @@ spec3 = Gem::Specification.new do |s|
   s.add_dependency('win32-shortcut', '>= 0.2.3')
   s.add_dependency('log4r', '>= 1.1.2')
   s.add_dependency('six-uac', '>= 0.1.0')
-  s.add_dependency('six-rsync', '>= 0.3.4')
+  s.add_dependency('six-rsync', '>= 0.7.0')
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,spec}/**/*") + Dir.glob("lib/*/**/*.rb")
   s.require_path = "lib"
   s.bindir = "bin"
@@ -58,7 +58,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.22.0'
+  s.version = '0.22.1'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -70,7 +70,7 @@ spec2 = Gem::Specification.new do |s|
   #s.add_dependency('win32-shortcut', '>= 0.2.3')
   s.add_dependency('log4r', '>= 1.1.2')
   #s.add_dependency('six-uac', '>= 0.1.0')
-  s.add_dependency('six-rsync', '>= 0.4.0')
+  s.add_dependency('six-rsync', '>= 0.7.0')
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,spec}/**/*") + Dir.glob("lib/*/**/*.rb")
   s.require_path = "lib"
   s.bindir = "bin"

data/lib/six/updater-app.rb

@@ -1,5 +1,5 @@
-require 'six/updater/options'
-require 'six/updater'
+require_relative 'updater/options'
+require_relative 'updater'
 
 # TODO: Should exec outside the module
 module Six

data/lib/six/updater.rb

@@ -20,10 +20,10 @@ end
 gem 'six-rsync'
 require 'six/rsync'
 
-require 'six/cleanup'
-require 'six/updater/mod'
+require_relative 'cleanup'
+require_relative 'updater/mod'
 #require 'sixupdater/gitrepo'
-require 'six/updater/rsyncrepo'
+require_relative 'updater/rsyncrepo'
 
 include Six::Repositories
 
@@ -39,7 +39,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.22.0'
+    VERSION = '0.22.1'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       
@@ -449,6 +449,9 @@ module Six
             end
 =end
           else
+            # TODO: Include exe/cmdnline check;
+            # /proc/PID/exe
+            # /proc/PID/cmdline
             %x[ps -A | grep #{name}].split("\n").each do |line|
               unless line[/grep/]
                 line[/^\s*([0-9]*)/]
@@ -486,6 +489,16 @@ module Six
       startgame(cmd)
     end
 
+    def afteraction
+      Dir.chdir(BASE_PATH)
+        case RUBY_PLATFORM
+          when /-mingw32$/, /-mswin32$/
+            system "afteraction.bat"
+          else
+            system "afteraction.sh"
+      end
+    end
+
     def startgame(cmd = nil)
       log.info "Starting the game with #{@config[:app_params]} -mod=#{@mods}#{cmd}"
       case RUBY_PLATFORM

data/lib/six/updater/mod.rb

@@ -52,6 +52,11 @@ module Six
         @modconfig[:disabled]
       end
 
+      def force?
+        log.info "Yet force is enabled, overriding disabled..." if @modconfig[:force]
+        @modconfig[:force]
+      end
+
       def installed?
         not_a_repository unless @installed
         @installed
@@ -130,6 +135,19 @@ module Six
         end
       end
 
+      def handle_cludes(opts)
+        if @modconfig.keys.include?(:include) || @modconfig.keys.include?(:exclude)
+          if @modconfig.keys.include?(:include)
+            opts[:include] = @modconfig[:include]
+            log.info "Includes: #{@modconfig[:include].join(", ")}"
+          end
+          if @modconfig.keys.include?(:exclude)
+            opts[:exclude] = @modconfig[:exclude]
+            log.info "Excludes: #{@modconfig[:exclude].join(", ")}"
+          end
+        end
+      end
+
       # UPDATE Process
       def update
         if self.skip?
@@ -141,14 +159,16 @@ module Six
           end
           return
         else
-          return if self.disabled?
+          return if self.disabled? && !self.force?
         end
 
         return unless self.installed?
 
         @stat[:previous] = @repository.version
         log.info "Current Version: #{@stat[:previous]}, checking for updates..."
-        done = begin; @repository.update; rescue => e; log.debug "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"; nil; end
+        opts = {}
+        handle_cludes(opts)
+        done = begin; @repository.update(opts); rescue => e; log.debug "#{e.class} #{e.message}: #{e.backtrace.join("\n")}"; nil; end
 
         begin
           @stat[:current] = @repository.version
@@ -193,7 +213,7 @@ module Six
       # INSTALL process
       def install
         log.debug "Path: #{@path}"
-        return if self.disabled?
+        return if self.disabled? && !self.force?
         if self.installed?
           log.info "Already installed, trying to update..."
           update
@@ -241,6 +261,7 @@ module Six
           @repository = RsyncRepo.new(@repositories, @path)
           opts = {}
           opts.merge!({:log => log}) if @config[:verbose]
+          handle_cludes(opts)
           begin
             @repository.clone(opts)
             @installed = true
@@ -311,7 +332,7 @@ module Six
 
       # Process keys
       def keys(force = true)
-        return if self.disabled?
+        return if self.disabled? && !self.force?
         return unless self.installed?
 
         path = File.join(@path, 'store', 'keys.tar')

data/lib/six/updater/options.rb

@@ -54,6 +54,10 @@ module Six
           second_todo << :cleanup if bool
         end
 
+        opts.on("-a", "--afteraction", "Runs user-configurable after-action script") do |bool|
+          general_todo << :afteraction if bool
+        end
+
         opts.on("-s", "--createshortcut", "Creates shortcut to run the game with the mods, in installation folder") do |bool|
           general_todo << :createshortcut if bool
         end

data/lib/six/updater/rsyncrepo.rb

@@ -20,6 +20,18 @@ module Six
         cfg ? cfg[:version] : nil 
       end
 
+      def config=(cnfg)
+        f = File.join(@path, '.rsync', 'config.yml')
+        #cfg = File.exists?(f) ? YAML::load_file(f) : nil
+        File.exists?(f) ? File.open(f, 'w') {|f| f.puts cnfg.to_yaml} : nil 
+      end
+
+      def config
+        f = File.join(@path, '.rsync', 'config.yml')
+        cfg = File.exists?(f) ? YAML::load_file(f) : nil
+        cfg ? cfg : nil 
+      end
+
       def convert(opts = {})
         @repository = Six::Repositories::Rsync.convert(@path, :log => log) 
       end
@@ -42,7 +54,7 @@ module Six
 
       def clone(opts = {})
         done = false
-        opts = {:path => File.dirname(@path), :depth => @depth, :log => log}
+        opts = opts.merge({:path => File.dirname(@path), :depth => @depth, :log => log})
         @repository = Rsync.clone(@repositories, File.basename(@path), opts)
         true
       end
@@ -50,12 +62,10 @@ module Six
       def update(opts = {})
         # 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, 'w') { |file| file.puts cfg.to_yaml }
+        opts[:hosts] = @repositories
 
         # Update!
-        repository.update
+        repository.update(opts)
         true
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: false
   segments: 
   - 0
   - 22
-  - 0
-  version: 0.22.0
+  - 1
+  version: 0.22.1
 platform: x86-mswin32
 authors: 
 - Sickboy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,12 +106,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 3
-        - 4
-        version: 0.3.4
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id006
 description: Your summary here