pione 0.3.2 → 0.4.0

data/lib/pione/global/diagnosis-variable.rb

@@ -0,0 +1,26 @@
+module Pione
+  module Global
+    define_internal_item(:diagnosis_notification_front_start_port) do |item|
+      item.desc = "start port number for front server of `pione diagnosis notification`"
+      item.init = 1024
+    end
+
+    define_internal_item(:diagnosis_notification_front_end_port) do |item|
+      item.desc = "end port number for front server of `pione diagnosis notification`"
+      item.init = 9999
+    end
+
+    define_computed_item(
+      :diagnosis_notification_front_port_range,
+      [:diagnosis_notification_front_start_port, :diagnosis_notification_front_end_port]
+    ) do |item|
+      item.desc = "port number for front server of `pione diagnosis notification`"
+      item.define_updater do
+        start_port = Global.diagnosis_notification_front_start_port
+        end_port = Global.diagnosis_notification_front_end_port
+
+        Range.new(start_port, end_port)
+      end
+    end
+  end
+end

data/lib/pione/global/item.rb

@@ -15,7 +15,7 @@ module Pione
       # Define an internal item. The item cannot be configured by user.
       def define_internal_item(name, initial_value=nil, &definition)
         Item.new(name, false).tap do |item|
-          definition.call(item)
+          definition.call(item) if block_given?
           item.register
         end
       end
@@ -23,7 +23,7 @@ module Pione
       # Define an external item. The item can be configured by user.
       def define_external_item(name, initial_value=nil, &definition)
         Item.new(name, true).tap do |item|
-          definition.call(item)
+          definition.call(item) if block_given?
           item.register
         end
       end
@@ -31,7 +31,7 @@ module Pione
       # Define a computed item. The item cannote be configured by user.
       def define_computed_item(name, dependencies, &definition)
         Item.new(name, false, :dependencies => dependencies).tap do |item|
-          definition.call(item)
+          definition.call(item) if block_given?
           item.register
         end
       end
@@ -101,8 +101,9 @@ module Pione
         @dependencies = option[:dependencies] || []
         @desc = nil
         @init = nil
-        @type = :string
+        @type = nil
         @updater = Proc.new {|val| val}
+        @post_action = nil
         @orig = nil
         @record = false
       end
@@ -158,10 +159,32 @@ module Pione
         @updater = b
       end
 
+      def post(&b)
+        @post_action = b
+      end
+
       # Update the item with the value.
       def update(val)
         @orig = val
-        @value = @updater.call(val)
+        @value = @updater.call(ValueConverter.convert(@type, val))
+        if @post_action
+          @post_action.call(@value)
+        end
+      end
+    end
+
+    module ValueConverter
+      def self.convert(type, val)
+        case type
+        when :string
+          val = val.to_s unless val.kind_of?(String)
+        when :integer
+          val = val.to_i unless val.kind_of?(Integer)
+        when :boolean
+          val = val == "true" ? true : false unless val == true or val == false
+        end
+
+        return val
       end
     end
   end

data/lib/pione/global/log-variable.rb

@@ -15,10 +15,11 @@ module Pione
     define_computed_item(:system_logger, [:system_logger_type]) do |item|
       item.desc = "system logger object"
       item.define_updater do |val|
-        if val.kind_of?(Log::SystemLogger)
+        case val
+        when Rootage::Logger
           val
         else
-          Log::SystemLogger.of(Global.system_logger_type).new
+          Rootage::Logger.of(Global.system_logger_type).new
         end
       end
     end
@@ -87,9 +88,9 @@ module Pione
       item.init = false
     end
 
-    # This is debug flag that shows presence notifications.
-    define_internal_item(:debug_presence_notification) do |item|
-      item.desc = "debug flag that shows presence notifications"
+    # This is debug flag that shows notifications.
+    define_internal_item(:debug_notification) do |item|
+      item.desc = "debug flag that shows notifications"
       item.type = :boolean
       item.init = false
     end

data/lib/pione/global/network-variable.rb

@@ -1,9 +1,80 @@
 module Pione
   module Global
-    # This is IP address of this system. Note that you should select one IP
-    # address if system has multiple addresses.
-    define_external_item(:my_ip_address) do |item|
-      item.desc = "IP address of this system"
+    #
+    # notification
+    #
+
+    define_internal_item(:default_notification_target_host) do |item|
+      item.desc = "default notification target host"
+      item.init = "255.255.255.255"
+    end
+
+    define_internal_item(:default_notification_target_port) do |item|
+      item.desc = "default notification target port number"
+      item.init = 56000
+    end
+
+    define_external_item(:notification_targets) do |item|
+      item.desc = "notification target addresses"
+      item.init = [Notification::Address.default_target_address]
+      item.define_updater do |addresses|
+        if addresses.is_a?(String)
+          addresses.split(",").map do |address|
+            Notification::Address.target_address_to_uri(address)
+          end
+        else
+          addresses
+        end
+      end
+    end
+
+    define_internal_item(:default_notification_receiver_host) do |item|
+      item.type = :string
+      item.desc = "default notification receiver host"
+      item.init = "0.0.0.0"
+    end
+
+    define_internal_item(:default_notification_receiver_port) do |item|
+      item.desc = "default notification receiver port number"
+      item.init = 56000
+    end
+
+    define_external_item(:notification_receivers) do |item|
+      item.desc = "notification receiver addresses"
+      item.init = [Notification::Address.default_receiver_address]
+      item.define_updater do |addresses|
+        if addresses.is_a?(String)
+          addresses.split(",").map do |address|
+            Notification::Address.receiver_address_to_uri(address.strip)
+          end
+        else
+          addresses
+        end
+      end
+    end
+
+    define_external_item(:notification_listener_front_port) do |item|
+      item.type = :integer
+      item.desc = "front port number for notification listener"
+      item.init = 55500
+    end
+
+    define_computed_item(:notification_listener,
+      [:communication_address, :notification_listener_front_port]) do |item|
+      item.desc = "Address of notification listener"
+      item.define_updater do
+        "druby://%s:%s" % [Global.communication_address, Global.notification_listener_front_port]
+      end
+    end
+
+    #
+    # communication
+    #
+
+    # This is the IP address of this system. Note that you should select one IP
+    # address even if system has multiple addresses.
+    define_external_item(:communication_address) do |item|
+      item.desc = "IP address for interprocess communication"
       item.init = Util::IPAddress.myself
     end
   end

data/lib/pione/global/path-variable.rb

@@ -12,7 +12,7 @@ module Pione
     # This is a configuration file path.
     define_computed_item(:config_path, [:dot_pione_dir]) do |item|
       item.desc = "configuration file of PIONE"
-      item.define_updater {Global.dot_pione_dir + "config.yml"}
+      item.define_updater {Global.dot_pione_dir + "config.json"}
     end
 
     # This is a current working directory. The directory is defined by the

data/lib/pione/global/system-variable.rb

@@ -14,20 +14,12 @@ module Pione
     # PIONE's process model
     #
 
-    # This is the command object of this process.
-    define_internal_item(:command) do |item|
-      item.desc = "command object of this process"
+    define_internal_item(:parent) do |item|
+      item.desc = "front of parent process"
     end
 
-    # This is the front server of this process.
-    define_internal_item(:front) do |item|
-      item.desc = "front object of this process"
-    end
-
-    # This process exits with this status.
-    define_internal_item(:exit_status) do |item|
-      item.desc = "exit status of this process"
-      item.init = true
+    define_internal_item(:notification_recipient) do |item|
+      item.desc = "notification recipient of this process"
     end
 
     #
@@ -37,6 +29,9 @@ module Pione
     define_external_item(:color_enabled) do |item|
       item.desc = "availability of color mode"
       item.init = true
+      item.post do |val|
+        Sickill::Rainbow.enabled = val
+      end
     end
 
     #
@@ -52,5 +47,10 @@ module Pione
       item.desc = "expression of features for this system"
       item.define_updater {Util.parse_features(Global.features)}
     end
+
+    define_external_item(:file_sliding) do |item|
+      item.desc = "enable/disable to slide files in file server"
+      item.init = true
+    end
   end
 end

data/lib/pione/global/task-worker-broker-variable.rb

@@ -0,0 +1,43 @@
+module Pione
+  module Global
+    define_external_item(:task_worker_broker_front_start_port) do |item|
+      item.desc = "start port number for front server of `task-worker-broker`"
+      item.init = 41000
+      item.type = :integer
+    end
+
+    define_external_item(:task_worker_broker_front_end_port) do |item|
+      item.desc = "end port number for front server of `task-worker-broker`"
+      item.init = 41099
+      item.type = :integer
+    end
+
+    define_computed_item(:task_worker_broker_front_port_range, [:broker_front_port_range_begin, :broker_front_port_range_end]) do |item|
+      item.desc = "port range for front server of `task-worker-broker`"
+      item.define_updater do
+        start_port = Global.task_worker_broker_front_start_port
+        end_port = Global.task_worker_broker_front_end_port
+
+        Range.new(start_port, end_port)
+      end
+    end
+
+    define_external_item(:task_worker_provider) do |item|
+      item.desc = "provider method of `task-worker-broker`"
+      item.init = "Pione::TaskWorkerBroker::EasyProvider"
+      item.define_updater {|val| eval(val)}
+    end
+
+    define_external_item(:task_worker_broker_short_sleep_time) do |item|
+      item.desc = "short sleep time for task worker broker"
+      item.init = 1
+      item.type = :positive_integer
+    end
+
+    define_external_item(:task_worker_broker_long_sleep_time) do |item|
+      item.desc = "long sleep time for task worker broker"
+      item.init = 3
+      item.type = :positive_integer
+    end
+  end
+end

