rsence 2.0.9.23 → 2.1.0

data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css

@@ -0,0 +1,45 @@
+
+.minimenuitem_control,
+.minimenuitem_label,
+.minimenuitem_state {
+  position: absolute;
+  top: 0px; height: 15px;
+}
+
+.minimenuitem_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.minimenuitem_control:hover {
+  background-color: #fff;
+}
+
+.minimenuitem_state {
+  left: 0px; top: 1px; height: 12px; width: 12px;
+  background-image: #{this.getCssFilePath('minimenuitem_checkmark.png')};
+}
+.checked .minimenuitem_state {
+  visibility: inherit;
+}
+.unchecked .minimenuitem_state {
+  visibility: hidden;
+}
+
+.minimenuitem_label {
+  left: 14px; right: 11px; top: 0px;
+  height: 15px; line-height: 15px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 11px;
+  color: #333;
+}
+.minimenuitem_label:hover {
+  color: #000;
+}
+.disabled .minimenuitem_control {
+  opacity: 0.8;
+}

data/js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html

@@ -0,0 +1,4 @@
+<div class="minimenuitem_control#{this.value?' checked':' unchecked'}" id="control#{_ID}">
+  <div class="minimenuitem_state" id="state#{_ID}"></div>
+  <div class="minimenuitem_label" id="label#{_ID}">#{this.label}</div>
+</div>

data/js/menus/minimenu/themes/default/minimenu.css

@@ -0,0 +1,63 @@
+
+.minimenu_control,
+.minimenu_edge_left,
+.minimenu_center,
+.minimenu_edge_right,
+.minimenu_label,
+.minimenu_antiselect {
+  position: absolute;
+  top: 0px; height: 15px;
+}
+
+.minimenu_control {
+  left: 0px; right: 0px;
+  cursor: pointer;
+}
+.disabled .minimenu_control {
+  cursor: default;
+}
+
+.minimenu_edge_left,
+.minimenu_center,
+.minimenu_edge_right {
+  background-image: #{this.getCssFilePath('minimenu.png')};
+}
+
+.minimenu_edge_left {
+  left: 0px; width: 7px;
+  background-position: 0px 0px;
+}
+
+.minimenu_edge_right {
+  right: 0px; width: 13px;
+  background-position: -7px 0px;
+}
+
+.minimenu_center {
+  left: 7px; right: 13px;
+  background-position: 0px -15px;
+  background-repeat: repeat-x;
+}
+
+.minimenu_label {
+  left: 6px; right: 11px; top: 0px;
+  height: 15px; line-height: 15px;
+  text-align: left;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space:nowrap;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 11px;
+  color: #333;
+}
+.minimenu_control:hover > .minimenu_label {
+  color: #000;
+}
+.disabled .minimenu_control {
+  opacity: 0.8;
+}
+
+.minimenu_antiselect {
+  left: 0px; right: 0px;
+}

data/js/menus/minimenu/themes/default/minimenu.html

@@ -0,0 +1,7 @@
+<div class="minimenu_control" id="control#{_ID}">
+  <div class="minimenu_edge_left"></div>
+  <div class="minimenu_center"></div>
+  <div class="minimenu_edge_right"></div>
+  <div class="minimenu_label" id="label#{_ID}">#{this.label}</div>
+  <div class="minimenu_antiselect"></div>
+</div>

data/js/util/reloadapp/reloadapp.js

@@ -127,7 +127,7 @@ ReloadApp = HApplication.extend({
         );
       }
     }).nu(
-      HRect.nu( _alertX, _alertY, _alertX+_alertWidth, _alertY+_alertHeight ),
+      HRect.nu( 0, 0, _alertWidth, _alertHeight ),
       _this, {
         label: _title,
         value: 0

data/lib/conf/argv.rb

@@ -19,6 +19,25 @@ module RSence
     return (not ['i386-mingw32','x86-mingw32'].include?(RUBY_PLATFORM))
   end
   
+  # @private  Returns true, if platform is linux
+  def self.linux?
+    return RUBY_PLATFORM.end_with?('-linux')
+  end
+  
+  # @private  Returns true, if platform is Mac OS X
+  def self.darwin?
+    return RUBY_PLATFORM.include?('-darwin')
+  end
+  
+  # @private  Returns signal name that resembles INFO or PWR (extra signal to poll for server status)
+  def self.info_signal_name
+    if self.linux?
+      return 'PWR'
+    else
+      return 'INFO'
+    end
+  end
+  
   # @private  ARGVParser is the "user interface" as a command-line argument parser.
   #           It parses the command-line arguments and sets up things accordingly.
   class ARGVParser
@@ -32,10 +51,10 @@ module RSence
     # system that fully implements POSIX standard signals.
     # These are necessary to send signals to the background process.
     if not RSence.pid_support?
-      @@cmds = [ :run, :initenv, :version, :help ]
+      @@cmds = [ :run, :init, :initenv, :version, :help ]
     else
       @@cmds = [ :run, :status, :start, :stop, :restart, :save,
-                 :initenv, :version, :help ]
+                 :init, :initenv, :version, :help ]
     end
     
     help_avail_cmds = @@cmds.map{|cmd|cmd.to_s}.join("\n       ")
@@ -315,7 +334,12 @@ module RSence
         if RUBY_VERSION.to_f >= 1.9
           sock = TCPSocket.open( addr, port )
         else
-          sock = TCPsocket.open( addr, port )
+          begin
+            sock = TCPsocket.open( addr, port )
+          rescue NameError => e
+            warn "TCPsocket not available, trying TCPSocket.."
+            sock = TCPSocket.open( addr, port )
+          end
         end
         sock.close
         return true
@@ -327,7 +351,8 @@ module RSence
       end
     end
     
-    # Main argument parser for the status command, sends the USR2 POSIX signal to the process, if running.
+    # Main argument parser for the status command, sends the INFO (or PWR on linux) POSIX signal to
+    # the process, if running.
     # Checks if the process responds on the port and address it's configured for.
     def parse_status_argv
       init_args
@@ -406,8 +431,9 @@ module RSence
         pid_fn = config[:daemon][:pid_fn]
         if File.exists?( pid_fn )
           pid = File.read( pid_fn ).to_i
+          sig_name = RSence.info_signal_name
           pid_status = RSence::SIGComm.wait_signal_response(
-            pid, pid_fn, 'USR2', 3
+            pid, pid_fn, sig_name, 3
           )
         else
           warn @@strs[:messages][:no_pid_file] if @args[:verbose]
@@ -504,7 +530,7 @@ module RSence
           pid = File.read( pid_fn ).to_i
           saving_message = @@strs[:messages][:saving_message]
           pid_status = RSence::SIGComm.wait_signal_response(
-            pid, pid_fn, 'USR1', 30, saving_message, '.', 0.1, true
+            pid, pid_fn, 'USR2', 30, saving_message, '.', 0.1, true
           )
         else
           warn @@strs[:messages][:no_pid_file] if @args[:verbose]
@@ -703,10 +729,13 @@ module RSence
       run_dir = File.expand_path( 'run', env_dir )
       Dir.mkdir( run_dir )
       unless create_blank
-        welcome_plugin_dir = File.join( SERVER_PATH, 'setup', 'welcome' )
-        welcome_plugin_dst = File.join( plugins_dir, 'welcome' )
-        puts ERB.new( @@strs[:initenv][:installing_welcome_plugin] ).result( binding )
-        FileUtils.cp_r( welcome_plugin_dir, welcome_plugin_dst )
+        print @@strs[:initenv][:install_welcome]
+        if yesno(true)
+          welcome_plugin_dir = File.join( SERVER_PATH, 'setup', 'welcome' )
+          welcome_plugin_dst = File.join( plugins_dir, 'welcome' )
+          puts ERB.new( @@strs[:initenv][:installing_welcome_plugin] ).result( binding )
+          FileUtils.cp_r( welcome_plugin_dir, welcome_plugin_dst )
+        end
       end
       puts @@strs[:initenv][:creating_files]
       conf_file = File.join( conf_dir, 'config.yaml' )
@@ -768,7 +797,7 @@ module RSence
           parse_status_argv
         elsif cmd == :save
           parse_save_argv
-        elsif cmd == :initenv
+        elsif cmd == :initenv or cmd == :init
           parse_initenv_argv
         end
       else

data/lib/daemon/daemon.rb

@@ -47,7 +47,7 @@ module RSence
     end
   
     def self.responds?( daemon )
-      wait_signal_response( daemon, 'USR2' )
+      wait_signal_response( daemon, RSence.info_signal_name )
     end
   
     # Reads the pid file and calls the process.
@@ -111,10 +111,22 @@ module RSence
         daemon.usr1
         write_signal_response( daemon, 'USR1' )
       end
-      Signal.trap('USR2') do 
+      Signal.trap( 'USR2' ) do 
         daemon.usr2
         write_signal_response( daemon, 'USR2' )
       end
+      # Signal.trap( 'PWR' ) do 
+      #   daemon.pwr
+      #   write_signal_response( daemon, 'PWR' )
+      # end
+      Signal.trap( 'ALRM' ) do 
+        daemon.alrm
+        write_signal_response( daemon, 'ALRM' )
+      end
+      Signal.trap( RSence.info_signal_name ) do 
+        daemon.info
+        write_signal_response( daemon, RSence.info_signal_name )
+      end
       ['INT', 'TERM', 'KILL'].each do | signal |
         Signal.trap( signal ) do
           puts "RSence killed with signal #{signal.inspect}" if RSence.args[:verbose]
@@ -194,12 +206,12 @@ module RSence
       sleep 1 while true
     end
   
-    # Sends the USR1 signal to the process, which in turn
+    # Sends the PWR signal to the process, which in turn
     # calls the save method of the daemon.
     def self.save( daemon )
       status_ = status( daemon )
       if status_
-        if wait_signal_response( daemon, 'USR1', 10, 'saving.', 'saved', 0.3 )
+        if wait_signal_response( daemon, 'PWR', 10, 'saving.', 'saved', 0.3 )
           puts "Session data saved."
         else
           puts "Warning: saving timed out! Session data not saved."
@@ -256,10 +268,19 @@ module RSence
 
   # @private  Simple process control, constructed here and called from Daemon::Controller
   class HTTPDaemon
-  
+    
+    def ps_name
+      config = RSence.config
+      url = "http://#{config[:http_server][:bind_address]}:#{config[:http_server][:port]}#{config[:base_url]}"
+      env_path = RSence.args[:env_path]
+      "RSence-#{RSence.version} on #{url} in #{env_path}"
+    end
+    
     # RSence top-level run handler. Almost identical to start.
     def run
-    
+      
+      $0 = ps_name
+      
       puts "Starting as a foreground process." if RSence.args[:verbose]
       puts "Press CTRL-C to terminate."
     
@@ -278,30 +299,32 @@ module RSence
       )
     
     end
-  
+    
     # Returns the pid file path.
     def pid_fn
       RSence.config[:daemon][:pid_fn]
     end
-  
+    
     # Returns the log path.
     def log_fn
       RSence.config[:daemon][:log_fn]
     end
-  
+    
     # Returns the configured bind address
     def addr
       RSence.config[:http_server][:bind_address]
     end
-  
+    
     # Returns the configured port.
     def port
       RSence.config[:http_server][:port]
     end
-  
+    
     # Called by Controller#start, contains RSence-specific operations
     def start
-    
+      
+      $0 = ps_name
+      
       @transporter = Transporter.new
     
       conf = RSence.config[:http_server]
@@ -321,17 +344,40 @@ module RSence
       yield @broker
     
     end
-  
+    
     # Called by Controller#stop, contains RSence-specific operations
     def stop
       @transporter.shutdown
     end
-  
-    # Called on USR1 signals (save data)
+    
+    # # Called on PWR signals (save data)
+    # def pwr
+    #   save
+    # end
+    
+    # Called on INFO (PWR) signals ("Alive?")
+    def info
+      puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- RSence version #{RSence.version} is running."
+    end
+    
+    # Called on ALRM signals (save data, reload all plugins manually)
+    def alrm
+      save
+      @transporter.plugins.shutdown
+      @transporter.plugins.init_bundles!
+    end
+    
+    # Called on usr1 signals (updates bundles manually, like the regular intervals of the -a switch and forces client to be rebuilt)
     def usr1
+      @transporter.plugins.update_bundles!
+      # @transporter.plugins.client_pkg.rebuild_client
+    end
+    
+    # Called on USR2 signals
+    def usr2
       save
     end
-  
+    
     # Save state
     def save
       puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- Saving state..."
@@ -342,12 +388,7 @@ module RSence
       @transporter.online = transporter_state
       puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- State saved."
     end
-  
-    # Called on USR2 signals ("Alive?")
-    def usr2
-      puts "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} -- RSence version #{RSence.version} is running."
-    end
-  
+    
     # Main entry point, daemonizes itself using Controller.
     def daemonize!
       Daemon.daemonize( self )

data/lib/plugins/gui_plugin.rb

@@ -29,27 +29,20 @@ module RSence
       # @return [:GUIPlugin]
       def self.bundle_type; :GUIPlugin; end
       
-      
-      # @private Placeholder for actual gui yaml file.
-      @@default_yaml_src = <<-END
-type: GUITree
-version: 0.6
-
-class: RSence.GUIApp
-options:
-  label: "Dummy Application"
-
-      END
-      
       # In addition to {Plugin__#init Plugin#init}, also automatically initializes a {GUIParser} instance as +@gui+
       #
       # @return [nil]
       def init
         super
         yaml_src = file_read( "gui/#{@name}.yaml" )
-        yaml_src = file_read( "gui/main.yaml" ) unless yaml_src
-        yaml_src = @@default_yaml_src unless yaml_src
-        @gui = GUIParser.new( self, yaml_src )
+        unless yaml_src
+          yaml_src = file_read( "gui/main.yaml" )
+        end
+        if yaml_src
+          @gui = GUIParser.new( self, yaml_src, @name )
+        else
+          @gui = nil
+        end
         @client_pkgs = false
       end
   
@@ -79,13 +72,14 @@ options:
       #   end
       #
       def gui_params( msg )
+        return unless @gui
         { :values => @gui.values( get_ses( msg ) ) }
       end
       
       # @private Method that implements +client_pkgs.yaml+ loading
       def install_client_pkgs
         if @client_pkgs
-          warn "install_client_pkgs: called with @client_pkgs defined; returning"
+          warn "install_client_pkgs: called with @client_pkgs defined (#{@client_pkgs.inspect}); returning" if RSence.args[:debug]
           return
         end
         @client_pkgs = yaml_read( 'client_pkgs.yaml' )
@@ -93,14 +87,14 @@ options:
           if @client_pkgs.has_key?(:src_dirs)
             @client_pkgs[:src_dirs].each do |src_dir|
               src_dir = bundle_path( src_dir[2..-1] ) if src_dir.start_with?('./')
-              @plugins.client_pkg.add_src_dir( src_dir )
+              client_pkg.add_src_dir( src_dir )
             end
           end
-          @plugins.client_pkg.add_packages(       @client_pkgs[:packages      ] ) if @client_pkgs.has_key?(:packages      )
-          @plugins.client_pkg.add_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
-          @plugins.client_pkg.add_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
-          @plugins.client_pkg.add_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
-          @plugins.client_pkg.rebuild_client
+          client_pkg.add_packages(       @client_pkgs[:packages      ] ) if @client_pkgs.has_key?(:packages      )
+          client_pkg.add_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
+          client_pkg.add_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
+          client_pkg.add_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
+          client_pkg.rebuild_client
         end
       end
       
@@ -112,14 +106,14 @@ options:
           if @client_pkgs.has_key?(:src_dirs)
             @client_pkgs[:src_dirs].each do |src_dir|
               src_dir = bundle_path( src_dir[2..-1] ) if src_dir.start_with?('./')
-              @plugins.client_pkg.del_src_dir( src_dir )
+              client_pkg.del_src_dir( src_dir )
             end
           end
-          @plugins.client_pkg.del_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
-          @plugins.client_pkg.del_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
-          @plugins.client_pkg.del_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
-          @plugins.client_pkg.del_packages(       @client_pkgs[:packages].keys  ) if @client_pkgs.has_key?(:packages      )
-          @plugins.client_pkg.rebuild_client
+          client_pkg.del_reserved_names( @client_pkgs[:reserved_names] ) if @client_pkgs.has_key?(:reserved_names)
+          client_pkg.del_gfx_formats(    @client_pkgs[:gfx_formats   ] ) if @client_pkgs.has_key?(:gfx_formats   )
+          client_pkg.del_themes(         @client_pkgs[:theme_names   ] ) if @client_pkgs.has_key?(:theme_names   )
+          client_pkg.del_packages(       @client_pkgs[:packages].keys  ) if @client_pkgs.has_key?(:packages      )
+          client_pkg.rebuild_client
         end
         @client_pkgs = false
       end
@@ -136,9 +130,10 @@ options:
         uninstall_client_pkgs if @client_pkgs
       end
       
-      # @private Sends gui specification to the main plugin
-      def spec_ui( msg )
-        # TODO
+      # @private Returns structured, processed gui tree to the caller.
+      def struct_ui( msg )
+        return {} unless @gui
+        @gui.struct( msg, gui_params( msg ) )
       end
       
       # Automatically inits the UI using {GUIParser#init}
@@ -147,11 +142,13 @@ options:
       #
       # @return [nil]
       def init_ui( msg )
+        return unless @gui
         @gui.init( msg, gui_params( msg ) )
       end
       
       # @private Automatically kills the UI using {GUIParser#kill}
       def kill_ui( msg )
+        return unless @gui
         @gui.kill( msg )
       end