six-updater-web 0.12.6 → 0.12.7

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.12.6'
+  s.version = '0.12.7'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/app/controllers/main_controller.rb

@@ -2,7 +2,7 @@ class MainController < ApplicationController
   def index
     @msg = []
     @skip, @install, @check, @disabled = [], [], [], []
-    preset, server, action, setting, reset, ok = nil, nil, nil, nil, false, true
+    preset, queryserver, server, action, setting, reset, ok = nil, nil, nil, nil, nil, false, true
     grab = false
     save_fav = true
 
@@ -115,7 +115,8 @@ class MainController < ApplicationController
     end
 
     begin
-      server = Server.find(@system_setting.favorite_server)
+      queryserver = Queryserver.find(@system_setting.favorite_server)
+      #server = Server.find(@system_setting.favorite_server)
     rescue
     end
 
@@ -130,10 +131,10 @@ class MainController < ApplicationController
     end
 
     preset = fetch_param([:config], Sixconfig, preset)
-    server = fetch_param([:server], Server, server)
+    #server = fetch_param([:server], Server, server)
     action = fetch_param([:act], Action, action)
     setting = fetch_param([:setting], Appsetting, setting)
-    queryserver = fetch_param([:gamespy], Queryserver, nil)
+    queryserver = fetch_param([:gamespy], Queryserver, queryserver)
     if queryserver
       @queryserver = queryserver.id
       server = queryserver.dynamic_server
@@ -145,8 +146,8 @@ class MainController < ApplicationController
     end
 
     if save_fav
-      @system_setting.favorite_server = if server
-        server.id unless server.new_record?
+      @system_setting.favorite_server = if queryserver #server
+        queryserver.id unless queryserver.new_record?
       else
         nil
       end

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

@@ -9,8 +9,17 @@ case RUBY_PLATFORM
 end
 require 'open3'
 
+case RUBY_VERSION
+  when /1\.8\.[0-9]/
+    class Array
+      def to_s
+        "[#{self.join(', ')}]"
+      end
+    end
+end
+
 module SixUpdaterWeb
-  VERSION = "0.12.6"
+  VERSION = "0.12.7"
 
   COMPONENT = "six-updater-web"
   SIX_PORT = 3000 unless defined?(SIX_PORT)
@@ -56,11 +65,12 @@ module SixUpdaterWeb
   #    end
   #end
 
+  rpath, distro = nil, nil
   case RUBY_PLATFORM
     when /-mingw32$/, /-mswin32$/
       TEMP_PATH = if ENV['TEMP']
         if ENV['TEMP'].size > 0
-          File.directory?(ENV['TEMP']) ? ENV['TEMP'].clone : BASE_PATH
+          File.directory?(ENV['TEMP']) ? "#{ENV['TEMP']}" : BASE_PATH
         else
           BASE_PATH
         end
@@ -79,35 +89,33 @@ module SixUpdaterWeb
       tpath.gsub!('/', '\\')
       ENV['PATH'] = "" unless ENV['PATH']
       ENV['PATH'] = "#{tpath};#{ENV['PATH']}" unless ENV['PATH'].include?(tpath)
-    else
-      HOME_PATH = ENV['HOME']
-      TEMP_PATH = '/tmp'
-  end
-  DATA_PATH = File.join(File.exists?(File.join(BASE_PATH, "legacy.txt")) ? BASE_PATH : HOME_PATH, "six-updater") # COMPONENT)
 
-  rpath = nil
-  begin
-    rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
-    DISTRO = "STEAM"
-  rescue
-    begin
-      rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
-      DISTRO = "ALT"
-    rescue
       begin
-        rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
-        DISTRO = "STANDARD"
+        rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_STEAM[0])[ARMA2_STEAM[1]]
+        distro = "STEAM"
       rescue
-        DISTRO = nil
+        begin
+          rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2_ALT[0])[ARMA2_ALT[1]]
+          distro = "ALT"
+        rescue
+          begin
+            rpath = Win32::Registry.open(Win32::Registry::HKEY_LOCAL_MACHINE, ARMA2[0])[ARMA2[1]]
+            distro = "STANDARD"
+          rescue
+          end
+        end
       end
-    end
+    else
+      HOME_PATH = "#{ENV['HOME']}"
+      TEMP_PATH = '/tmp'
   end
-  ARMA_PATH = rpath
+  DATA_PATH = File.join(File.exists?(File.join(BASE_PATH, "legacy.txt")) ? BASE_PATH : HOME_PATH, "six-updater") # COMPONENT)
+  ARMA_PATH, DISTRO = rpath, distro
 
   module_function
 
-  def logger;
-    ActiveRecord::Base.logger;
+  def logger
+    ActiveRecord::Base.logger
   end
 
   def initialize(config)
