six-updater 0.17.2 → 0.17.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.17.2'
+  s.version = '0.17.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.17.2'
+  s.version = '0.17.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.17.2'
+  s.version = '0.17.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -68,7 +68,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.3.4')
+  s.add_dependency('six-rsync', '>= 0.4.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.rb

@@ -38,9 +38,10 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.17.2'
+    VERSION = '0.17.3'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
+    FOLDER = /(.*)\/(.*)/
                       
     # Configuration
     case RUBY_PLATFORM
@@ -63,7 +64,6 @@ module Six
       p.gsub!('\\', '/')
       p
     end
-    TOOL_PATH = File.join(BASE_PATH, 'tools')
 
     case RUBY_PLATFORM
       when /-mingw32$/, /-mswin32$/
@@ -77,11 +77,16 @@ module Six
           BASE_PATH
         end
         HOME_PATH = File.exists?(File.join(ENV['APPDATA'])) ? File.join(ENV['APPDATA']) : TEMP_PATH
-        bpath = BASE_PATH.clone
-        bpath.gsub!('/', '\\')
-        tpath = "#{File.join(bpath, 'tools')};#{File.join(bpath, 'tools', 'bin')}"
+
+        # TODO: Deprecated; This has moved to the six-updater.rb included in the windows suite
+        # But requires everyone to update to it, unless we do it for them :D
+        path = File.join(BASE_PATH, "tools")
+        rubypath = File.join(path, 'ruby', 'bin')
+        rubypath.gsub!("/", "\\")
+        tpath = "#{path};#{File.join(path, 'bin')};#{rubypath}"
         tpath.gsub!('/', '\\')
-        ENV['PATH'] = "#{bpath};#{tpath};#{ENV['PATH']}"
+        ENV['PATH'] = "" unless ENV['PATH']
+        ENV['PATH'] = "#{tpath};#{ENV['PATH']}" unless ENV['PATH'].include?(tpath)
       else
         HOME_PATH = ENV['HOME']
         TEMP_PATH = '/tmp'
@@ -181,9 +186,13 @@ module Six
       log.info 'Run with --help for help'
       log.warn "WARNING: Please make sure anything ArmA related has been closed / shutdown, incl explorer windows, etc"
       log.debug "BASE_PATH: #{BASE_PATH}"
-      log.debug "TOOL_PATH: #{TOOL_PATH}"
       log.debug "@config #{@config}"
 
+      unless @zip7_installed ||= begin; %x[7z]; $? == 0; rescue; false; end
+        puts "7z command not found"
+        raise StandardError
+      end
+
       # Process the config file
       config = "#{COMPONENT}.yml"
       config = File.join(DATA_PATH, config)
@@ -278,6 +287,11 @@ module Six
       end
       log.debug "@config #{@config}"
 
+      procs = find_process(process_name)
+      unless procs.empty?
+        log.warn "WARNING: Found open arma processes! #{procs}, you might want to abort and close them!"
+      end
+
       # PreProcess the config data
       @mods = []
       @mods << @config[:mods] if @config[:mods]
@@ -334,6 +348,41 @@ module Six
       STDIN.gets
     end
 
+    def find_process(name)
+      # TODO: Filter for process's folder.
+
+      pids = []
+      case RUBY_PLATFORM
+        when /-mingw32$/, /-mswin32$/
+          out = %x[tasklist]
+          out.split("\n").each do |line|
+            if line =~ /\A#{name}[\t| ]*([0-9]*)/
+              pid = $1
+              if pid.size > 0
+                pid = pid.to_i
+                pids << pid
+              end
+            end
+          end
+        else
+          %x[ps -A | grep #{name}].split("\n").each do |line|
+            unless line[/grep/]
+              line[/^\s*([0-9]*)/]
+              pids << $1
+            end
+          end
+      end
+      pids
+    end
+
+    def process_name
+      if @config[:app_exe][FOLDER]
+        $2
+      else
+        @config[:app_exe]
+      end
+    end
+
     def sure?
       log.info "Are you really sure? Please press Enter to continue, or close the application to abort."
       wait

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 17
-  - 2
-  version: 0.17.2
+  - 3
+  version: 0.17.3
 platform: ruby
 authors: 
 - Sickboy
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
         - 4
-        version: 0.3.4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id002
 description: Your summary here