six-updater-web 0.23.7 → 0.24.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.23.7'
+  s.version = '0.24.0'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -23,6 +23,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('six-updater', '>= 0.22.1')
   s.add_dependency('rails', '2.3.8')
   s.add_dependency('haml', '3.0.10')
+  #s.add_dependency('minitar', '>= 0.5.3')
   s.add_dependency('coderay', '>= 0.9.3')
   s.add_dependency('RedCloth', '>= 4.2.2')
 end

data/lib/six-updater-web/app/controllers/main_controller.rb

@@ -82,26 +82,6 @@ class MainController < ApplicationController
         grab = true
         params["all"] = ""
 
-      when "update_gamespy"
-        gslist_installed = begin
-          %x[gslist -h]
-          $? == 0
-        rescue
-          false
-        end
-
-        if gslist_installed
-          @msg << "<b>A window should open displaying the gamespy progress</b>"
-          if gs_geo
-            @system_setting.update_gamespy #(true)
-          else
-            @system_setting.update_gamespy_nogeo #(true)
-          end
-        else
-          @error << "<b>ERROR: gslist tool is missing!</b>"
-          @error << "Please download from <a href=\"http://six.dev-heaven.net/wagn/Six_Updater_Suite+download+gslist\" target=\"_blank\">Six Updater Wagn</a>, and put in #{SixUpdaterWeb::TOOL_PATH}"
-        end
-
       when "prune_gamespy"
         @msg << "Pruning Gamespy"
         Queryserver.prune
@@ -120,6 +100,7 @@ class MainController < ApplicationController
         @error << "<b>ERROR: Please confirm by checking the checkbox</b>" if !d
     end
 
+    # Handle params
     begin
       preset = Sixconfig.find(@system_setting.favorite_preset)
     rescue
@@ -129,12 +110,6 @@ class MainController < ApplicationController
       end
     end
 
-    begin
-      queryserver = Queryserver.find(@system_setting.favorite_server)
-      #server = Server.find(@system_setting.favorite_server)
-    rescue
-    end
-
     begin
       setting = Appsetting.find(@system_setting.favorite_settings_profile)
     rescue
@@ -146,15 +121,47 @@ class MainController < ApplicationController
     end
 
     preset = fetch_param([:config], Sixconfig, preset)
-    #server = fetch_param([:server], Server, server)
     action = fetch_param([:act], Action, action)
     setting = fetch_param([:setting], Appsetting, setting)
+
+    # Handle gamespy update
+    case params["commit"].downcase
+    when "update_gamespy"
+      gslist_installed = begin
+        %x[gslist -h]
+        $? == 0
+      rescue
+        false
+      end
+
+      if gslist_installed
+        @msg << "<b>A window should open displaying the gamespy progress</b>"
+        if gs_geo
+          @system_setting.update_gamespy(setting) #(true)
+        else
+          @system_setting.update_gamespy_nogeo(setting) #(true)
+        end
+      else
+        @error << "<b>ERROR: gslist tool is missing!</b>"
+        @error << "Please download from <a href=\"http://six.dev-heaven.net/wagn/Six_Updater_Suite+download+gslist\" target=\"_blank\">Six Updater Wagn</a>, and put in #{SixUpdaterWeb::TOOL_PATH}"
+      end
+    end
+
+    # Handle gamespy server
+    begin
+      queryserver = Queryserver.find(@system_setting.favorite_server)
+      #server = Server.find(@system_setting.favorite_server)
+    rescue
+    end
+
     queryserver = fetch_param([:gamespy], Queryserver, queryserver)
     if queryserver
       @queryserver = queryserver
       server = queryserver.dynamic_server
     end
+    #server = fetch_param([:server], Server, server)
 
+    # Handle settings and favs
     if params[:system]
       @beta = case params[:system][:beta]
         when "default"
@@ -205,18 +212,39 @@ class MainController < ApplicationController
       @system_setting.save
     end
 
-    if grab && params["all"]
-      preset = Sixconfig.new
-      preset.name = "Dynamic"
-      preset.mods += Mod.find(:all)
+    case params["commit"].downcase
+      when "edit preset"
+        redirect_to "/sixconfigs/edit/#{preset.id}"
+        return
+
+      when "edit server"
+        redirect_to "/queryservers/edit/#{queryserver.id}"
+        return
+
+      when "edit action"
+        redirect_to "/actions/edit/#{action.id}"
+        return
+
+      when "edit setting"
+        redirect_to "/appsettings/edit/#{setting.id}"
+        return
+
+      when "edit userconfig"
+        redirect_to "/config/?setting=#{setting.id}"
+        return
     end
 
     if preset
       @status << "Preset: <a href='/sixconfigs/edit/#{preset.id}' title='#{preset.mods.map{|e| e.name}.join(", ")}'>#{preset.name}</a>"
     else
       @status << "No preset selected!"
-      act(setting, preset, action, server)
-      return
+      preset = Sixconfig.new(:name => "Dynamic")
+      #act(setting, preset, action, server)
+      #return
+    end
+
+    if grab && params["all"]
+      preset.mods += Mod.find(:all)
     end
 
     unless params["all"]
@@ -243,20 +271,9 @@ class MainController < ApplicationController
       end
     end
 
-    if action
-      @status << "Override action: <a href='/actions/edit/#{action.id}' title='#{action.tasks.join(",") if action.tasks.is_a?(Array)}'>#{action.name}</a>"
-    else
-      if preset.action
-        action = preset.action
-        @status << "Preset action: #{action.name}"
-      end
-    end
-
-    unless setting
-      setting = Arma2Appsetting.new(:beta => @beta, :server => @server_bool)
-    end
+    setting = Arma2Appsetting.new(:beta => @beta, :server => @server_bool) if setting.nil?
+    @setting_used = setting
 
-    @msg << "Skip status reset!" if reset
     if setting.real_path
       unless File.directory?(setting.real_path)
         @error << "<b>WARNING:</b> ArmA folder not set or non existent: #{setting.real_path}"
@@ -271,62 +288,49 @@ class MainController < ApplicationController
       end
     end
 
-    @procs = setting.processes
-
-    preset.all_mods(server, setting).each do |mod|
-      mod.update_version(setting.real_path) # TODO: this already runs in updater_yml, but there doesn't run if autoskip is disabled
-      if reset && !@autoskip
-        mod.skip = false
-      else
-        mod.update_skip if @autoskip
+    if action
+      @status << "Override action: <a href='/actions/edit/#{action.id}' title='#{action.tasks.join(",") if action.tasks.is_a?(Array)}'>#{action.name}</a>"
+    else
+      if preset.action
+        action = preset.action
+        @status << "Preset action: #{action.name}"
       end
-      mod.save unless mod.new_record?
+    end
 
-      mod.disabled = true if (!mod.exists?(setting) || mod.installed? || mod.class.appset::SPECIFIC) && !mod.version_match?(setting)
-      #mod.skip = true if (mod.exists?(setting) && !mod.has_rsync?(setting))         
-      if mod.special
-        @special << mod
-        next
-      end
-      if mod.disabled
-        @disabled << mod
-        next
-      end
-      if mod.installed? || mod.exists?(setting)
-        if mod.skip
+    @msg << "Skip status reset!" if reset
+
+    # Check for open processes
+    @procs = setting.processes
+
+    # Process all configured mods..    
+    @mods = preset.all_mods(server, setting)
+    @mods.each do |mod|
+      mod.process(setting, reset, @autoskip)
+      case mod.status
+        when :special
+          @special << mod
+        when :disabled
+          @disabled << mod
+        when :skip
           @skip << mod
-        else
+        when :check
           @check << mod
-        end
-      else
-        @install << mod
+        when :install
+          @install << mod
+        else
+          logger.debug "Warning; weird mod status: #{mod.status}"
       end
     end
+    @skip.sort! { |a, b| a.name <=> b.name }
+    @check.sort! { |a, b| a.name <=> b.name }
+    @install.sort! { |a, b| a.name <=> b.name }
+    @disabled.sort! { |a, b| a.name <=> b.name }
 
-    @setting_used = setting
     case params["commit"].downcase
-      when "edit preset"
-        redirect_to "/sixconfigs/edit/#{preset.id}"
-        return
-
-      when "edit server"
-        redirect_to "/queryservers/edit/#{queryserver.id}"
-        return
-
-      when "edit action"
-        redirect_to "/actions/edit/#{action.id}"
-        return
-
-      when "edit setting"
-        redirect_to "/appsettings/edit/#{setting.id}"
-        return
-
-      when "edit userconfig"
-        redirect_to "/config/?setting=#{setting.id}"
-        return
-
       when "server mod check"
         if queryserver
+          queryserver.latest
+          queryserver.save if queryserver.changed?
           @server_check = true
           @signatures = queryserver.signatures
           @allowed, @disallowed, @garbage = *setting.allowance(@signatures)
@@ -335,10 +339,18 @@ class MainController < ApplicationController
         end
 
       when "save"
+        unless queryserver.nil?
+          queryserver.latest
+          queryserver.save if queryserver.changed?
+        end
         preset.output_yml(setting, server)
         @msg << "Saved six-updater.yml!"
 
       when "execute"
+        unless queryserver.nil?
+          queryserver.latest
+          queryserver.save if queryserver.changed?
+        end
         preset.execute(action, setting, server, @autoskip, @inweb)
 
         if @inweb
@@ -354,6 +366,10 @@ class MainController < ApplicationController
         @system_setting.speedtest
         @msg << "<b>A window should open displaying the speedtest progress</b>"          
 
+      when "open armafolder"
+        setting.explore
+        @msg << "Explorer should open"
+
       when "stop game"
         setting.kill!.each { |entry| @msg << "Process killed: #{entry}" }
         sleep 1
@@ -361,11 +377,6 @@ class MainController < ApplicationController
       when "read mods"
         Mod.read_modfolders(setting)
     end
-
-    @skip.sort! { |a, b| a.name <=> b.name }
-    @check.sort! { |a, b| a.name <=> b.name }
-    @install.sort! { |a, b| a.name <=> b.name }
-    @disabled.sort! { |a, b| a.name <=> b.name }
     act(setting, preset, action, server)
   end
 
@@ -379,29 +390,17 @@ class MainController < ApplicationController
     case params["commit"].downcase
       when "rpt"
         lf = setting.logfile
-        if lf.nil?
-          @msg << "No logfile found!"
-        else
-          send_file(lf, {:filename => "#{setting.rpt}_#{Time.now.to_i}.log"})
-        end
+        lf.nil? ? @msg << "No logfile found!" : send_file(lf, {:filename => "#{setting.rpt}_#{Time.now.to_i}.log"})
 
       when "updater"
         f = "six-updater.log"
         lf = File.join(SixUpdaterWeb::DATA_PATH, "logs", f)
-        if File.exists?(lf)
-          send_file(lf, {:filename => "#{f}_#{Time.now.to_i}.log"})
-        else
-          @msg << "No logfile found!"
-        end
+        File.exists?(lf) ? send_file(lf, {:filename => "#{f}_#{Time.now.to_i}.log"}) : @msg << "No logfile found!"
 
       when "updater-web"
         f = "six-updater-web.log"
         lf = File.join(SixUpdaterWeb::DATA_PATH, "logs", f)
-        if File.exists?(lf)
-          send_file(lf, {:filename => "#{f}_#{Time.now.to_i}.log"})
-        else
-          @msg << "No logfile found!"
-        end
+        File.exists?(lf) ? send_file(lf, {:filename => "#{f}_#{Time.now.to_i}.log"}) : @msg << "No logfile found!"
     end
   end
 
@@ -497,12 +496,6 @@ class MainController < ApplicationController
    else
      Appsetting.new
    end
-=begin
-    @preset = preset ? preset : Sixconfig.new
-    @server = server ? server : Queryserver.new
-    @action = action ? action : Action.new
-    @setting = setting ? setting : Arma2Appsetting.new
-=end
   end
 
   def fetch_param(ar, ty, default = nil)
@@ -515,18 +508,15 @@ class MainController < ApplicationController
         break
       end
     end
-    if a
-      if a.empty?
-        return nil
-      else
-        begin
-          return ty.find(a)
-        rescue
-          return default
-        end
-      end
+    return default if a.nil?    
+    if a.empty?
+      return nil
     else
