spiderfw 0.5.9 → 0.5.10

data/apps/master/controllers/master_controller.rb

@@ -0,0 +1,110 @@
+module Spider; module Master
+    
+    class MasterController < Spider::PageController
+        
+        layout 'master'
+        
+        route /customers\/(\d+)\/installations\//, :installations
+        
+        __.html :template => 'index'
+        def index
+        end
+        
+        __.html
+        def customers(id=nil)
+            if id
+                visual_params[:template] = 'customer'
+                @scene.customer = Customer.new(id) if id && id != 'new'
+                @scene.edit = (@request.params['_w'] && @request.params['_w'].key?('customer_form')) || @request.params.key?('edit') || id == 'new'
+                @scene.pk = id
+                get_template
+                if id == 'new' && @template.widgets[:customer_form]
+                    @template.widgets[:customer_form].attributes[:auto_redirect] = Master.url+'/customers'
+                end
+            else
+                @scene.customers = Customer.all
+                visual_params[:template] = 'customers'
+            end
+        end
+        
+        
+        
+        __.html :template => 'installation'
+        def installations(id, customer_id)
+            @customer = Customer.new(customer_id)
+            @installation = Installation.new(id) unless id == 'new'
+            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 = (@installation.apps && !@installation.apps.empty?)  ? @installation.apps.split(',') : []
+                @scene.apps = Spider::AppServer.apps
+            end
+            @scene << {
+                :customer => @customer,
+                :installation => @installation
+            }
+        end
+        
+        __.html
+        def servants(id=nil)
+            if id
+                @scene.servant = Servant.new(id)
+                render('servant')
+            else
+                @scene.servants = Servant.all
+                render('servants')
+            end
+            
+        end
+        
+        __.action
+        def ping
+            servant_id = @request.params['servant_id']
+            servant = Master::Servant.load(:id => servant_id)
+            new_servant = false
+            unless servant
+                servant = Master::Servant.static(:id => servant_id)
+                new_servant = true
+            end
+            servant.last_check = DateTime.now
+            servant.name = @request.params['servant_name']
+            servant.system_status = @request.params['system_status']
+            curr_resources = servant.resources_by_type
+            resources = []
+            if @request.params['resources']
+                @request.params['resources'].each do |res_type, type_resources|
+                    type_resources.each do |name, details|
+                        if curr_resources[res_type]
+                            res = curr_resources[res_type][name]
+                        end
+                        res ||= Resource.static
+                        res.resource_type = res_type
+                        res.name = name
+                        res.description = details['description']
+                        res.save
+                        resources << res
+                    end
+                end
+            end
+            servant.resources = resources
+            if new_servant
+                servant.insert
+            else
+                servant.update
+            end
+            $out << 'ok'
+        end
+        
+    end
+    
+end; end

data/apps/master/master.appspec

@@ -0,0 +1,5 @@
+id "master"
+name "Master"
+version "0.1"
+author "Ivan Pirlik"
+

data/apps/master/models/customer.rb

@@ -0,0 +1,13 @@
+require 'apps/master/models/installation'
+
+module Spider; module Master
+    
+    class Customer < Spider::Model::Managed
+        element :name, String
+        element :public_key, Text
+        element :private_key, Text
+        many :installs, Installation, :add_reverse => :customer
+        
+    end
+    
+end; end

data/apps/master/models/installation.rb

@@ -0,0 +1,10 @@
+module Spider; module Master
+    
+    class Installation < Spider::Model::Managed
+        element :name, String
+        element :apps, Text
+        element :configuration, Text
+        
+    end
+    
+end; end

data/apps/master/models/resource.rb

@@ -0,0 +1,10 @@
+module Spider; module Master
+    
+    class Resource < Spider::Model::Managed
+        element :name, String
+        element :resource_type, String
+        element :description, Text
+        
+    end
+    
+end; end

data/apps/master/models/servant.rb

@@ -0,0 +1,25 @@
+require 'apps/master/models/resource'
+
+module Spider; module Master
+    
+    class Servant < Spider::Model::Managed
+        remove_element :id
+        element :id, String, :primary_key => true
+        element :name, String
+        element :last_check, DateTime
+        element :system_status, Text
+        many :resources, Spider::Master::Resource, :delete_cascade => true
+        
+        
+        def resources_by_type
+            r = {}
+            self.resources.each do |res|
+                r[res.resource_type] ||= {}
+                r[res.resource_type][res.name] = res
+            end
+            r
+        end
+        
+    end
+    
+end; end

data/apps/master/views/customer.shtml

@@ -0,0 +1,20 @@
+<div>
+    <h3 sp:if="@customer">_(Customer %s) % @customer.name </h3>
+    <h3 sp:if="!@customer">_(New customer)</h3>
+    <tpl:pass sp:if="!@edit">
+        <a href="?edit">_(Edit)</a>
+        <a href="{ Master.url }/customers">_(List)</a>
+    </tpl:pass>
+    <tpl:pass sp:if="@edit">
+        <forms:form id="customer_form" model="Spider::Master::Customer" pk="@pk" auto_redirect="true"/>
+    </tpl:pass>
+    <tpl:pass sp:if="@customer && !@edit">
+        <h4>_(Installations)</h4>
+        <a href="{ @customer.id }/installations/new">_(New installation)</a>
+        <ul>
+            <li sp:each="@customer.installs |installation|">
+                <a href="{ customer.id }/installations/{ installation.id }">{ installation.name }</a>
+            </li>
+        </ul>
+    </tpl:pass>
+</div>

data/apps/master/views/customers.shtml

@@ -0,0 +1,10 @@
+<div>
+    <div class="actions">
+        <a href="{ Master.url }/customers/new">_(New customer)</a>
+    </div>
+    <ul>
+        <li sp:each="@customers |customer|">
+            <a href="{ Master.url }/customers/{ customer.id }">{ customer.name }</a>
+        </li>
+    </ul>
+</div>

data/apps/master/views/index.shtml

@@ -0,0 +1,4 @@
+<div>
+    <a href="{ Master.url }/customers">_(Customers)</a>
+    <a href="{ Master.url }/servants">_(Servants)</a>
+</div>

data/apps/master/views/installation.shtml

@@ -0,0 +1,36 @@
+<div>
+    <div class="actions">
+        <a href="{ Master.url }/customers/{ @customer.id }">_(Back to customer)</a>
+    </div>
+    <div sp:if="!@installation">
+        <h3>_(New installation for %s) % @customer.name</h3>
+        <form action="" method="POST">
+            <div class="row">
+                <label for="installation_name">_(Name):</label>
+                <input type="text" name="installation_name" id="installation_name">
+                <input type="submit" name="installation_create" value="Ok">
+            </div>
+        </form>
+    </div>
+    <div sp:if="@installation">
+        <h3 sp:if="@installation">_(Installation "%s" for %s) % [@installation.name, @customer.name] </h3>
+        <core:tabs id="install_tabs">
+            <tab id="edit" label="_(Edit installation)">
+                <div class="apps">
+                    <h4>_(Apps)</h4>
+                    <form action="" method="POST">
+                        <ul>
+                            <li sp:each="@apps |app|">
+                                <input type="checkbox" name="apps[{ app.app_id }]" value="true" sp:attr-if="@install_apps.include?(app.app_id),checked">
+                                { app.name }
+                            </li>
+                        </ul>
+                        <input type="submit" name="save_apps" value="_(Save)">
+                    </form>
+                </div>
+            </tab>
+            <tab id="targets" label="_(Targets)">
+            </tab>
+        </core:tabs>
+    </div>
+</div>

data/apps/master/views/master.layout.shtml

@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html>
+    <head>
+        <title>Spider Master</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="content">
+            <sp:yield />
+        </div>
+    </body>
+</html>

data/apps/master/views/servant.shtml

@@ -0,0 +1,26 @@
+<div>
+    <h3>_(Servant %s) % @servant.name </h3>
+    <div>
+        _(Last check): 
+        { @servant.last_check.lformat(:short) }
+    </div>
+    <div id="resources">
+        <h4>_(Resources)</h4>
+        <ul>
+            <li sp:each="@servant.resources_by_type |type, resources|">
+                { type }
+                <ul>
+                    <li sp:each="resources |name, resource|">
+                        { name }: { resource.description }
+                    </li>
+                </ul>
+            </li>
+        </ul>
+    </div>
+    <div>
+        <h4>_(System details)</h4>
+        <pre class="json">
+            { servant.system_status }
+        </pre>
+    </div>
+</div>

data/apps/master/views/servants.shtml

@@ -0,0 +1,7 @@
+<div>
+    <ul>
+        <li sp:each="@servants |servant|">
+            <a href="{ Master.url }/servants/{ servant.id }">{ servant.name }</a>
+        </li>
+    </ul>
+</div>

data/apps/servant/_init.rb

@@ -0,0 +1,5 @@
+module Spider
+    module Servant
+        include Spider::App
+    end
+end

data/apps/servant/bin/spider-servant.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'spiderfw'
+require 'cmdparse'
+require $SPIDER_PATH+'/apps/servant/lib/servant.rb'
+require 'ruby-debug'
+
+
+class Cmd
+
+    def initialize
+        @cmd = CmdParse::CommandParser.new( true, true )
+        @cmd.program_name = "spider-servant"
+        @cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+            opt.separator _("Global options:")
+            opt.on("--verbose", _("Be verbose when outputting info"), "-v" ) {|t| $verbose = true }
+            opt.on("--config-file [FILE]", _("Configuration file"), "-c"){ |c| @config_file = c }
+        end
+
+        ping_server = CmdParse::Command.new('ping_server', false)
+        ping_server.set_execution_block do |args|
+            servant = Spider::Servant::Servant.new(@config_file)
+            servant.ping_server
+        end
+
+
+        @cmd.add_command(CmdParse::HelpCommand.new, true)
+        @cmd.add_command(ping_server)
+
+    end
+
+    def parse
+        cmd_name = nil
+        0.upto(ARGV.length) do |i|
+            if (ARGV[i] && ARGV[i] != 'help' && ARGV[i][0].chr != '-')
+                cmd_name = ARGV[i]
+                break
+            end
+        end
+        cmd_name ||= 'help'
+        @cmd.parse
+    end
+
+end
+
+cmd = Cmd.new
+cmd.parse

data/apps/servant/lib/resource.rb

@@ -0,0 +1,11 @@
+module Spider; module Servant
+    
+    class Resource
+        
+        def description
+            {}
+        end
+        
+    end
+    
+end; end

data/apps/servant/lib/resources/db/mysql.rb

@@ -0,0 +1,31 @@
+module Spider; module Servant; module Resources
+    
+    class Mysql < Db
+       
+        
+        
+        def create_db(name)
+            return if db_exists?(name)
+            sql = "create database #{name}"
+            @storage.execute(sql)
+        end
+        
+        def db_exists?(name)
+            sql = "select schema_name from information_schema.schemata where schema_name = '#{name}'"
+            res = @storage.execute(sql)
+            return res[0] ? true : false
+        end
+        
+        def add_user(name, password)
+            sql = "create user '#{name}'@'localhost' identified by '#{password}'"
+            @storage.execute(sql)
+        end
+        
+        def grant_db_to_user(db_name, user)
+            sql = "grant all on #{db_name}.* to '#{user}'@'localhost'"
+            @storage.execute(sql)
+        end
+        
+    end
+    
+end; end; end

data/apps/servant/lib/resources/db.rb

@@ -0,0 +1,54 @@
+require 'spiderfw'
+
+module Spider; module Servant; module Resources
+    
+    class Db < Resource
+        
+        def self.get_resource(url)
+            matches = url.match(/^(.+?):\/\/(.+)/)
+            adapter = matches[1]
+            rest = matches[2]
+            if (adapter =~ /(.+):(.+)/)
+                connector = $1
+                adapter = $2
+                url = "#{adapter}://#{rest}"
+            end
+            case adapter
+            when 'sqlite'
+                class_name = :SQLite
+            when 'oci8'
+                class_name = :OCI8
+            when 'mysql'
+                class_name = :Mysql
+            when 'mssql'
+                class_name = :MSSQL
+            end
+            return Resources.const_get(class_name).new(url)
+        end
+        
+        def initialize(url)
+            @storage = Spider::Model::Storage.get_storage('db', url)
+        end
+        
+        def create_db(name)
+            raise "Unimplemented"
+        end
+        
+        def db_exists?(name)
+            raise "Unimplemented"
+        end
+        
+        def add_user(name, password)
+            raise "Unimplemented"
+        end
+        
+        def grant_db_to_user(db_name, user)
+            raise "Unimplemented"
+        end
+        
+        def resource_type
+            :db
+        end
+    end
+    
+end; end; end

data/apps/servant/lib/servant.rb

@@ -0,0 +1,82 @@
+require 'rubygems'
+require 'ohai'
+require 'httpclient'
+$SPIDER_SERVANT_LIB = File.dirname(__FILE__)
+require "#{$SPIDER_SERVANT_LIB}/resource"
+require "#{$SPIDER_SERVANT_LIB}/resources/db"
+require "#{$SPIDER_SERVANT_LIB}/resources/db/mysql"
+
+module Spider
+    
+    module Servant
+        
+        class Servant
+            DEFAULTS = {
+                :config_file => '/etc/spider/servant.yml'
+            }
+        
+            def initialize(config_file=nil)
+                @config = {
+                    :server_url => 'http://localhost:8989/spider/master/ping'
+                }
+                config_file ||= Servant::DEFAULTS[:config_file] if File.exists?(Servant::DEFAULTS[:config_file])
+                if config_file
+                    y = YAML::load_file(config_file)
+                    @config.merge!(y)
+                end
+                ohai = Ohai::System.new
+                ohai.all_plugins
+                @ohai = ohai
+                @config[:servant_id] ||= ohai["hostname"]
+                @config[:servant_name] ||= @config[:servant_id]
+                create_resources
+            end
+        
+            def ping_server(url=nil)
+                url ||= @config[:server_url]
+
+                @system_status = @ohai.to_json
+                clnt = HTTPClient.new
+                clnt.post(url, Spider::HTTP.params_to_hash(self.description))
+            end
+        
+            def create_resources
+                @resources = {}
+                return unless @config['resources'].is_a?(Hash)
+                @config['resources'].each do |res_type, hash|
+                    @resources[res_type] ||= {}
+                    case res_type
+                    when 'db'
+                        hash.each do |res_name, params|
+                            @resources[res_type][res_name] = Resources::Db.get_resource(params['url'])
+                        end
+                    end
+                end
+            end
+            
+            def description
+                {
+                    :servant_id => @config[:servant_id],
+                    :servant_name => @config[:servant_name],
+                    :system_status => @system_status,
+                    :resources => resources_description
+                }
+            end
+            
+            def resources_description
+                desc = {}
+                @resources.each do |type, type_resources|
+                    desc[type] ||= {}
+                    type_resources.each do |name, resource|
+                        desc[type][name] = {
+                            :description => resource.description.to_json
+                        }
+                    end
+                end
+            end
+            
+        end
+        
+    end
+    
+end

data/apps/servant/servant.appspec

@@ -0,0 +1,4 @@
+name "Servant"
+version "0.1"
+author "Ivan Pirlik"
+gems "ohai >0.3", "httpclient"

