spiderfw 0.6.5 → 0.6.6

data/lib/spiderfw/model/storage/db/adapters/oracle.rb

@@ -270,15 +270,92 @@ module Spider; module Model; module Storage; module Db
          end
 
          def list_tables
-             return execute("SELECT TABLE_NAME FROM user_tables ORDER BY table_name").map{ |r| r['TABLE_NAME'] }
+             tables = execute("SELECT TABLE_NAME FROM user_tables ORDER BY table_name").map{ |r| r['TABLE_NAME'] }
+             mv = execute("SELECT OBJECT_NAME FROM user_objects WHERE OBJECT_TYPE = 'MATERIALIZED VIEW'").map{ |r| r['OBJECT_NAME'] }
+             tables - mv
+         end
+         
+         def get_table_create_sql(table)
+             sql = nil
+             connection do |c|
+                 out = nil
+                 cursor = c.parse('BEGIN :out1 := DBMS_METADATA.GET_DDL(object_type=>:in1, name=>:in2); END;')
+                 cursor.bind_param(1, out, OCI8::CLOB)
+                 cursor.bind_param(2, 'TABLE', String)
+                 cursor.bind_param(3, table, String)
+                 res = cursor.exec
+                 sql = cursor[1].read
+                 cursor.close
+                 # cursor = c.parse('BEGIN DBMS_METADATA_UTIL.LOAD_STYLESHEETS(); END;')
+                 # cursor.exec
+             end
+             sql
+         end
+         
+         def dump(stream, tables=nil)
+             stream << "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';\n\n"
+             super(stream, tables)
+         end
+         
+         def dump_table_data(table, stream)
+             connection do |c|
+                 cursor = c.parse("SELECT COUNT(*) AS N FROM #{table}")
+                 cursor.exec
+                 num = cursor.fetch[0]
+                 cursor.close
+                 cursor = c.parse("select * from #{table}")
+                 cursor.exec
+                 if num > 0
+                     info = describe_table(table)
+                     fields = info[:columns]
+                     stream << "INSERT INTO #{table} (#{info[:order].map{ |f| "#{f}"}.join(', ')})\n"
+                     stream << "VALUES\n"
+                     cnt = 0
+                     while row = cursor.fetch
+                         cnt += 1
+                         stream << "("
+                         info[:order].each_with_index do |f, i|
+                             stream << dump_value(row[i], fields[f])
+                             stream << ", " if i < fields.length - 1
+                         end
+                         stream << ")"
+                         if cnt < num
+                             stream << ",\n"
+                         else
+                             stream << ";\n"
+                         end
+                     end
+                     stream << "\n\n"
+                 end
+                 cursor.close
+             end
+         end
+         
+         def dump_value(val, field)
+             return 'NULL' if val.nil?
+             type =  field[:type]
+             if ['CHAR', 'VARCHAR', 'VARCHAR2', 'BLOB', 'CLOB'].include?(type)
+                 val = val.gsub("'", "''").gsub("\n", '\n').gsub("\r", '\r')
+                 return "'#{val}'"
+             elsif ['DATE', 'TIME', 'DATETIME'].include?(type)
+                 val = val.strftime("%Y-%m-%d %H:%M:%S")
+                 return "'#{val}'"
+             else
+                 return val.to_s
+             end
          end
 
          def describe_table(table)
              primary_keys = []
              o_foreign_keys = {}
              columns = {}
+             order = []
              connection do |conn|
