six-updater 0.20.0 → 0.21.0

data/Rakefile

@@ -13,13 +13,14 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.platform = "x86-mingw32"
   s.name = 'six-updater'
-  s.version = '0.20.0'
+  s.version = '0.21.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
   s.description = s.summary
   s.author = 'Sickboy'
   s.email = 'sb@dev-heaven.net'
+  #s.add_dependency('faster_require', '>= 0.5.2')
   s.add_dependency('win32-api', '= 1.4.6')
   s.add_dependency('win32-process', '>= 0.6.0')
   s.add_dependency('win32-shortcut', '>= 0.2.3')
@@ -35,13 +36,14 @@ end
 spec3 = Gem::Specification.new do |s|
   s.platform = "x86-mswin32"
   s.name = 'six-updater'
-  s.version = '0.20.0'
+  s.version = '0.21.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
   s.description = s.summary
   s.author = 'Sickboy'
   s.email = 'sb@dev-heaven.net'
+  #s.add_dependency('faster_require', '>= 0.5.2')
   s.add_dependency('win32-api', '= 1.4.6')
   s.add_dependency('win32-process', '>= 0.6.0')
   s.add_dependency('win32-shortcut', '>= 0.2.3')
@@ -56,7 +58,7 @@ end
 
 spec2 = Gem::Specification.new do |s|
   s.name = 'six-updater'
-  s.version = '0.20.0'
+  s.version = '0.21.0'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six/updater.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-
+#begin; require 'faster_require'; rescue LoadError; end if RUBY_PLATFORM =~ /cygwin|mingw|win32/
 require 'yaml'
 require 'fileutils'
 
@@ -39,7 +39,7 @@ end
 module Six
   # TODO: Evaluate if this module should be a class instead?
   module Updater
-    VERSION = '0.20.0'
+    VERSION = '0.21.0'
     COMPONENT = 'six-updater'
     LOG_LIMIT = 9999
                       
@@ -135,7 +135,6 @@ module Six
     # Create config hash with default settings
     @config = Hash.new
     @config[:app_params] = '-noSplash -noFilePatching -showScriptErrors'
-    @config[:app_exe] = 'arma2.exe'
     @config[:depth] = 1
     @config[:folders] = []
     @config[:server] = Hash.new
@@ -236,34 +235,52 @@ module Six
       # Parses CLI Parameters, merges configuration and gets todo list
       parse_options
 
-      # Backwards compatibility
-      @config[:app_path] = @config[:armapath] if @config[:armapath]
-      @config[:app_exe] = @config[:armaexe] if @config[:armaexe]
-      @config[:app_params] = @config[:armaparams] if @config[:armaparams]
-      #@config[:git_path] = @config[:gitpath] if @config[:gitpath]
-
       # Determine arma distribution and location
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
-
-        unless @config[:app_path]
-          begin
-            @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
-            log.info "ArmA 2 Steam Distribution detected"
-          rescue
+          rpath = nil
+          distro = "UNKNOWN"
+          ex = "arma2oa.exe"
+          unless @config[:app_path]
             begin
-              @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
-              log.info "ArmA 2 Alt Distribution detected"
+              rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0] + " OA")[ARMA2_STEAM[1]]
+              distro = "OA STEAM"
             rescue
               begin
-                @config[:app_path] = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
-                log.info "ArmA 2 Standard Distribution detected"
+                rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0] + " OA")[ARMA2_ALT[1]]
+                distro = "OA ALT"
               rescue
-                log.warn "No (known) ArmA 2 Distribution detected"
+                begin
+                  rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0] + " OA")[ARMA2[1]]
+                  distro = "OA STANDARD"
+                rescue
+                  begin
+                    rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
+                    distro = "A2 STEAM"
+                    ex = "arma2.exe"
+                  rescue
+                    begin
+                      rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
+                      distro = "A2 ALT"
+                      ex = "arma2.exe"
+                    rescue
+                      begin
+                        rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
+                        distro = "A2 STANDARD"
+                        ex = "arma2.exe"
+                      rescue
+                      end
+                    end
+                  end
+                end
               end
             end
+            @config[:app_path] = rpath if rpath
+            log.info "#{distro} Distribution detected"
           end
-        end
+          @config[:app_exe] = ex unless @config[:app_exe]
+        else
+          @config[:app_exe] = "arma2oa.exe" unless @config[:app_exe]
       end
 
       # Verify installation folder

data/lib/six/updater/mod.rb

@@ -109,6 +109,8 @@ module Six
 
       # Convert process
       def convert
+        return if self.disabled?
+        return if self.skip?
         if @installed
           log.warn "Already a six-updater repository, not converting."
         else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: six-updater
 version: !ruby/object:Gem::Version 
+  hash: 75
   prerelease: false
   segments: 
   - 0
-  - 20
+  - 21
   - 0
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +02:00
+date: 2010-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
@@ -35,9 +38,11 @@ dependencies:
   name: six-rsync
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
@@ -76,23 +81,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Your summary here