six-updater-web 0.11.2 → 0.12.1

data/Rakefile

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

data/lib/app/controllers/mods_controller.rb

@@ -9,7 +9,7 @@ class ModsController < ApplicationController
       :path,
       :priority,
       :sixconfigs,
-      :servers,
+      :networks,
       :queryservers,
 #      :created_at,
       :updated_at,
@@ -36,7 +36,7 @@ class ModsController < ApplicationController
 #    config.columns[:changelog_link].label = "Changelog"
     config.columns[:queryservers].label = "Gamespy servers"
 
-    [:servers, :queryservers, :sixconfigs].each do |c|
+    [:networks, :servers, :queryservers, :sixconfigs].each do |c|
       config.columns[c].form_ui = :record_select
     end
 

data/lib/app/controllers/networks_controller.rb

@@ -0,0 +1,24 @@
+class NetworksController < ApplicationController
+  record_select :per_page => 10, :search_on => "name", :order_by => "name ASC", :full_text_search => true
+
+  active_scaffold :networks do |config|
+    config = self # Ruby19 compatibility
+    config.list.sorting = { :name => :asc }
+    config.columns = [
+            :name,
+            :homepage,
+            :repositories,
+            :mods,
+            :priority,
+            :disabled,
+            :created_at
+            ]
+    [:disabled, :priority].each do |column| # , :favorite
+      config.columns[column].inplace_edit = true
+    end
+    config.columns[:homepage].label = "NFO"
+    [:mods, :repositories].each do |c|
+      config.columns[c].form_ui = :record_select
+    end
+  end
+end

data/lib/app/controllers/repositories_controller.rb

@@ -1,15 +1,17 @@
 class RepositoriesController < ApplicationController
+  record_select :per_page => 10, :search_on => "url", :order_by => "url ASC", :full_text_search => true
   active_scaffold :repositories do |config|
     config = self # Ruby19 compatibility
     config.columns = [
       :url,
+      :network,
       :updated_at,
-      :disabled,
-      :favorite
+      :priority,
+      :disabled
     ]
     config.action_links.add 'copy', :label => 'Clone', :type => :record, :position => false, :confirm => "Do you really want to *clone* this item?"
     config.list.sorting = { :url => :asc }
-    [:disabled, :favorite].each do |column|
+    [:priority, :disabled].each do |column|
       config.columns[column].inplace_edit = true
     end
   end

data/lib/app/helpers/networks_helper.rb

@@ -0,0 +1,5 @@
+module NetworksHelper
+  def homepage_column(record, b = nil)
+    link_to "nfo", "#{record.homepage}", :target => "_blank"
+  end
+end

data/lib/app/models/mod.rb

@@ -2,6 +2,7 @@ class Mod < ActiveRecord::Base
   has_and_belongs_to_many :sixconfigs
   has_and_belongs_to_many :servers
   has_and_belongs_to_many :queryservers
+  has_and_belongs_to_many :networks
 
   six_guid
 
@@ -54,6 +55,16 @@ class Mod < ActiveRecord::Base
     end
   end
 
+  def all_repositories
+    if self.networks.empty?
+      Repository.find(:all)
+    else
+      repos = []
+      self.networks.each { |net| repos += net.repositories unless net.disabled }
+      repos
+    end
+  end
+
   def update_skip
     self.skip = if self.new_record?; true ; else; ((self.version == self.version_local) && !self.version.nil?); end
   end
@@ -71,10 +82,8 @@ class Mod < ActiveRecord::Base
     name = self.name.downcase
     name.gsub!("@", '')
     unless self.new_record?
-      Repository.find(:all).each do |rep|
-        unless rep.disabled
-          hash[:repository] << "#{rep.to_updater_yml}/rel/#{name}/."
-        end
+      self.all_repositories.each do |rep|
+        hash[:repository] << "#{rep.to_updater_yml}/rel/#{name}/." unless rep.disabled
       end
     end
     hash

