six-updater 0.22.1-x86-mingw32 → 0.22.3-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.22.1'
+  s.version = '0.22.3'
   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.22.1'
+  s.version = '0.22.3'
   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.22.1'
+  s.version = '0.22.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

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.22.1'
+    VERSION = '0.22.3'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       
@@ -321,7 +321,7 @@ module Six
       end                                                
       log.debug "@config #{@config}"
 
-      @procs = find_process(process_name, @config[:app_path])
+      @procs = find_process(process_name, full_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
@@ -380,6 +380,11 @@ module Six
       end
     end
 
+    def full_path
+      File.dirname(File.join(@config[:app_path], @config[:app_exe])).gsub("\\", "/")
+    end
+
+
     def beta_msg
       if @beta_exe && !@beta
         log.warn "WARNING: You do not seem to be running the 'beta' modfolder, but have selected 'beta/arma2.exe'"
@@ -415,6 +420,7 @@ module Six
                 reg = /([0-9]*)$/
                 line[reg]
                 pid = $1
+                next if pid.nil?
                 line.sub!(reg, "")
                 line.strip!
                 line[/^([\w ]*\.\w*)[ ]*(.*)/]
@@ -423,15 +429,13 @@ module Six
 
                 case image.downcase
                   when name.downcase
+                    pid = pid.to_i
+                    next unless pid > 0
                     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
+                    if File.join(path, name).gsub("/", "\\").downcase == full.downcase
                       pids << pid
                     end
                 end
@@ -500,13 +504,15 @@ module Six
     end
 
     def startgame(cmd = nil)
-      log.info "Starting the game with #{@config[:app_params]} -mod=#{@mods}#{cmd}"
+      log.info "Starting the game #{@config[:app_exe]} from #{@config[:app_path]}"
+      log.info "#{@config[:app_params]} -mod=#{@mods}#{cmd}"
+
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
           begin
             struct = Process.create(
               :app_name         => File.join(@config[:app_path], @config[:app_exe]),
-              :command_line     => " #{@config[:app_params]} -mod=#{@mods}#{cmd}",
+              :command_line     => " #{@config[:app_params]} \"-mod=#{@mods}#{cmd}\"",
               :creation_flags   => Process::DETACHED_PROCESS,
               :process_inherit  => false,
               :thread_inherit   => false,
@@ -520,7 +526,7 @@ module Six
           end
         else
           Dir.chdir(@config[:app_path]) do
-            system "#{@config[:app_exe]} #{@config[:app_params]} -mod=#{@mods}#{cmd}"
+            system "#{@config[:app_exe]} #{@config[:app_params]} \"-mod=#{@mods}#{cmd}\""
           end
       end
     end
@@ -544,7 +550,7 @@ module Six
               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}"
+              shortcut.arguments = "#{@config[:app_params]} \"-mod=#{mods2}\""
             end
             log.info "Created shortcut (in #{path}): #{name}"
           rescue => e

data/lib/six/updater/mod.rb

@@ -341,6 +341,11 @@ module Six
         if File.exists?(path)
           log.info "Found keys, processing..."
           k_path = File.join(@config[:app_path], 'keys')
+          FileUtils.mkdir_p(k_path) unless File.exists(k_path)
+          unless File.directory?(k_path)
+            log.warn "WARNING: Keys folder not existing (or is file), aborting"
+            return
+          end
           if File.directory? path
             Dir[File.join(path, '*.bikey')].each do |key|
               path, file = File.dirname(key), File.basename(key)
@@ -385,6 +390,10 @@ module Six
           FileUtils::mv(uconfigpath, "#{uconfigpath}_#{time}") if File.exists?(uconfigpath)
           if File.directory? path
             FileUtils::mkdir_p uconfig unless File.exists?(uconfig)
+            unless File.directory?(uconfig)
+              log.warn "WARNING: Userconfig folder not existing (or is file), aborting"
+              return
+            end
             FileUtils::cp_r(path, uconfigpath)
           else
             unpack(path, @config[:app_path])

data/lib/six/updater/rsyncrepo.rb

@@ -60,8 +60,8 @@ module Six
       end
 
       def update(opts = {})
-        # Update the config file with our hosts list
-        file = File.join(@path, '.rsync/config.yml')
+       # # Update the config file with our hosts list
+        #file = File.join(@path, '.rsync/config.yml')
         opts[:hosts] = @repositories
 
         # Update!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 65
   prerelease: false
   segments: 
   - 0
   - 22
-  - 1
-  version: 0.22.1
+  - 3
+  version: 0.22.3
 platform: x86-mingw32
 authors: 
 - Sickboy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency