six-updater 0.21.3-x86-mswin32 → 0.22.0-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.21.3'
+  s.version = '0.22.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -36,7 +36,7 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.21.3'
+  s.version = '0.22.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -58,7 +58,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.21.3'
+  s.version = '0.22.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/updater-app.rb

@@ -55,6 +55,11 @@ module Six
       File.open(PID_FILE, 'w') {|f| f.puts Process.pid}
 
       initialize
+
+      puts
+      log.info "Preprocessing:"
+      @pre_todo.each { |t| Six::Updater.send t }
+
       mods = []
       puts
       log.info "Processing:"

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.21.3'
+    VERSION = '0.22.0'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       
@@ -321,9 +321,9 @@ module Six
       end                                                
       log.debug "@config #{@config}"
 
-      procs = find_process(process_name)
-      unless procs.empty?
-        log.warn "WARNING: Found open arma processes! #{@config[:app_exe]}, PIDs: #{procs}, you might want to abort and close them!"
+      @procs = find_process(process_name, @config[:app_path])
+      unless @procs.empty?
+        log.warn "WARNING: Found open arma processes! #{@config[:app_exe]}, PIDs: #{@procs}, you might want to abort and close them!"
       end
 
       # PreProcess the config data
@@ -401,13 +401,42 @@ module Six
       STDIN.gets
     end
 
-    def find_process(name)
+    def find_process(name, path)
       # TODO: Filter for process's folder.
 
       pids = []
       begin
         case RUBY_PLATFORM
           when /-mingw32$/, /-mswin32$/
+            %x[WMIC PROCESS get Caption,ExecutablePath,ProcessId].each_line do |l| #Commandline
+                line = l.clone
+                line.chomp!
+                line.strip!
+                reg = /([0-9]*)$/
+                line[reg]
+                pid = $1
+                line.sub!(reg, "")
+                line.strip!
+                line[/^([\w ]*\.\w*)[ ]*(.*)/]
+                image, full = $1, $2
+                next if image.nil?
+
+                case image.downcase
+                  when name.downcase
+                    unless path && !full.nil?
+                      pid = pid.to_i
+                      next unless pid > 0
+                      pids << pid
+                      next
+                    end
+                    if File.join(path, name).sub("/", "\\").downcase == full.downcase
+                      pid = pid.to_i
+                      next unless pid > 0
+                      pids << pid
+                    end
+                end
+            end
+=begin
             out = %x[tasklist]
             out.split("\n").each do |line|
               if line =~ /\A#{name}[\t| ]*([0-9]*)/
@@ -418,6 +447,7 @@ module Six
                 end
               end
             end
+=end
           else
             %x[ps -A | grep #{name}].split("\n").each do |line|
               unless line[/grep/]
@@ -496,13 +526,17 @@ module Six
               mods2.gsub!('/', '\\')
           end
           name = "Play ArmA2 with #{mods}.lnk"
-          Win32::Shortcut.new(name) do |shortcut|
-            shortcut.description = "Start Arma2 with #{mods2}"
-            shortcut.path = File.join(@config[:app_path], @config[:app_exe])
-            shortcut.working_directory = @config[:app_path]
-            shortcut.arguments = "#{@config[:app_params]} -mod=#{mods2}"
+          begin
+            Win32::Shortcut.new(name) do |shortcut|
+              shortcut.description = "Start Arma2 with #{mods2}"
+              shortcut.path = File.join(@config[:app_path], @config[:app_exe])
+              shortcut.working_directory = @config[:app_path]
+              shortcut.arguments = "#{@config[:app_params]} -mod=#{mods2}"
+            end
+            log.info "Created shortcut (in #{path}): #{name}"
+          rescue => e
+            log.warn "WARNING: Problem while creating shortcut! ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
           end
-          log.info "Created shortcut (in #{path}): #{name}"
           Dir.chdir cwd
         else
           log.warn "Unsupported on current Platform: #{RUBY_PLATFORM}"
@@ -513,6 +547,14 @@ module Six
       shortcut @config[:app_path]
     end
 
+    def kill
+      @procs.each do |p|
+        Process.kill(9, p).each do |kill| #.ProcessId
+          log.debug "Killed: #{kill}"
+        end        
+      end
+    end
+
     def createdesktopshortcut
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/

data/lib/six/updater/options.rb

@@ -7,7 +7,7 @@ module Six
   module Updater
     module_function
     def parse_options
-      todo, general_todo, second_todo = [], [], []
+      todo, general_todo, second_todo, pre_todo = [], [], [], []
 
       options = Hash.new
       OptionParser.new do |opts|
@@ -78,6 +78,10 @@ module Six
           options[:force] = bool
         end
 
+        opts.on("-q", "--kill", "Kills the open processes") do |bool|
+          pre_todo << :kill if bool
+        end
+
         opts.on("--mods S", String, "Additional Mods") do |s|
           options[:mods] = s
         end
@@ -87,7 +91,7 @@ module Six
         end
       end.parse!
 
-      default = if (todo + second_todo + general_todo).size > 0
+      default = if (todo + second_todo + general_todo + pre_todo).size > 0
         false
       else
         true
@@ -105,6 +109,8 @@ module Six
           []
         end
       end
+
+      @pre_todo = pre_todo
       @general_todo = if general_todo.size > 0
         general_todo
       else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 71
   prerelease: false
   segments: 
   - 0
-  - 21
-  - 3
-  version: 0.21.3
+  - 22
+  - 0
+  version: 0.22.0
 platform: x86-mswin32
 authors: 
 - Sickboy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency