six-updater-web 0.23.6 → 0.23.7

data/Rakefile

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

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

@@ -264,7 +264,9 @@ class Appsetting < ActiveRecord::Base
   end
 
   def full_path
-    File.dirname(File.join(self.real_path, self.real_exe)).gsub("\\", "/")
+    rp = self.real_path
+    return nil if rp.nil?
+    File.dirname(File.join(rp, self.real_exe)).gsub("\\", "/")
   end
 
   def processes

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

@@ -42,7 +42,7 @@ class Repository < ActiveRecord::Base
   end
 
   def ping
-    SixUpdaterWeb.run_program("ping", SixUpdaterWeb::BASE_PATH, "-f -l #{PING_PACKET_SIZE} -r 9 -n 30 -t #{self.address}")
+    SixUpdaterWeb.run_program("ping", SixUpdaterWeb::BASE_PATH, "-f -l #{PING_PACKET_SIZE} -n 30 #{self.address}")
   end
 
   def tracert

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

@@ -47,9 +47,16 @@ class SystemSetting < ActiveRecord::Base
   end
 
   def synchronize
-    Six::Network::Panel.setlogger(logger)
+    begin
+      # TODO: This should be in after_initialize yet there it fails..
+      SixUpdaterWeb.update_site_controllers # Update the list of controllers - give default adminstrator permission to
+    rescue => e
+      logger.debug "ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
+    end
+
     l = []
     begin
+      Six::Network::Panel.setlogger(logger)
       status = Timeout::timeout(TIMEOUT) do
         Six::Network::Panel.login(self.server_username, self.server_password, true)
       end

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

@@ -1,17 +1,17 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
-
-# Don't care if the mailer can't send
+# Settings specified here will take precedence over those in config/environment.rb
+
+# In the development environment your application's code is reloaded on
+# every request.  This slows down response time but is perfect for development
+# since you don't have to restart the webserver when you make code changes.
+config.cache_classes = false
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_view.debug_rjs                         = true
+config.action_controller.perform_caching             = false
+
+# Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

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

@@ -23,7 +23,7 @@ end
 require 'open3'
 
 module SixUpdaterWeb
-  VERSION = "0.23.6"
+  VERSION = "0.23.7"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)
@@ -241,12 +241,10 @@ module SixUpdaterWeb
 
   def after_initialize
     if defined?(OLDLOCATION && SPECIAL)
-      # Update data in tables; nah, rather start warning users on main page?
-      #Six::Dbmanager.check
-
+      # Open the browser
+      return unless defined?(OPEN_BROWSER)
       case RUBY_PLATFORM
         when /-mingw32$/, /-mswin32$/
-          return unless defined?(OPEN_BROWSER)
           Thread.new() do
             file_to_use = "#{LOCAL_URL}/main"
             sleep 3
@@ -264,22 +262,59 @@ module SixUpdaterWeb
               system "start #{file_to_use}"
             end
           end
-=begin
-          arguments = nil
-          directory = nil
-          operation = "OPEN"
-          show = nil
-            #begin
-              shell = WIN32OLE.new('Shell.Application')
-              shell.ShellExecute(file_to_use, arguments, directory, operation, show)
-            #rescue => e
-              #logger.warn "Unable to open browser: ERROR: #{e.class} #{e.message} #{e.backtrace.join("\n")}"
-            #end
-=end
       end
     end
   end
 
+  def update_site_controllers
+    from_classes = Goldberg::SiteController.classes
+    from_db = Goldberg::SiteController.find(:all,
+                                  :order => 'name')
+    known = Hash.new
+    missing = Array.new
+    for dbc in from_db do
+      if from_classes.has_key? dbc.name
+        known[dbc.name] = dbc
+      else
+        missing << dbc
+      end
+    end
+
+    unknown = Hash.new
+    app = Array.new
+    builtin = Array.new
+
+    for name in from_classes.keys.sort do
+      if known.has_key? name
+        if known[name].builtin == 1
+          builtin << known[name]
+        else
+          app << known[name]
+        end
+      else
+        unknown[name] = from_classes[name]
+      end
+    end
+
+    saved = false
+    logger.info "Unknown: #{unknown.inspect}"
+    unknown.keys.each do |name|
+      h = Hash.new
+      h[:name] = name
+      h[:permission_id] = 1 # TODO: Search for it instead?
+      h[:builtin] = 0    
+      site_controller = Goldberg::SiteController.new(h)
+      if site_controller.save
+        #flash[:notice] = 'SiteController was successfully created.'
+        saved = true
+      else
+        #foreign
+        #render :action => 'new'
+      end
+    end
+    Goldberg::Role.rebuild_cache if saved
+  end
+
   def run_program(exec, startpath, cl)
     logger.info "Current Path: #{Dir.pwd}, BASE_PATH: #{BASE_PATH}, DATA_PATH: #{DATA_PATH}"
     logger.info "Starting with #{cl} from #{startpath}"

data/lib/six-updater-web/vendor/plugins/six-app_manager/lib/six/appmanager.rb

@@ -80,7 +80,7 @@ module Six
                   when name.downcase
                     pid = pid.to_i
                     next unless pid > 0
-                    unless path && !full.nil?
+                    if path.nil? || full.nil?
                       pids << pid
                       next
                     end

data/lib/six-updater-web/vendor/plugins/six-import/lib/six/import.rb

@@ -128,7 +128,7 @@ module Six
             n = self.new h
           end
           n.type = h[:type] if h[:type] if n.respond_to?(:type)
-          logger.info "#{n.class} #{n.id} #{n.changed?}: #{"#{n.inspect} - #{previous}" if n.changed?}"
+          #logger.info "#{n.class} #{n.id} #{n.changed?}: #{"#{n.inspect} - #{previous}" if n.changed?}"
           n.save if n.changed?# || n.new?
           n
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 23
-  - 6
-  version: 0.23.6
+  - 7
+  version: 0.23.7
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency