spiderfw 0.6.6 → 0.6.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 0.6.7
+== 26 July, 2011
+* Process management and app setup enhancements
+
 = 0.6.6
 == 19 July, 2011
 * Fix: use SEE_OTHER as default redirect code to avoid FF 5 caching

data/VERSION

@@ -1 +1 @@
-0.6.6
+0.6.7

data/apps/master/_init.rb

@@ -14,6 +14,8 @@ require 'apps/master/master'
 require 'apps/master/models/admin'
 require 'apps/master/models/customer'
 require 'apps/master/models/installation'
+require 'apps/master/models/command'
+require 'apps/master/models/event'
 require 'apps/master/models/remote_log'
 require 'apps/master/models/server'
 require 'apps/master/models/scout_plugin_info'

data/apps/master/controllers/master_controller.rb

@@ -18,7 +18,7 @@ module Spider; module Master
         #route /servers\/([^\/]+)/, ServerController, :do => lambda{ |id| @request.misc[:server] = Server.new(id) }
         route 'login', LoginController
         
-        require_user Master::Admin, :unless => [:login, :admin, :ping], :redirect => 'login'
+        require_user Master::Admin, :unless => [:login, :admin, :ping, :servant_event], :redirect => 'login'
         require_user Spider::Auth::SuperUser, :only => [:admin]
         
         
@@ -118,28 +118,34 @@ module Spider; module Master
                 @installation = Installation.new(id) unless id == 'new'
                 @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('installation_form')) || @request.params.key?('edit') || id == 'new'
                 @scene.pk = id
-            
-                # if id == 'new'
-                #     if @request.params.key?('installation_create') && !@request.params['installation_name'].empty?
-                #         i = Installation.new(:name => @request.params['installation_name'])
-                #         i.customer = @customer
-                #         i.save
-                #         redirect(File.dirname(@request.path)+"/#{i.id}")
-                #     end
-                # else
-                #     if @request.params.key?('save_apps')
-                #         @installation.apps = @request.params['apps'].keys.join(',')
-                #         @installation.save
-                #         redirect(request.path)
-                #     end
-                #     @scene.install_apps = JSON.parse(@installation.apps) unless @installation.apps.blank?
-                #     @scene.install_apps ||= []
-                #     @scene.apps = Spider::AppServer.apps_by_id
-                # end
+                
+                if @request.params['add_command']
+                    command = @request.params['command']
+                    args = @request.params['arguments']
+                    arguments = args
+                    # FIXME: move somewhere else
+                    case command
+                    when 'gems', 'apps'
+                        arguments = args.split(/\s*,\s*/).to_json
+                    end
+                    Master::Command.create(
+                        :installation => @installation,
+                        :name => @request.params['command'],
+                        :arguments => arguments,
+                        :status => 'pending'
+                    )
+                    redirect(@request.path)
+    
+                end
                 @scene.install_apps = JSON.parse(@installation.apps) unless @installation.apps.blank?
                 @scene.install_apps ||= []
                 @scene.apps = Spider::AppServer.apps_by_id
                 @scene.logs = RemoteLog.where(:installation => @installation)
