six-updater-web 0.13.2 → 0.13.3

data/Rakefile

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

data/lib/app/controllers/main_controller.rb

@@ -111,7 +111,10 @@ class MainController < ApplicationController
     begin
       preset = Sixconfig.find(@system_setting.favorite_preset)
     rescue
-      # preset = Sixconfig.find(:first) # Auto select preset?
+      begin
+        preset = Sixconfig.find(:first) # Auto select preset?
+      rescue
+      end
     end
 
     begin

data/lib/app/models/sixconfig.rb

@@ -13,7 +13,6 @@ class Sixconfig < ActiveRecord::Base
   end
 
   def all_mods(srv = self.server)
-    hash = Hash.new
     m = []
     m += srv.mods if srv
     self.mods.each { |mod| m << mod unless m.include?(mod) }
@@ -91,12 +90,38 @@ class Sixconfig < ActiveRecord::Base
     yml
   end
 
-  def self.path
-    path = SixUpdaterWeb::RUBY_PATH.clone
-    path.gsub!("/", "\\")
+  def to_updater_yml(setting_override = nil, server_override = nil)
+    setting = if setting_override
+      setting_override
+    else
+      self.appsetting
+    end
+
+    srv = if server_override
+      server_override
+    else
+      self.server
+    end
+
+    setting = Appsetting.new unless setting
+    hash = setting.to_updater_yml
+    hash[:folders] = []
+
+    self.all_mods(srv).each do |mod|
+      y = mod.to_updater_yml
+      hash[:folders] << y unless hash[:folders].include?(y)
+    end
+
+    hash[:server] = srv.to_updater_yml if srv
+
+    hash
   end
 
-  def self.app_path
+  def self.backtrace(e, log)
+    log.info "ERROR!!! #{e.class}: #{e.message} #{e.backtrace.join("\n")}"
+  end
+
+  def self.exec
     # Dirty workaround for Windows six-updater.rb inside BASE_PATH will take precedence over ruby\bin\six-updater(.bat)
     case RUBY_PLATFORM
       when /-mingw32$/, /-mswin32$/
@@ -107,79 +132,128 @@ class Sixconfig < ActiveRecord::Base
   end
 
   def self.start_updater(cl)
-    SixUpdaterWeb::run_program(path, app_path, SixUpdaterWeb::BASE_PATH, cl)
+    SixUpdaterWeb.run_program(self.exec, SixUpdaterWeb::BASE_PATH, cl)
+  end
+
+  def self.process_msg(msg, messages, ses, previous_r = nil)
+    entry = nil
+    if msg[/\n$/] #&& ! msg[/.+\r\n$/]
+      # Create new log entry
+      entry = Log.new :logsession_id => ses, :content => msg
+      previous_r = nil
+    else
+      if previous_r
+        # Overwrite previous log entry
+        entry = previous_r
+      else
+        # Create new log entry
+        entry = Log.new :logsession_id => ses
+        previous_r = entry
+      end
+      entry.content = msg
+    end
+    # Add back into messages even when used before, as the content might be changed anyway, but dont add it if still in queue for nect cycle
+    messages << entry unless messages.include?(entry)
+    #p [msg, entry]
+    previous_r
   end
 
-  def self.start_updater_inweb(cl)
-    logger.info "Starting #{self.app_path} with #{cl} from #{SixUpdaterWeb::BASE_PATH}"
-    #$stdout.sync = true
+  # TODO: FIXME, Can't run this in development atm!
+  def self.start_updater_inweb(cli)
+    logger.info "Starting #{exec} with #{cli} from #{SixUpdaterWeb::BASE_PATH}"
+
     ActiveRecord::Base.connection_pool.clear_stale_cached_connections!
-    Thread.new(cl, logger) do |cl, logger|
-      #out = []
+    Thread.new(cli, logger) do |cl, log|
       Dir.chdir SixUpdaterWeb::BASE_PATH do |dir|
-        session = Logsession.new
-        session.save
-        buff2 = []
-        status = Open3.popen3("#{self.app_path} #{cl}") do |io_in, io_out, io_err, waitth|
-          previous = Time.now
-          io_out.each do |buffer|
-            logger.info buffer
-            entry = Log.new
-            entry.logsession = session
-            entry.content = buffer
-            buff2 << entry
-            if Time.now - previous > 2
+        # Setup session
+        ses = Logsession.new
+        ses.save
+        ses = ses.id # Workaround for some issue with throwing around this record, in development mode.
+        messages, buff = [], []
+        found_r, previous_r = nil, nil
+        begin
+          status = Open3.popen3("#{exec} #{cl}") do |io_in, io_out, io_err, waitth|
+            previous = Time.now
+            io_out.sync = true
+            io_out.each_byte do |b|
               begin
-                buff2.each do |e|
-                  e.save
-                  buff2 -= [e]
+                char = b.chr
+                case RUBY_PLATFORM
+                  when /-mingw32$/, /-mswin32$/
+                    if found_r
+                      # Found \r
+                      found_r = false
+                      if ["\n"].include?(char)
+                        # Line ending: Add to buffer, then process it
+                        buff << char
+                        msg = buff.join("")
+                        buff = []
+                        previous_r = process_msg(msg, messages, ses, previous_r)
+                      else
+                        # Other char; Process buffer, then add it to a new buffer
+                        msg = buff.join("")
+                        buff = []
+                        previous_r = process_msg(msg, messages, ses, previous_r)
+                        found_r = true if ["\r"].include?(char)
+                        buff << char
+                      end
+                    else
+                      # Default processing
+                      buff << char
+                      case char
+                        when "\r"
+                          found_r = true
+                        when "\n"
+                          msg = buff.join("")
+                          buff = []
+                          previous_r = process_msg(msg, messages, ses, previous_r)
+                      end
+                    end
+                  else
+                    # Default processing
+                    buff << char
+                    if ["\r","\n"].include?(char)
+                      msg = buff.join("")
+                      buff = []
+                      previous_r = process_msg(msg, messages, ses, previous_r)
+                    end                    
+                end
+              rescue => e
+                backtrace(e, log)
+              end
+              unless messages.empty?
+                # Write the messages buffer to database
+                # only check every 2 seconds
+                if Time.now - previous > 2
+                  previous = Time.now
+                  done = []
+                  begin
+                    messages.uniq.each {|msg| msg.save; done << msg}
+                  rescue => e
+                    backtrace(e, log)
+                  end
+                  messages -= done                  
                 end
-                buff2 = []
-                previous = Time.now
-              rescue
-                logger.warn "Updater Thread Exception Caught"
-                logger.debug "#{$!}"
               end
             end
-            #out << buffer
           end
+        rescue => e
+          backtrace(e, log)
         end
-        begin
-          buff2.each { |e| e.save }
-        rescue
-          logger.warn "Updater Thread Exception Caught"
-          logger.debug "#{$!}"
+
+        # Handle last bits in the buffer
+        process_msg(buff.join(""), messages, ses, previous_r) unless buff.empty?
+
+        unless messages.empty?
+          begin
+            messages.each {|msg| msg.save}
+          rescue => e
+            backtrace(e, log)
+          end
         end
       end
       ActiveRecord::Base.connection_pool.clear_stale_cached_connections!
     end
     sleep 2
   end
-
-  def to_updater_yml(setting_override = nil, server_override = nil)
-    setting = if setting_override
-      setting_override
-    else
-      self.appsetting
-    end
-
-    srv = if server_override
-      server_override
-    else
-      self.server
-    end
-
-    setting = Appsetting.new unless setting
-    hash = setting.to_updater_yml
-    hash[:folders] = []
-
-    self.all_mods(srv).each do |mod|
-      y = mod.to_updater_yml
-      hash[:folders] << y unless hash[:folders].include?(y)
-    end
-
-    hash[:server] = srv.to_updater_yml if srv
-
-    hash
-  end
 end

data/lib/app/models/system_setting.rb

@@ -10,35 +10,24 @@ class SystemSetting < ActiveRecord::Base
     end
   end
 
-  def path
-    path = SixUpdaterWeb::RUBY_PATH.clone
-    path.gsub!("/", "\\")
-  end
-
-  def app_path
-    "rake"
+  def exec
+    "rake" # .bat on Windows
   end
 
   def update_gamespy
     self.gamespied_at = Time.now
     self.save
     cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" # + cl
-    SixUpdaterWeb.run_program(path, app_path, RAILS_ROOT, cl)
+    SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
   end
 
   def update_gamespy_nogeo
     self.gamespied_at = Time.now
     self.save
     cl = "sync:gamespy RAILS_ENV=#{ENV['RAILS_ENV']} NOGEO=1 BASE_PATH=\'#{SixUpdaterWeb::BASE_PATH}\'" # + cl
-    SixUpdaterWeb.run_program(path, app_path, RAILS_ROOT, cl)
+    SixUpdaterWeb.run_program(exec, RAILS_ROOT, cl)
   end
 
-  #system "tools/ruby/bin/ruby tools/ruby/bin/rake sync:gamespy"
-  #path = File.join(SixUpdaterWeb::BASE_PATH, 'tools', "ruby", "bin")
-  #path = File.join("C:", "Ruby", "Bin")
-  #path.gsub!("/", "\\")
-  # \"#{path}\\rake\"
-
   def synchronize
     Six::Network::Panel.setlogger(logger)
     l = []
