six-updater-web 0.14.7 → 0.14.8

data/Rakefile

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

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

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.14.7"
+  VERSION = "0.14.8"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

data/lib/six-updater-web/db/migrate/20090826185820_create_repositories.rb

@@ -6,7 +6,7 @@ class CreateRepositories < ActiveRecord::Migration
     create_table :repositories do |t|
       t.string :url
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
     six_join(FIELDS, :up)
   end

data/lib/six-updater-web/db/migrate/20090826185836_create_mods.rb

@@ -5,7 +5,7 @@ class CreateMods < ActiveRecord::Migration
     create_table :mods do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
 
     # generate the join tables

data/lib/six-updater-web/db/migrate/20090826185847_create_servers.rb

@@ -8,7 +8,7 @@ class CreateServers < ActiveRecord::Migration
       t.integer :port
       t.string :password
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
 
     # generate the join tables

data/lib/six-updater-web/db/migrate/20090826185930_create_appsettings.rb

@@ -9,7 +9,7 @@ class CreateAppsettings < ActiveRecord::Migration
       t.string :exe
       t.string :params
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
     six_join(["appsetting", "sixconfig"])
   end

data/lib/six-updater-web/db/migrate/20090826190008_create_sixconfigs.rb

@@ -6,7 +6,7 @@ class CreateSixconfigs < ActiveRecord::Migration
       t.integer :current_setting_id
       t.integer :current_server_id
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
   end
 

data/lib/six-updater-web/db/migrate/20090829165545_create_actions.rb

@@ -6,7 +6,7 @@ class CreateActions < ActiveRecord::Migration
       t.string :name
       t.text :tasks
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
     six_join(["action", "sixconfig"])
   end

data/lib/six-updater-web/db/migrate/20090916174120_create_logs.rb

@@ -4,7 +4,7 @@ class CreateLogs < ActiveRecord::Migration
       t.text :content
       t.integer :logsession_id
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
   end
 

data/lib/six-updater-web/db/migrate/20090916174333_create_logsessions.rb

@@ -3,7 +3,7 @@ class CreateLogsessions < ActiveRecord::Migration
     create_table :logsessions do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
   end
 

data/lib/six-updater-web/db/migrate/20090921092253_create_sessions.rb

@@ -3,7 +3,7 @@ class CreateSessions < ActiveRecord::Migration
     create_table :sessions do |t|
       t.string :session_id, :null => false
       t.text :data
-      t.timestamps
+      t.timestamps :lock_version => false
     end
 
     add_index :sessions, :session_id

data/lib/six-updater-web/db/migrate/20090928163554_create_system_settings.rb

@@ -4,7 +4,7 @@ class CreateSystemSettings < ActiveRecord::Migration
       t.string :server_username
       t.string :server_password
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
   end
 

data/lib/six-updater-web/db/migrate/20100327164004_create_queryservers.rb

@@ -8,7 +8,7 @@ class CreateQueryservers < ActiveRecord::Migration
       t.text :content, :limit => 1024*1024
       t.integer :failures, :default => 0
 
-      t.timestamps
+      t.timestamps :lock_version => false
     end
   end
 

data/lib/six-updater-web/db/migrate/20100425121901_create_networks.rb

@@ -10,7 +10,7 @@ class CreateNetworks < ActiveRecord::Migration
       t.boolean :disabled
       t.integer :priority
 
-      t.timestamps :deleted_at => false, :lock_version => false
+      t.timestamps :lock_version => false
     end
     six_join(["mod", "network"], :up, true)
     add_column :repositories, :network_id, :string, :limit => 36

data/lib/six-updater-web/db/schema.rb

@@ -210,7 +210,6 @@ ActiveRecord::Schema.define(:version => 20100425143140) do
     t.boolean  "disabled"
     t.integer  "priority"
     t.datetime "created_at"
-    t.datetime "deleted_at"
     t.datetime "updated_at"
   end
 
@@ -223,7 +222,7 @@ ActiveRecord::Schema.define(:version => 20100425143140) do
     t.string   "name"
     t.string   "ip"
     t.integer  "port"
-    t.integer  "failures"
+    t.integer  "failures",                            :default => 0
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "mod",              :limit => 1048576

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

@@ -8,17 +8,23 @@ module SixUpdaterWeb
 
   OPEN_BROWSER = true
 
-  argvs = ARGV.to_s
-
-  SIX_HOST = if argvs[/--bindi?n?g?=([0-9\.]+)/] || argvs[/-b *([0-9\.]+)/]
-    $1
+  # Process commandline args to setup host and port
+  argvs = ARGV.join(" ")
+  SIX_HOST = case argvs
+    when /-b *(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+      $1
+    when /--bindi?n?g?=(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+      $1
   else
     ARGV << "--binding=#{DEFAULT_IP}"
     DEFAULT_IP
   end
 
-  SIX_PORT = if argvs[/--port=([0-9]+)/] || argvs[/-p *([0-9]+)/]
-    $1
+  SIX_PORT = case argvs
+    when /--port=([0-9]+)/
+      $1
+    when /-p *([0-9]+)/
+      $1
   else
     ARGV << "--port=#{DEFAULT_PORT}"
     DEFAULT_PORT
@@ -37,10 +43,12 @@ module SixUpdaterWeb
       puts "Database Missing, creating and loading default schema and system data..."
       File.open(db, 'w') {|f| }
       Dir.chdir(File.dirname(__FILE__)) do
-        system "ruby -rubygems \"_rake.rb\" db:schema:load sync:system"
+        system "ruby -rubygems \"_rake.rb\" db:migrate goldberg:migrate db:schema:dump sync:system"
       end
       #FileUtils.cp(File.join(BASE_PATH, "db", "production.sqlite3"), db)
+      return true
     end
+    false
   end
 end
 
@@ -52,12 +60,24 @@ puts "This window needs to remain running during GUI operations"
 puts ""
 
 #if defined?(SixUpdaterWeb::OLDLOCATION)
-SixUpdaterWeb.prepare_data_path
+done = SixUpdaterWeb.prepare_data_path
 #end
 
-puts "Checking for required Database migrations..."
-Dir.chdir(File.dirname(__FILE__)) do
-  system "ruby -rubygems \"_rake.rb\" db:migrate" #  goldberg:migrate
+unless done
+=begin
+# Fix older db's. TODO: convert into code 
+  begin
+    if "SELECT * FROM plugin_schema_migrations WHERE plugin_name = 'goldberg'"
+      [1, 2, 3, 4].each {|i| "INSERT INTO plugin_schema_migrations VALUES('goldberg', '#{i}')" }
+    end
+  rescue => e
+    puts "Something went wrong processing plugin_schema_migrations. #{e.class} #{e.message}: #{e.backtrace.join("\n")}"
+  end
+=end
+  puts "Checking for required Database migrations..."
+  Dir.chdir(File.dirname(__FILE__)) do
+    system "ruby -rubygems \"_rake.rb\" db:migrate"
+  end
 end
 
 # Check for required data updates?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 7
-  version: 0.14.7
+  - 8
+  version: 0.14.8
 platform: ruby
 authors: 
 - Sickboy