-                 columns = do_describe_table(conn, table)
+                 cols = do_describe_table(conn, table)
+                 cols.each do |col|
+                     columns[col[:name]] = col
+                     order << col[:name]
+                 end
                  res = execute("SELECT cols.table_name, cols.COLUMN_NAME, cols.position, cons.status, cons.owner
                  FROM user_constraints cons, user_cons_columns cols
                  WHERE cons.constraint_type = 'P'
@@ -310,7 +387,7 @@ module Spider; module Model; module Storage; module Db
              o_foreign_keys.each do |fk_name, fk_hash|
                  foreign_keys << ForeignKeyConstraint.new(fk_name, fk_hash[:table], fk_hash[:columns])
              end
-             return {:columns => columns, :primary_keys => primary_keys, :foreign_key_constraints => foreign_keys}
+             return {:columns => columns, :order => order, :primary_keys => primary_keys, :foreign_key_constraints => foreign_keys}
 
          end
 

data/lib/spiderfw/model/storage/db/connectors/jdbc_oracle.rb

@@ -305,16 +305,17 @@ module Spider; module Model; module Storage; module Db; module Connectors
         def do_describe_table(conn, table)
             md = get_db_metadata(conn)
             res = md.getColumns(nil, @user.upcase, table, nil)
-            columns = {}
+            columns = []
             while res.next()
                 col_name = res.getString("COLUMN_NAME")
                 col = {
+                    :name => col_name,
                     :type => res.getString("TYPE_NAME"),
                     :length => res.getInt("COLUMN_SIZE"),
                     :precision => res.getInt("DECIMAL_DIGITS"),
                 }
                 col.delete(:length) if (col[:precision])
-                columns[col_name] = col
+                columns << col
             end
             columns
         end

data/lib/spiderfw/model/storage/db/connectors/oci8.rb

@@ -180,10 +180,11 @@ module Spider; module Model; module Storage; module Db; module Connectors
         end
         
         def do_describe_table(conn, table)
-            columns = {}
+            columns = []
             t = conn.describe_table(table)
             t.columns.each do |c|
                 col = {
+                    :name => c.name,
                     :type => c.data_type.to_s.upcase,
                     :length => c.data_size,
                     :precision => c.precision,
@@ -191,7 +192,7 @@ module Spider; module Model; module Storage; module Db; module Connectors
                     :null => c.nullable?
                 }
                 col.delete(:length) if (col[:precision])
-                columns[c.name] = col
+                columns << col
             end
             columns
         end

data/lib/spiderfw/model/storage/db/db_storage.rb

@@ -671,6 +671,28 @@ module Spider; module Model; module Storage; module Db
             col
         end
         
+        def dump(stream, tables=nil, options={})
+            tables ||= list_tables
+            options = ({
+                :include_create => true
+            }).merge(options)
+            tables.each do |t|
+                 Spider.logger.info("Dumping table #{t}")
+                 begin
+                     if options[:include_create]
+                         create = get_table_create_sql(t)
+                         stream << create
+                         stream << "\n\n"
+                     end
+                     dump_table_data(t, stream)
+                     stream << "\n\n"
+                 rescue => exc
+                     Spider.logger.error("Failed to dump table #{t}")
+                     Spider.logger.error(exc.message)
+                 end
+             end
+         end
+        
         ##############################################################
         #   Aggregates                                               #
         ##############################################################

data/lib/spiderfw/setup/app_manager.rb

@@ -77,15 +77,19 @@ module Spider
             end
         end
         
+        def pre_update
+        end
+        
         def self.post_setup(specs, options={})
-            require 'bundler'
-            Bundler::Installer.install(options[:home_path], Bundler.definitions, {})
+            #require 'bundler'
+            #Bundler::Installer.install(options[:home_path], Bundler.definitions, {})
         end
         
         def self.update(specs, home_path, options)
             options[:use_git] = true unless options[:use_git] == false
             specs = [specs] unless specs.is_a?(Array)
             pre_setup(specs, options)
+            pre_update(specs, option)
             specs.each do |spec|
                 if spec.git_repo && options[:use_git]
                     git_update(spec, home_path, options)

data/lib/spiderfw/site.rb

@@ -41,13 +41,15 @@ module Spider
         def to_s
             s = "http://#{@domain}"
             s += ":#{@port}" if @port != 80
+            s
         end
         
         def ssl_to_s
             s = "https://#{@domain}"
             s += ":#{@ssl_port}" if @ssl_port != 443
+            s
         end
         
     end 
 
-end
+end

data/lib/spiderfw/spider.rb

@@ -9,6 +9,11 @@ require 'spiderfw/requires'
 
 require 'spiderfw/version'
 
+begin
+    require 'fssm'
+rescue LoadError
+end
+
 
 module Spider
     
@@ -109,6 +114,7 @@ module Spider
             load_configuration File.join($SPIDER_PATH, 'config')
             load_configuration File.join(@root, 'config')
             Locale.default = Spider.conf.get('i18n.default_locale')
+            setup_env
             @init_base_done = true
         end
         
@@ -118,15 +124,21 @@ module Spider
         #         mod.app_stop if mod.respond_to?(:app_stop)
         #     end
         # end
-
-
-        # Invoked before a server is started. Apps may implement the app_startup method, that will be called.
-        def startup
+        
+        def setup_env
             unless File.exists?(File.join(Spider.paths[:root], 'init.rb'))
-                raise "The server must be started from the root directory"
+                raise "This command must be run from the root directory"
             end
             FileUtils.mkdir_p(Spider.paths[:tmp])
             FileUtils.mkdir_p(Spider.paths[:var])
+            FileUtils.mkdir_p(File.join(Spider.paths[:var], 'memory'))
+            
+        end
+
+
+        # Invoked before a long running service started. Apps may implement the app_startup method, that will be called.
+        def startup
+            setup_env
             if Spider.conf.get('template.cache.reload_on_restart')
                 FileUtils.touch("#{Spider.paths[:tmp]}/templates_reload.txt")
             end
@@ -144,21 +156,86 @@ module Spider
             @apps.each do |name, mod|
                 mod.app_startup if mod.respond_to?(:app_startup)
             end
-
             @startup_done = true
+            at_exit do
+                Spider.shutdown
+            end
+        end
+        
+        def main_process_startup
+            if Object.const_defined?(:FSSM)
+                monitor = FSSM::Monitor.new
+
+                monitor.path(Spider.paths[:tmp], 'restart.txt') do
+                    create { |base, relative| Process.kill 'HUP', $$ }
+                    update { |base, relative| Process.kill 'HUP', $$ }            
+
+                end
+
+                @fssm_thread = Thread.new do
+                    monitor.run
+                end
+                Spider.logger.debug("Monitoring restart.txt")
+            else
+                Spider.logger.debug("FSSM not installed, unable to monitor restart.txt")
+            end
+            trap('TERM'){ Spider.main_process_shutdown; exit }
+            trap('INT'){ Spider.main_process_shutdown; exit }
+            trap('HUP'){ Spider.respawn! }
+            
+            if @main_process_startup_blocks
+                @main_process_startup_blocks.each{ |block| block.call }
+            end
+            
+        end
+        
+        def on_main_process_startup(&proc)
+            @main_process_startup_blocks ||= []
+            @main_process_startup_blocks << proc
         end
         
         def startup_done?
             @startup_done
         end
         
+        def on_shutdown(&block)
+            @shutdown_blocks ||= []
+            @shutdown_blocks << block
+        end
+        
         # Invoked when a server is shutdown. Apps may implement the app_shutdown method, that will be called.        
-        def shutdown
-            return unless Thread.current == Thread.main
+        def shutdown(force=false)
+            unless force
+                #return unless Thread.current == Thread.main
+                return if @shutdown_done
+            end
+            @shutdown_done = true
+            Spider.logger.debug("Shutdown")
             Debugger.post_mortem = false if Object.const_defined?(:Debugger) && Debugger.post_mortem?
             @apps.each do |name, mod|
                 mod.app_shutdown if mod.respond_to?(:app_shutdown)
             end
+            if @shutdown_blocks
+                @shutdown_blocks.each{ |b| b.call }
+            end
+        end
+        
+        def shutdown!
+            shutdown(true)
+        end
+        
+        def main_process_shutdown
+            if startup_done?
+                shutdown!
+            end
+            if @main_process_shutdown_blocks
+                @main_process_shutdown_blocks.each{ |b| b.call }
+            end
+        end
+        
+        def on_main_process_shutdown(&block)
+            @main_process_shutdown_blocks ||= []
+            @main_process_shutdown_blocks << block
         end
         
         def current
@@ -237,6 +314,9 @@ module Spider
             @paths[:tmp] = File.join(root, 'tmp')
             @paths[:data] = File.join(root, 'data')
             @paths[:log] = File.join(@paths[:var], 'log')
+            @paths.each do |k, path|
+                @paths[k] = File.expand_path(File.readlink(path)) if File.symlink?(path)
+            end
         end
         
         # Finds an app by name, looking in paths[:apps] and paths[:core_apps]. Returns the found path.
@@ -283,7 +363,11 @@ module Spider
             GetText::LocalePath.add_default_rule(File.join(path, "data/locale/%{lang}/LC_MESSAGES/%{name}.mo"))
         end
         
+        
         def load_apps(*l)
+            if l.empty?
+                l = Spider.conf.get('apps')
+            end
             l.each do |app|
                 load_app(app)
             end
@@ -295,9 +379,10 @@ module Spider
             end
         end
         
-        def find_all_apps
+        def find_all_apps(paths=nil)
+            paths ||= [@paths[:core_apps], @paths[:apps]]
             app_paths = []
-            Find.find(@paths[:core_apps], @paths[:apps]) do |path|
+            Find.find(*paths) do |path|
                 if (File.basename(path) == '_init.rb')
                     app_paths << File.dirname(path)
                     Find.prune
@@ -337,6 +422,35 @@ module Spider
             return false
         end
         
+        def activate_apps(apps, specs=nil)
+            require 'spiderfw/config/configuration_editor'
+            init_base
+            unless specs
+                specs = {}
+                Spider.home.apps.each do |k, v|
+                    specs[k] = v[:spec] if apps.include?(k)
+                end
+            end
+            editor = Spider::ConfigurationEditor.new
+            Spider.config.loaded_files.each do |f|
+                editor.load(f)
+            end
+            c_apps = Spider.config.get('apps')
+            c_apps = (c_apps + apps).uniq
+            editor.set('apps', Spider.apps_load_order(c_apps, specs))
+            editor.save
+        end
+        
+        def apps_load_order(apps, specs)
+            # TODO
+            require 'spiderfw/app'
+            sort = Spider::App::RuntimeSort.new
+            apps.each do |a|
+                sort.add(specs[a] ? specs[a] : a)
+            end
+            sort.tsort
+        end
+        
         def load_configuration(path)
             return unless File.directory?(path)
             opts = File.join(path, 'options.rb')
@@ -451,9 +565,9 @@ module Spider
                     return Resource.new(path, self)
                 elsif (cur_path)
                     if (path[0..1] == './')
-                        return Resource.new(first_found(extensions, cur_path+path[1..-1]), owner_class)
+                        return Resource.new(first_found(extensions, File.dirname(cur_path)+path[1..-1]), owner_class)
                     elsif (path[0..1] == '../')
-                        return Resource.new(first_found(extensions, File.dirname(cur_path)+path[2..-1]), owner_class)
+                        return Resource.new(first_found(extensions, File.dirname(File.dirname(cur_path))+path[2..-1]), owner_class)
                     end
                 end
                 app = nil
@@ -488,6 +602,7 @@ module Spider
                     return Resource.new(found, definer) if found
                 end
             end
+            resource_type, path, cur_path=nil, owner_classes=nil, search_paths
             return Resource.new(path)
         end
         
@@ -596,12 +711,24 @@ module Spider
         end
         
         def respawn!
-            # TODO
-            raise "Unimplemented"
-            Spider.logger.info("Respawning")
-            @spawner.write('spawn')
-            @spawner.close
-            Process.kill "KILL", Process.pid
+            require 'rbconfig'
+            Spider.logger.info("Restarting")
+            ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
+            Spider.main_process_shutdown
+            return if $SPIDER_NO_RESPAWN
+            cmd = $SPIDER_SCRIPT || $0
+            args = $SPIDER_PROC_ARGS || ARGV
+            Spider.logger.debug("CWD: #{Dir.pwd}")
+            if RUBY_PLATFORM =~ /win32|mingw32/
+                start_cmd = "start cmd /C #{ruby} #{cmd} #{args.join(' ')}"
+                Spider.logger.debug(start_cmd)
+                IO.popen(start_cmd)
+                sleep 5
+            else
+                start_cmd = "#{ruby} #{cmd} #{args.join(' ')}"
+                Spider.logger.debug(start_cmd)
+                exec(start_cmd)
+            end
         end
         
         def runmode=(mode)

data/lib/spiderfw/templates/blocks/parent_context.rb

@@ -13,7 +13,9 @@ module Spider; module TemplateBlocks
 #            c += "debugger\n"
             parent_c, parent_init = compile_content(c, init, options)
             parent_c.gsub!("'", "\\\\'")
-            parent_init.gsub!("'", "\\\\'")
+            #parent_init.gsub!("'", "\\\\'")
+            init = parent_init
+            init.gsub!('scene[', 'scene[:_parent][')
             c += "self[:_parent].instance_eval('def __run_block\n;#{parent_c}\nend\n')\n"
             c += "yield :_parent\n"
             return CompiledBlock.new(init, c)

data/lib/spiderfw/templates/template.rb

@@ -27,7 +27,7 @@ module Spider
         attr_accessor :mode # :widget, ...
         attr_accessor :assets
         attr_accessor :runtime_overrides
-        attr_reader :overrides, :path, :subtemplates, :widgets
+        attr_reader :overrides, :path, :subtemplates, :widgets, :content
         attr_accessor :asset_profiles
         
         @@registered = {}
@@ -269,7 +269,7 @@ module Spider
             doc = open(@path){ |f| Hpricot.XML(f) }
             root = get_el(doc)
             el = process_tags(root)
-            @overrides.each{ |o| apply_override(root, o) } if @overrides
+            apply_overrides(root)
             root.search('tpl:placeholder').remove # remove empty placeholders
             owner_class = @owner ? @owner.class : @owner_class
             @assets += owner_class.assets if owner_class
@@ -459,6 +459,7 @@ module Spider
             doc = nil
             if path_or_doc.is_a?(Hpricot::Doc)
                 doc = path_or_doc
+                path = @path
             else
                 path = path_or_doc
                 path ||= @path
@@ -478,7 +479,6 @@ module Spider
             add_overrides overrides
             @overrides += orig_overrides
             if root.name == 'tpl:extend'
-
                 orig_overrides = @overrides
                 @overrides = []
                 ext_src = root.get_attribute('src')
@@ -500,7 +500,8 @@ module Spider
                 if ext_owner && ext_owner.respond_to?(:template_paths)
                     ext_search_paths = ext_owner.template_paths
                 end 
-                ext = self.class.real_path(ext_src, @path, ext_owner, ext_search_paths)
+                ext = self.class.real_path(ext_src, path, ext_owner, ext_search_paths)
+                raise "Extended template #{ext_src} not found (search path #{path}, owner #{ext_owner}, search paths #{ext_search_paths.inspect}" unless ext
                 assets = []
                 if root.children
                     assets = root.children_of_type('tpl:asset')
@@ -525,7 +526,7 @@ module Spider
             else
                 assets_html = ""
                 root.search('tpl:include').each do |incl|
-                    resource = Spider.find_resource(:views, incl.get_attribute('src'), File.dirname(@path), [@owner.class, @definer_class])
+                    resource = Spider.find_resource(:views, incl.get_attribute('src'), @path, [@owner.class, @definer_class])
                     src = resource.path
                     @dependencies << src
                     incl_el = self.get_el(src)
@@ -685,6 +686,7 @@ module Spider
             scene.instance_eval("def __run_template\n"+@compiled.run_code+"end\n", @compiled.cache_path+'/run.rb', 0)
             scene.__run_template do |yielded|
                 if yielded == :_parent
+                    @owner.parent.template.content.merge!(@content)
                     @owner.parent.template.run_block
                 else
                     @content[yielded].render if @content[yielded]
@@ -750,6 +752,13 @@ module Spider
         def overrides_for(widget_id)
             @widgets_overrides[widget_id] || []
         end
+
+        def apply_overrides(el)
+            if @overrides
+                @overrides.each{ |o| apply_override(el, o) }
+            end
+            el
+        end
         
         # Applies an override to an (Hpricot) element.
         def apply_override(el, override)

data/lib/spiderfw/widget/widget.rb

@@ -413,6 +413,7 @@ module Spider
             if !@is_target && @widget_target
                 first, rest = @widget_target.split('/', 2)
                 @_widget = find_widget(first)
+                raise "#{self} couldn't find widget #{first} for target #{@widget_target}" unless @_widget
                 @_widget.is_target_ancestor = true
                 @_widget.widget_target = rest
                 @_widget.is_target = true unless rest

data/lib/spiderfw/widget/widget_attributes.rb

@@ -25,7 +25,7 @@ module Spider
                 when 'String'
                     v = v.to_s
                 when 'Symbol'
-                    v = v.to_sym
+                    v = v.to_sym if v
                 when 'TrueClass', 'FalseClass', 'Spider::DataTypes::Bool'
                     v = (v.to_s == 'false' || v.to_s.empty?) ? false : true
                 when 'Fixnum'
@@ -51,4 +51,4 @@ module Spider
         
     end
     
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +02:00
+date: 2011-07-19 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -838,7 +838,8 @@ files:
 - apps/master/controllers/login_controller.rb
 - apps/master/controllers/master_controller.rb
 - apps/master/controllers/scout_controller.rb
-- apps/master/controllers/servant_controller.rb
+- apps/master/controllers/server_controller.rb
+- apps/master/data/locale/it/LC_MESSAGES/master.mo
 - apps/master/data/locale/it/LC_MESSAGES/spider_master.mo
 - apps/master/lib/resource.rb
 - apps/master/lib/resources/db_resource.rb
@@ -850,6 +851,7 @@ files:
 - apps/master/models/command.rb
 - apps/master/models/customer.rb
 - apps/master/models/installation.rb
+- apps/master/models/remote_log.rb
 - apps/master/models/resource.rb
 - apps/master/models/scout_alert.rb
 - apps/master/models/scout_average.rb
@@ -859,13 +861,12 @@ files:
 - apps/master/models/scout_plugin_trigger.rb
 - apps/master/models/scout_report.rb
 - apps/master/models/scout_report_field.rb
-- apps/master/models/servant.rb
+- apps/master/models/server.rb
 - apps/master/plugins/resources/apache/apache.rb
 - apps/master/plugins/resources/mysql/mysql.rb
 - apps/master/plugins/site_types/spider/spider.rb
-- apps/master/po/it/spider_master.po
+- apps/master/po/it/master.po
 - apps/master/po/master.pot
-- apps/master/po/spider_master.pot
 - apps/master/public/css/img/web.png
 - apps/master/public/css/login.css
 - apps/master/public/css/master.css
@@ -885,8 +886,8 @@ files:
 - apps/master/views/plugin_data.shtml
 - apps/master/views/plugin_edit.shtml
 - apps/master/views/plugin_instance.shtml
-- apps/master/views/servant.shtml
-- apps/master/views/servants.shtml
+- apps/master/views/server.shtml
+- apps/master/views/servers.shtml
 - apps/master/views/site.shtml
 - apps/master/views/site_edit.shtml
 - apps/master/views/trigger_edit.shtml
@@ -930,14 +931,12 @@ files:
 - apps/servant/_init.rb
 - apps/servant/bin/spider-servant.rb
 - apps/servant/cmd.rb
+- apps/servant/config/options.rb
 - apps/servant/controllers/servant_controller.rb
-- apps/servant/lib/commands/discovery.rb
-- apps/servant/lib/resource.rb
-- apps/servant/lib/resources/db/mysql.rb
-- apps/servant/lib/resources/db.rb
-- apps/servant/lib/servant.rb
+- apps/servant/Gemfile
+- apps/servant/lib/client.rb
 - apps/servant/servant.appspec
-- apps/servant/var/log/error.log
+- apps/servant/servant.rb
 - apps/soap/_init.rb
 - apps/soap/controllers/soap_controller.rb
 - apps/soap/doc/examples/example.rb
@@ -974,6 +973,7 @@ files:
 - blueprints/app/views/__APP__.layout.shtml
 - blueprints/app/views/index.shtml
 - blueprints/app/widgets/.gitignore
+- blueprints/bin/spider
 - blueprints/home/.dirs
 - blueprints/home/.DS_Store
 - blueprints/home/.gitignore