six-updater-web 0.20.5 → 0.20.7

data/Rakefile

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

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

@@ -207,8 +207,8 @@ class MainController < ApplicationController
       if server
         @msg << "Override server: <a href='/queryservers/edit/#{queryserver.id}' title='#{queryserver.mods.map{|e| e.name}.join(", ")}'>#{queryserver.to_label}</a>"
       else
-        if preset.server
-          server = preset.server
+        if preset.get_server
+          server = preset.get_server
           @msg << "Preset server: <a href='/servers/edit/#{server.id}' title='#{server.mods.map{|e| e.name}.join(", ")}'>#{server.to_label}"
         end
       end

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

@@ -6,6 +6,7 @@ class SixconfigsController < ApplicationController
     config.columns = [
       :name,
       :mods,
+      :queryserver,
       :server,
       :appsetting,
       :action,
@@ -22,7 +23,7 @@ class SixconfigsController < ApplicationController
     config.create.columns.exclude :exec
 
 
-    [:mods, :server, :appsetting, :action].each do |c|
+    [:mods, :queryserver, :server, :appsetting, :action].each do |c|
       config.columns[c].form_ui = :record_select
     end
 

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

@@ -14,10 +14,11 @@ class Mod < ActiveRecord::Base
 
 
   def all_dependentmods(mods = [])
+    mods += [self]
     self.mods.each do |mod|
       next if mods.include?(mod)
-      mods << mod
       mods += mod.all_dependentmods(mods)
+      mods << mod
     end
     mods.uniq
   end

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

@@ -10,6 +10,7 @@ class Queryserver < ActiveRecord::Base
   serialize :signatures, Array
 
   has_and_belongs_to_many :mods
+  has_many :sixconfigs
 
   def address
     [self.ip, self.port].join(":")
@@ -107,6 +108,10 @@ class Queryserver < ActiveRecord::Base
     s
   end
 
+  def to_updater_yml
+    self.dynamic_server.to_updater_yml
+  end
+
   def exec2
     ""
   end

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

@@ -1,5 +1,7 @@
 class Sixconfig < ActiveRecord::Base
   has_and_belongs_to_many :mods
+
+  belongs_to :queryserver
   belongs_to :server
   belongs_to :appsetting
   belongs_to :action
@@ -12,13 +14,13 @@ class Sixconfig < ActiveRecord::Base
     end
   end
 
-  def all_mods(srv = self.server)
+  def all_mods(srv = self.get_server)
     m = []
     m += srv.mods if srv
     self.mods.each { |mod| m << mod unless m.include?(mod) }
     m.each {|mod| if (mod.new_record? && !mod.exists?(self.appsetting)); mod.disabled = true; end }
     ms = []
-    m.each {|mod| ms << mod; ms += mod.all_dependentmods} 
+    m.each {|mod| ms += mod.all_dependentmods; ms << mod } 
     ms.uniq
   end
 
@@ -59,6 +61,25 @@ class Sixconfig < ActiveRecord::Base
     end
   end
 
+
+  def get_server
+    if self.queryserver.nil?
+      if self.server.nil?
+        return nil
+      else
+        begin
+          self.server
+        rescue
+        end
+      end
+    else
+      begin
+        self.queryserver
+      rescue
+      end
+    end
+  end
+
   def auto_skip_status(setting_override = false, server_override = nil, force = false)
     setting = if setting_override
       setting_override
@@ -68,7 +89,7 @@ class Sixconfig < ActiveRecord::Base
     srv = if server_override
       server_override
     else
-      self.server
+      self.get_server
     end
 
     setting = Appsetting.new unless setting
@@ -102,7 +123,7 @@ class Sixconfig < ActiveRecord::Base
     srv = if server_override
       server_override
     else
-      self.server
+      self.get_server
     end
 
     setting = Appsetting.new unless setting

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

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

data/lib/six-updater-web/db/migrate/20100715142961_add_queryserver_to_sixconfigs.rb

@@ -0,0 +1,9 @@
+class AddQueryserverToSixconfigs < ActiveRecord::Migration
+  def self.up
+    add_column :sixconfigs, :queryserver_id, :integer
+  end
+
+  def self.down
+    remove_column :sixconfigs, :queryserver_id
+  end
+end

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

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100715142960) do
+ActiveRecord::Schema.define(:version => 20100715142961) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -315,6 +315,7 @@ ActiveRecord::Schema.define(:version => 20100715142960) do
     t.string   "appsetting_id",      :limit => 36
     t.string   "server_id",          :limit => 36
     t.string   "action_id",          :limit => 36
+    t.integer  "queryserver_id"
   end
 
   create_table "system_settings", :force => true do |t|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 20
-  - 5
-  version: 0.20.5
+  - 7
+  version: 0.20.7
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -256,6 +256,7 @@ files:
 - lib/six-updater-web/db/migrate/20100520101655_add_defaults_to_type.rb
 - lib/six-updater-web/db/migrate/20100520101656_add_server_to_appsettings.rb
 - lib/six-updater-web/db/migrate/20100715142960_add_beta_to_system_settings.rb
+- lib/six-updater-web/db/migrate/20100715142961_add_queryserver_to_sixconfigs.rb
 - lib/six-updater-web/db/schema.rb
 - lib/six-updater-web/doc/README_FOR_APP
 - lib/six-updater-web/init.rb