+                @scene.commands = Master::Command.where{ |c| (c.installation == @installation) }.order_by(:obj_created)
+                @scene.available_commands = {
+                    'gems' => _('Install or update gems'),
+                    'apps' => _('Install or update apps')
+                }
                 @scene << {
                     :customer => @customer,
                     :installation => @installation
@@ -345,15 +351,66 @@ module Spider; module Master
                 RemoteLog.create(:text => desc, :level => level, :time => time, :installation => install)
             end
             response = {
-                :pong => DateTime.new
+                :pong => DateTime.now
             }
-            # server.pending_commands.each do |command|
-            #     response[:commands] ||= []
-            #     response[:commands] << command.to_h
-            # end
+            commands = []
+            Master::Command.where{ |c| (c.installation == install) & (c.status == 'pending') }.each do |c|
+                commands << {
+                    :id => c.uuid,
+                    :name => c.name,
+                    :arguments => c.arguments ? JSON.parse(c.arguments) : nil
+                }
+            end
+            response[:commands] = commands unless commands.empty?
             $out << response.to_json
+            Master::Command.where{ |c| (c.installation == install) & (c.status == 'pending') }.each do |c|
+                c.sent = DateTime.now
+                c.status = 'sent'
+                c.save
+            end
         end
         
+        __.json
+        def servant_event
+            params = @request.params.clone
+            name = params.delete('event')
+            install_id = params.delete('install_id')
+            unless install_id
+                Spider.logger.error("No install_id passed in ping")
+                done
+            end
+            install = Spider::Master::Installation.load_or_create(:uuid => install_id)
+            details = @request.params['details']
+            params = JSON.parse(details)
+            Event.create(
+                :installation => install,
+                :name => name,
+                :details => details
+            )
+            case name.to_sym
+            when :command_done
+                cmd = Master::Command.load(:uuid => params['id'])
+                cmd.done = DateTime.now
+                cmd.result = params['res'].to_json
+                cmd.status = 'success'
+                cmd.save
+            when :plan_done
+                results = params['results']
+                results.each do |res|
+                    cmd = Master::Command.load(:uuid => res['command_id'])
+                    if res['previous_error']
+                        cmd.status = 'not_done'
+                        cmd.save
+                    elsif res['error']
+                        cmd.status = 'error'
+                        cmd.save
+                    end
+                end
+            end
+        end
+        
+        
+        
         private
         
         def decompress_string(str)

data/apps/master/models/command.rb

@@ -1,17 +1,24 @@
 module Spider; module Master
     
-    class Command < Spider::Model::BaseModel
-        remove_element :id
-        element :id, UUID
+    class Command < Spider::Model::Managed
+        element :installation, Installation, :add_multiple_reverse => :commands
+        element :uuid, UUID
         element :name, String
         element :arguments, Text
         element :status, {
             'pending' => 'Pending',
+            'sent' => 'Sent',
             'success' => 'Success',
-            'failure' => 'Failure'
+            'failure' => 'Failure',
+            'not_done' => 'Not done'
         }, :default => 'pending'
-        element :executed, DateTime
+        element :sent, DateTime
+        element :done, DateTime
         element :result, Text
+        
+        def to_s
+            "#{self.name} '#{self.arguments}' - #{self.status}"
+        end
     end
     
 end; end

data/apps/master/models/event.rb

@@ -0,0 +1,9 @@
+module Spider; module Master
+
+    class Event < Spider::Model::Managed
+        element :installation, Installation, :add_multiple_reverse => :events
+        element :name, String
+        element :details, Text
+    end
+
+end; end

data/apps/master/views/installation.shtml

@@ -20,6 +20,12 @@
             <h2>_(Installation "%s") % [@installation]</h2>
             <a href="?edit" class="manage edit">_(Edit)</a>
         </div>
+        <div class="details">
+            _(Last check-in): { @installation.last_check.lformat(:short) }
+            <tpl:pass sp:if="@installation.interval">
+                _(Next check-in): { (@installation.last_check + @installation.interval).lformat(:short) }
+            </tpl:pass>
+        </div>
         <core:tabs id="tabs">
             <tab label="_(Apps)" id="apps">
                 <div class="apps">
@@ -43,6 +49,22 @@
                     <core:table id="logs_table" queryset="@logs" sort="time,desc" />
                 </div>
             </tab>
+            <tab label="_(Commands)" id="commands">
+                <div class="commands">
+                    <h4>_(Commands)</h4><a href="#" class="manage add">_(Add command)</a>
+                    <div id="add_command">
+                        <form>
+                            <select name="command">
+                                <option></option>
+                                <option sp:each="@available_commands |k, v|" value="{ k }">{ v }</option>
+                            </select>
+                            <input type="text" name="arguments">
+                            <input type="submit" name="add_command" value="_(Ok)">
+                        </form>
+                    </div>
+                    <core:list id="commands_list" queryset="@commands" delete="true" />
+                </div>
+            </tab>
         </core:tabs>
     </div>
 </div>

data/apps/servant/lib/client.rb

@@ -10,9 +10,14 @@ module Spider
             def initialize(url)
                 @url = url
             end
+            
+            def http_client
+                HTTPClient.new
+            end
         
-            def ping_server(url=@url)
-                clnt = HTTPClient.new
+            def ping_server(url=nil)
+                url ||= @url
+                clnt = self.http_client
                 status = Servant.status
                 status[:apps] = status[:apps].to_json
                 last_check_file = File.join(Spider.paths[:var], 'memory', 'servant_last_check')
@@ -29,15 +34,24 @@ module Spider
                 end
                 File.open(last_check_file, 'w'){ |f| f << Time.now.to_s }
                 res = JSON.parse(res.content)
-                if res[:commands]
-                    res[:commands].each do |command|
-                        command_result = execute_command(command[:name], command[:arguments])
-                        clnt.post()
-                    end
+                if res['commands']
+                    processor = Servant.command_processor.new(url)
+                    processor.run_commands(res['commands'])
                 end
             end
             
+            def process_commands(commands)
+            end
+            
+            def send_event(name, details)
+                self.http_client.post("#{@url}/servant_event", {
+                    :event => name, :install_id => Servant.install_id, :details => details.to_json
+                })
+            end
+
+            
             private
+
             
             def compress_string(str)
                 compr = ""

data/apps/servant/lib/commands_processor.rb

@@ -0,0 +1,109 @@
+module Spider; module Servant
+    
+    class CommandsProcessor
+        attr_reader :client
+        
+        def self.plan_file
+            File.join(Spider.paths[:var], 'servant_command_plan')
+        end
+        
+        def self.progress_file
+            File.join(Spider.paths[:var], 'servant_command_progress')
+        end
+        
+        def self.save_plan(commands)
+            File.open(self.plan_file, 'w'){ |f| f << commands.to_json }
+        end
+        
+        def self.read_plan
+            return nil unless File.exists?(self.plan_file)
+            JSON.parse(File.readfile(self.plan_file))
+        end
+        
+        def self.unfinished_plan?
+            File.exists?(self.plan_file)
+        end
+        
+        def initialize(master_url)
+            @url = master_url
+            @client = Servant::Client.new(@url)
+            @progress = {}
+        end
+        
+        def resume_plan
+            plan = self.class.read_plan
+            progress = JSON.parse(File.read(self.progress_file)) if File.exists?(self.progress_file)
+            progress ||= {}
+            plan.reject!{ |c| progress[c['id']] }
+            process_commands(plan)
+        end
+        
+        def save_progress
+            File.open(self.class.progress_file, 'w'){ |f| f << @progress.to_json }
+        end
+        
+        def run_commands(commands)
+            self.class.save_plan(commands)
+            process_commands(commands)
+        end
+        
+        def process_commands(commands)
+            results = []
+            error = nil
+            commands.each do |command|
+                command_result = {:command_id => command['id']}
+                if error
+                    command_result[:previous_error] = true
+                else
+                    begin
+                        command_result[:res] = execute_command(command)
+                    rescue => exc
+                        error = exc.message
+                        command_result[:error] = error
+                    end
+                end
+                results << command_result
+            end
+            self.client.send_event(:plan_done, {:results => results})
+            File.unlink(self.class.plan_file) if File.exists?(self.class.plan_file)
+            File.unlink(self.class.progress_file) if File.exists?(self.class.progress_file)
+        end
+        
+        def execute_command(command)
+            args = command["arguments"]
+            res = case command["name"]
+            when "gems"
+                install_gems(args)
+            when "apps"
+                install_apps(args)
+            when "configure"
+                
+            end
+            @progress[command['id']] = true
+            save_progress
+            self.client.send_event(:command_done, {:id => command['id'], :res => res})
+            res
+        end
+        
+        def install_gems(gems)
+            inst = Gem::DependencyInstaller.new
+            installed = []
+            gems.each do |g|
+                v = g['version'] || Gem::Requirement.default
+                unless Gem.available?(g['name'], v)
+                    inst.install g['name'], v
+                    installed << g
+                end
+                
+            end
+            return {:installed => gems}
+        end
+        
+        def install_apps(apps)
+            require 'spiderfw/setup/app_manager'
+            Spider::AppManager.install_or_update(apps)
+        end
+        
+    end
+    
+end; end

data/apps/servant/servant.rb

@@ -1,9 +1,19 @@
 require 'uuidtools'
+require 'apps/servant/lib/client'
+require 'apps/servant/lib/commands_processor'
 
 module Spider
 
     module Servant
+
+        def self.command_processor
+            @command_processor ||= Spider::Servant::CommandsProcessor
+        end
         
+        def self.command_processor=(klass)
+            @command_processor = klass
+        end
+
         def self.install_id
             uuid_file = File.join(Spider.paths[:var], 'install_id')
             return File.read(uuid_file) if File.exists?(uuid_file)

data/lib/spiderfw/cmd/commands/app.rb

@@ -5,7 +5,6 @@ class AppCommand < CmdParse::Command
         super('app', true, true )
         @short_desc = _("Manage apps")
         
-        @server_url = 'http://www.soluzionipa.it/euroservizi/spider/app_server'
         
         self.options = CmdParse::OptionParserWrapper.new do |opt|
             opt.on("--proxy [SERVER]", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
@@ -57,6 +56,11 @@ class AppCommand < CmdParse::Command
             end
             if @remote
                 require 'spiderfw/setup/app_server_client'
+                unless @server_url
+                    require 'spiderfw/spider'
+                    Spider.init_base
+                    @server_url = Spider.config.get('app_server.url')
+                end
                 client = Spider::AppServerClient.new(@server_url)
                 remote = {}
                 client.specs.each do |app|
@@ -119,56 +123,26 @@ class AppCommand < CmdParse::Command
                 puts _("Please execute this command from the home folder")
                 exit
             end
-            require 'spiderfw/setup/app_server_client'
-            use_git = false
-            unless @no_git
-                begin
-                    require 'grit'
-                    use_git = true
-                rescue => exc
-                    puts exc.message
-                    puts "Grit not available; install Grit for Git support"
-                end
-            end
-            
-            apps = args
-            existent = []
-            apps.each do |app|
-                if File.exist?("apps/#{app}")
-                    puts _("%s already exists, skipping") % app
-                    existent << app
-                end
-            end
             require 'spiderfw/setup/app_manager'
-            specs = []
-            client = Spider::AppServerClient.new(@server_url)
-            if @no_deps
-                specs = client.get_specs(apps)
-            else
-                specs = client.get_deps(apps, :no_optional => @no_optional)
-            end
-            deps = specs.map{ |s| s.app_id }
-            unless (deps - apps).empty?
-                puts _("The following apps will be installed as a dependency:")
-                puts (deps - apps).inspect
-            end
             options = {
-                :use_git => use_git, 
-                :no_gems => @no_gems,
-                :no_optional_gems => @no_optional_gems
+                :no_git => @no_git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
+                :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
             }
-            options[:ssh_user] = @ssh_user if @ssh_user
-            inst_specs = specs.reject!{ |s| existent.include? s.app_id }
-            Spider::AppManager.install(inst_specs, Dir.pwd, options)
-            unless @no_activate
-                require 'spiderfw/spider'
-                specs_hash = {}
-                specs.each{ |s| specs_hash[s.app_id] = s }
-                Spider.activate_apps(deps, specs_hash)
-            end
+            options[:url] = @server_url if @server_url
+            Spider::AppManager.install_apps(args, options)
         end
         self.add_command(install)
         
+        activate = CmdParse::Command.new('activate', false )
+        activate.short_desc = _("Activate an app")
+        activate.set_execution_block do |args|
+            apps = args
+            require 'spiderfw/spider'
+            apps = Spider.get_app_deps(apps)
+            Spider.activate_apps(apps)
+        end
+        self.add_command(activate)
+        
         update = CmdParse::Command.new( 'update', false )
         update.short_desc = _("Update an app")
         update.options = CmdParse::OptionParserWrapper.new do |opt|
@@ -188,44 +162,13 @@ class AppCommand < CmdParse::Command
                 puts _("Please execute this command from the home folder")
                 exit
             end
-            require 'spiderfw/setup/app_server_client'
-            use_git = false
-            unless @no_git
-                begin
-                    require 'grit'
-                    use_git = true
-                rescue
-                    puts "Grit not available; install Grit for Git support"
-                end
-            end
-            apps = args
-            if @all
-                require 'spiderfw/home'
-                home = Spider::Home.new(Dir.pwd)
-                apps = home.list_apps
-            end
-            if apps.empty?
-                puts _("No app to update")
-                exit
-            end
             require 'spiderfw/setup/app_manager'
-            specs = []
-            client = Spider::AppServerClient.new(@server_url)
-            if @no_deps
-                specs = client.get_specs(apps)
-            else
-                specs = client.get_deps(apps, :no_optional => @no_optional)
-            end
-            deps = specs.map{ |s| s.app_id }
-            unless (deps - apps).empty?
-                puts _("The following apps will be updated as a dependency:")
-                puts (deps - apps).inspect
-            end
-            Spider::AppManager.update(specs, Dir.pwd, {
-                :use_git => use_git, 
-                :no_gems => @no_gems,
-                :no_optional_gems => @no_optional_gems
-            })
+            options = {
+                :no_git => @no_git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
+                :no_gems => @no_gems, :no_optional_gems => @no_optional_gems
+            }
+            options[:url] = @server_url if @server_url
+            Spider::AppManager.update_apps(args, options)
         end
         self.add_command(update)
         

data/lib/spiderfw/config/options/spider.rb

@@ -33,7 +33,7 @@ module Spider
         :default => Proc.new{ RUBY_VERSION_PARTS[1] == '8' && !Object.const_defined?(:PhusionPassenger) ? true : false }
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
-        :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
+        :default => Proc.new{ RUBY_PLATFORM !~ /win32|mingw32/ && Spider.config.get('runmode') == 'devel' ? true : false }
     config_option 'static_content.mode', _("Mode to use for serving static files"), :type => String,
         :choices => [nil, 'x-sendfile', 'x-accel-redirect', 'published'], :default => nil
     config_option 'static_content.auto_publish', _("Automatically publish content to the home's public folder"),

data/lib/spiderfw/controller/controller_exceptions.rb

@@ -22,6 +22,9 @@ module Spider
         class ControllerError < RuntimeError
         end
         
+        class Maintenance < RuntimeError
+        end
+        
     end
     
 end

data/lib/spiderfw/controller/first_responder.rb

@@ -40,6 +40,11 @@ module Spider
             
         end
         
+        def try_rescue(exc)
+            super
+            self.done = true
+        end
+        
         
     end
     

data/lib/spiderfw/controller/home_controller.rb

@@ -1,7 +1,7 @@
 module Spider
 
     class HomeController < Controller
-        include StaticContent
+        include StaticContent, HTTPMixin
         route 'spider/public', Spider.controller, :prepend => 'public/'
         #        route 'spider', Spider.controller
 

data/lib/spiderfw/controller/mixins/http_mixin.rb

@@ -89,9 +89,13 @@ module Spider; module ControllerMixins
             super
         end
         
-        def base_url()
+        def self.base_url
             HTTPMixin.reverse_proxy_mapping("")
         end
+        
+        def base_url
+            self.class.base_url
+        end
 
         def prepare_scene(scene)
             scene = super
@@ -101,7 +105,6 @@ module Spider; module ControllerMixins
         end
         
         def try_rescue(exc)
-            self.done = true
             if (exc.is_a?(Spider::Controller::NotFound))
                 @response.status = Spider::HTTP::NOT_FOUND
             elsif (exc.is_a?(Spider::Controller::BadRequest))

data/lib/spiderfw/controller/mixins/visual.rb

@@ -40,6 +40,9 @@ module Spider; module ControllerMixins
             output_format_headers(format)
             @executed_format = format
             @executed_format_params = format_params
+            if Spider.runmode != 'devel' && File.exists?(File.join(Spider.paths[:tmp], 'maintenance.txt'))
+                raise Spider::Controller::Maintenance
+            end
             super
         end
         
@@ -182,7 +185,7 @@ module Spider; module ControllerMixins
         def render(path=nil, options={})
             scene = options[:scene] || @scene
             scene ||= get_scene
-            scene = prepare_scene(scene)
+            scene = prepare_scene(scene) unless options[:no_prepare_scene]
             request = options[:request] || @request
             response = options[:response] || @response
             if (path.is_a?(Spider::Template))
@@ -215,6 +218,11 @@ module Spider; module ControllerMixins
             return template
         end
         
+        def render_error(path, options)
+            options[:no_prepare_scene] = true
+            render(path, options)
+        end
+        
         def find_widget(name)
             @template.find_widget(name)
         end
@@ -239,19 +247,26 @@ module Spider; module ControllerMixins
             return obj
         end
         
-        def try_rescue(exc)            
+        def try_rescue(exc)
             exc.uuid = UUIDTools::UUID.random_create.to_s if exc.respond_to?(:uuid=)
             format = self.class.output_format(:error) || :html
-            return super unless @executed_format == :html
-            return super unless action_target?
-            return super if target_mode?
+            unless exc.is_a?(Spider::Controller::Maintenance) || exc.is_a?(Spider::Controller::NotFound)
+                return super unless @executed_format == :html
+                return super unless action_target?
+                return super if target_mode?
+            end
             output_format_headers(format)
-            if (exc.is_a?(Spider::Controller::NotFound))
-                error_page = '404'
+            layout = 'errors/error'
+            if exc.is_a?(Spider::Controller::Maintenance)
+                error_page = 'maintenance'
+                layout = 'generic'
+            elsif exc.is_a?(Spider::Controller::NotFound)
+                error_page = 'errors/404'
+                layout = 'errors/simple'
                 @scene.error_msg = _("Page not found")
                 @scene.email_subject = @scene.error_msg
             else
-                error_page = 'error_generic'
+                error_page = 'errors/error_generic'
                 if (exc.is_a?(HTTPMixin::HTTPStatus))
                     @scene.error_msg = exc.status_message
                 end
@@ -259,13 +274,13 @@ module Spider; module ControllerMixins
                 @scene.email_subject = @scene.error_msg
             end
             
-            if (exc.respond_to?(:uuid))
+            if exc.respond_to?(:uuid)
                 exc.extend(UUIDExceptionMessage)
                 @scene.exception_uuid = exc.uuid
-                @scene.email_subject += " (#{exc.uuid})"
+                @scene.email_subject += " (#{exc.uuid})" if @scene.email_subject
             end
             @scene.admin_email = Spider.conf.get('site.tech_admin.email')
-            if (Spider.runmode == 'devel')
+            if Spider.runmode == 'devel'
                 begin
                     @scene.devel = true
                     @scene.backtrace = build_backtrace(exc)
@@ -294,7 +309,7 @@ module Spider; module ControllerMixins
                 rescue => exc2
                 end
             end
-            render "errors/#{error_page}", :layout => "errors/error"
+            render_error "#{error_page}", :layout => layout
             super
         end
         

data/lib/spiderfw/http/server.rb

@@ -166,7 +166,6 @@ module Spider; module HTTP
                         Process.kill 'KILL', @monitor_thread[:spawner_child_pid]
                     }
                     Spider.on_main_process_shutdown(&exit_spawner)
-                    Spider.main_process_startup
                     $SPIDER_SCRIPT ||= $0
                     $0 = 'spider-spawner'
                 end

data/lib/spiderfw/setup/app_manager.rb

@@ -4,6 +4,129 @@ require 'fileutils'
 module Spider
 
     module AppManager
+        
+        def self.install_or_update(apps, options={})
+            require 'spiderfw/home'
+            home = Spider::Home.new(Dir.pwd)
+            installed = {}
+            Spider.init_base
+            active = Spider.config.get('apps')
+            Spider.home.apps.each do |app, info|
+                installed[app] = {
+                    :active => active.include?(app)
+                }
+                if spec = info[:spec]
+                    installed[app].merge!({
+                        :version => spec.version
+                    })                        
+                end
+            end
+            to_inst = apps.select{ |a| !installed[a] }
+            to_upd = apps.select{ |a| installed[a] }
+            install_apps(to_inst, options)
+            update_apps(to_upd, options)
+            return {:installed => to_inst, :updated => to_upd}
+        end
+        
+        def self.install_apps(apps, options={})
+            return if apps.empty?
+            require 'spiderfw/setup/app_server_client'
+            use_git = false
+            unless options[:no_git]
+                begin
+                    require 'grit'
+                    use_git = true
+                rescue => exc
+                    puts exc.message
+                    puts "Grit not available; install Grit for Git support"
+                end
+            end
+            
+            existent = []
+            apps.each do |app|
+                if File.exist?("apps/#{app}")
+                    puts _("%s already exists, skipping") % app
+                    existent << app
+                end
+            end
+            require 'spiderfw/setup/app_manager'
+            specs = []
+            url = options[:url]
+            unless url
+                require 'spiderfw/spider'
+                Spider.init_base
+                url = Spider.config.get('app_server.url')
+            end
+            client = Spider::AppServerClient.new(url)
+            if options[:no_deps]
+                specs = client.get_specs(apps)
+            else
+                specs = client.get_deps(apps, :no_optional => options[:no_optional])
+            end
+            deps = specs.map{ |s| s.app_id }
+            unless (deps - apps).empty?
+                puts _("The following apps will be installed as a dependency:")
+                puts (deps - apps).inspect
+            end
+            i_options = {
+                :use_git => use_git, 
+                :no_gems => options[:no_gems],
+                :no_optional_gems => options[:no_optional_gems]
+            }
+            i_options[:ssh_user] = options[:ssh_user] if options[:ssh_user]
+            inst_specs = specs.reject!{ |s| existent.include? s.app_id }
+            Spider::AppManager.install(inst_specs, Dir.pwd, i_options)
+            unless options[:no_activate]
+                require 'spiderfw/spider'
+                specs_hash = {}
+                specs.each{ |s| specs_hash[s.app_id] = s }
+                Spider.activate_apps(deps, specs_hash)
+            end
+            
+        end
+        
+        def self.update_apps(apps, options={})
+            require 'spiderfw/spider'
+            require 'spiderfw/setup/app_server_client'
+            Spider.init_base
+            url = options[:url] || Spider.conf.get('app_server.url')
+            use_git = false
+            unless options[:no_git]
+                begin
+                    require 'grit'
+                    use_git = true
+                rescue
+                    puts "Grit not available; install Grit for Git support"
+                end
+            end
+            if options[:all]
+                require 'spiderfw/home'
+                home = Spider::Home.new(Dir.pwd)
+                apps = home.list_apps
+            end
+            if apps.empty?
+                puts _("No app to update")
+                exit
+            end
+            require 'spiderfw/setup/app_manager'
+            specs = []
+            client = Spider::AppServerClient.new(url)
+            if options[:no_deps]
+                specs = client.get_specs(apps)
+            else
+                specs = client.get_deps(apps, :no_optional => options[:no_optional])
+            end
+            deps = specs.map{ |s| s.app_id }
+            unless (deps - apps).empty?
+                puts _("The following apps will be updated as a dependency:")
+                puts (deps - apps).inspect
+            end
+            Spider::AppManager.update(specs, Dir.pwd, {
+                :use_git => use_git, 
+                :no_gems => options[:no_gems],
+                :no_optional_gems => options[:no_optional_gems]
+            })
+        end
 
         def self.install(specs, home_path, options)
             options[:use_git] = true unless options[:use_git] == false
@@ -77,7 +200,7 @@ module Spider
             end
         end
         
-        def pre_update
+        def self.pre_update(specs, options={})
         end
         
         def self.post_setup(specs, options={})
@@ -89,7 +212,7 @@ module Spider
             options[:use_git] = true unless options[:use_git] == false
             specs = [specs] unless specs.is_a?(Array)
             pre_setup(specs, options)
-            pre_update(specs, option)
+            pre_update(specs, options)
             specs.each do |spec|
                 if spec.git_repo && options[:use_git]
                     git_update(spec, home_path, options)

data/lib/spiderfw/spider.rb

@@ -78,6 +78,11 @@ module Spider
                 @home.instance_eval(File.read(init_file), init_file)
             end
             
+            init_apps
+            @init_done=true
+        end
+        
+        def init_apps
             @apps.each do |name, mod|
                 mod.app_init if mod.respond_to?(:app_init)
             end
@@ -87,7 +92,6 @@ module Spider
                     GetText.bindtextdomain(mod.short_name)
                 end
             end
-            @init_done=true
         end
         
         def init_done?
@@ -175,9 +179,9 @@ module Spider
                 @fssm_thread = Thread.new do
                     monitor.run
                 end
-                Spider.logger.debug("Monitoring restart.txt")
+                Spider.logger.debug("Monitoring restart.txt") if Spider.logger
             else
-                Spider.logger.debug("FSSM not installed, unable to monitor restart.txt")
+                Spider.logger.debug("FSSM not installed, unable to monitor restart.txt") if Spider.logger
             end
             trap('TERM'){ Spider.main_process_shutdown; exit }
             trap('INT'){ Spider.main_process_shutdown; exit }
@@ -314,6 +318,7 @@ module Spider
             @paths[:tmp] = File.join(root, 'tmp')
             @paths[:data] = File.join(root, 'data')
             @paths[:log] = File.join(@paths[:var], 'log')
+            @paths[:restart_file] = File.join(@paths[:tmp], 'restart.txt')
             @paths.each do |k, path|
                 @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
             end
@@ -422,6 +427,20 @@ module Spider
             return false
         end
         
+        def get_app_deps(apps, options={})
+            new_apps = apps.clone
+            specs = {}
+            init_base
+            while !new_apps.empty? && curr = new_apps.pop
+                raise "Could not find app #{curr}" unless Spider.home.apps[curr]
+                spec = Spider.home.apps[curr][:spec]
+                specs[curr] = spec
+                new_apps += spec.depends.reject{ |app| specs[app] }
+                new_apps += spec.depends_optional.reject{ |app| specs[app] } if options[:optional]
+            end
+            specs.keys
+        end
+        
         def activate_apps(apps, specs=nil)
             require 'spiderfw/config/configuration_editor'
             init_base
@@ -448,7 +467,7 @@ module Spider
             apps.each do |a|
                 sort.add(specs[a] ? specs[a] : a)
             end
-            sort.tsort
+            sort.tsort.reject{ |a| a.nil? }
         end
         
         def load_configuration(path)

data/views/errors/404.shtml

@@ -3,4 +3,7 @@
 	<div class="error_description">
 		_(We are sorry, but the required page was not found).
 	</div>
+	<div class="link_back">
+	    <a href="{ Spider.site }/{ Spider::ControllerMixins::HTTPMixin.base_url }">_(Return to the site)</a>
+	</div>
 </div>

data/views/errors/simple.layout.shtml

@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+	<tpl:asset type="css" src="css/error_page.css" />
+    <head>
+        <title>{ @error_msg }</title>
+        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
+        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
+    </head>
+    <body>
+		<div id="header">
+		</div>
+        <div id="content">
+            <sp:yield />
+        </div>
+    </div>
+</div>

data/views/generic.layout.shtml

@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+	<tpl:asset type="css" src="css/error_page.css" />
+    <head>
+        <title>{ @error_msg }</title>
+        <script sp:each='@assets[:js] |script|' type="text/javascript" src="{ script }"></script>
+        <link sp:each='@assets[:css] |css_file|' rel='stylesheet' href='{ css_file }' />
+    </head>
+    <body>
+		<div id="header">
+		</div>
+        <div id="content">
+            <sp:yield />
+        </div>
+    </div>
+</div>

data/views/maintenance.shtml

@@ -0,0 +1,6 @@
+<div>
+    <h3 class="error_message">_(Under maintenance)</h3>
+    <div class="error_description">
+		_(The server is currently under maintenance. Please come back shortly).
+	</div>
+</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -850,6 +850,7 @@ files:
 - apps/master/models/admin.rb
 - apps/master/models/command.rb
 - apps/master/models/customer.rb
+- apps/master/models/event.rb
 - apps/master/models/installation.rb
 - apps/master/models/remote_log.rb
 - apps/master/models/resource.rb
@@ -935,6 +936,7 @@ files:
 - apps/servant/controllers/servant_controller.rb
 - apps/servant/Gemfile
 - apps/servant/lib/client.rb
+- apps/servant/lib/commands_processor.rb
 - apps/servant/servant.appspec
 - apps/servant/servant.rb
 - apps/soap/_init.rb
@@ -1211,6 +1213,9 @@ files:
 - views/errors/404.shtml
 - views/errors/error.layout.shtml
 - views/errors/error_generic.shtml
+- views/errors/simple.layout.shtml
+- views/generic.layout.shtml
+- views/maintenance.shtml
 has_rdoc: true
 homepage: http://github.com/me/spider
 licenses: []