six-updater-web 0.21.6 → 0.22.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.21.6'
+  s.version = '0.22.0'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ['six-updater-web', 'six-updater-web-rake', 'six-get']
   #s.add_dependency('faster_require', '>= 0.5.2')
   s.add_dependency('uuidtools', '>= 2.0.0')
-  s.add_dependency('six-updater', '>= 0.17.0')
+  s.add_dependency('six-updater', '>= 0.22.1')
   s.add_dependency('rails', '2.3.8')
   s.add_dependency('haml', '3.0.10')
   s.add_dependency('coderay', '>= 0.9.3')

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

@@ -1,7 +1,7 @@
 class MainController < ApplicationController
   def index
     @msg = []
-    @skip, @install, @check, @disabled = [], [], [], []
+    @skip, @install, @check, @disabled, @special = [], [], [], [], []
     preset, queryserver, server, action, setting, reset, ok = nil, nil, nil, nil, nil, false, true
     grab = false
     save_fav = true
@@ -287,6 +287,10 @@ class MainController < ApplicationController
       end
       mod.save unless mod.new_record?
       mod.disabled = true if !mod.version_match?(setting)
+      if mod.special 
+        @special << mod
+        next
+      end
       if mod.disabled
         @disabled << mod
         next

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

@@ -18,6 +18,8 @@ class ModsController < ApplicationController
       :updated_at,
       :updated_version,
       :priority,
+      :incl,
+      :excl,
       :skip,
       :disabled,
       :remote]
@@ -25,7 +27,7 @@ class ModsController < ApplicationController
     config.update.columns.exclude :remote, :queryservers, :servers
     config.action_links.add 'copy', :label => 'Clone', :type => :record, :position => false, :confirm => "Do you really want to *clone* this item?"
 
-    config.list.columns.exclude :sixconfigs, :servers, :path, :updated_at, :priority
+    config.list.columns.exclude :sixconfigs, :servers, :path, :updated_at, :priority, :incl, :excl
 
     config.list.sorting = { :name => :asc }
 

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

@@ -131,6 +131,10 @@ class Mod < ActiveRecord::Base
     self.skip = if self.new_record?; true ; else; ((self.version == self.version_local) && !self.version.nil?); end
   end
 
+  def special
+    self.incl && !self.incl.empty?
+  end
+
   def to_updater_yml
     return unless self.real_name
     hash = Hash.new
@@ -140,6 +144,13 @@ class Mod < ActiveRecord::Base
     # TODO: Enable once proper processing is implemented
     #hash[:path] = self.path
     hash[:disabled] = self.disabled
+    if self.incl
+      hash[:include] = self.incl.split(";")
+      hash[:force] = true unless hash[:include].empty?
+    end
+    if self.excl
+      hash[:exclude] = self.excl.split(";")
+    end
     hash[:priority] = self.priority
     name = self.real_name.clone
     name.gsub!("@", '')

data/lib/six-updater-web/app/views/main/_check.haml

@@ -11,7 +11,7 @@
     - mods.each do |mod|
       %tr
         %td{:width => "30%"}
-          = link_to mod.name, "/mods/edit/#{mod.id}", {:title => "Size: #{mod.size}, Updated Version: #{mod.updated_version}. #{mod.categories.map{|e| e.name}.join(", ")}"}
+          = link_to mod.name, "/mods/edit/#{mod.id}", {:title => "Size: #{mod.size}, Updated Version: #{mod.updated_version}.#{" Incl: #{mod.incl} " if mod.incl}#{" Excl: #{mod.excl} " if mod.excl}#{mod.categories.map{|e| e.name}.join(", ")}"}
         %td{:class => if mod.version_local == mod.version; "green"; else; "red"; end}
           = if mod.version_local.empty?; "none" else; mod.version_local; end
         %td= mod.version

data/lib/six-updater-web/app/views/main/_right.haml

@@ -12,7 +12,7 @@
       %br
       Autoskip: #{@autoskip ? "Enabled" : "Disaabled"}.
       %br
-      - if (@check.size + @skip.size + @install.size + @disabled.size) > 0
+      - if (@check.size + @skip.size + @install.size + @disabled.size + @special.size) > 0
         - if @check.size > 0
           %br
           To be checked:
@@ -28,6 +28,11 @@
           Not installed:
           %br
           = render :partial => "check", :locals => {:mods => @install}
+        - if @special.size > 0
+          %br
+          Special (Hover over modname to see why):
+          %br
+          = render :partial => "check", :locals => {:mods => @special}
         - if @disabled.size > 0
           %br
           Disabled:

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

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

data/lib/six-updater-web/db/migrate/20100724124730_add_incl_and_excl_to_mods.rb

@@ -0,0 +1,11 @@
+class AddInclAndExclToMods < ActiveRecord::Migration
+  def self.up
+    add_column :mods, :incl, :string
+    add_column :mods, :excl, :string
+  end
+
+  def self.down
+    remove_column :mods, :incl
+    remove_column :mods, :excl
+  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 => 20100715142962) do
+ActiveRecord::Schema.define(:version => 20100724124730) do
 
   create_table "actions", :id => false, :force => true do |t|
     t.string   "id",         :limit => 36, :null => false
@@ -193,6 +193,8 @@ ActiveRecord::Schema.define(:version => 20100715142962) do
     t.integer  "size_wd",                       :default => 0
     t.datetime "updated_version"
     t.string   "type",                          :default => "Mod"
+    t.string   "incl"
+    t.string   "excl"
   end
 
   create_table "mods_networks", :id => false, :force => true do |t|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 21
-  - 6
-  version: 0.21.6
+  - 22
+  - 0
+  version: 0.22.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +02:00
+date: 2010-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,9 +42,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 17
-        - 0
-        version: 0.17.0
+        - 22
+        - 1
+        version: 0.22.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -266,6 +266,7 @@ files:
 - 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/migrate/20100715142962_add_server_bool_to_system_settings.rb
+- lib/six-updater-web/db/migrate/20100724124730_add_incl_and_excl_to_mods.rb
 - lib/six-updater-web/db/schema.rb
 - lib/six-updater-web/doc/README_FOR_APP
 - lib/six-updater-web/init.rb