-      return default
+      begin
+        return ty.find(a)
+      rescue
+        return default
+      end
     end
   end
 end

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

@@ -22,6 +22,8 @@ class Appsetting < ActiveRecord::Base
   DEFAULT_MODS_PARAM = "-mod=" # TODO
   DEFAULT_BETA_MODS = ["beta"]
   STATIC_TYPES = []
+  GAMESPY_TYPES = ["arma2pc"]
+  GAME_MIN_VERSIONS = ["1.0"]
 
   # TODO: Auto enumurate from model properties?
   # folders: expansion, common, addons
@@ -94,6 +96,10 @@ class Appsetting < ActiveRecord::Base
     ed
   end
 
+  def explore
+    SixUpdaterWeb.run_program("explorer.exe", SixUpdaterWeb::BASE_PATH, self.real_path)
+  end
+
   def nice_edition
     t = self.edition(false)
     t ? t.label : "ERROR: None detected"

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

@@ -13,4 +13,6 @@ class Arma2OaAppsetting < Arma2Appsetting
 
   FAMILY = Hash.new
   FAMILY["Arma2Oa"] = [[DEFAULT_EXE, DEFAULT_SERVER_EXE, "#{DEFAULT_BETA_EXE_PATH}/#{DEFAULT_BETA_EXE}"], {"Arma2OaCo" => ["addons/"], "Arma2OaSt" => ["!addons/"]}]
+  GAMESPY_TYPES = ["arma2oapc"]
+  GAME_MIN_VERSIONS = ["1.5"]
 end

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

@@ -6,4 +6,6 @@ class Arma2OaCoAppsetting < Arma2OaAppsetting
 # Perhaps look at adding a boolean: specific, so when it is enabled, non of the inherited editions can be used?
 # Since Arma2 standalone addons should work on OaCo, yet you would loose the specific 'arma2standalone only' option
   STATIC_TYPES = [Arma2CaAppsetting]
+  GAMESPY_TYPES = ["arma2oapc", "arma2pc"]
+  GAME_MIN_VERSIONS = ["1.5", "1.0"]
 end

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

@@ -30,6 +30,56 @@ class Mod < ActiveRecord::Base
     Kernel.const_get(self.short+"Appsetting")
   end
 
+  def process(setting, reset, autoskip)
+    self.update_version(setting.real_path) # TODO: this already runs in updater_yml, but there doesn't run if autoskip is disabled
+    if reset && !autoskip
+      self.skip = false
+    else
+      self.update_skip if autoskip
+    end
+    self.save unless self.new_record?
+
+    self.disabled = true if (!self.exists?(setting) || self.installed? || self.class.appset::SPECIFIC) && !self.version_match?(setting)
+    #self.skip = true if (self.exists?(setting) && !self.has_rsync?(setting))
+
+  end
+
+  def uconfig_name
+    self.real_name.sub(/^@/, "")
+  end
+
+  def userconfig(setting = Appsetting.new)
+    # Packs everything that matches Find.find('tests')
+    #File.open('test.tar', 'wb') { |tar| Archive::Tar::Minitar.pack('tests', tar) }
+    # Unpacks 'test.tar' to 'x', creating 'x' if necessary.
+    # Archive::Tar::Minitar.unpack('test.tar', 'x')
+    rpath = self.real_path
+
+    path = File.join(rpath, 'store', 'userconfig.tar')
+    path = File.join(rpath, 'store', 'userconfig') unless File.exists?(path)
+    path = File.join(rpath, 'userconfig') unless File.exists?(path)
+    if File.exists?(path)
+      #f = .clone
+      #f.gsub!('@', '')
+      #uconfig = File.join(setting.real_path, 'userconfig')
+      #uconfigpath = File.join(uconfig, self.uconfig_name)
+      if File.directory? path
+
+      else
+        #Archive::Tar::Minitar.unpack('test.tar', 'x')
+      end
+    end
+  end
+
+  def status
+    return :special if self.special
+    return :disabled if self.disabled
+    if self.installed? || self.exists?(setting)
+      self.skip ? :skip : :check
+    else
+      :install
+    end    
+  end
 
   # arma2 mod: works for all subclasses
   # armaoa mod; works for arma2-oa-st, arma2-oa-

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