data/lib/app/models/network.rb

@@ -0,0 +1,9 @@
+class Network < ActiveRecord::Base
+  six_guid
+  has_and_belongs_to_many :mods
+  has_many :repositories
+
+  def to_label
+    "#{self.name}"
+  end
+end

data/lib/app/models/repository.rb

@@ -1,4 +1,5 @@
 class Repository < ActiveRecord::Base
+  belongs_to :network
   six_guid
 
   def to_label

data/lib/app/models/system_setting.rb

@@ -46,7 +46,7 @@ class SystemSetting < ActiveRecord::Base
       status = Timeout::timeout(TIMEOUT) do
         Six::Network::Panel.login(self.server_username, self.server_password, true)
       end
-      [Mod, Server, Repository, Action, Appsetting, Sixconfig].each do |t|
+      [Network, Mod, Server, Repository, Action, Appsetting, Sixconfig].each do |t|
         l += t.imp
       end
     rescue Timeout::Error

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

@@ -10,7 +10,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.11.2"
+  VERSION = "0.12.1"
 
   COMPONENT = "six-updater-web"
   SIX_PORT = 3000 unless defined?(SIX_PORT)
@@ -83,8 +83,7 @@ module SixUpdaterWeb
       HOME_PATH = ENV['HOME']
       TEMP_PATH = '/tmp'
   end
-  DATA_PATH = File.join(HOME_PATH, "six-updater") # Alt path... , COMPONENT)
-  TOOLDATA_PATH = File.join(RAILS_ROOT, "config")
+  DATA_PATH = File.join(File.exists?(File.join(BASE_PATH, "legacy.txt")) ? BASE_PATH : HOME_PATH, "six-updater") # COMPONENT)
 
   rpath = nil
   begin

data/lib/db/migrate/20100425121901_create_networks.rb

@@ -0,0 +1,24 @@
+class CreateNetworks < ActiveRecord::Migration
+  include Six::Dbmanager::Migrate
+
+  def self.up
+    create_table :networks, :id => false do |t|
+      t.string :id, :limit => 36, :null => false, :primary => true
+
+      t.string :name
+      t.string :homepage
+      t.boolean :disabled
+      t.integer :priority
+
+      t.timestamps :deleted_at => false, :lock_version => false
+    end
+    six_join(["mod", "network"], :up, true)
+    add_column :repositories, :network_id, :string, :limit => 36
+  end
+
+  def self.down
+    drop_table :networks
+    six_join(["mod", "network"], :down)
+    remove_column :repositories, :network_id
+  end
+end

data/lib/db/migrate/20100425143140_change_repositories_column.rb

@@ -0,0 +1,11 @@
+class ChangeRepositoriesColumn < ActiveRecord::Migration
+  def self.up
+    remove_column :repositories, :favorite
+    add_column :repositories, :priority, :integer
+  end
+
+  def self.down
+    remove_column :repositories, :priority
+    add_column :repositories, :favorite, :boolean
+  end
+end

data/lib/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100409114653) do
+ActiveRecord::Schema.define(:version => 20100425143140) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -171,6 +171,14 @@ ActiveRecord::Schema.define(:version => 20100409114653) do
     t.integer  "priority"
   end
 
+  create_table "mods_networks", :id => false, :force => true do |t|
+    t.string "mod_id",     :limit => 36
+    t.string "network_id", :limit => 36
+  end
+
+  add_index "mods_networks", ["mod_id"], :name => "index_mods_networks_on_mod_id"
+  add_index "mods_networks", ["network_id"], :name => "index_mods_networks_on_network_id"
+
   create_table "mods_queryservers", :id => false, :force => true do |t|
     t.string  "mod_id",         :limit => 36
     t.integer "queryserver_id"
@@ -195,6 +203,17 @@ ActiveRecord::Schema.define(:version => 20100409114653) do
   add_index "mods_sixconfigs", ["mod_id"], :name => "index_mods_sixconfigs_on_mod_id"
   add_index "mods_sixconfigs", ["sixconfig_id"], :name => "index_mods_sixconfigs_on_sixconfig_id"
 
