pione 0.1.2 → 0.1.3

data/lib/pione/model/variable.rb

@@ -1,98 +1,103 @@
-module Pione::Model
-  # Variable represent variable name objects. A variable object can evaluates
-  # its value with the variable table.
-  class Variable < BasicModel
-    set_pione_model_type TypeAny
-
-    attr_reader :name
-
-    # true if the variable is user parameter
-    attr_reader :user_param
-
-    # Creates a variable with name.
-    # @param [String] name
-    #   variable name
-    def initialize(name)
-      @name = name.to_s
-      @toplevel = nil
-      @user_param = nil
-      super()
-    end
-
-    # Evaluates self variable name in the table and returns it. Return self if
-    # the variable name is unbound in the table.
-    # @param [VariableTable] vtable
-    #   variable table for evaluation
-    # @return [BasicModel]
-    #   evaluation result
-    def eval(vtable)
-      val = vtable.get(self)
-      raise UnboundVariableError.new(self) if val.nil?
-      return val
-    end
+module Pione
+  module Model
+    # Variable represent variable name objects. A variable object can evaluates
+    # its value with the variable table.
+    class Variable < BasicModel
+      set_pione_model_type TypeAny
+
+      attr_reader :name
+
+      # true if the variable is user parameter
+      attr_reader :user_param
+
+      # Create a variable with name.
+      #
+      # @param name [String]
+      #   variable name
+      def initialize(name)
+        @name = name.to_s
+        @toplevel = nil
+        @user_param = nil
+        super()
+      end
 
-    # Returns true because variable is a variable.
-    # @return [Boolean]
-    #   true
-    def include_variable?
-      true
-    end
+      # Evaluate self variable name in the table and returns it. Return self if
+      # the variable name is unbound in the table.
+      #
+      # @param vtable [VariableTable]
+      #   variable table for evaluation
+      # @return [BasicModel]
+      #   evaluation result
+      def eval(vtable)
+        val = vtable.get(self)
+        raise UnboundVariableError.new(self) if val.nil?
+        return val
+      end
 
-    # Set truth of toplevel variable.
-    def set_toplevel(b)
-      @toplevel = b
-    end
+      # Return true because variable is a variable.
+      #
+      # @return [Boolean]
+      #   true
+      def include_variable?
+        true
+      end
 
-    # Set truth of user parameter.
-    def set_user_param(b)
-      @user_param = b
-    end
+      # Set truth of toplevel variable.
+      def set_toplevel(b)
+        @toplevel = b
+      end
 
-    # Returns true if the variable is defined in toplevel.
-    # @return [Boolean]
-    #   true if the variable is defined in toplevel
-    def toplevel?
-      @toplevel
-    end
+      # Set truth of user parameter.
+      def set_user_param(b)
+        @user_param = b
+      end
 
-    # @api private
-    def task_id_string
-      "Variable<#{@name}>"
-    end
+      # Return true if the variable is defined in toplevel.
+      #
+      # @return [Boolean]
+      #   true if the variable is defined in toplevel
+      def toplevel?
+        @toplevel
+      end
 
-    # @api private
-    def textize
-      "$%s" % [@name]
-    end
+      # @api private
+      def task_id_string
+        "Variable<#{@name}>"
+      end
 
-    # Comparisons with other variable.
-    # @api private
-    def <=>(other)
-      unless other.kind_of?(self.class)
-        raise ArgumentError.new(other)
+      # @api private
+      def textize
+        "$%s" % @name
       end
-      @name <=> other.name
-    end
 
-    # Return true if other is a variable object which name is same as myself.
-    # @api private
-    def ==(other)
-      other.kind_of?(self.class) && @name == other.name
-    end
+      # Compare with other variable.
+      #
+      # @api private
+      def <=>(other)
+        unless other.kind_of?(self.class)
+          raise ArgumentError.new(other)
+        end
+        @name <=> other.name
+      end
 
-    alias :eql? :"=="
+      # Return true if other is a variable object which name is same as myself.
+      #
+      # @api private
+      def ==(other)
+        other.kind_of?(self.class) && @name == other.name
+      end
+      alias :eql? :"=="
 
-    # @api private
-    def hash
-      @name.hash
-    end
+      # @api private
+      def hash
+        @name.hash
+      end
 
-    # @api private
-    def inspect
-      "#<Pione::Model::Variable @name=%s>" % @name.inspect
+      # @api private
+      def inspect
+        "#<Pione::Model::Variable @name=%s>" % @name.inspect
+      end
+      alias :to_s :inspect
     end
-
-    # @api private
-    alias :to_s :inspect
   end
 end

data/lib/pione/option.rb

@@ -0,0 +1,13 @@
+module Pione
+  # Option is a name space for command option set modules.
+  module Option; end
+end
+
+require 'pione/option/option-interface'
+require 'pione/option/common-option'
+require 'pione/option/child-process-option'
+require 'pione/option/presence-notifier-option'
+require 'pione/option/tuple-space-provider-option'
+require 'pione/option/tuple-space-provider-owner-option'
+require 'pione/option/tuple-space-receiver-option'
+require 'pione/option/task-worker-owner-option'

data/lib/pione/option/child-process-option.rb

@@ -0,0 +1,19 @@
+module Pione
+  module Option
+    # ChildProcessOption provides options for child process like
+    # pione-task-worker or pione-tuple-space-receiver.
+    module ChildProcessOption
+      extend OptionInterface
+
+      # --parent-front
+      option('--parent-front=URI', 'set parent front URI') do |data, uri|
+        data[:parent_front] = DRbObject.new_with_uri(uri)
+      end
+
+      # --no-parent
+      option('--no-parent', 'turn on no parent mode') do
+        data[:no_parent_mode] = true
+      end
+    end
+  end
+end

data/lib/pione/{command-option → option}/common-option.rb

@@ -1,26 +1,27 @@
 module Pione
-  module CommandOption
+  module Option
+    # CommonOption provides common options for pione commands.
     module CommonOption
       extend OptionInterface
 
       # --debug
-      define_option('-d', '--debug', "turn on debug mode") do |name|
+      option('-d', '--debug', "turn on debug mode") do |data, name|
         Pione.debug_mode = true
       end
 
       # --show-communication
-      define_option('--show-communication', "show object communication") do |show|
+      option('--show-communication', "show object communication") do |data, show|
         Global.show_communication = true
       end
 
       # --color
-      define_option('--[no-]color', 'turn on/off color mode') do |str|
+      option('--[no-]color', 'turn on/off color mode') do |data, str|
         bool = nil
         bool = true if str == "true"
         bool = false if str == "false"
         if bool.nil?
           puts "invalid color option: %s" % bool
-          exit
+          exit!
         end
         Terminal.color_mode = bool
       end

data/lib/pione/option/option-interface.rb

@@ -0,0 +1,73 @@
+module Pione
+  module Option
+    # OptionInterface provides basic methods for option modules. All option
+    # modules should be extended by this.
+    module OptionInterface
+      # Make an array of definitions.
+      #
+      # @api private
+      def self.extended(obj)
+        obj.instance_variable_set(:@definitions, [])
+        obj.instance_variable_set(:@default_table, {})
+        obj.instance_variable_set(:@validators, [])
+      end
+
+      attr_reader :definitions
+      attr_reader :default_table
+      attr_reader :validators
+
+      # Define default value of the option data set.
+      #
+      # @param name [Symbol]
+      #   option data key
+      # @param value [Object]
+      #   option data value
+      # @return [void]
+      def default(name, value)
+        @default_table[name] = value
+      end
+
+      # Define a new option for the command.
+      #
+      # @param args [Array]
+      #   OptionParser arguments
+      # @param b [Proc]
+      #   option action
+      # @return [void]
+      def option(*args, &b)
+        @definitions << [args, b]
+      end
+
+      # Remove the option.
+      #
+      # @param b [Proc]
+      #   remove options that match proc's result
+      # @return [void]
+      def remove_option(&b)
+        @definitions.select! do |definition|
+          not(b.call(definition))
+        end
+      end
+
+      # Install the option module.
+      #
+      # @param mod [Module]
+      #   PIONE's option set modules
+      # @return [void]
+      def use(mod)
+        @definitions += mod.definitions
+        @default_table.merge!(mod.default_table)
+        @validators += mod.validators
+      end
+
+      # Define validation of the option set.
+      #
+      # @param b [Proc]
+      #   validation content
+      # @return [void]
+      def validate(&b)
+        @validators << b
+      end
+    end
+  end
+end