@@ -61,17 +50,12 @@ class SystemSetting < ActiveRecord::Base
     self.synchronized_at = Time.now
     self.save
     content = nil
-    #begin
-      l = self.synchronize
-      if l.size > 0
-        content = "Synchronized #{l.size} records with server-site!" #l.map {|e| e.to_json}.join(", ")
-      else
-        content = "WARNING: No objects received, possibly issue with connection (timeout?), or server site"
-      end
-   # rescue
-    #  logger.debug "#{$!}"
-    #  content = "ERROR: Failed synchronization: #{$!}"
-    #end
+    l = self.synchronize
+    if l.size > 0
+      content = "Synchronized #{l.size} records with server-site!" #l.map {|e| e.to_json}.join(", ")
+    else
+      content = "WARNING: No objects received, possibly issue with connection (timeout?), or server site"
+    end
     content
   end
 end

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

@@ -19,17 +19,15 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.13.2"
-
+  VERSION = "0.13.3"
   COMPONENT = "six-updater-web"
-  SIX_PORT = 3000 unless defined?(SIX_PORT)
 
-  # Determine by commandline etc. Can actually be done by intepreting argv manually in init
-  #LOCAL_URL = "http://localhost"
-  LOCAL_URL = "http://127.0.0.1"
-  ARMA2 = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']
-  ARMA2_ALT = ['SOFTWARE\\Bohemia Interactive\\ArmA 2', 'InstallPath']
-  ARMA2_STEAM = ['SOFTWARE\\Valve\\Steam\\Common\\ARMA 2', 'InstallPath']
+  DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
+  DEFAULT_PORT = 3000 unless defined?(DEFAULT_PORT)
+
+  SIX_HOST = DEFAULT_IP unless defined?(SIX_HOST)
+  SIX_PORT = DEFAULT_PORT unless defined?(SIX_PORT)
+  LOCAL_URL = "http://#{SIX_HOST == "0.0.0.0" ? DEFAULT_IP : SIX_HOST}:#{SIX_PORT}"
 
   bpath = if ENV['BASE_PATH']
     OLDLOCATION = "#{ENV['BASE_PATH']}" unless defined?(OLDLOCATION)
@@ -43,8 +41,6 @@ module SixUpdaterWeb
   bpath.gsub!("\\", "/")
   BASE_PATH = bpath
   TOOL_PATH = File.join(BASE_PATH, 'tools')
-  RUBY_PATH = File.join(TOOL_PATH, "ruby", "bin")
-  #RUB_PATH = "tools/ruby/bin"
 
   args = ARGV.join(" ")
   if args[/RAILS_ENV=(\w)/]
@@ -57,17 +53,21 @@ module SixUpdaterWeb
     end    
   end
 
-  #case RUBY_VERSION
-  #  when /1\.8\.[0-9]/
-  #    begin
-  #      reg_path = Win32::Registry::HKEY_CURRENT_USER.open("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders")['AppData']
-  #    rescue
-  #    end
-  #end
-
   rpath, distro = nil, nil
   case RUBY_PLATFORM
     when /-mingw32$/, /-mswin32$/
+      ARMA2 = ['SOFTWARE\\Bohemia Interactive Studio\\ArmA 2', 'MAIN']
+      ARMA2_ALT = ['SOFTWARE\\Bohemia Interactive\\ArmA 2', 'InstallPath']
+      ARMA2_STEAM = ['SOFTWARE\\Valve\\Steam\\Common\\ARMA 2', 'InstallPath']
+
+      #case RUBY_VERSION
+      #  when /1\.8\.[0-9]/
+      #    begin
+      #      reg_path = Win32::Registry::HKEY_CURRENT_USER.open("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders")['AppData']
+      #    rescue
+      #    end
+      #end
+
       TEMP_PATH = if ENV['TEMP']
         if ENV['TEMP'].size > 0
           File.directory?(ENV['TEMP']) ? "#{ENV['TEMP']}" : BASE_PATH
@@ -77,6 +77,8 @@ module SixUpdaterWeb
       else
         BASE_PATH
       end
+
+      # Handles non us-ascii characters on Windows; appdata won't exist etc.
       HOME_PATH = File.exists?(File.join(ENV['APPDATA'])) ? File.join(ENV['APPDATA']) : TEMP_PATH
 
       CMD_EXE = File.join(ENV['WINDIR'], 'system32', 'cmd.exe')
@@ -106,7 +108,7 @@ module SixUpdaterWeb
         end
       end
     else
-      HOME_PATH = "#{ENV['HOME']}"
+      HOME_PATH = "#{ENV['HOME']}" # Unfreezes the string
       TEMP_PATH = '/tmp'
   end
   DATA_PATH = File.join(File.exists?(File.join(BASE_PATH, "legacy.txt")) ? BASE_PATH : HOME_PATH, "six-updater") # COMPONENT)