data/lib/pione/global/tuple-space-notifier-variable.rb

@@ -4,13 +4,6 @@ module Pione
     # provider & receiver
     #
 
-    # presence port
-    define_external_item(:presence_port) do |item|
-      item.desc = "presence port number"
-      item.type = :integer
-      item.init = 56000
-    end
-
     #
     # pione-tuple-space-provider
     #
@@ -46,55 +39,10 @@ module Pione
       end
     end
 
-    # presence notification address
-    define_external_item(:presence_notification_addresses) do |item|
-      item.desc = "presence notification addresses"
-      item.init = ["255.255.255.255:56000"]
-      item.define_updater do |vals|
-        vals.map {|val| val.is_a?(String) ? URI.parse("broadcast://%s" % val) : val}
-      end
-    end
-
-    #
-    # pione-tuple-space-receiver
-    #
-
-    # tuple space receiver uri
-    define_internal_item(:tuple_space_receiver_uri) do |item|
-      item.desc = "URI of tuple space receiver"
-    end
-
-    # receiver-front port range begin
-    define_external_item(:tuple_space_receiver_front_port_range_begin) do |item|
-      item.desc = "start port number of tuple space receiver front"
-      item.type = :integer
-      item.init = 43000
-    end
-
-    # receiver-front port range end
-    define_external_item(:tuple_space_receiver_front_port_range_end) do |item|
-      item.desc = "end port number of tuple space receiver front"
-      item.type = :integer
-      item.init = 43999
-    end
-
-    # receiver-front port range
-    define_computed_item(:tuple_space_receiver_front_port_range,
-      [:tuple_space_receiver_front_port_range_begin, :tuple_space_receiver_front_port_range_end]) do |item|
-      item.desc = "port range of tuple space receiver front"
-      item.define_updater do
-        Range.new(
-          Global.tuple_space_receiver_front_port_range_begin,
-          Global.tuple_space_receiver_front_port_range_end
-        )
-      end
-    end
-
-    # disconnect time for tuple space receiver
-    define_internal_item(:tuple_space_receiver_disconnect_time) do |item|
-      item.desc = "tuple space receiver disconnect time"
+    define_internal_item(:tuple_space_disconnection_time) do |item|
+      item.desc = "tuple space disconnection time"
       item.type = :integer
-      item.init = 180
+      item.init = 60
     end
   end
 end

data/lib/pione/lang/boolean.rb

@@ -13,6 +13,10 @@ module Pione
       def value
         @__value__ ||= pieces.inject(true){|b, piece| b and piece.value}
       end
+
+      def textize
+        "(<b>%s)" % pieces.map {|piece| piece.value}.join("|")
+      end
     end
 
     #

data/lib/pione/lang/data-expr.rb

@@ -119,7 +119,7 @@ module Pione
       alias :"=~" :match?
 
       def textize
-        "(%s/d)" % pieces.map {|piece| piece.pattern}.join("|")
+        "(<d>%s)" % pieces.map {|piece| "'%s'" % piece.pattern}.join("|")
       end
     end
 

data/lib/pione/lang/integer.rb

@@ -11,7 +11,7 @@ module Pione
       piece_class PioneInteger
 
       def textize
-        "(%s/i)" % pieces.map {|piece| piece.value}.join("|")
+        "(<i>%s)" % pieces.map {|piece| piece.value}.join("|")
       end
     end
 

data/lib/pione/lang/string.rb

@@ -18,6 +18,10 @@ module Pione
       def value
         @__value__ ||= pieces.map{|piece| piece.value}.join
       end
+
+      def textize
+        "(<s>%s)" % pieces.map {|piece| '"%s"' % piece.value}.join("|")
+      end
     end
 
     TypeString.instance_eval do

data/lib/pione/lang/type.rb

@@ -72,7 +72,7 @@ module Pione
       # @return [void]
       def check(data)
         unless match(data)
-          raise PioneTypeError.new(data, self)
+          raise LangTypeError.new(data, self)
         end
       end
 

data/lib/pione/location.rb

@@ -11,6 +11,7 @@ require 'pione/location/local-scheme'
 require 'pione/location/dropbox-scheme'
 require 'pione/location/broadcast-scheme'
 require 'pione/location/myftp-scheme'
+require 'pione/location/notification-scheme'
 
 # storage
 require 'pione/location/basic-location'