data/lib/pione/{command-option → option}/presence-notifier-option.rb

@@ -1,13 +1,14 @@
 module Pione
-  module CommandOption
+  module Option
+    # PresenceNotifierOption provides options for presence notifiers.
     module PresenceNotifierOption
       extend OptionInterface
 
       # --show-presence-notifier
-      define_option(
+      option(
         "--show-presence-notifier",
         "show presence notifier informations"
-      ) do
+      ) do |data|
         Global.show_presence_notifier = true
       end
     end

data/lib/pione/option/task-worker-owner-option.rb

@@ -0,0 +1,24 @@
+module Pione
+  module Option
+    # TaskWorkerOwnerOption provides options for commands that make task
+    # workers. Options are:
+    #
+    # - task-worker
+    # - features
+    module TaskWorkerOwnerOption
+      extend OptionInterface
+
+      default :task_worker, [Util.core_number - 1, 1].max
+
+      # --task-worker
+      option('-t N', '--task-worker=N', 'set task worker number that this process creates') do |data, n|
+        data[:task_worker] = n.to_i
+      end
+
+      # --features
+      option('--features=FEATURES', 'set features') do |data, features|
+        data[:features] = features
+      end
+    end
+  end
+end

data/lib/pione/{command-option → option}/tuple-space-provider-option.rb

@@ -1,14 +1,16 @@
 module Pione
-  module CommandOption
+  module Option
+    # TupleSpaceProviderOption provides options for commands that make tuple
+    # space provider agent.
     module TupleSpaceProviderOption
       extend OptionInterface
-      use_option_module PresenceNotifierOption
+      use PresenceNotifierOption
 
       # --presence-notification-address
-      define_option(
+      option(
         "--presence-notification-address=255.255.255.255:%s" % Global.presence_port,
         "set the address for sending presence notifier"
-      ) do |address|
+      ) do |data, address|
         # clear addresses at first time
         unless @__option_notifier_address__
           @__option_notifier_address__ = true

data/lib/pione/option/tuple-space-provider-owner-option.rb

@@ -0,0 +1,18 @@
+module Pione
+  module Option
+    # TupleSpaceProviderOption provides options for commands that make tuple
+    # space provider agent.
+    module TupleSpaceProviderOwnerOption
+      extend OptionInterface
+      use TupleSpaceProviderOption
+
+      # --without-tuple-space-provider
+      option(
+        '--without-tuple-space-provider',
+        'process without tuple space provider'
+      ) do |data|
+        data[:without_tuple_space_provider] = true
+      end
+    end
+  end
+end

data/lib/pione/option/tuple-space-receiver-option.rb

@@ -0,0 +1,8 @@
+module Pione
+  module Option
+    # TupleSpaceReceiverOption provides options for tuple space receiver.
+    module TupleSpaceReceiverOption
+      extend OptionInterface
+    end
+  end
+end

data/lib/pione/parser/common-parser.rb

@@ -78,7 +78,8 @@ module Pione
         :keyword_true => 'true',
         :keyword_false => 'false',
         :keyword_and => 'and',
-        :keyword_or => 'or'
+        :keyword_or => 'or',
+        :keyword_null => 'null'
       }
 
       # make keywords
@@ -95,7 +96,7 @@ module Pione
       #     line end.
       #   @return [Parslet::Atoms::Entity] +identifier+ atom
       rule(:identifier) {
-        ((space | symbols | line_end).absent? >> any).repeat(1)
+        ((space | symbols | line_end).absent? >> any).repeat(1) >> question.maybe
       }
 
       # @!attribute [r] digit