spiderfw 0.5.13 → 0.5.14

data/lib/spiderfw/app.rb

@@ -15,6 +15,7 @@ module Spider
                     attr_accessor :short_prefix
                     attr_reader :command
                     attr_reader :spec
+                    attr_reader :gettext_dirs, :gettext_extensions, :gettext_parsers
                     
                     def init
                         unless @path
@@ -23,6 +24,7 @@ module Spider
                           @path = dir
                         end
                         @short_name ||= Inflector.underscore(self.name).gsub('/', '_')
+                        @dotted_name = Inflector.underscore(self.name).gsub('/', '.')
                         @pub_path ||= @path+'/public'
                         @test_path ||= @path+'/test'
                         @setup_path ||= @path+'/setup'
@@ -35,15 +37,46 @@ module Spider
                         load_spec(spec_path) if File.exists?(spec_path)
                         @route_url ||= Inflector.underscore(self.name)
                         @label ||= @short_name.split('_').each{ |p| p[0] = p[0].chr.upcase }.join(' ')
+                        @gettext_parsers ||= []
+                        @gettext_dirs ||= ['lib','bin','controllers','models','views','widgets','public']
+                        @gettext_extensions ||= ['rb','rhtml','shtml','js']
                         
                         find_tags
                     end
                     
                     def request_url
+                        if u = Spider.conf.get("#{@dotted_name}.url") 
+                            return u
+                        end
                         Spider::ControllerMixins::HTTPMixin.reverse_proxy_mapping('/'+@route_url)
                     end
                     alias :url :request_url
                     
+                    def http_url(action=nil)
+                        if u = Spider.conf.get("#{@dotted_name}.http_url") 
+                            return u
+                        end
+                        return nil unless Spider.site
+                        u = "http://#{Spider.site.domain}"
+                        u += ":#{Spider.site.port}" unless Spider.site.port == 80
+                        u += url
+                        u += "/"+action.to_s if action
+                        u
+                    end
+                    
+                    def https_url
+                        return nil unless Spider.site && Spider.site.ssl?
+                        u = "https://#{Spider.site.domain}"
+                        u += ":#{Spider.site.ssl_port}" unless Spider.site.ssl_port == 443
+                        u += url
+                        u
+                    end
+                    
+                    def http_s_url
+                        return https_url if Spider.site && Spider.site.ssl?
+                        return http_url
+                    end
+                    
                     def pub_url
                         if Spider.conf.get('static_content.mode') == 'publish'
                             Spider::HomeController.pub_url+'/apps/'+self.short_name
@@ -99,6 +132,16 @@ module Spider
                         self.constants.map{ |m| const_get(m) }.select{ |m| m.subclass_of? Spider::Controller }
                     end
                     
+                    def find_resource(type, name, cur_path=nil)
+                        Spider.find_resource(type, name, cur_path, self)
+                    end
+
+                    def find_resource_path(type, name, cur_path=nil)
+                        res = Spider.find_resource(type, name, cur_path, self)
+                        return res ? res.path : nil
+                    end
+                    
+                    
                     def register_tag(tag, obj)
                         @tags ||= {}
                         @tags[tag] = obj
@@ -172,6 +215,11 @@ module Spider
                         @version = @spec.version if @spec.version
                     end
                     
+                    def gettext_parsers
+                        @gettext_parsers ||[]
+                    end
+                    
+                    
                     
                 end
 
@@ -183,11 +231,24 @@ module Spider
         class AppSpec
             @@attributes = []
             
-            def self.attribute(name)
+            def self.attribute(name, options={})
                 @@attributes << name
                 str = <<END_OF_EVAL
                 def #{name}(val=nil)
                     @#{name} = val if val
+                    @#{name} ||= #{options[:default].inspect}
+                    @#{name}
+                end
+END_OF_EVAL
+                class_eval(str)
+            end
+            
+            def self.array_attribute(name, options={})
+                @@attributes << name
+                str = <<END_OF_EVAL
+                def #{name}(*vals)
+                    @#{name} = vals unless vals.empty?
+                    @#{name} ||= []
                     @#{name}
                 end
 END_OF_EVAL
@@ -197,13 +258,16 @@ END_OF_EVAL
             attribute :app_id
             attribute :name
             attribute :description
-            attribute :authors
             attribute :git_repo
-            attribute :git_repo_ro
             attribute :git_repo_rw
-            attribute :depends
-            attribute :gems
+            array_attribute :authors
+            array_attribute :depends
+            array_attribute :depends_optional
+            array_attribute :can_use
+            array_attribute :gems
+            array_attribute :gems_optional
             attribute :version
