six-updater-web 0.24.4 → 0.24.5

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.24.4'
+  s.version = '0.24.5'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('six-updater', '>= 0.22.1')
   s.add_dependency('sqlite3-ruby', '~> 1.3.1')
   s.add_dependency('rails', '2.3.8')
-  s.add_dependency('haml', '~> 3.0.18')
+  s.add_dependency('haml', '~> 3.0.21')
   #s.add_dependency('minitar', '~> 0.5.3')
   s.add_dependency('coderay', '~> 0.9.3')
   s.add_dependency('RedCloth', '~> 4.2.2')

data/lib/six-updater-web/app/models/appsetting.rb

@@ -25,6 +25,8 @@ class Appsetting < ActiveRecord::Base
   GAMESPY_TYPES = ["arma2pc"]
   GAME_MIN_VERSIONS = ["1.0"]
 
+  MODS = []
+
   # TODO: Auto enumurate from model properties?
   # folders: expansion, common, addons
   # files: arma2.exe, arma2server.exe (-.exe for linux), arma2oa.exe, arma2oaserver.exe, addons/chernarus.pbo
@@ -45,9 +47,7 @@ class Appsetting < ActiveRecord::Base
     end
     hash[:app_path] = self.real_path unless hash[:app_path]
     hash[:app_exe] = self.real_exe unless hash[:app_exe]
-    if self.beta
-      hash[:mods] = self.edition::DEFAULT_BETA_MODS.map{|e| e.gsub("/", "\\")}.join(";")
-    end
+    hash[:mods] = self.modfolders.join(";").gsub("/", "\\")
     hash
   end
 
@@ -299,4 +299,12 @@ class Appsetting < ActiveRecord::Base
       nil
     end
   end
+
+  def modfolders
+    if self.beta
+      self.edition::DEFAULT_BETA_MODS
+    else
+      []
+    end
+  end
 end

data/lib/six-updater-web/app/models/arma2_oa_appsetting.rb

@@ -8,6 +8,7 @@ class Arma2OaAppsetting < Arma2Appsetting
   DEFAULT_SERVER_EXE = "arma2oaserver.exe"
   DEFAULT_SERVER_EXE_PATH = DEFAULT_EXE_PATH
   DEFAULT_BETA_MODS = ["expansion/beta", "expansion/beta/expansion"]
+  MODS = ["Expansion"]
 
   REGKEYS = {"Arma2Oa" => ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2 OA', 'MAIN']}
 

data/lib/six-updater-web/app/models/arma2_oa_co_appsetting.rb

@@ -8,4 +8,18 @@ class Arma2OaCoAppsetting < Arma2OaAppsetting
   STATIC_TYPES = [Arma2CaAppsetting]
   GAMESPY_TYPES = ["arma2oapc", "arma2pc"]
   GAME_MIN_VERSIONS = ["1.5", "1.0"]
-end
+
+  def modfolders
+    v = Appsetting::REGKEYS["Arma2"]
+    @mpath = begin; Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, v[0])[v[1]]; rescue; nil; end
+    m = !File.directory?(File.join(self.class.default_path, 'addons')) && !@mpath.nil? && @mpath != self.class.default_path ? [@mpath] : []
+    if !m.empty?
+      m = m + self.class::MODS
+    end
+    if self.beta
+      m + self.edition::DEFAULT_BETA_MODS
+    else
+      m
+    end
+  end
+end

data/lib/six-updater-web/config/environment.rb

@@ -48,7 +48,7 @@ Rails::Initializer.run do |config|
   # Specify gems that this application depends on and have them installed with rake gems:install
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   config.gem "sqlite3-ruby", :lib => "sqlite3"
-  config.gem "haml", :version => "~> 3.0.18"
+  config.gem "haml", :version => "~> 3.0.21"
   config.gem "coderay"
   #config.gem "minitar"
   #config.gem "uuidtools"

data/lib/six-updater-web/config/six-updater-web.rb

@@ -23,7 +23,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.24.4"
+  VERSION = "0.24.5"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 24
-  - 4
-  version: 0.24.4
+  - 5
+  version: 0.24.5
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +02:00
+date: 2010-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,8 +88,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 18
-        version: 3.0.18
+        - 21
+        version: 3.0.21
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency