six-updater-web 0.12.3 → 0.12.4

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.12.3'
+  s.version = '0.12.4'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{bin,spec}/**/*") + Dir.glob("lib/**/*")
   s.require_path = "lib"
   s.bindir = "bin"
-  s.executables = ['six-updater-web']
+  s.executables = ['six-updater-web', 'six-updater-web-rake']
   s.add_dependency('uuidtools', '>= 2.0.0')
   s.add_dependency('six-updater', '>= 0.16.0')
   s.add_dependency('rails', '2.3.5')

data/bin/six-updater-web-rake

@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+# encoding: utf-8
+require 'rake'
+
+begin
+  load '_rake.rb'
+rescue => e
+  puts e.class, e.message, e.backtrace.join("\n")
+  begin
+    require 'fileutils'
+    path = File.join(SixUpdaterWeb::DATA_PATH, 'logs')
+    FileUtils.mkdir_p path unless File.exists?(path)
+    File.open(File.join(path, "six-updater-web-error.log"), 'w') {|f| f.puts e.class, e.message, e.backtrace.join("\n")}
+  rescue
+    puts "ERROR: #{$!}"
+  end
+  sleep 10
+end

data/lib/_rake.rb

@@ -0,0 +1,19 @@
+require 'common'
+
+Dir.chdir(File.dirname(__FILE__)) do
+	load 'Rakefile'
+	#begin
+#	  require 'rake'
+#	rescue LoadError
+#	  require 'rubygems'
+#	  require 'rake'
+#	end
+  #Rake.application.run
+
+  # TODO: This doesn't load the Rails initializer always, thus can be using wrong db or whatever (at least for db:create)
+  arg = ARGV.clone
+  ARGV.clear
+  arg.each do |entry|
+    Rake.application[entry].invoke
+  end
+end

data/lib/common.rb

@@ -0,0 +1,44 @@
+module SixUpdaterWeb
+  DEFAULT_PORT = 16333
+  DEFAULT_IP = '127.0.0.1'
+  OLDLOCATION = if defined?(TAR2RUBYSCRIPT)
+		oldlocation
+	else
+		Dir.pwd
+  end
+  SPECIAL = true
+
+  SIX_ADMIN = true
+end
+
+case RUBY_PLATFORM
+when /-mingw32$/, /-mswin32$/
+	begin
+	  %x[chcp]
+	rescue
+	  puts "WARNING: chcp was not found. If the web-client doesn't start properly, "
+	  puts "Please follow these steps:"
+	  puts
+	  f = File.join(ENV['WINDIR'], 'system32', 'chcp.com').gsub!("/", "\\")
+	  path = SixUpdaterWeb::OLDLOCATION
+	  nf = File.join(path, "tools", "ruby", "bin").gsub!("/", "\\")
+	  puts "Copy #{f} to #{nf}"
+	  puts "And rename the copy to chcp.EXE. Then restart this program"
+	  puts
+	  puts "More info, at: http://dev-heaven.net/wiki/six-arma-updater/Six_Updater_Suite#Known-Issues"
+	  sleep 10
+	end
+end
+
+begin
+  # If env var VERSION exists and is a number, and no VERSION= argument is passed, migration will likely fail.
+  # move original env VERSION value to OS_VERSION, in case it's needed, and reset ENV["VERSION"].
+  if not ARGV.any?{ |arg| /^VERSION=/i.match(arg) }
+    ENV["OS_VERSION"] = ENV["VERSION"]
+    ENV["VERSION"] = nil
+  end
+rescue
+  puts "ERROR: #{$!}"
+end
+
+ENV["RAILS_ENV"] = "production"

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

@@ -10,7 +10,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 
   COMPONENT = "six-updater-web"
   SIX_PORT = 3000 unless defined?(SIX_PORT)
@@ -120,12 +120,13 @@ module SixUpdaterWeb
   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
+      #Six::Dbmanager.migrate_data
+      #Six::Dbmanager.migrate_system
 
       if defined?(SPECIAL)
         case RUBY_PLATFORM
           when /-mingw32$/, /-mswin32$/
+            return unless defined?(OPEN_BROWSER)
             file_to_use = "#{LOCAL_URL}:#{SIX_PORT}/main"
             arguments = nil
             directory = nil

data/lib/init.rb

@@ -1,28 +1,14 @@
 # $stdout, $stderr = # File or String in Memory (any cleanup measures?)
 #require 'RubyGems'
 
-module SixUpdaterWeb
-  DEFAULT_PORT = 16333
-  DEFAULT_IP = '127.0.0.1'
-  OLDLOCATION = if defined?(TAR2RUBYSCRIPT)
-		oldlocation
-	else
-		Dir.pwd
-  end
-  SPECIAL = true
-	
+puts "Starting the web client... please be patient..."
+puts "This window needs to remain running during GUI operations"
+puts ""
 
-  # TODO: TEMPORARY UNTIL GOLDBERG DATAMIGRATIONS ARE VALIDATED
-  SIX_ADMIN = true
-=begin
-  if ARGV.include?("--admin")
-    ARGV =- ["--admin"]
-    true
-  else
-    false
-  end
-=end
+require 'common'
 
+module SixUpdaterWeb
+  OPEN_BROWSER = true
   SIX_PORT = if ARGV.to_s[/--port=([0-9]*)|-p/]
       $1
   else
@@ -35,40 +21,13 @@ module SixUpdaterWeb
   end
 end
 
-puts "Starting the web client... please be patient..."
-puts "This window needs to remain running during GUI operations"
-
-case RUBY_PLATFORM
-when /-mingw32$/, /-mswin32$/
-	begin
-	  %x[chcp]
-	rescue
-	  puts "WARNING: chcp was not found. If the web-client doesn't start properly, "
-	  puts "Please follow these steps:"
-	  puts
-	  f = File.join(ENV['WINDIR'], 'system32', 'chcp.com').gsub!("/", "\\")
-	  path = SixUpdaterWeb::OLDLOCATION
-	  nf = File.join(path, "tools", "ruby", "bin").gsub!("/", "\\")
-	  puts "Copy #{f} to #{nf}"
-	  puts "And rename the copy to chcp.EXE. Then restart this program"
-	  puts
-	  puts "More info, at: http://dev-heaven.net/wiki/six-arma-updater/Six_Updater_Suite#Known-Issues"
-	  sleep 10
-	end
-end
+puts "Checking for required Database migrations..."
 
-begin
-  # If env var VERSION exists and is a number, and no VERSION= argument is passed, migration will likely fail.
-  # move original env VERSION value to OS_VERSION, in case it's needed, and reset ENV["VERSION"].
-  if not ARGV.any?{ |arg| /^VERSION=/i.match(arg) }
-    ENV["OS_VERSION"] = ENV["VERSION"]
-    ENV["VERSION"] = nil
-  end
-rescue
-  puts "ERROR: #{$!}"
+Dir.chdir(File.dirname(__FILE__)) do
+  system "ruby -rubygems \"_rake.rb\" db:migrate" #  goldberg:migrate
 end
 
-ENV["RAILS_ENV"] = "production"
+puts ""
 
 # Kick off Rails
 load 'script/server'	

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 3
-  version: 0.12.3
+  - 4
+  version: 0.12.4
 platform: ruby
 authors: 
 - Sickboy
@@ -91,6 +91,7 @@ description: Your summary here
 email: sb@dev-heaven.net
 executables: 
 - six-updater-web
+- six-updater-web-rake
 extensions: []
 
 extra_rdoc_files: []
@@ -100,6 +101,7 @@ files:
 - README
 - Rakefile
 - bin/six-updater-web
+- bin/six-updater-web-rake
 - lib/app/controllers/actions_controller.rb
 - lib/app/controllers/application_controller.rb
 - lib/app/controllers/appsettings_controller.rb
@@ -156,6 +158,7 @@ files:
 - lib/app/views/mods/imp.haml
 - lib/app/views/Repositories/imp.erb
 - lib/app/views/servers/imp.erb
+- lib/common.rb
 - lib/config/boot.rb
 - lib/config/database.yml
 - lib/config/database.yml.sample
@@ -846,6 +849,7 @@ files:
 - lib/vendor/plugins/six-query/lib/six/query/gamespy_master.rb
 - lib/vendor/plugins/six-query/lib/six/query.rb
 - lib/vendor/plugins/six-query/Rakefile
+- lib/_rake.rb
 has_rdoc: true
 homepage: 
 licenses: []