six-updater-web 0.16.0 → 0.16.2

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.16.0'
+  s.version = '0.16.2'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ['six-updater-web', 'six-updater-web-rake', 'six-get']
   s.add_dependency('uuidtools', '>= 2.0.0')
   s.add_dependency('six-updater', '>= 0.17.0')
-  s.add_dependency('rails', '2.3.6')
+  s.add_dependency('rails', '2.3.8')
   s.add_dependency('haml', '>= 2.2.0')
   s.add_dependency('RedCloth', '>= 4.2.2')
 end

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

@@ -81,9 +81,9 @@ class MainController < ApplicationController
         if gslist_installed
           @msg << "Updating Gamespy...This will take a while, please wait until done!<br />"
           if gs_geo
-            @system_setting.update_gamespy
+            @system_setting.update_gamespy #(true)
           else
-            @system_setting.update_gamespy_nogeo
+            @system_setting.update_gamespy_nogeo #(true)
           end
         else
           @msg << "<b>ERROR: gslist tool is missing!</b><br />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}<br />"

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

@@ -14,20 +14,30 @@ class SystemSetting < ActiveRecord::Base
     "rake" # .bat on Windows
   end
 
-  def update_gamespy
+  def update_gamespy(internal = false)
     self.gamespied_at = Time.now
     self.save
-    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']}" # + cl
-    cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
-    SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
+    ENV['NOGEO'] = nil
+    if internal
+      SixUpdaterWeb.update_gamespy
+    else
+      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']}" # + cl
+      cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
+      SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)      
+    end
   end
 
-  def update_gamespy_nogeo
+  def update_gamespy_nogeo(internal = false)
     self.gamespied_at = Time.now
     self.save
-    cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1" # + cl
-    cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
-    SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
+    ENV['NOGEO'] = "1"
+    if internal
+      SixUpdaterWeb.update_gamespy
+    else
+      cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1" # + cl
+      cl += " BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" if defined?(SixUpdaterWeb::OLDLOCATION)
+      SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
+    end
   end
 
   def synchronize

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

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.6' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 class String
   def safe_concat(v)
@@ -12,6 +12,10 @@ end
 # Bootstrap the Rails environment, frameworks, and default configuration
 require_relative 'boot'
 
+if ENV['RAILS_ENV'].nil? || ENV['RAILS_ENV'].empty?
+  ENV['RAILS_ENV'] = Rails.env
+end
+
 require_relative 'six-updater-web'
 
 if defined?(SixUpdaterWeb::OLDLOCATION)
@@ -69,8 +73,6 @@ Rails::Initializer.run do |config|
     SixUpdaterWeb.after_initialize
   end
 
-
-
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.16.0"
+  VERSION = "0.16.2"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -48,12 +48,6 @@ module SixUpdaterWeb
   args = ARGV.join(" ")
   if args[/RAILS_ENV=(\w*)/]
     ENV["RAILS_ENV"] = $1
-  else
-    if ENV['RAILS_ENV']
-      ENV["RAILS_ENV"] = "development" if ENV["RAILS_ENV"].empty?
-    else
-      ENV["RAILS_ENV"] = "development"
-    end    
   end
 
   rpath, distro = nil, nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 16
-  - 0
-  version: 0.16.0
+  - 2
+  version: 0.16.2
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 +02:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,8 +58,8 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 6
-        version: 2.3.6
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -899,7 +899,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Your summary here