+  create_table "networks", :id => false, :force => true do |t|
+    t.string   "id",         :limit => 36, :null => false
+    t.string   "name"
+    t.string   "homepage"
+    t.boolean  "disabled"
+    t.integer  "priority"
+    t.datetime "created_at"
+    t.datetime "deleted_at"
+    t.datetime "updated_at"
+  end
+
   create_table "plugin_schema_migrations", :id => false, :force => true do |t|
     t.string "plugin_name", :null => false
     t.string "version",     :null => false
@@ -236,7 +255,8 @@ ActiveRecord::Schema.define(:version => 20100409114653) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "disabled"
-    t.boolean  "favorite"
+    t.string   "network_id", :limit => 36
+    t.integer  "priority"
   end
 
   create_table "servers", :id => false, :force => true do |t|

data/lib/test/functional/networks_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class NetworksControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/test/unit/helpers/networks_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class NetworksHelperTest < ActionView::TestCase
+end

data/lib/test/unit/network_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class NetworkTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

data/lib/vendor/plugins/six-db_manager/db/goldberg_controller_actions.yml

@@ -175,7 +175,7 @@ goldberg_controller_actions_029:
   url_to_use: ""
 goldberg_controller_actions_030: 
   id: "33"
-  site_controller_id: "19"
+  site_controller_id: "23"
   name: index
   permission_id: 
   url_to_use: ""
@@ -209,3 +209,15 @@ goldberg_controller_actions_035:
   name: reset
   permission_id: 
   url_to_use: ""
+goldberg_controller_actions_036: 
+  id: "39"
+  site_controller_id: "25"
+  name: index
+  permission_id: 
+  url_to_use: ""
+goldberg_controller_actions_037: 
+  id: "40"
+  site_controller_id: "24"
+  name: index
+  permission_id: 
+  url_to_use: ""

data/lib/vendor/plugins/six-db_manager/db/goldberg_menu_items.yml

@@ -1,169 +1,177 @@
 --- 
-goldberg_menu_items_018: 
-  name: Logs
-  label: "\"In Browser\" Logs"
-  controller_action_id: "36"
-  id: "25"
-  parent_id: "28"
-  content_page_id: 
+goldberg_menu_items_001: 
+  id: "1"
+  parent_id: 
+  name: main
+  label: Main
   seq: "1"
+  controller_action_id: "30"
+  content_page_id: 
+goldberg_menu_items_002: 
+  id: "3"
+  parent_id: 
+  name: admin
+  label: Administration
+  seq: "6"
+  controller_action_id: 
+  content_page_id: "9"
+goldberg_menu_items_003: 
+  id: "5"
+  parent_id: "9"
+  name: setup/permissions
+  label: Permissions
+  seq: "3"
+  controller_action_id: "4"
+  content_page_id: 
+goldberg_menu_items_004: 
+  id: "6"
+  parent_id: "9"
+  name: setup/roles
+  label: Roles
+  seq: "2"
+  controller_action_id: "3"
+  content_page_id: 
+goldberg_menu_items_005: 
+  id: "7"
+  parent_id: "9"
+  name: setup/pages
+  label: Content Pages
+  seq: "5"
+  controller_action_id: "8"
+  content_page_id: 
+goldberg_menu_items_006: 
+  id: "8"
+  parent_id: "9"
+  name: setup/controllers
+  label: Controllers / Actions
+  seq: "4"
+  controller_action_id: "9"
+  content_page_id: 
 goldberg_menu_items_007: 
+  id: "9"
+  parent_id: "3"
   name: setup
   label: Setup
+  seq: "1"
   controller_action_id: 
-  id: "9"
-  parent_id: "3"
   content_page_id: "8"
-  seq: "1"
-goldberg_menu_items_020: 
-  name: logs
-  label: Logs
-  controller_action_id: "35"
-  id: "28"
-  parent_id: 
-  content_page_id: 
-  seq: "4"
-goldberg_menu_items_019: 
-  name: Output
-  label: "\"In Browser\" Output"
-  controller_action_id: "37"
-  id: "27"
-  parent_id: "28"
-  content_page_id: 
-  seq: "2"
 goldberg_menu_items_008: 
-  name: setup/menus
-  label: Menu Editor
-  controller_action_id: "11"
   id: "11"
   parent_id: "9"
-  content_page_id: 
+  name: setup/menus
+  label: Menu Editor
   seq: "6"
-goldberg_menu_items_021: 
-  name: help
-  label: Help
-  controller_action_id: 
-  id: "30"
-  parent_id: 
-  content_page_id: "12"
-  seq: "5"
-goldberg_menu_items_010: 
-  name: setup/users
-  label: Users
-  controller_action_id: "15"
-  id: "13"
-  parent_id: "9"
+  controller_action_id: "11"
   content_page_id: 
-  seq: "1"
 goldberg_menu_items_009: 
+  id: "12"
+  parent_id: "9"
   name: setup/system_settings
   label: System Settings
+  seq: "7"
   controller_action_id: "12"
-  id: "12"
+  content_page_id: 
+goldberg_menu_items_010: 
+  id: "13"
   parent_id: "9"
+  name: setup/users
+  label: Users
+  seq: "1"
+  controller_action_id: "15"
   content_page_id: 
-  seq: "7"
 goldberg_menu_items_011: 
+  id: "15"
+  parent_id: 
   name: Configuration
   label: Configuration
+  seq: "3"
   controller_action_id: "38"
-  id: "15"
-  parent_id: 
   content_page_id: 
-  seq: "3"
 goldberg_menu_items_012: 
-  name: Presets
-  label: Presets
-  controller_action_id: "24"
   id: "16"
   parent_id: "15"
-  content_page_id: 
+  name: Presets
+  label: Presets
   seq: "1"
-goldberg_menu_items_001: 
-  name: main
-  label: Main
-  controller_action_id: "30"
-  id: "1"
-  parent_id: 
+  controller_action_id: "24"
   content_page_id: 
-  seq: "1"
 goldberg_menu_items_013: 
+  id: "19"
+  parent_id: "15"
   name: Mods
   label: Mods
+  seq: "3"
   controller_action_id: "31"
-  id: "19"
-  parent_id: "15"
   content_page_id: 
-  seq: "3"
-goldberg_menu_items_002: 
-  name: admin
-  label: Administration
-  controller_action_id: 
-  id: "3"
-  parent_id: 
-  content_page_id: "9"
-  seq: "6"
 goldberg_menu_items_014: 
-  name: Mirrors
-  label: Mirrors
-  controller_action_id: "32"
   id: "20"
   parent_id: "15"
-  content_page_id: 
+  name: Mirrors
+  label: Mirrors
   seq: "6"
-goldberg_menu_items_003: 
-  name: setup/permissions
-  label: Permissions
-  controller_action_id: "4"
-  id: "5"
-  parent_id: "9"
+  controller_action_id: "32"
   content_page_id: 
-  seq: "3"
 goldberg_menu_items_015: 
-  name: Actions
-  label: Actions
-  controller_action_id: "28"
   id: "21"
   parent_id: "15"
-  content_page_id: 
+  name: Actions
+  label: Actions
   seq: "5"
-goldberg_menu_items_004: 
-  name: setup/roles
-  label: Roles
-  controller_action_id: "3"
-  id: "6"
-  parent_id: "9"
+  controller_action_id: "28"
   content_page_id: 
-  seq: "2"
 goldberg_menu_items_016: 
-  name: Servers
-  label: Servers
-  controller_action_id: "33"
   id: "22"
   parent_id: "15"
-  content_page_id: 
+  name: Servers
+  label: Servers
   seq: "4"
-goldberg_menu_items_005: 
-  name: setup/pages
-  label: Content Pages
-  controller_action_id: "8"
-  id: "7"
-  parent_id: "9"
+  controller_action_id: "33"
   content_page_id: 
-  seq: "5"
 goldberg_menu_items_017: 
+  id: "24"
+  parent_id: "15"
   name: Settings
   label: Settings
+  seq: "2"
   controller_action_id: "29"
-  id: "24"
-  parent_id: "15"
   content_page_id: 
+goldberg_menu_items_018: 
+  id: "25"
+  parent_id: "28"
+  name: Logs
+  label: "\"In Browser\" Logs"
+  seq: "1"
+  controller_action_id: "36"
+  content_page_id: 
+goldberg_menu_items_019: 
+  id: "27"
+  parent_id: "28"
+  name: Output
+  label: "\"In Browser\" Output"
   seq: "2"
-goldberg_menu_items_006: 
-  name: setup/controllers
-  label: Controllers / Actions
-  controller_action_id: "9"
-  id: "8"
-  parent_id: "9"
+  controller_action_id: "37"
   content_page_id: 
+goldberg_menu_items_020: 
+  id: "28"
+  parent_id: 
+  name: logs
+  label: Logs
   seq: "4"
+  controller_action_id: "35"
+  content_page_id: 
+goldberg_menu_items_021: 
+  id: "30"
+  parent_id: 
+  name: help
+  label: Help
+  seq: "5"
+  controller_action_id: 
+  content_page_id: "12"
+goldberg_menu_items_022: 
+  id: "31"
+  parent_id: "15"
+  name: Networks
+  label: Networks
+  seq: "7"
+  controller_action_id: "40"
+  content_page_id: 

data/lib/vendor/plugins/six-db_manager/db/goldberg_site_controllers.yml

@@ -104,3 +104,13 @@ goldberg_site_controllers_021:
   name: queryservers
   permission_id: "1"
   builtin: "0"
+goldberg_site_controllers_022: 
+  id: "24"
+  name: networks
+  permission_id: "1"
+  builtin: "0"
+goldberg_site_controllers_023: 
+  id: "25"
+  name: system_settings
+  permission_id: "1"
+  builtin: "0"

data/lib/vendor/plugins/six-db_manager/lib/six/dbmanager.rb

@@ -16,15 +16,20 @@ module Six
       end
 
       module ClassMethods        
-        def six_join(ar, dir = :up)
+        def six_join(ar, dir = :up, uid = false)
           table = "#{ar[0].pluralize}_#{ar[1].pluralize}"
           case dir
             when :down
               drop_table table
             when :up
               create_table table, :id => false do |t|
-                t.column "#{ar[0]}_id", :integer
-                t.column "#{ar[1]}_id", :integer
+                if uid
+                  t.column "#{ar[0]}_id", :string, :limit => 36
+                  t.column "#{ar[1]}_id", :string, :limit => 36
+                else
+                  t.column "#{ar[0]}_id", :integer
+                  t.column "#{ar[1]}_id", :integer
+                end
               end
               add_index table, "#{ar[0]}_id"
               add_index table, "#{ar[1]}_id"

data/lib/vendor/plugins/six-query/lib/six/query/gamespy_master.rb

@@ -5,6 +5,7 @@ module Six
                 :mod, :signatures, :verifysignatures, :gamestate, :dedicated, :platform, :sv_battleeye, :language, :difficulty]
 
       LINUX, WIN = "\\\\", "\\" # TODO: Autodetect?
+      GEOIP_PATH = File.join(RAILS_ROOT, "config")
 
       def initialize(geo = nil)
         @list = Hash.new
@@ -17,12 +18,12 @@ module Six
 
       def read
         geo = @geo ? @geo : "-Q 8 "
-        unless File.exists?(File.join(SixUpdaterWeb::TOOLDATA_PATH, "GeoIP.dat"))
+        unless File.exists?(File.join(GEOIP_PATH, "GeoIP.dat"))
           puts
-          puts "Warning: GeoIP.dat database missing. Can't parse countries. #{SixUpdaterWeb::TOOLDATA_PATH}"
+          puts "Warning: GeoIP.dat database missing. Can't parse countries. #{GEOIP_PATH}"
           geo = nil
         end
-        reply = %x[gslist -p "#{SixUpdaterWeb::TOOLDATA_PATH.gsub("/", "\\")}" -n arma2pc #{geo}-X #{PARAMS.clone.map{|e| "#{WIN}#{e}"}.join("")}]
+        reply = %x[gslist -p "#{GEOIP_PATH.gsub("/", "\\")}" -n arma2pc #{geo}-X #{PARAMS.clone.map{|e| "#{WIN}#{e}"}.join("")}]
         reply.gsub!("\\\\\\", "") if geo
         reply.split("\n")
       end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 11
-  - 2
-  version: 0.11.2
+  - 12
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +02:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,6 +108,7 @@ files:
 - lib/app/controllers/logviews_controller.rb
 - lib/app/controllers/main_controller.rb
 - lib/app/controllers/mods_controller.rb
+- lib/app/controllers/networks_controller.rb
 - lib/app/controllers/queryservers_controller.rb
 - lib/app/controllers/repositories_controller.rb
 - lib/app/controllers/servers_controller.rb
@@ -121,6 +122,7 @@ files:
 - lib/app/helpers/logviews_helper.rb
 - lib/app/helpers/main_helper.rb
 - lib/app/helpers/mods_helper.rb
+- lib/app/helpers/networks_helper.rb
 - lib/app/helpers/queryservers_helper.rb
 - lib/app/helpers/repositories_helper.rb
 - lib/app/helpers/servers_helper.rb
@@ -132,6 +134,7 @@ files:
 - lib/app/models/logsession.rb
 - lib/app/models/log_observer.rb
 - lib/app/models/mod.rb
+- lib/app/models/network.rb
 - lib/app/models/queryserver.rb
 - lib/app/models/repository.rb
 - lib/app/models/server.rb
@@ -198,6 +201,8 @@ files:
 - lib/db/migrate/20100405142959_change_mods_queryservers_id.rb
 - lib/db/migrate/20100405142960_add_gamespied_at_to_system_settings.rb
 - lib/db/migrate/20100409114653_add_priority_and_path_to_mods.rb
+- lib/db/migrate/20100425121901_create_networks.rb
+- lib/db/migrate/20100425143140_change_repositories_column.rb
 - lib/db/schema.rb
 - lib/doc/README_FOR_APP
 - lib/init.rb
@@ -288,6 +293,7 @@ files:
 - lib/test/functional/logviews_controller_test.rb
 - lib/test/functional/main_controller_test.rb
 - lib/test/functional/mods_controller_test.rb
+- lib/test/functional/networks_controller_test.rb
 - lib/test/functional/queryservers_controller_test.rb
 - lib/test/functional/repositories_controller_test.rb
 - lib/test/functional/servers_controller_test.rb
@@ -304,6 +310,7 @@ files:
 - lib/test/unit/helpers/logviews_helper_test.rb
 - lib/test/unit/helpers/main_helper_test.rb
 - lib/test/unit/helpers/mods_helper_test.rb
+- lib/test/unit/helpers/networks_helper_test.rb
 - lib/test/unit/helpers/queryservers_helper_test.rb
 - lib/test/unit/helpers/repositories_helper_test.rb
 - lib/test/unit/helpers/servers_helper_test.rb
@@ -312,6 +319,7 @@ files:
 - lib/test/unit/logsession_test.rb
 - lib/test/unit/log_test.rb
 - lib/test/unit/mod_test.rb
+- lib/test/unit/network_test.rb
 - lib/test/unit/queryserver_test.rb
 - lib/test/unit/repository_test.rb
 - lib/test/unit/server_test.rb