rsence 2.0.0.pre → 2.0.0.1.pre

data/lib/plugins/plugin_plugins.rb

@@ -0,0 +1,47 @@
+##   Riassence Framework
+ #   Copyright 2010 Riassence Inc.
+ #   http://riassence.com/
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #   with this software package. If not, contact licensing@riassence.com
+ ##
+
+## Interface to enable plugins in a plugin. Just include this in your subclass of Plugin.
+module PluginPlugins
+  def init
+    super
+    @plugin_plugins = RSence::PluginManager.new( [ bundle_path('plugins') ] )
+  end
+  def open
+    super
+    @plugin_plugins.delegate(:open)
+  end
+  def close
+    super
+    @plugin_plugins.delegate(:close)
+  end
+  def flush
+    super
+    @plugin_plugins.delegate(:flush)
+  end
+  def idle( msg )
+    super
+    @plugin_plugins.delegate(:idle,msg)
+  end
+  def init_ses( msg )
+    super
+    @plugin_plugins.delegate(:init_ses,msg)
+  end
+  def restore_ses( msg )
+    super
+    @plugin_plugins.delegate(:restore_ses,msg)
+  end
+  def cloned_target( msg, source_session )
+    super
+    @plugin_plugins.delegate(:cloned_target,msg,source_session)
+  end
+  def cloned_source( msg, target_session )
+    super
+    @plugin_plugins.delegate(:cloned_source,msg,target_session)
+  end
+end

data/lib/plugins/pluginmanager.rb

@@ -58,6 +58,9 @@ require 'plugins/plugin_sqlite_db'
 # servlet includes the Servlet class, for handling any requests / responses
 require 'plugins/servlet'
 
+# Interface for plugins in a plugin bundle
+require 'plugins/plugin_plugins'
+
 ## = Abstract
 ## PluginManager is the service that loads and provides method delegation
 ## amongst all installed plugins.
@@ -72,15 +75,16 @@ class PluginManager
   
   # Initialize with a list of directories as plugin_paths.
   # It's an array containing all plugin directories to scan.
-  def initialize( transporter, plugin_paths )
-    @transporter = transporter
-    @sessions = transporter.sessions
+  def initialize( plugin_paths, transporter=nil, autoreload=false )
+    if transporter
+      @transporter = transporter
+      @sessions = transporter.sessions
+    end
     @plugin_paths = plugin_paths
-    puts "Loading plugins..."
+    puts "Loading plugins..." if RSence.args[:verbose]
     scan_plugins
-    puts "Plugins loaded."
-    puts "Riassence Framework is online."
-    if $DEBUG_MODE
+    puts "Plugins loaded." if RSence.args[:verbose]
+    if autoreload
       @thr = Thread.new do
         Thread.pass
         while true
@@ -118,7 +122,7 @@ class PluginManager
           if @registry.has_key?( bundle_name.to_sym )
             puts "Disabling bundle #{bundle_name}..."
             unload_bundle( bundle_name.to_sym )
-            if ARGV.include?('-say')
+            if RSence.args[:say]
               Thread.new do
                 Thread.pass
                 system(%{say "Unloaded #{bundle_name.to_s}."})
@@ -130,7 +134,7 @@ class PluginManager
             puts "Loading bundle #{bundle_name}..."
             load_bundle( bundle_path, bundle_name.to_sym, bundle_name+'.rb' )
             call( bundle_name.to_sym, :open )
-            if ARGV.include?('-say')
+            if RSence.args[:say]
               Thread.new do
                 Thread.pass
                 system(%{say "Loaded #{bundle_name.to_s}."})
@@ -144,7 +148,7 @@ class PluginManager
               unload_bundle( bundle_name.to_sym )
               load_bundle( bundle_path, bundle_name.to_sym, bundle_name+'.rb' )
               call( bundle_name.to_sym, :open )
-              if ARGV.include?('-say')
+              if RSence.args[:say]
                 Thread.new do
                   Thread.pass
                   system(%{say "Reloaded #{bundle_name.to_s}."})
@@ -234,11 +238,12 @@ class PluginManager
   # Finds the most recent file in the path
   def most_recent( bundle_path, newest_date=0 )
     path_date = File.stat( bundle_path ).mtime.to_i
-    if path_date > newest_date
+    is_dir = File.directory?( bundle_path )
+    if path_date > newest_date and not is_dir
       # puts "File is newer: #{bundle_path}"
       newest_date = path_date
     end
-    if File.directory?( bundle_path )
+    if is_dir
       Dir.entries( bundle_path ).each do |entry_name|
         next if entry_name[0].chr == '.'
         full_path = File.join( bundle_path, entry_name )

data/lib/transporter/transporter.rb

@@ -33,13 +33,10 @@ class Transporter
     
     @valuemanager = ValueManager.new
     @sessions = SessionManager.new( self )
-    @plugins = PluginManager.new( self, ::RSence.config[:plugin_paths] )
-    
-    
-    # Used by:
-    #   plugins/main/main.rb
-    $SESSION = @sessions
-    
+    @plugins = PluginManager.new( ::RSence.config[:plugin_paths], self, $DEBUG_MODE )
+    if RSence.launch_pid != Process.pid
+      Process.kill( 'TERM', RSence.launch_pid )
+    end
   end
   
   def servlet( request_type, request, response )
@@ -48,7 +45,7 @@ class Transporter
     # if $DEBUG_MODE and uri == $config[:index_html][:respond_address] and request_type == :get
     #   unless ARGV.include?('-no-rescan') or ARGV.include?('--no-rescan')
     #     puts "Reloading plugins."
-    #     if ARGV.include?('-say')
+    #     if RSence.args[:say]
     #       Thread.new do
     #         Thread.pass
     #         system('say "Reloading plugins."')
@@ -56,7 +53,7 @@ class Transporter
     #     end
     #     @plugins.rescan
     #     puts "Plugins reloaded."
-    #     if ARGV.include?('-say')
+    #     if RSence.args[:say]
     #       Thread.new do
     #         Thread.pass
     #         system('say "Plugins reloaded."')

data/plugins/client_pkg/client_pkg.rb

@@ -63,14 +63,17 @@ class ClientPkg < Servlet
       @log_file = nil
     end
     def log( str )
-      puts str
-      return
-      if @last_time < Time.now - 30
-        @last_time = Time.now
-        @log_file.write( %{--- #{@last_time.strftime("%Y-%m-%d %H:%M:%S")} ---\n} )
+      if ::RSence.args[:verbose]
+        puts str
+        return
+      else
+        if @last_time < Time.now - 30
+          @last_time = Time.now
+          @log_file.write( %{--- #{@last_time.strftime("%Y-%m-%d %H:%M:%S")} ---\n} )
+        end
+        @log_file.write( "#{str}\n" )
+        @log_file.flush
       end
-      @log_file.write( "#{str}\n" )
-      @log_file.flush
     end
     def open
       return if @log_file
@@ -104,7 +107,7 @@ class ClientPkg < Servlet
             if @client_build.bundle_changes( @last_change )
               rebuild_client
               puts "Autobuilt."
-              if ARGV.include?('-say')
+              if RSence.args[:say]
                 Thread.new do
                   Thread.pass
                   system('say "Autobuilt."')
@@ -169,7 +172,7 @@ class ClientPkg < Servlet
     
     @thr = false
     
-    @build_logger = BuildLogger.new( File.join(@path,'log','build_log') )
+    @build_logger = BuildLogger.new( File.join(::RSence.args[:env_path],'log','build_log') )
     @build_logger.open
     
     @client_build = ClientPkgBuild.new( ::RSence.config[:client_pkg], @build_logger )

data/plugins/client_pkg/lib/client_pkg_build.rb

@@ -538,7 +538,7 @@ class ClientPkgBuild
   ##    end
   ##    flush
   ##    run
-  ##    `say "Autobuild complete!"` if ARGV.include?('-say')
+  ##    `say "Autobuild complete!"` if RSence.args[:say]
   ##  end
   ##end
   

data/plugins/index_html/tmpl/index.html

@@ -6,10 +6,10 @@
 <title>__DEFAULT_TITLE__</title>
 <style type="text/css">body{margin:0;padding:0;background-color:#ddd;font-family:Arial,sans-serif;}</style>
 __SCRIPT_DEPS__
-<script type="text/javascript" src="__CLIENT_BASE__/js/core.js"></script>
-<!--[if lt IE 7]><script type="text/javascript" src="__CLIENT_BASE__/js/iefix.js"></script><![endif]-->
+<script src="__CLIENT_BASE__/js/core.js"></script>
+<!--[if lt IE 7]><script src="__CLIENT_BASE__/js/iefix.js"></script><![endif]-->
 
-<script type="text/javascript">
+<script>
 
 /** Runtime configuration: **/
 HCLIENT_REV='__CLIENT_REV__';

data/plugins/main/main.rb

@@ -110,6 +110,7 @@ class Main < Plugin
     ## to tell the server its status by updating its value
     location_href_id = ses[:location_href].val_id.to_json
     msg.reply "COMM.Values.values[#{location_href_id}].bind(COMM.urlResponder);"
+    
     ## This enables SesWatcher that changes :client_time every 60 seconds.
     ## It makes the client to poll the server on regular intervals, when polling mode
     ## is disabled.

metadata

@@ -6,8 +6,9 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
+  - 1
   - pre
-  version: 2.0.0.pre
+  version: 2.0.0.1.pre
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +03:00
+date: 2010-05-08 00:00:00 +03:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,18 +42,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/build_client.rb
-- bin/help
-- bin/launch.rb
-- bin/rdoc.sh
-- bin/restart
 - bin/rsence
-- bin/run
-- bin/run.rb
-- bin/save
-- bin/start
-- bin/status
-- bin/stop
+- lib/conf/argv.rb
 - lib/conf/default.rb
 - lib/conf/wizard.rb
 - lib/daemon/daemon.rb
@@ -63,6 +54,7 @@ files:
 - lib/plugins/gui_plugin.rb
 - lib/plugins/guiparser.rb
 - lib/plugins/plugin.rb
+- lib/plugins/plugin_plugins.rb
 - lib/plugins/plugin_sqlite_db.rb
 - lib/plugins/plugin_util.rb
 - lib/plugins/pluginmanager.rb
@@ -75,9 +67,10 @@ files:
 - lib/values/hvalue.rb
 - lib/values/valuemanager.rb
 - conf/config.ru
+- conf/config.yaml
 - conf/default_conf.yaml
 - conf/default_strings.yaml
-- conf/local_conf.yaml
+- conf/local_conf.yaml.devel
 - conf/unicorn.conf
 - plugins/client_pkg/client_pkg.rb
 - plugins/client_pkg/info.yaml
@@ -175,6 +168,7 @@ files:
 - js/controls/dialogs/sheet/sheet.js
 - js/controls/dialogs/sheet/themes/default/sheet.css
 - js/controls/dialogs/sheet/themes/default/sheet.html
+- js/controls/dialogs/sheet/themes/default/sheet_bg-ie6.gif
 - js/controls/dialogs/sheet/themes/default/sheet_bg.png
 - js/controls/dialogs/sheet/themes/default/sheet_dim-ie6.gif
 - js/controls/dialogs/sheet/themes/default/sheet_dim.png
@@ -279,7 +273,9 @@ files:
 - js/controls/window/js.inc
 - js/controls/window/themes/default/window.css
 - js/controls/window/themes/default/window.html
+- js/controls/window/themes/default/window_bg_active-ie6.gif
 - js/controls/window/themes/default/window_bg_active.png
+- js/controls/window/themes/default/window_bg_inactive-ie6.gif
 - js/controls/window/themes/default/window_bg_inactive.png
 - js/controls/window/themes/default/window_buttons-ie6.gif
 - js/controls/window/themes/default/window_buttons.png
@@ -298,6 +294,8 @@ files:
 - js/core/iefix/ie_css_style.htc
 - js/core/iefix/iefix.js
 - js/core/iefix/js.inc
+- js/debugg/debugg.js
+- js/debugg/js.inc
 - js/foundation/application/application.js
 - js/foundation/application/js.inc
 - js/foundation/control/control.js
@@ -338,6 +336,10 @@ files:
 - js/views/inlineview/js.inc
 - js/views/scrollview/js.inc
 - js/views/scrollview/scrollview.js
+- README.rdoc
+- INSTALL.rdoc
+- LICENSE
+- VERSION
 has_rdoc: true
 homepage: http://www.rsence.org/
 licenses: []

data/bin/build_client.rb

@@ -1,254 +0,0 @@
-#!/usr/bin/env ruby
-#--
-##   Riassence Framework
- #   Copyright 2010 Riassence Inc.
- #   http://riassence.com/
- #
- #   You should have received a copy of the GNU General Public License along
- #   with this software package. If not, contact licensing@riassence.com
- ##
- #++
-
-if ARGV.include?('--help') or ARGV.include?('-h')
-  puts %{
-
-  Riassence Framework Client Builder
-  This script builds the client into the DESTINATION_PATH that defaults to ./client
-
-  Usage:
-    #{__FILE__} [DESTINATION_PATH] [params]
-
-  Params:
-    -d                      Debug/Development mode
-    --config <PATH>         Optional config override file
-    --auto                  Checks if the source has changed every 3 seconds
-    --help                  This message
-    -h                      This message
-  
-  Examples:
-    #{__FILE__} /web/sites/my_site/rsence/client -d
-  
-  Further information:
-     http://riassence.org/
-
-}
-  exit
-end
-
-require 'profile' if ARGV.include?('--profile')
-
-## Auto-construct paths using this file as the waypoint
-SERVER_PATH = ARGV.include?('--root-path')?(ARGV[ARGV.index('--root-path')+1]):File.split(File.expand_path(File.dirname(__FILE__)))[0]
-
-## Include server & lib in the search path
-$LOAD_PATH << SERVER_PATH
-$LOAD_PATH << File.join( SERVER_PATH, 'lib' )
-
-require 'rubygems'
-require 'yaml'
-require 'json'
-
-config = YAML.load( File.read( File.join( SERVER_PATH, 'conf', 'default_conf.yaml' ) ) )
-
-## Create default local configuratation override file, if it does not exist:
-local_config_file_paths = [
-  File.join(SERVER_PATH,'conf','local_conf.yaml'),
-  File.join( File.split( SERVER_PATH )[0], 'conf', 'local_conf.yaml' ),
-  File.join( Dir.pwd, 'conf', 'local_conf.yaml' ),
-  File.join(SERVER_PATH,'conf','client-build-config.rb'),
-  File.join( File.split( SERVER_PATH )[0], 'conf', 'client-build-config.rb' ),
-  File.join( Dir.pwd, 'conf', 'client-build-config.rb' ),
-]
-if ARGV.include?('--config')
-  argv_conf_file = ARGV[ARGV.index('--config')+1]
-  if not argv_conf_file.begin_with? '/'
-    argv_conf_file = File.join( Dir.pwd, conf_file )
-  end
-  local_config_file_paths.push( argv_conf_file )
-end
-
-def array_merge( target, source )
-  source.each do |item|
-    unless target.include?(item)
-      if item.class == Array
-        sub_arr = []
-        array_merge( sub_arr, item )
-        target.push( sub_arr )
-      elsif item.class == Hash
-        sub_hash = {}
-        hash_merge( sub_hash, item )
-        target.push( sub_hash )
-      else
-        target.push( item )
-      end
-    end
-  end
-end
-def hash_merge( target, source )
-  source.each do |key,item|
-    if not target.has_key?key or target[key] != item
-      if item.class == Array
-        target[key] = [] unless target.has_key?(key)
-        array_merge( target[key], item )
-        # if key == :plugin_paths
-        #   puts target[key].inspect
-        # end
-      elsif item.class == Hash
-        target[key] = {} unless target.has_key?key
-        hash_merge( target[key], item )
-      else
-        target[key] = item
-      end
-    end
-  end
-end
-
-local_config_file_path_found = false
-local_config_file_paths.each do |local_config_file_path|
-  if File.exists? local_config_file_path and File.file? local_config_file_path
-    if local_config_file_path.end_with? '.yaml'
-      local_conf = YAML.load( File.read( local_config_file_path ) )
-      hash_merge( config, local_conf )
-      local_config_file_path_found = true
-    else
-      warn "Only Yaml configuration files are allowed at this time."
-    end
-  end
-end
-
-
-require 'plugins/client_pkg/lib/client_pkg_build'
-
-class JSBuilder < ClientPkgBuild
-  def initialize( conf, logger )
-    super
-    @conf = conf
-    @debug = ARGV.include?('-d')
-    @quiet = false
-  end
-  def flush
-    @jscompress.free_indexes
-  end
-  def ensure_client_dir
-    dst_dir = @conf[:dst_dir]
-    Dir.mkdir( dst_dir ) unless File.exist?( dst_dir )
-    js_dir = File.join( dst_dir, 'js' )
-    Dir.mkdir( js_dir ) unless File.exist?( js_dir )
-    themes_dir = File.join( dst_dir, 'themes' )
-    Dir.mkdir( themes_dir ) unless File.exist?( themes_dir )
-    @themes.each_key do |theme_name|
-      theme_dir = File.join( themes_dir, theme_name )
-      Dir.mkdir( theme_dir ) unless File.exist?( theme_dir )
-      ['gfx','css','html'].each do |theme_part|
-        theme_part_dir = File.join( theme_dir, theme_part )
-        Dir.mkdir( theme_part_dir ) unless File.exist?( theme_part_dir )
-      end
-    end
-  end
-  def store_client_files
-    dst_dir = @conf[:dst_dir]
-    js_dir = File.join( dst_dir, 'js' )
-    @js.each_key do |js_name|
-      js_path = File.join( js_dir, "#{js_name}.js" )
-      js_file = File.open( js_path, 'wb' )
-      js_file.write( @js[js_name] )
-      js_file.close
-    end
-    @gz.each_key do |gz_name|
-      gz_path = File.join( js_dir, "#{gz_name}.gz" )
-      gz_file = File.open( gz_path, 'wb' )
-      gz_file.write( @gz[gz_name] )
-      gz_file.close
-    end
-    themes_dir = File.join( dst_dir, 'themes' )
-    @themes.each_key do |theme_name|
-      theme_dir = File.join( themes_dir, theme_name )
-      gfx_dir = File.join( theme_dir, 'gfx' )
-      @themes[theme_name][:gfx].each do | img_name, file_data |
-        img_path = File.join( gfx_dir, img_name )
-        img_file = File.open( img_path, 'wb' )
-        img_file.write( file_data )
-        img_file.close
-      end
-      css_dir = File.join( theme_dir, 'css' )
-      @themes[theme_name][:css].each do | css_name, file_data |
-        css_path = File.join( css_dir, "#{css_name}.css" )
-        css_file = File.open( css_path, 'wb' )
-        css_file.write( file_data )
-        css_file.close
-        css_path += '.gz'
-        css_file = File.open( css_path, 'wb' )
-        css_file.write( gzip_string( file_data ) )
-        css_file.close
-      end
-      html_dir = File.join( theme_dir, 'html' )
-      @themes[theme_name][:html].each do | html_name, file_data |
-        html_path = File.join( html_dir, "#{html_name}.html" )
-        html_file = File.open( html_path, 'wb' )
-        html_file.write( file_data )
-        html_file.close
-        html_path += '.gz'
-        html_file = File.open( html_path, 'wb' )
-        html_file.write( gzip_string( file_data ) )
-        html_file.close
-      end
-    end
-    built_path = File.join( js_dir, 'built' )
-    built_file = File.open( built_path, 'w' )
-    built_file.write( Time.now.to_i.to_s )
-    built_file.close
-  end
-  def run
-    ensure_client_dir
-    super
-    store_client_files
-  end
-end
-class Logger
-  def log( str )
-    puts str
-  end
-end
-
-conf = config[:client_pkg]
-dst_dir = File.join( SERVER_PATH, 'client' )
-if ARGV.length > 0
-  unless ['-d','-auto','--auto','-say','--config','--root-path'].include?( ARGV[0] )
-    dst_dir = ARGV[0]
-    unless dst_dir.start_with?('/')
-      dst_dir = File.join( SERVER_PATH, dst_dir )
-    end
-  end
-end
-puts "Client build destination directory: #{dst_dir}"
-conf[:dst_dir] = dst_dir
-
-conf[:compound_packages].each do | pkg_name, js_order |
-  pkg_files = []
-  js_order.each do |js_pkg|
-    unless conf[:packages].has_key?(js_pkg)
-      pkg_files.push( js_pkg )
-      next
-    end
-    conf[:packages][js_pkg].each do |js_file|
-      pkg_files.push( js_file )
-    end
-  end
-  conf[:packages][ pkg_name ] = pkg_files
-end
-
-js_builder = JSBuilder.new( conf, Logger.new )
-js_builder.run
-if ARGV.include? '-auto' or ARGV.include? '--auto'
-  last_change = Time.now.to_i
-  while true
-    if js_builder.bundle_changes( last_change )
-      last_change = Time.now.to_i
-      js_builder.run
-      # client_cache.set_cache( @client_build.js, @client_build.gz, @client_build.themes )
-      `say "Autobuild complete!"` if ARGV.include?('-say')
-    end
-    sleep 3
-  end
-end
-js_builder.flush