data/apps/servant/var/log/error.log

@@ -0,0 +1 @@
+# Logfile created on Mon Apr 12 15:39:53 +0200 2010 by /

data/apps/worker/worker.rb

@@ -133,7 +133,7 @@ module Spider
         end
         
         def self.at(time, proc_string)
-            job = Job.new(:uuid => ::UUID.new.generate, :time => time, :task => proc_string)
+            job = Job.new(:uuid => UUIDTools::UUID.random_create.to_s, :time => time, :task => proc_string)
             job.save
             return job.uuid
         end

data/blueprints/install/config.ru

@@ -0,0 +1,12 @@
+ENV['LANG'] = 'it_IT.UTF-8'
+require 'spiderfw'
+require 'spiderfw/http/adapters/rack'
+PhusionPassenger.on_event(:starting_worker_process) do
+    Spider.start_loggers
+    Spider.startup
+end
+rack_app = Spider::HTTP::RackApplication.new
+app = proc do |env|
+    rack_app.call(env)
+end
+run app

data/lib/spiderfw/app.rb

@@ -45,6 +45,14 @@ module Spider
                     alias :url :request_url
                     
                     def pub_url
+                        if Spider.conf.get('static_content.mode') == 'publish'
+                            Spider::HomeController.pub_url+'/apps/'+self.short_name
+                        else
+                            request_url+'/public'
+                        end
+                    end
+                    
+                    def pub_url!
                         request_url+'/public'
                     end
                     

data/lib/spiderfw/cmd/cmd.rb

@@ -2,12 +2,13 @@ require 'rubygems'
 require 'spiderfw/i18n/gettext'
 require 'cmdparse'
 require 'spiderfw/cmd/commands/webserver'
-require 'spiderfw/cmd/commands/init'
+require 'spiderfw/cmd/commands/create'
 require 'spiderfw/cmd/commands/console'
 require 'spiderfw/cmd/commands/test'
 require 'spiderfw/cmd/commands/setup'
 require 'spiderfw/cmd/commands/model'
 require 'spiderfw/cmd/commands/config'
+require 'spiderfw/cmd/commands/content'
 
 module Spider; module CommandLine
 
@@ -36,7 +37,7 @@ module Spider; module CommandLine
 
             @cmd.add_command(CmdParse::HelpCommand.new, true)
             @cmd.add_command(WebServerCommand.new)
-            @cmd.add_command(InitCommand.new)
+            @cmd.add_command(CreateCommand.new)
             @cmd.add_command(ConsoleCommand.new)
             begin
                 require 'spiderfw/cmd/commands/cert'
@@ -47,6 +48,7 @@ module Spider; module CommandLine
             @cmd.add_command(SetupCommand.new)
             @cmd.add_command(ModelCommand.new)
             @cmd.add_command(ConfigCommand.new)
+            @cmd.add_command(ContentCommand.new)
             # @cmd.add_command(ScaffoldCommand.new)
         end
 

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

@@ -0,0 +1,33 @@
+require 'fileutils'
+
+class ContentCommand < CmdParse::Command
+
+
+    def initialize
+        super( 'content', true, true )
+        @short_desc = _("Manage static content")
+        
+        publish = CmdParse::Command.new( 'publish', false )
+        publish.short_desc = _("Publish apps static content to home public folder")
+        publish.options = CmdParse::OptionParserWrapper.new do |opt|
+        end
+        
+        publish.set_execution_block do |args|
+            require 'spiderfw'
+            Spider::StaticContent.publish
+        end
+        
+        self.add_command(publish)
+        
+        compress = CmdParse::Command.new('compress', false)
+        compress.short_desc = _("Compress Javascript files")
+        compress.set_execution_block do |args|
+            require 'spiderfw'
+            Spider::StaticContent.compress(*args)
+        end
+        
+        self.add_command(compress)
+        
+    end
+    
+end