@@ -20,38 +20,40 @@ class SystemSetting < ActiveRecord::Base
     SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
   end
 
-  def update_gamespy(internal = false)
+  def update_gamespy(setting = Appsetting.new, internal = false)
     self.gamespied_at = Time.now
     self.save
     ENV['NOGEO'] = nil
     if internal
       SixUpdaterWeb.update_gamespy
     else
-      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']}" # + cl
+      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} GAMESPY_TYPES=#{setting.edition::GAMESPY_TYPES.join(",")}" # + cl
       cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
       SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)      
     end
   end
 
-  def update_gamespy_nogeo(internal = false)
+  def update_gamespy_nogeo(setting = Appsetting.new, internal = false)
     self.gamespied_at = Time.now
     self.save
     ENV['NOGEO'] = "1"
     if internal
       SixUpdaterWeb.update_gamespy
     else
-      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1" # + cl
+      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1 GAMESPY_TYPES=#{setting.edition::GAMESPY_TYPES.join(",")}" # + cl
       cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
       SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
     end
   end
 
   def synchronize
-    begin
-      # TODO: This should be in after_initialize yet there it fails..
-      SixUpdaterWeb.update_site_controllers # Update the list of controllers - give default adminstrator permission to
-    rescue => e
-      logger.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+    if ENV["RAILS_ENV"] == "production" && (RUBY_VERSION > "1.9.1" || RUBY_VERSION < "1.9.1")
+      begin
+        # TODO: This should be in after_initialize yet there it fails..
+        SixUpdaterWeb.update_site_controllers # Update the list of controllers - give default adminstrator permission to
+      rescue => e
+        logger.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+      end
     end
 
     l = []

data/lib/six-updater-web/app/views/active_scaffold_overrides/_list.html.erb

@@ -0,0 +1,50 @@
+<div class="active-scaffold-footer">
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
+  <div class="active-scaffold-pagination">
+    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } unless @page.pager.number_of_pages < 2 %>
+  </div>
+  <br clear="both" /><%# a hack for the Rico Corner problem %>
+</div>
+<table cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <%= render :partial => 'list_column_headings' %>
+    </tr>
+  </thead>
+  <tbody class="messages">
+    <tr>
+      <td colspan="<%= active_scaffold_config.list.columns.length + 1 -%>" class="messages-container">
+        <div id="<%= active_scaffold_messages_id -%>">
+          <%= render :partial => 'messages' %>
+        </div>
+        <%# AST show_actions_column -%>
+        <% if !active_scaffold_config.show_actions_column and active_scaffold_config.list.show_search_reset %>
+        <p class="filtered-message" <%= ' style="display:none;" ' unless @filtered %>>
+          <%# AST link_to_reset_filter -%>
+          <%= @link_to_reset_filter %>
+        </p>
+        <%# AST End -%>
+        <% end %>
+        <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" ' unless @page.items.empty? %>>
+          <%# AST :no_entries -%>
+          <%= as_(:no_entries) %>
+        </p>
+      </td>
+    </tr>
+  </tbody>
+  <tbody class="records" id="<%= active_scaffold_tbody_id %>">
+    <% if !@records.empty? -%>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :dont_show_calculations => true } %>
+    <% end -%>
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?} -%>
+      <%= render :partial => 'list_calculations' %>
+    <% end -%>
+  </tbody>
+</table>
+<div class="active-scaffold-footer">
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
+  <div class="active-scaffold-pagination">
+    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } unless @page.pager.number_of_pages < 2 %>
+  </div>
+  <br clear="both" /><%# a hack for the Rico Corner problem %>
+</div>

data/lib/six-updater-web/app/views/main/_left.haml

@@ -62,6 +62,8 @@
           = submit_tag "Server Mod check"
         %p
           = submit_tag "Speedtest"
+           
+          = submit_tag "Open Armafolder"
       %strong Logs
       - form_tag :action => :fetch do
         %p

data/lib/six-updater-web/app/views/main/_right.haml

@@ -6,6 +6,7 @@
         %br
         = @status.join("<br />")
         %br
+      Total: #{@mods.size} mods.
       Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}.
       Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}.
       %br
@@ -28,28 +29,28 @@
 %table{ :border => 1, :cellpadding => "5", :width => "100%"}
   %tr
     %td
+      - if @install.size > 0
+        %b Not installed (#{@install.size})
+        %br
+        = render :partial => "check", :locals => {:mods => @install}
+        %br
       - if @check.size > 0
         %b To be checked
         %br
         = render :partial => "check", :locals => {:mods => @check}
         %br
-      - if @skip.size > 0
-        %b To be skipped
-        %br
-        = render :partial => "check", :locals => {:mods => @skip}
-        %br
-      - if @install.size > 0
-        %b Not installed
-        %br
-        = render :partial => "check", :locals => {:mods => @install}
-        %br
       - if @special.size > 0
-        %b Special (Hover over modname to see why)
+        %b Special (#{@special.size}) (Hover over modname to see why)
         %br
         = render :partial => "check", :locals => {:mods => @special}
         %br
+      - if @skip.size > 0
+        %b To be skipped (#{@skip.size})
+        %br
+        = render :partial => "check", :locals => {:mods => @skip}
+        %br
       - if @disabled.size > 0
-        %b Disabled
+        %b Disabled (#{@disabled.size})
         %br
         = render :partial => "check", :locals => {:mods => @disabled}
         %br

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

@@ -50,6 +50,8 @@ Rails::Initializer.run do |config|
   config.gem "sqlite3-ruby", :lib => "sqlite3"
   config.gem "haml", :version => "3.0.10"
   config.gem "coderay"
+  #config.gem "minitar"
+  #config.gem "uuidtools"
 
   # config.gem "aws-s3", :lib => "aws/s3"
 
@@ -79,6 +81,8 @@ Rails::Initializer.run do |config|
   # config.i18n.default_locale = :de
 end
 
+#require 'zlib'
+#require 'archive/tar/minitar'
 
 ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.merge!(
   :test => '%m-%d %H:%M:%S',

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

@@ -23,7 +23,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.23.7"
+  VERSION = "0.24.0"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -139,11 +139,12 @@ module SixUpdaterWeb
     puts "Fetching server info..."
     geo = ENV['NOGEO'] || nogeo ? "" : nil
     #geo = ""
+    types = ENV['GAMESPY_TYPES'].split(",")
     puts "Pings and Countries: #{geo.nil?}"
     puts ""
 
     ids = []
-    ["arma2oapc", "arma2pc"].each do |game|
+    types.each do |game|
       q = Six::Query::GamespyMaster.new(geo, game)
       h = q.process
       puts ""

data/lib/six-updater-web/vendor/plugins/active_scaffold/lib/active_scaffold/generators/active_scaffold/templates/helper.rb

@@ -1,2 +1,2 @@
-module <%= controller_class_name -%>Helper
+eval("module #{controller_class_name}Helper")
 end

data/lib/six-updater-web/vendor/plugins/six-query/lib/six/query/gamespy_master.rb

@@ -45,7 +45,7 @@ module Six
           ip, port, content = $1, $2, $3
           content = content.split("\\")
           content << "" unless (content.size % 2 == 0)
-          i = 0;
+          i = 0
           content.map! do |e|
             i += 1
             i % 2 == 0 ? e : clean(e)
@@ -59,11 +59,7 @@ module Six
             e[:port] = port
             @list[addr] = e
           end
-          if e[:gamedata]
-            e[:gamedata].merge!(Hash[*content])
-          else
-            e[:gamedata] = Hash[*content]
-          end
+          e[:gamedata] ? e[:gamedata].merge!(Hash[*content]) : e[:gamedata] = Hash[*content]
         end
         @list
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 23
-  - 7
-  version: 0.23.7
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +02:00
+date: 2010-07-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -180,6 +180,7 @@ files:
 - lib/six-updater-web/app/models/server.rb
 - lib/six-updater-web/app/models/sixconfig.rb
 - lib/six-updater-web/app/models/system_setting.rb
+- lib/six-updater-web/app/views/active_scaffold_overrides/_list.html.erb
 - lib/six-updater-web/app/views/appsettings/manage.erb
 - lib/six-updater-web/app/views/config/edit.haml
 - lib/six-updater-web/app/views/config/index.haml