@@ -116,31 +124,42 @@ module SixUpdaterWeb
     end
   end
 
+  def prepare_data_path
+    # Arrange appdata!
+    lf = File.join(DATA_PATH, "logs")
+    FileUtils.mkdir_p(lf) unless File.directory?(lf)
+    df = File.join(DATA_PATH, "db")
+    FileUtils.mkdir_p(df) unless File.directory?(df)
+    db = File.join(DATA_PATH, "db", "production.sqlite3")
+    FileUtils.cp(File.join(BASE_PATH, "db", "production.sqlite3"), db) unless File.exists?(db)
+  end
+
+  def print_info
+    puts "Six Updater Web (GUI) #{VERSION}, by Sickboy"
+    puts "BASE: #{BASE_PATH}"
+    puts "DATA: #{DATA_PATH}"
+    puts "ARMA: #{DISTRO} PATH: #{ARMA_PATH}"
+  end
+
   def after_initialize
-    if defined?(OLDLOCATION) #(TAR2RUBYSCRIPT) #|| RUBYSCRIPT2EXE.is_compiling?
-      # Migrate the database to current version if required
-      #Six::Dbmanager.migrate_data
-      #Six::Dbmanager.migrate_system
-
-      if defined?(SPECIAL)
-        case RUBY_PLATFORM
-          when /-mingw32$/, /-mswin32$/
-            return unless defined?(OPEN_BROWSER)
-            #Thread.new() do
-              file_to_use = "#{LOCAL_URL}:#{SIX_PORT}/main"
-              arguments = nil
-              directory = nil
-              operation = "OPEN"
-              show = nil
-             # sleep 3
-              begin
-                shell = WIN32OLE.new('Shell.Application')
-                shell.ShellExecute(file_to_use, arguments, directory, operation, show)
-              rescue
-                #logger.warn "Unable to open browser: #{$!}"
-              end
-            #end
-        end
+    if defined?(OLDLOCATION && SPECIAL) #(TAR2RUBYSCRIPT) #|| RUBYSCRIPT2EXE.is_compiling?
+      case RUBY_PLATFORM
+        when /-mingw32$/, /-mswin32$/
+          return unless defined?(OPEN_BROWSER)
+          #Thread.new() do
+            file_to_use = "#{LOCAL_URL}:#{SIX_PORT}/main"
+            arguments = nil
+            directory = nil
+            operation = "OPEN"
+            show = nil
+           # sleep 3
+            begin
+              shell = WIN32OLE.new('Shell.Application')
+              shell.ShellExecute(file_to_use, arguments, directory, operation, show)
+            rescue
+              #logger.warn "Unable to open browser: #{$!}"
+            end
+          #end
       end
     end
 
@@ -170,6 +189,7 @@ module SixUpdaterWeb
           )
         else
           Dir.chdir(startpath) do
+            # TODO: Properly create seperate process like on windows..
             p = Process.fork do
               logger.info "#{app_path} #{cl}"
               system "#{app_path} #{cl}"
@@ -184,31 +204,11 @@ module SixUpdaterWeb
   end
 end
 
-case RUBY_VERSION
-  when /1\.8\.[0-9]/
-    class Array
-      def to_s
-        "[#{self.join(', ')}]"
-      end
-    end
-end
-
-puts "Six Updater Web (GUI) #{SixUpdaterWeb::VERSION}, by Sickboy"
-puts "BASE: #{SixUpdaterWeb::BASE_PATH}"
-puts "DATA: #{SixUpdaterWeb::DATA_PATH}"
-puts "ARMA: #{SixUpdaterWeb::DISTRO} PATH: #{SixUpdaterWeb::ARMA_PATH}"
+SixUpdaterWeb.print_info
 
 if defined?(SixUpdaterWeb::OLDLOCATION)
-  # Arrange appdata!
-  lf = File.join(SixUpdaterWeb::DATA_PATH, "logs")
-  FileUtils.mkdir_p(lf) unless File.directory?(lf)
-  df = File.join(SixUpdaterWeb::DATA_PATH, "db")
-  FileUtils.mkdir_p(df) unless File.directory?(df)
-  db = File.join(SixUpdaterWeb::DATA_PATH, "db", "production.sqlite3")
-  FileUtils.cp(File.join(SixUpdaterWeb::BASE_PATH, "db", "production.sqlite3"), db) unless File.exists?(db)
-end
+  SixUpdaterWeb.prepare_data_path
 
-if defined?(SixUpdaterWeb::OLDLOCATION)
   module Rails
     class Configuration
       def database_configuration

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 6
-  version: 0.12.6
+  - 7
+  version: 0.12.7
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency