six-updater-web 0.20.8 → 0.21.0

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.20.8'
+  s.version = '0.21.0'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'
@@ -18,11 +18,12 @@ spec = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.bindir = "bin"
   s.executables = ['six-updater-web', 'six-updater-web-rake', 'six-get']
-  s.add_dependency('faster_require', '>= 0.5.2')
+  #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('rails', '2.3.8')
   s.add_dependency('haml', '3.0.10')
+  s.add_dependency('coderay', '>= 0.9.3')
   s.add_dependency('RedCloth', '>= 4.2.2')
 end
 

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

@@ -35,4 +35,5 @@ class AppsettingsController < ApplicationController
       @processes = []
     end
   end
+
 end

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

@@ -0,0 +1,76 @@
+class ConfigController < ApplicationController
+  # TODO: Display original file, perhaps with diff, unpacked from store\userconfig.tar or where-ever it is located?
+  # TODO: arma2.cfg, .armaprofile, bans.txt, server.cfg ?
+  def index
+    preset = nil
+    preset = fetch_param([:config], Sixconfig, preset)
+
+    setting = if preset && preset.appsetting
+      preset.appsetting
+    else
+      Appsetting.new
+    end
+    setting = fetch_param([:setting], Appsetting, setting)
+    path = setting.real_path.gsub("\\", "/")
+
+
+    @userconfigs = Dir.chdir(path) { Dir["userconfig/**/*"].reject {|e| File.directory?(e) || File.dirname(e)[/_[0-9]*$/]} }
+    @userconfigs += ["ban.txt"]
+    cfg = params["options"] && params["options"]["userconfig"] ? params["options"]["userconfig"] : @userconfigs[0]
+    case params["commit"]
+      when "Edit"
+        redirect_to "/config/edit/?setting=#{params["setting"]}&options[userconfig]=#{params["options"]["userconfig"]}"
+        return
+    end
+    @userconfig = File.exists?(File.join(path, cfg)) ? File.open(File.join(path, cfg)) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+  end
+
+  def edit
+    path = Appsetting.find(params["setting"]).real_path.gsub("\\", "/")
+    @userconfig = File.exists?(File.join(path, params["options"]["userconfig"])) ? File.open(File.join(path, params["options"]["userconfig"])) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+  end
+
+  def show
+    path = Appsetting.find(params["setting"]).real_path.gsub("\\", "/")
+    @userconfig = File.exists?(File.join(path, params["options"]["userconfig"])) ? File.open(File.join(path, params["options"]["userconfig"])) {|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a.read + ' ')[0..-2].split("\n").map{|e| e.sub("\r", "")}.join("\n") } : ""
+  end
+
+  def update
+    path = Appsetting.find(params["setting"]).real_path.gsub("\\", "/")
+    case params["commit"]
+      when "Save"
+        if params["options"]
+          File.open(File.join(path, params["options"]["userconfig"]), 'w') {|a| a.write params["options"]["content"].gsub("\r", "") }
+        end
+      when "Reload"
+        redirect_to "/config/edit/?setting=#{params["setting"]}&options[userconfig]=#{params["options"]["userconfig"]}"
+        return
+    end
+    redirect_to "/config/show/?setting=#{params["setting"]}&options[userconfig]=#{params["options"]["userconfig"]}"
+  end
+
+  def fetch_param(ar, ty, default = nil)
+    a = params
+    ar.each do |e|
+      if a[e]
+        a = a[e]
+      else
+        a = nil
+        break
+      end
+    end
+    if a
+      if a.empty?
+        return nil
+      else
+        begin
+          return ty.find(a)
+        rescue
+          return default
+        end
+      end
+    else
+      return default
+    end
+  end
+end

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

@@ -1,11 +1,4 @@
 class MainController < ApplicationController
-  def userconfig
-    path = File.join(Appsetting.new.real_path, "Userconfig").gsub("\\", "/")
-    @userconfigs = Dir.chdir(path) { Dir["**/*"].reject {|e| File.directory?(e) || File.dirname(e)[/_[0-9]*$/]} }
-    cfg = params["options"] && params["options"]["userconfig"] ? params["options"]["userconfig"] : @userconfigs[0]
-    @userconfig =  File.open(File.join(path, cfg)) {|a| a.readlines }
-  end
-
   def index
     @msg = []
     @skip, @install, @check, @disabled = [], [], [], []
@@ -18,6 +11,8 @@ class MainController < ApplicationController
     @autoskip = true if @autoskip.nil?
     @beta = @system_setting.beta
 
+    @server_check = false
+
     @inweb = @system_setting.inweb
     @queryserver = Queryserver.new
 
@@ -289,14 +284,31 @@ class MainController < ApplicationController
     end
 
     case params["commit"].downcase
-      when "edit"
-        redirect_to "/sixconfigs/edit/#{params[:config]}"
+      when "edit preset"
+        redirect_to "/sixconfigs/edit/#{preset.id}"
+        return
+
+      when "edit server"
+        redirect_to "/queryservers/edit/#{queryserver.id}"
         return
 
-      when "show"
-        redirect_to "/queryservers/edit/#{params[:gamespy]}"
+      when "edit action"
+        redirect_to "/actions/edit/#{action.id}"
         return
 
+      when "edit setting"
+        redirect_to "/appsettings/edit/#{setting.id}"
+        return
+
+      when "edit userconfig"
+        redirect_to "/config/?setting=#{setting.id}"
+        return
+
+      when "server mod check"
+        @server_check = true
+        @signatures = queryserver.signatures
+        @allowed, @disallowed, @garbage = *setting.allowance(@signatures)
+
       when "save"
         preset.output_yml(setting, server)
         @msg << "<br />Saved six-updater.yml!"

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

@@ -37,4 +37,10 @@ class SixconfigsController < ApplicationController
     @original_record = t[0]
     @record = t[1]
   end
+
+  def test1
+    @sixconfig = Sixconfig.find("a5de5f84-94bd-11df-8867-00248c385045")
+    @signatures = @sixconfig.queryserver.signatures
+    @allowed, @disallowed, @garbage = *@sixconfig.appsetting.allowance(@signatures)
+  end
 end

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

@@ -145,6 +145,38 @@ class Appsetting < ActiveRecord::Base
     end
   end
 
+  def allowance(signatures)
+    signatures = signatures.map{|e| e.downcase}
+    allowed, disallowed, garbage = [], [], []
+    path = self.real_path.gsub("\\", "/")
+    pbos = Dir[File.join(path, "**", "*.pbo")]
+    pbos.each do |p|
+      inter = p.sub("#{path}/", "")
+      unless inter =~ /\/(addons|dta)\//i || inter =~ /^common\//i || inter =~ /^(addons|dta)\//i
+        garbage << inter
+        next
+      end
+      if signatures.empty?
+        allowed << inter
+        next
+      end
+      sigs = Dir["#{p}*.bisign"]
+      found = false
+      sigs.each do |s|
+        sig = s.sub("#{p}.", "").sub(".bisign", "").downcase
+        if signatures.include?(sig)
+          found = true
+          allowed << inter
+          break
+        end
+      end
+      unless found
+        disallowed << inter
+      end
+    end
+    [allowed, disallowed, garbage]
+  end
+
   def processes
     Six::Appmanager.find_process(process_name, self.real_path)
   end

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

@@ -27,7 +27,7 @@ class Mod < ActiveRecord::Base
   # arma2 mod: works for all subclasses
   # armaoa mod; works for arma2-oa-st, arma2-oa-
   def self.label
-    self.to_s.sub("Mod", "")
+    Kernel.const_get(self.short+"Appsetting").label
   end
 
   def self.short

data/lib/six-updater-web/app/views/config/_show.haml

@@ -0,0 +1,2 @@
+%div{:class => "CodeRay"}
+  %pre= CodeRay.scan(@userconfig, :cpp).html

data/lib/six-updater-web/app/views/config/edit.haml

@@ -0,0 +1,11 @@
+= link_to "Back to index", "/config"
+%br
+- form_tag("/config/update", {:method => :get}) do
+  %input{:type => "hidden", :name => "options[userconfig]", :value => params["options"]["userconfig"]}
+  %input{:type => "hidden", :name => "setting", :value => params["setting"]}
+  = submit_tag "Reload"
+  = submit_tag "Save"
+  = params["options"]["userconfig"]
+  %br
+  %pre
+    %textarea{:name => "options[content]", :cols => "120", :rows => "50", :wrap => "off"}= @userconfig

data/lib/six-updater-web/app/views/config/index.haml

@@ -0,0 +1,6 @@
+- form_tag({}, {:method => :get}) do
+  %input{:type => "hidden", :name => "setting", :value => params["setting"]}
+  = select( "options", "userconfig", @userconfigs, {:selected => "#{params["options"]["userconfig"] if params["options"]}"})
+  = submit_tag "Change"
+  = submit_tag "Edit"
+  = render :partial => "config/show"

data/lib/six-updater-web/app/views/config/show.haml

@@ -0,0 +1,5 @@
+= link_to "Back to index", "/config"
+%br
+= link_to "Edit", "/config/edit/?setting=#{params["setting"]}&options[userconfig]=#{params["options"]["userconfig"]}"
+%br
+= render :partial => "config/show"

data/lib/six-updater-web/app/views/layouts/application.haml

@@ -7,6 +7,7 @@
     %meta{ :content => "text/html; charset=utf-8", "http-equiv" => "content-type" }
     %link{ :href => "/goldberg/stylesheets/goldberg.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
     %link{ :href => "/goldberg/stylesheets/layout.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
+    %link{ :href => "/stylesheets/coderay.css", :rel => "stylesheet", :type => "text/css", :media => "screen" }
     %script{ :src => "/goldberg/javascripts/suckerfish.js", :type => "text/javascript" }
     = javascript_include_tag :defaults
     = record_select_includes

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

@@ -4,19 +4,17 @@
       %th Mod
       %th Current
       %th Latest
-      %th Remote
-      %th Changelog
-      %th Type
-      %th Fits edition?
+      %th Info
+      %th Changes
+      %th Compatible?
   %tbody
     - 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}"}
+          = link_to mod.name, "/mods/edit/#{mod.id}", {:title => "Size: #{mod.size}, Updated Version: #{mod.updated_version}. #{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
         %td= link_to "Info", "http://updater.dev-heaven.net/mods/show/#{mod.id}", :target => "_blank"
-        %td= link_to "Changelog", "http://updater.dev-heaven.net/mods/changelog/#{mod.id}", :target => "_blank"
-        %td= mod.class.label
-        %td= mod.version_match?(@current_setting)
+        %td= link_to "Changes", "http://updater.dev-heaven.net/mods/changelog/#{mod.id}", :target => "_blank"
+        %td{:class => mod.version_match?(@current_setting) ? "green" : "red"}= "#{mod.version_match?(@current_setting) ? "Yes" : "No"} #{link_to mod.class.short, "", {:title => mod.class.label}}"

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

@@ -0,0 +1,66 @@
+%table{ :border => 1, :width => "100%"}
+  %tr
+    %td
+      = link_to "Follow with Google Wave", "/main/wave"
+      - form_tag :action => :index do
+        %p
+          %label{ :for => "sixconfigs" }
+            = link_to "Preset", "/sixconfigs", :title => "Click to access Presets overview"
+           
+          = record_select_field 'config', @preset
+          = submit_tag "Edit preset"
+          = submit_tag "Sync", :name => "portalsync"
+        %strong Optional Preset Overrides
+        %p
+          %label{ :for => "actions" }
+            = link_to "Action", "/actions", :title => "Click to access Actions overview"
+             
+          = record_select_field 'act', @action
+          = submit_tag "Edit action"
+        %p
+          %label{ :for => "servers" }
+            = link_to "Server", "/queryservers", :title => "Click to access Gamespy browser overview"
+             
+          = record_select_field 'gamespy', @queryserver
+          = submit_tag "Edit server"
+          = submit_tag "Sync", :name => "serversync"
+        %p
+          %label{ :for => "settings" }
+            = link_to "Setting", "/appsettings", :title => "Click to access Settings Profiles overview"
+             
+          = record_select_field 'setting', @setting, :controller => "Appsettings"
+          = submit_tag "Edit setting"
+        %p
+          = check_box :system, :beta, {:checked => @beta}
+          %a{:title => "Enable beta mod and mode" }
+            Beta
+           
+          = check_box :system, :autoskip, {:checked => @autoskip}
+          %a{:title => "Only update mods whos online version doesnt match local" }
+            Autoskip
+           
+          = check_box :system, :inweb, {:checked => @inweb}
+          %a{:title => "Display updater output into ajax-refreshed web-page (Handy for remote-management)" }
+            Integrated
+        %p
+          = submit_tag "Execute"
+           
+          = submit_tag "Save"
+           
+          = submit_tag "Edit Userconfig"
+           
+          = submit_tag "Server Mod check"
+        %p
+          = submit_tag "Stop Game"
+           
+          = submit_tag "Reset Skip Status"
+           
+          = submit_tag "Show status"
+      %strong Logs
+      - form_tag :action => :fetch do
+        %p
+          = submit_tag "Rpt"
+           
+          = submit_tag "Updater"
+           
+          = submit_tag "Updater-Web"

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

@@ -0,0 +1,34 @@
+%table{ :border => 1, :cellpadding => "5", :width => "100%"}
+  %tr
+    %td
+      Edition: #{link_to @current_setting.nice_found_type, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }
+      %br
+      Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}
+      Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}
+      %br
+      %br
+      = @msg.join("<br />")
+      %br
+      Autoskip: #{@autoskip ? "Enabled" : "Disaabled"}.
+      %br
+      - if (@check.size + @skip.size + @install.size + @disabled.size) > 0
+        - if @check.size > 0
+          %br
+          To be checked:
+          %br
+          = render :partial => "check", :locals => {:mods => @check}
+        - if @skip.size > 0
+          %br
+          To be skipped:
+          %br
+          = render :partial => "check", :locals => {:mods => @skip}
+        - if @install.size > 0
+          %br
+          Not installed:
+          %br
+          = render :partial => "check", :locals => {:mods => @install}
+        - if @disabled.size > 0
+          %br
+          Disabled:
+          %br
+          = render :partial => "check", :locals => {:mods => @disabled}

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

@@ -0,0 +1,18 @@
+Server: #{@queryserver.to_label}
+%br
+Signatures: #{@signatures}
+%br
+%br
+Allowed:
+%br
+= @allowed
+%br
+%br
+Disallowed:
+%br
+= @disallowed
+%br
+%br
+Garbage:
+%br
+= @garbage

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

@@ -1,97 +1,6 @@
 %table{:width => "100%"}
   %tr
     %td{:valign => "top", :width => "40%"}
-      %table{ :border => 1, :width => "100%"}
-        %tr
-          %td
-            = link_to "Follow with Google Wave", "/main/wave"
-            - form_tag :action => :index do
-              %p
-                %label{ :for => "sixconfigs" }
-                  = link_to "Preset", "/sixconfigs", :title => "Click to access Presets overview"
-                 
-                = record_select_field 'config', @preset
-                = submit_tag "Edit"
-                = submit_tag "Sync", :name => "portalsync"
-              %strong Optional Preset Overrides
-              %p
-                %label{ :for => "actions" }
-                  = link_to "Action", "/actions", :title => "Click to access Actions overview"
-                   
-                = record_select_field 'act', @action
-              %p
-                %label{ :for => "servers" }
-                  = link_to "Server", "/queryservers", :title => "Click to access Gamespy browser overview"
-                   
-                = record_select_field 'gamespy', @queryserver
-                = submit_tag "Show"
-                = submit_tag "Sync", :name => "serversync"
-              %p
-                %label{ :for => "settings" }
-                  = link_to "Setting", "/appsettings", :title => "Click to access Settings Profiles overview"
-                   
-                = record_select_field 'setting', @setting, :controller => "Appsettings"
-              %p
-                = submit_tag "Execute"
-                 
-                = submit_tag "Save"
-                 
-                = check_box :system, :beta, {:checked => @beta}
-                %a{:title => "Enable beta mod and mode" }
-                  Beta
-                 
-                = check_box :system, :autoskip, {:checked => @autoskip}
-                %a{:title => "Only update mods whos online version doesnt match local" }
-                  Autoskip
-                 
-                = check_box :system, :inweb, {:checked => @inweb}
-                %a{:title => "Display updater output into ajax-refreshed web-page (Handy for remote-management)" }
-                  Integrated
-              %p
-                = submit_tag "Stop Game"
-                 
-                = submit_tag "Reset Skip Status"
-                 
-                = submit_tag "Show status"
-            %strong Logs
-            - form_tag :action => :fetch do
-              %p
-                = submit_tag "Rpt"
-                 
-                = submit_tag "Updater"
-                 
-                = submit_tag "Updater-Web"
+      = render :partial => "main/left"
     %td{:valign => "top", :width => "60%"}
-      %table{ :border => 1, :cellpadding => "5", :width => "100%"}
-        %tr
-          %td
-            Edition: #{link_to @current_setting.nice_found_type, nil, :title => "Supports mods for: #{@current_setting.found_types.map{|e| e.label}.join(", ")}" }, 
-            Last sync #{@system_setting.synchronized_at ? time_ago_in_words(@system_setting.synchronized_at) + " ago" : "never"}
-            Gamespy #{@system_setting.gamespied_at ? time_ago_in_words(@system_setting.gamespied_at) + " ago" : "never"}
-            %br
-            %br
-            = @msg.join("<br />")
-            %br
-            Autoskip: #{@autoskip ? "Enabled" : "Disaabled"}.
-            %br
-            - if (@check.size + @skip.size + @install.size + @disabled.size) > 0
-              - if @check.size > 0
-                %br
-                To be checked:
-                %br
-                = render :partial => "check", :locals => {:mods => @check}
-              - if @skip.size > 0
-                %br
-                To be skipped:
-                %br
-                = render :partial => "check", :locals => {:mods => @skip}
-              - if @install.size > 0
-                %br
-                Not installed:
-                %br
-                = render :partial => "check", :locals => {:mods => @install}
-              - if @disabled.size > 0
-                %br
-                Disabled:
-                %br
-                = render :partial => "check", :locals => {:mods => @disabled}
+      =  render :partial => @server_check ? "main/servercheck" : "main/right"

data/lib/six-updater-web/app/views/sixconfigs/test1.haml

@@ -0,0 +1,16 @@
+Signatures: #{@signatures}
+%br
+Allowed:
+%br
+= @allowed
+%br
+%br
+Disallowed:
+%br
+= @disallowed
+%br
+%br
+Garbage:
+%br
+= @garbage
+

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

@@ -49,6 +49,7 @@ Rails::Initializer.run do |config|
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   config.gem "sqlite3-ruby", :lib => "sqlite3"
   config.gem "haml", :version => "3.0.10"
+  config.gem "coderay"
 
   # config.gem "aws-s3", :lib => "aws/s3"
 

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

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

data/lib/six-updater-web/public/stylesheets/coderay.css

@@ -0,0 +1,130 @@
+.CodeRay {
+  background-color: #f8f8f8;
+  border: 1px solid silver;
+  font-family: 'Courier New', 'Terminal', monospace;
+  color: #000;
+}
+.CodeRay pre { margin: 0px }
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#888; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .cm { color:#A08; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .de { color:#B0B; }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#C00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #ddd; color: black }
+.CodeRay .il .il { background: #ccc }
+.CodeRay .il .il .il { background: #bbb }
+.CodeRay .il .idl { background: #ddd; font-weight: bold; color: #666 }
+.CodeRay .idl { background-color: #bbb; font-weight: bold; color: #666; }
+
+.CodeRay .im { color:#f00; }
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight:bold }
+.CodeRay .pt { color:#074; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0; color: #D20; }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
+
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 }
+.CodeRay .sh .k { }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }
+
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }

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

@@ -1,121 +1,126 @@
 --- 
 goldberg_site_controllers_001: 
-  id: "1"
+  id: 1
   name: goldberg/content_pages
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_002: 
-  id: "2"
+  id: 2
   name: goldberg/controller_actions
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_003: 
-  id: "3"
+  id: 3
   name: goldberg/auth
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_004: 
-  id: "5"
+  id: 5
   name: goldberg/menu_items
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_005: 
-  id: "6"
+  id: 6
   name: goldberg/permissions
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_006: 
-  id: "7"
+  id: 7
   name: goldberg/roles
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_007: 
-  id: "8"
+  id: 8
   name: goldberg/site_controllers
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_008: 
-  id: "9"
+  id: 9
   name: goldberg/system_settings
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_009: 
-  id: "10"
+  id: 10
   name: goldberg/users
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_010: 
-  id: "11"
+  id: 11
   name: goldberg/roles_permissions
-  permission_id: "1"
-  builtin: "1"
+  permission_id: 1
+  builtin: 1
 goldberg_site_controllers_011: 
-  id: "12"
+  id: 12
   name: main
-  permission_id: "5"
-  builtin: "0"
+  permission_id: 5
+  builtin: 0
 goldberg_site_controllers_012: 
-  id: "14"
+  id: 14
   name: appsettings
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_013: 
-  id: "15"
+  id: 15
   name: mods
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_014: 
-  id: "16"
+  id: 16
   name: sixconfigs
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_015: 
-  id: "17"
+  id: 17
   name: repositories
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_016: 
-  id: "18"
+  id: 18
   name: actions
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_017: 
-  id: "19"
+  id: 19
   name: servers
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_018: 
-  id: "20"
+  id: 20
   name: logsessions
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_019: 
-  id: "21"
+  id: 21
   name: logs
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_020: 
-  id: "22"
+  id: 22
   name: logviews
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_021: 
-  id: "23"
+  id: 23
   name: queryservers
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_022: 
-  id: "24"
+  id: 24
   name: networks
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_023: 
-  id: "25"
+  id: 25
   name: system_settings
-  permission_id: "1"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
 goldberg_site_controllers_024: 
-  id: "28"
+  id: 28
   name: categories
-  permission_id: "3"
-  builtin: "0"
+  permission_id: 1
+  builtin: 0
+goldberg_site_controllers_025: 
+  id: 29
+  name: config
+  permission_id: 1
+  builtin: 0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 20
-  - 8
-  version: 0.20.8
+  - 21
+  - 0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Sickboy
@@ -14,28 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 +02:00
+date: 2010-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: faster_require
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +31,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: six-updater
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +46,11 @@ dependencies:
         - 0
         version: 0.17.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -76,11 +61,11 @@ dependencies:
         - 8
         version: 2.3.8
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -91,6 +76,21 @@ dependencies:
         - 10
         version: 3.0.10
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 3
+        version: 0.9.3
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -128,6 +128,7 @@ files:
 - lib/six-updater-web/app/controllers/application_controller.rb
 - lib/six-updater-web/app/controllers/appsettings_controller.rb
 - lib/six-updater-web/app/controllers/categories_controller.rb
+- lib/six-updater-web/app/controllers/config_controller.rb
 - lib/six-updater-web/app/controllers/logsessions_controller.rb
 - lib/six-updater-web/app/controllers/logs_controller.rb
 - lib/six-updater-web/app/controllers/logviews_controller.rb
@@ -178,6 +179,10 @@ files:
 - lib/six-updater-web/app/models/sixconfig.rb
 - lib/six-updater-web/app/models/system_setting.rb
 - lib/six-updater-web/app/views/appsettings/manage.erb
+- lib/six-updater-web/app/views/config/edit.haml
+- lib/six-updater-web/app/views/config/index.haml
+- lib/six-updater-web/app/views/config/show.haml
+- lib/six-updater-web/app/views/config/_show.haml
 - lib/six-updater-web/app/views/layouts/application.haml
 - lib/six-updater-web/app/views/layouts/empty.haml
 - lib/six-updater-web/app/views/logviews/upd.rjs
@@ -190,14 +195,17 @@ files:
 - lib/six-updater-web/app/views/main/reset.erb
 - lib/six-updater-web/app/views/main/reset_act.haml
 - lib/six-updater-web/app/views/main/test.rjs
-- lib/six-updater-web/app/views/main/userconfig.haml
 - lib/six-updater-web/app/views/main/wave.haml
 - lib/six-updater-web/app/views/main/_check.haml
+- lib/six-updater-web/app/views/main/_left.haml
+- lib/six-updater-web/app/views/main/_right.haml
+- lib/six-updater-web/app/views/main/_servercheck.haml
 - lib/six-updater-web/app/views/main/_test.haml
 - lib/six-updater-web/app/views/main/_wave.haml
 - lib/six-updater-web/app/views/mods/imp.haml
 - lib/six-updater-web/app/views/Repositories/imp.erb
 - lib/six-updater-web/app/views/servers/imp.erb
+- lib/six-updater-web/app/views/sixconfigs/test1.haml
 - lib/six-updater-web/common.rb
 - lib/six-updater-web/config/boot.rb
 - lib/six-updater-web/config/database.yml
@@ -329,6 +337,7 @@ files:
 - lib/six-updater-web/public/stylesheets/active_scaffold/default/tools-left-handed-stylesheet-ie.css
 - lib/six-updater-web/public/stylesheets/active_scaffold/default/tools-left-handed-stylesheet.css
 - lib/six-updater-web/public/stylesheets/active_scaffold/DO_NOT_EDIT
+- lib/six-updater-web/public/stylesheets/coderay.css
 - lib/six-updater-web/public/stylesheets/record_select/record_select.css
 - lib/six-updater-web/Rakefile
 - lib/six-updater-web/README

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

@@ -1,11 +0,0 @@
-- form_tag do
-  = select( "options", "userconfig", @userconfigs, {:selected => "#{params["options"]["userconfig"] if params["options"]}"})
-  = submit_tag "Change"
-
-- form_tag do
-  %textarea{:name => "options[content]", :cols => "120", :rows => "50"}
-    = @userconfig.map{|a| Iconv.new("utf-8//IGNORE//TRANSLIT", "utf-8").iconv(a + ' ')[0..-2]}.join("")
-  = submit_tag "Save"
-
-
-