+            attribute :app_server
             
             def id(val=nil)
                 self.app_id(val)
@@ -249,6 +313,14 @@ END_OF_EVAL
             def to_json
                 to_h.to_json
             end
+            
+            def self.parse_hash(h)
+                spec = self.new
+                h.each do |key, value|
+                    spec.send(:"#{key}", value)
+                end
+                spec
+            end
 
         end
         

data/lib/spiderfw/cache/template_cache.rb

@@ -24,11 +24,13 @@ module Spider
         end
         
         def fresh?(path)
+            full_path = get_location(path)
             if Spider.config.get('template.cache.disable')
-                debug("Cache disabled, recreating #{path}")
+                Spider::Request.current[:compiled_templates] ||= {}
+                return true if Spider::Request.current[:compiled_templates][full_path]
+                #debug("Cache disabled, recreating #{full_path}")
                 return false
             end
-            full_path = get_location(path)
             exists = File.exist?(full_path)
             if (Spider.config.get('template.cache.no_check') && exists)
                 return true
@@ -47,7 +49,7 @@ module Spider
             # TODO: maybe insert here an (optional) tamper check 
             # that looks if the cache mtime is later then the saved time
             Marshal.load(IO.read(check_file)).each do |check, time|
-                debug("Template file #{check} changed, refreshing cache")
+                #debug("Template file #{check} changed, refreshing cache")
                 return false if File.mtime(check) > time
             end
             lock_file.flock(File::LOCK_UN)
@@ -59,7 +61,7 @@ module Spider
         end
         
         def refresh(path, &block)
-            debug("Refreshing cache for #{path}")
+            #debug("Refreshing cache for #{path}")
             res = block.call()
             write_cache(path, res)
             return res
@@ -70,6 +72,7 @@ module Spider
             compiled.cache_path = path
             init_code = IO.read(path+'/init.rb')
             run_code = IO.read(path+'/run.rb')
+            compiled.assets = Marshal.load(IO.read(path+'/assets'))
             block = Spider::TemplateBlocks::CompiledBlock.new(init_code, run_code)
             compiled.block = block
             Dir.new(path).each do |entry|
@@ -83,7 +86,7 @@ module Spider
         end
         
         def load_cache(template_path)
-            debug("Using cached #{template_path}")
+            # debug("Using cached #{template_path}")
             full_path = get_location(template_path)
             lock_file = File.new(full_path)
             lock_file.flock(File::LOCK_SH)
@@ -100,6 +103,9 @@ module Spider
             File.open(path+'/run.rb', 'w') do |file|
                 file.puts(compiled.block.run_code)
             end
+            File.open(path+'/assets', 'w') do |file|
+                file.puts(Marshal.dump(compiled.assets))
+            end
             compiled.subtemplates.each do |id, sub|
                 sub_path = "#{path}/#{id}"
                 FileUtils.mkpath(sub_path)
@@ -112,6 +118,10 @@ module Spider
                     f.puts(val)
                 end
             end
+            if Spider.config.get('template.cache.disable')
+                Spider::Request.current[:compiled_templates] ||= {}
+                Spider::Request.current[:compiled_templates][path] = true
+            end
         end
         
         def write_cache(template_path, compiled_template)

data/lib/spiderfw/cmd/cmd.rb

@@ -9,6 +9,7 @@ require 'spiderfw/cmd/commands/setup'
 require 'spiderfw/cmd/commands/model'
 require 'spiderfw/cmd/commands/config'
 require 'spiderfw/cmd/commands/content'
+require 'spiderfw/cmd/commands/app'
 
 module Spider; module CommandLine
 
@@ -49,6 +50,7 @@ module Spider; module CommandLine
             @cmd.add_command(ModelCommand.new)
             @cmd.add_command(ConfigCommand.new)
             @cmd.add_command(ContentCommand.new)
+            @cmd.add_command(AppCommand.new)
             # @cmd.add_command(ScaffoldCommand.new)
         end
 

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

@@ -0,0 +1,159 @@
+class AppCommand < CmdParse::Command
+
+
+    def initialize
+        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", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
+                ENV['http_proxy'] = p
+            }
+            opt.on("--server", _("App server"), "-s") { |s|
+                @server_url = s
+            }
+        end
+  
+        @installed = true
+        
+        list = CmdParse::Command.new( 'list', false )
+        list.short_desc = _("List installed and available apps")
+        list.options = CmdParse::OptionParserWrapper.new do |opt|
+            opt.on("--installed", _("List installed apps (the default)")) { |installed|
+                @remote = false
+            }
+            opt.on("--remote", _("List only remote apps"), "-r"){ |r|
+                @installed = false
+                @remote = true
+            }
+            opt.on("--all", _("List both local and remote apps"), "-a"){ |a|
+                @installed = true
+                @remote = true
+                @all = true
+            }
+            opt.on("--core", _("Include apps that come with spider"), "-c"){ |c|
+                @core = true
+            }
+        end
+        list.set_execution_block do |args|
+            if @installed
+                require 'spiderfw'
+                installed = {}
+                Spider.home.list_apps.each do |app|
+                    installed[app] = {
+                        :active => Spider.apps_by_path[app] ? true : false
+                    }
+                    if appspec = Dir.glob("#{Spider.paths[:apps]}/#{app}/*.appspec")[0]
+                        info = Spider::App::AppSpec.load(appspec)
+                        installed[app].merge!({
+                            :version => info.version
+                        })
+                    end
+                end
+            end
+            if @remote
+                require 'spiderfw/setup/app_server_client'
+                client = Spider::AppServerClient.new(@server_url)
+                remote = {}
+                client.specs.each do |app|
+                    remote[app.app_id] = {
+                        :version => app.version
+                    }
+                    if installed && installed[app] && installed[app][:version]
+                        v = Gem::Version.new(installed[app][:version])
+                        if v < app.version
+                            installed[app][:available] = app.version
+                        end
+                    end
+                end
+            end
+            if @installed
+                puts
+                puts "*** INSTALLED APPS ***"
+                puts  
+                installed.keys.sort.each do |app|                  
+                    details = installed[app]
+                    str = app
+                    str += " #{details[:version]}" if details[:version]
+                    str += " (#{_('active')})" if details[:active]
+                    puts str
+                end
+            end
+            if @remote
+                puts
+                puts "*** REMOTE APPS ***"
+                puts
+                remote.keys.sort.each do |app|
+                    details = remote[app]
+                    str = app
+                    str += " #{details[:version]}" if details[:version]
+                    puts str
+                end
+            end
+            puts
+        end
+        self.add_command( list )
+        
+        
+        install = CmdParse::Command.new( 'install', false )
+        install.short_desc = _("Install an app")
+        install.options = CmdParse::OptionParserWrapper.new do |opt|
+            opt.on("--no-git", _("Don't use git for installing apps"), "-g"){ |r| @no_git = true }
+            opt.on("--no-dependencies", _("Don't install other apps this one depends on"), "-d"){ |d| 
+                @no_deps = true 
+            }
+            opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
+            opt.on("--no-optional", _("Don't install optional app dependencies"), "-D"){ |o| @no_optional = true }
+            opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
+                @no_optional_gems = true
+            }
+        end
+        install.set_execution_block do |args|
+            unless File.exist?('init.rb') && File.directory?('apps')
+                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
+            existent = []
+            apps.each do |app|
+                if File.exist?("apps/#{app}")
+                    puts _("%s already exists, skipping") % app
+                    existent << app
+                end
+            end
+            apps -= existent
+            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
+            Spider::AppManager.install(specs, Dir.pwd, {
+                :use_git => use_git, 
+                :no_gems => @no_gems,
+                :no_optional_gems => @no_optional_gems
+            })
+        end
+        self.add_command(install)
+        
+    end
+end

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

@@ -48,6 +48,22 @@ class ConfigCommand < CmdParse::Command
         end
         
         self.add_command(get)
+        
+        set = CmdParse::Command.new('set', false)
+        set.short_desc = _("Set the value of a configuration option")
+        set.set_execution_block do |args|
+            require 'spiderfw'
+            require 'lib/spiderfw/config/configuration_editor'
+            editor = Spider::ConfigurationEditor.new
+            Spider.config.loaded_files.each do |f|
+                editor.load(f)
+            end
+            editor.set(*args)
+            editor.save
+        end
+        
+        self.add_command(set)
+        
     end
     
 end

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

@@ -23,7 +23,7 @@ class ContentCommand < CmdParse::Command
         compress.short_desc = _("Compress Javascript files")
         compress.set_execution_block do |args|
             require 'spiderfw'
-            Spider::StaticContent.compress(*args)
+            Spider::ContentUtils.compress(*args)
         end
         
         self.add_command(compress)

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

@@ -37,11 +37,24 @@ class CreateCommand < CmdParse::Command
                    "-p"){ |path|
                 @path = path
             }
+            opt.on("--no-wizard", _("Don't launch wizard"), "-W"){ |w| @no_wizard }
         end
         install.set_execution_block do |installs|
             @path ||= Dir.pwd
             installs.each do |inst|
                 Spider::Create.home(inst, @path)
+                unless @no_wizard
+                    Dir.chdir(inst) do 
+                        $SPIDER_RUN_PATH = Dir.pwd
+                        $:.push($SPIDER_RUN_PATH)
+                        require 'spiderfw'
+                        require 'lib/spiderfw/setup/spider_setup_wizard'
+                        wizard = Spider::SpiderSetupWizard.new
+                        wizard.first_run = true
+                        wizard.implementation(Spider::ConsoleWizard)
+                        wizard.run
+                    end
+                end
             end
         end
         self.add_command(install, false)

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

@@ -6,6 +6,7 @@ class ModelCommand < CmdParse::Command
         @short_desc = _("Manage models")
         @apps = []
         @force = false
+        @no_fkc = true
 
         sync_cmd = CmdParse::Command.new( 'sync', false )
         sync_cmd.short_desc = _("Sync models")
@@ -23,6 +24,7 @@ class ModelCommand < CmdParse::Command
             }
             opt.on("--non-managed", _("Process also non managed models"), "-m"){ |m| @non_managed = true}
             opt.on("--no-fk-constraints", _("Don't create foreign key constraints"), "-c"){ |c| @no_fkc = true }
+            opt.on("--fk-constraints", _("Create foreign key constraints"), "-C" ){ |c| @no_fkc = false } 
         end
         
         sync_cmd.set_execution_block do |req_models|
@@ -37,7 +39,9 @@ class ModelCommand < CmdParse::Command
                 if (mod.is_a?(Module) && mod.include?(Spider::App))
                     mod.models.each do |m|
                         unless @non_managed || m < Spider::Model::Managed
-                            Spider.logger.warn("Skipping #{m} because it's non managed (use -m to override)")
+                            unless m < Spider::Model::InlineModel || m.attributes[:sub_model]
+                                Spider.logger.warn("Skipping #{m} because it's non managed (use -m to override)")
+                            end
                             next
                         end
                         models << m

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

@@ -17,6 +17,9 @@ class SetupCommand < CmdParse::Command
             opt.on("--to [VERSION]", _("Setup to a specific version"), "-t"){ |to|
                 @to = Gem::Version.new(to)
             }
+            opt.on("--version [VERSION]", _("Only run the setup script for the given version"), "-v"){ |v|
+                @version = Gem::Version.new(v)
+            }
             opt.on("--all", _("Setup all active apps")){ |all|
                 @all = true
             }
@@ -25,8 +28,15 @@ class SetupCommand < CmdParse::Command
         set_execution_block do |apps|
             require 'spiderfw'
             apps = Spider.apps.keys if @all
-            if (apps.length > 1) && (@to || @from)
-                raise "Can't use --from or --to with multiple apps"
+            if (apps.length > 1) && (@to || @from || @version)
+                raise "Can't use --from, --to or --version with multiple apps"
+            end
+            if apps.length == 0
+                require 'lib/spiderfw/setup/spider_setup_wizard'
+                wizard = Spider::SpiderSetupWizard.new
+                wizard.implementation(Spider::ConsoleWizard)
+                wizard.run
+                
             end
             apps.each do |name|
                 Spider.load_app(name) unless Spider.apps[name]
@@ -35,15 +45,39 @@ class SetupCommand < CmdParse::Command
                 current = @from || app.installed_version
                 new_version = @to || app.version
                 next unless File.exist?(path)
-                Dir.entries(path).sort.each do |entry|
-                    next if (entry[0].chr == '.')
-                    task = Spider::SetupTask.load("#{path}/#{entry}")
-                    next unless task
-                    next if current && task.version < current
-                    next if new_version && task.version > new_version
-                    Spider.logger.info("Running setup task #{path+'/'+entry}")
-                    task.up
+                tasks = []
+                if @version
+                    tasks = ["#{@version}.rb"]
+                else
+                    tasks = Dir.entries(path).reject{ |p| p[0].chr == '.'}.sort{ |a, b| 
+                        va = Gem::Version.new(File.basename(a, '.rb'))
+                        vb = Gem::Version.new(File.basename(b, '.rb'))
+                        va <=> vb
+                    }
+                    if @from || @to
+                        tasks.reject!{ |t|
+                            v = Gem::Version.new(File.basename(t, '.rb'))
+                            true if @from && v < @from
+                            true if @to && v > @to
+                            false
+                        }
+                    end
+                end
+                done_tasks = []
+                Spider::Model::Managed.no_set_dates = true
+                tasks.each do |task|
+                    Spider.logger.info("Running setup task #{path+'/'+task}")
+                    t = Spider::SetupTask.load("#{path}/#{task}")
+                    t.app = app
+                    begin
+                        done_tasks << t
+                        t.do_up
+                    rescue => exc
+                        done_tasks.each{ |dt| dt.do_down } # FIXME: rescue and log errors in down
+                        raise
+                    end
                 end
+                Spider::Model::Managed.no_set_dates = false
                 app.installed_version = app.version
             end 
         end

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

@@ -38,6 +38,10 @@ class WebServerCommand < CmdParse::Command
         start.set_execution_block do |args|
             require 'spiderfw'
             raise "Can't use cgi mode with SSL" if @ssl && @cgi
+            if @ssl && @server_name != 'webrick'
+                puts _("Note: Using WEBrick as a webserver, since SSL was requested")
+                @server_name = 'webrick'
+            end
             @port ||= Spider.conf.get('webserver.port')
             @server_name ||= Spider.conf.get('http.server')
             @pid_file = Spider.paths[:var]+'/run/server.pid'
@@ -47,6 +51,12 @@ class WebServerCommand < CmdParse::Command
             ssl_server = nil
             start = lambda{
                 Spider.startup
+                if Spider.conf.get('devel.trace.extended')
+                    require 'ruby-debug'
+                    require 'spiderfw/utils/monkey/debugger'
+                    Debugger.start
+                    Debugger.post_mortem
+                end
                 
                 thread = Thread.new do
                     server.start(:port => @port, :cgi => @cgi)
@@ -54,12 +64,16 @@ class WebServerCommand < CmdParse::Command
                 if (@ssl)
                     @ssl_cert ||= Spider.conf.get('orgs.default.cert')
                     @ssl_key ||= Spider.conf.get('orgs.default.private_key')
+                    raise "SSL Certificate not set" unless @ssl_cert
+                    raise "SSL Key not set" unless @ssl_key
+                    raise "SSL Certificate (#{@ssl_cert}) not found" unless File.file?(@ssl_cert)
+                    raise "SSL Key (#{@ssl_key}) not found" unless File.file?(@ssl_key)
                     ssl_thread = Thread.new do
                         ssl_server = Spider::HTTP.const_get(servers[@server_name]).new
                         ssl_server.start(:port => @ssl, :ssl => true, :ssl_cert => @ssl_cert, :ssl_private_key => @ssl_key)
                     end
                 end
-                do_shutdown = lambda{
+                do_shutdown = lambda{ |arg|
                     server.shutdown
                     ssl_server.shutdown if ssl_server
                     Spider.shutdown

data/lib/spiderfw/config/configuration.rb

@@ -5,6 +5,7 @@ module Spider
     
     class Configuration
         attr_accessor :options, :current_set, :hash_key
+        attr_reader :loaded_files
         @@options = {}
         @@lang_aliases = {}
         
@@ -26,6 +27,7 @@ module Spider
             @sets['default'] = self
             @values = {}
             @hash_key = nil
+            @loaded_files = []
         end
         
         def global_options
@@ -103,6 +105,7 @@ module Spider
                     end
                 else
                     val = convert_val(@options[key][:params][:type], val) if (@options[key][:params][:type])
+                    @options[key][:params][:do].call(val) if @options[key][:params][:do]
                     self[key] = val
                 end
             end
@@ -175,7 +178,7 @@ module Spider
         # -:default     the default value for the option; if it is a proc, it will be called
         # -:choiches    an array of allowed values
         # -:type        parameter type; can be one of int, string, bool
-        def config_option(name, description, params={}, &proc)
+        def config_option(name, description=nil, params={}, &proc)
             name = name.to_s
             if (params.empty? && description.is_a?(Hash))
                 params = description
@@ -183,12 +186,16 @@ module Spider
             end
             o = @options
             params[:action] ||= proc if proc
+            params[:type] ||= String
             first, rest = name.split('.', 2)
             while (rest)
                 o = (o[first] ||= {})
                 first, rest = rest.split('.', 2)
             end
-            o[first] = {:description => description, :params => params}
+            if params && description
+                o[first] = {:description => description, :params => params}
+            end
+            o[first]
         end
         
         def option(name)
@@ -266,6 +273,7 @@ module Spider
                     configure(key, val)
                 end
             end
+            @loaded_files << file
         end
         
         def to_yaml
@@ -286,6 +294,15 @@ module Spider
             return h
         end
         
+        def get_editor
+            require 'spiderfw/config/configuration_editor'
+            editor = ConfigurationEditor.new
+            @loaded_files.each do |f|
+                editor.load(f)
+            end
+            editor
+        end
+        
     end
     
     class ConfigurationException < Exception