@@ -132,39 +134,43 @@ module SixUpdaterWeb
   end
 
   def after_initialize
-    if defined?(OLDLOCATION && SPECIAL) #(TAR2RUBYSCRIPT) #|| RUBYSCRIPT2EXE.is_compiling?
+    if defined?(OLDLOCATION && SPECIAL)
+      # Update data in tables; nah, rather start warning users on main page?
+      #Six::Dbmanager.check
+
       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
+          Thread.new() do
+            file_to_use = "#{LOCAL_URL}/main"
+            sleep 4
+            system "start #{file_to_use}"
+          end
+=begin
+          arguments = nil
+          directory = nil
+          operation = "OPEN"
+          show = nil
+            #begin
               shell = WIN32OLE.new('Shell.Application')
               shell.ShellExecute(file_to_use, arguments, directory, operation, show)
-            rescue
+            #rescue
               #logger.warn "Unable to open browser: #{$!}"
-            end
-          #end
+            #end
+=end
       end
     end
-
-    #Six::Dbmanager.check
   end
 
-  def run_program(path, app_path, startpath, cl)
+  def run_program(exec, startpath, cl)
     logger.info "Current Path: #{Dir.pwd}, BASE_PATH: #{BASE_PATH}, DATA_PATH: #{DATA_PATH}"
-    logger.info "Starting with #{cl} from #{startpath}" #, with #{path}"
+    logger.info "Starting with #{cl} from #{startpath}"
     # TODO: Cleanup
     startpath = "#{startpath}"
     begin
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
-          cl = "\"#{app_path}\" #{cl}"
+          cl = "\"#{exec}\" #{cl}"
           cl = "/C #{cl}"
           logger.info "#{CMD_EXE} #{cl}"
           struct = Process.create(
@@ -179,10 +185,12 @@ module SixUpdaterWeb
           )
         else
           Dir.chdir(startpath) do
-            # TODO: Properly create seperate process like on windows..
+            # TODO: Properly create seperate process like on windows.. or maybe this is fine just needs 2>&1 >> /dev/null ?
+            # as logfiles deliver the feedback, or rather run integrated. However maybe when running in a desktop environment
+            # maybe it's useful to open a new terminal window/tab ..
             p = Process.fork do
-              logger.info "#{app_path} #{cl}"
-              system "#{app_path} #{cl}"
+              logger.info "#{exec} #{cl}"
+              system "#{exec} #{cl}"
             end
           end
           #logger.info "Unimplemented on current platform: #{RUBY_PLATFORM}"

data/lib/init.rb

@@ -6,16 +6,19 @@ module SixUpdaterWeb
   DEFAULT_IP = '127.0.0.1'
 
   OPEN_BROWSER = true
-  SIX_PORT = if ARGV.to_s[/--port=([0-9]*)|-p/]
+
+  SIX_HOST = if ARGV.to_s[/--bindi?n?g?=([0-9\.]*)/]
     $1
   else
-    ARGV << "--port=#{DEFAULT_PORT}"
-    DEFAULT_PORT
+    ARGV << "--binding=#{DEFAULT_IP}"
+    DEFAULT_IP
   end
 
-  unless ARGV.to_s[/--binding=|-b/]
-    # TODO: SIX_HOST?
-    ARGV << "--binding=#{DEFAULT_IP}"
+  SIX_PORT = if ARGV.to_s[/--port=([0-9]*)/]
+    $1
+  else
+    ARGV << "--port=#{DEFAULT_PORT}"
+    DEFAULT_PORT
   end
 
   module_function
@@ -54,6 +57,8 @@ Dir.chdir(File.dirname(__FILE__)) do
   system "ruby -rubygems \"_rake.rb\" db:migrate" #  goldberg:migrate
 end
 
+# Check for required data updates?
+
 puts ""
 puts "Starting the web client..."
 

data/lib/lib/tasks/sync.rake

@@ -36,6 +36,10 @@ namespace :sync do
   task :data => :environment do
     Six::Dbmanager.reload_data
   end
+
+  task :integrated => :environment do
+    Sixconfig.start_updater_inweb("--install")
+  end
 end
 
 

data/lib/vendor/plugins/six-app_manager/lib/six/appmanager.rb

@@ -90,9 +90,9 @@ module Six
               end
             end
         end
-      rescue
+      rescue => e
         logger.warn "Failed checking tasklist for #{name}"
-        logger.debug "#{$!}"
+        logger.debug "#{e.class}: #{e.message} #{e.backtrace.join("\n")}"
       end
       pids
 =begin

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 13
-  - 2
-  version: 0.13.2
+  - 3
+  version: 0.13.3
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-04-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency