pione 0.2.0 → 0.2.1

data/lib/pione/command/pione-log.rb

@@ -8,40 +8,59 @@ module Pione
       end
 
       define_option do
-        default :format, :xes
+        use :color
+        use :debug
+
         default :trace_filter, []
-        default :location, Location["local:./output/pione-process.log"]
 
-        option("--agent-activity[=TYPE]", "output only agent activity log") do |data, name|
-          data[:trace_filter] << Proc.new do |trace|
-            trace.attributes.include?(XES.string("pione:traceType", "agent_activity")) and
-              (name.nil? or trace.events.first.org_resource == name)
+        define(:agent_activity) do |item|
+          item.long = "--agent-activity[=TYPE]"
+          item.desc = "output only agent activity log"
+          item.action = proc do |option, name|
+            option[:trace_filter] << Proc.new do |trace|
+              trace.attributes.include?(XES.string("pione:traceType", "agent_activity")) and
+                (name.nil? or trace.events.first.org_resource == name)
+            end
           end
         end
 
-        option("--rule-process", "generate rule process log") do |data|
-          data[:trace_filter] << Proc.new do |trace|
-            trace.attributes.include?(XES.string("pione:traceType", "rule_process"))
+        define(:rule_process) do |item|
+          item.long = "--rule-process"
+          item.desc = "generate rule process log"
+          item.action = proc do |option|
+            option[:trace_filter] << Proc.new do |trace|
+              trace.attributes.include?(XES.string("pione:traceType", "rule_process"))
+            end
           end
         end
 
-        option("--task-process", "generate task process log") do |data|
-          data[:trace_filter] << Proc.new do |trace|
-            trace.attributes.include?(XES.string("pione:traceType", "task_process"))
+        define(:task_process) do |item|
+          item.long = "--task-process"
+          item.desc = "generate task process log"
+          item.action = proc do |option|
+            option[:trace_filter] << Proc.new do |trace|
+              trace.attributes.include?(XES.string("pione:traceType", "task_process"))
+            end
           end
         end
 
-        option("--location=LOCATION", "set log location of PIONE process") do |data, location|
-          data[:location] = Location[location]
+        define(:location) do |item|
+          item.long = "--location=LOCATION"
+          item.desc = "set log location of PIONE process"
+          item.default = Location["local:./output/pione-process.log"]
+          item.value = proc {|location| Location[location]}
         end
 
-        option("--format=(XES|JSON|HTML)", "set format type") do |data, name|
-          data[:format] = name.downcase.to_sym
+        define(:format) do |item|
+          item.long = "--format=(XES|JSON|HTML)"
+          item.desc = "set format type"
+          item.default = :xes
+          item.value = proc {|name| name.downcase.to_sym}
         end
 
-        validate do |data|
-          unless data[:location].exist?
-            abort("File not found in the location: %s" % data[:location].uri.to_s)
+        validate do |option|
+          unless option[:location].exist?
+            abort("File not found in the location: %s" % option[:location].uri.to_s)
           end
         end
       end

data/lib/pione/command/pione-relay-account-db.rb

@@ -9,40 +9,65 @@ module Pione
       end
 
       define_option do
-        option("-a", "--add", "add an account") do |data|
-          data[:action] = :add
+        use :color
+        use :debug
+
+        define(:add) do |item|
+          item.short = "-a"
+          item.long = "--add"
+          item.desc = "add an account"
+          item.action = lambda {|option| option[:action] = :add}
         end
 
-        option("-d", "--delete", "delete an account") do |data|
-          data[:action] = :delete
+        define(:delete) do |item|
+          item.short = "-d"
+          item.long = "--delete"
+          item.desc = "delete an account"
+          item.action = lambda {|option| option[:action] = :delete}
         end
 
-        option("-l", "--list", "list accounts") do |data|
-         data[:action] = :list
+        define(:list) do |item|
+          item.short = "-l"
+          item.long = "--list"
+          item.desc = "list accounts"
+          item.action = lambda {|option| option[:action] = :list}
         end
 
-        option("-r realm", "--realm realm", "realm name") do |data, realm|
-          data[:realm] = realm
+        define(:realm) do |item|
+          item.short = "-r"
+          item.long = "--realm=REALM"
+          item.desc = "realm name"
+          item.value = lambda {|name| name}
         end
 
-        option("-u name", "--user name", "user name") do |data, name|
-          data[:name] = name
+        define(:name) do |item|
+          item.short = "-u"
+          item.long = "--user=NAME"
+          item.desc = "user name"
+          item.value = lambda {|name| name}
         end
 
-        option("-p password", "--password password", "password") do |data, password|
-          data[:password] = password
+        define(:password) do |item|
+          item.short = "-p"
+          item.long = "--password=PASSWORD"
+          item.desc = "password"
+          item.value = lambda {|password| password}
         end
 
-        option("-f path", "--file path", "account db path") do |data, path|
-          Global.relay_account_db_path = path
+        define(:file) do |item|
+          item.short = "-f"
+          item.long = "--file=PATH"
+          item.desc = "account db path"
+          item.action = lambda {|path| Global.relay_account_db_path = path}
         end
 
-        validate do |data|
-          abort("error: -a, -d, or -l") unless data[:action]
+        validate do |option|
+          abort("error: -a, -d, or -l") unless option[:action]
         end
       end
 
-      def initialize
+      def initialize(*options)
+        super(*options)
         @realm = nil
         @name = nil
         @password = nil

data/lib/pione/command/pione-relay-client-db.rb

@@ -9,32 +9,53 @@ module Pione
       end
 
       define_option do
-        option("-a", "--add", "add a client") do |data|
-          data[:action] = :add
+        use :color
+        use :debug
+
+        define(:add) do |item|
+          item.short = "-a"
+          item.long = "--add"
+          item.desc = "add a client"
+          item.action = lambda {|option| option[:action] = :add}
         end
 
-        option("-d", "--delete", "delete a client") do |data|
-          data[:action] = :delete
+        define(:delete) do |item|
+          item.short = "-d"
+          item.long = "--delete"
+          item.desc = "delete a client"
+          item.action = lambda {|option| option[:action] = :delete}
         end
 
-        option("-l", "--list", "list clients") do |data|
-          data[:action] = :list
+        define(:list) do |item|
+          item.short = "-l"
+          item.long = "--list"
+          item.desc = "list clients"
+          item.action = lambda {|option| option[:action] = :list}
         end
 
-        option("-u name", "--user name", "user name") do |data, name|
-          data[:name] = name
+        define(:name) do |item|
+          item.short = "-u"
+          item.long = "--user=NAME"
+          item.desc = "user name"
+          item.value = lambda {|name| name}
         end
 
-        option("-p password", "--password password", "password") do |data, password|
-          data[:password] = password
+        define(:password) do |item|
+          item.short = "-p"
+          item.long = "--password=PASSWORD"
+          item.desc = "password"
+          item.value = lambda {|password| password}
         end
 
-        option("-f path", "--file path", "client db path") do |data, path|
-          Global.relay_client_db_path = path
+        define(:file) do |item|
+          item.short = "-f"
+          item.long = "--file=PATH"
+          item.desc = "client db path"
+          item.action = lambda {|option, path| Global.relay_client_db_path = path}
         end
 
-        validate do |data|
-          abort("error: -a, -d, or -l") unless data[:action]
+        validate do |option|
+          abort("error: -a, -d, or -l") unless option[:action]
         end
       end
 

data/lib/pione/command/pione-relay.rb

@@ -9,19 +9,27 @@ module Pione
       end
 
       define_option do
-        default :relay_port, Global.relay_port
+        use :color
+        use :debug
+        use :my_ip_address
+        use :show_communication
 
-        option("--realm name", "set relay realm name for client authentification") do |data, name|
-          Global.relay_realm = name
+        define(:realm) do |item|
+          item.long = "--realm name"
+          item.desc = "set relay realm name for client authentification"
+          item.action = lambda {|_, name| Global.relay_realm = name}
         end
 
-        option("--relay-port port", "set relay port") do |data, port|
-          data[:relay_port] = port
+        define(:relay_port) do |item|
+          item.long = "--relay-port port"
+          item.desc = "set relay port"
+          item.default = Global.relay_port
+          item.value = lambda {|port| port}
         end
 
-        validate do |data|
+        validate do |option|
           abort("error: no realm name") if Global.relay_realm.nil? or Global.relay_realm.empty?
-          abort("error: no relay port") unless data[:relay_port]
+          abort("error: no relay port") unless option[:relay_port]
         end
       end
 
@@ -35,7 +43,7 @@ module Pione
 
         puts DRb.front.uri
         DRb::DRbServer.new(
-          "relay://:%s" % data[:relay_port],
+          "relay://:%s" % option[:relay_port],
           nil,
           {:SSLCertName => Global.relay_ssl_certname}
         )

data/lib/pione/command/pione-syntax-checker.rb

@@ -9,30 +9,50 @@ module Pione
       end
 
       define_option do
+        use :color
+        use :debug
+
         default :readline_mode, true
-        default :syntax, false
-        default :transform, false
 
-        option('-e', '--expr=EXPR', 'check the expression string and exit') do |data, e|
-          data[:expr] = e
-          data[:readline_mode] = false
+        define(:expr) do |item|
+          item.short = '-e'
+          item.long = '--expr=EXPR'
+          item.desc = 'check the expression string and exit'
+          item.action = lambda do |option, e|
+            option[:expr] = e
+            option[:readline_mode] = false
+          end
         end
 
-        option('-s', '--syntax', 'show syntax tree') do |data|
-          data[:syntax] = true
+        define(:syntax) do |item|
+          item.short = '-s'
+          item.long = '--syntax'
+          item.desc = 'show syntax tree'
+          item.default = false
+          item.value = true
         end
 
-        option('-t', '--transformer', 'show transformer result') do |data|
-          data[:transform] = true
+        define(:transform) do |item|
+          item.short = '-t'
+          item.long = '--transformer'
+          item.desc = 'show transformer result'
+          item.default = false
+          item.value = true
         end
 
-        option('-f', '--file=PATH', 'check syntax of the document') do |data, path|
-          data[:document] = path
-          data[:readline_mode] = false
+        define(:file) do |item|
+          item.short = '-f'
+          item.long = '--file=PATH'
+          item.desc = 'check syntax of the document'
+          item.action = lambda do |option, path|
+            option[:document] = path
+            option[:readline_mode] = false
+          end
         end
       end
 
-      def initialize
+      def initialize(*argv)
+        super
         @history = File.join(Global.dot_pione_dir, "pione-history")
       end
 

data/lib/pione/command/pione-task-worker.rb

@@ -21,36 +21,41 @@ BANNER
       end
 
       define_option do
-        use Option::ChildProcessOption
-
-        default :features, Model::Feature::EmptyFeature.new
-
-        # --connection-id
-        option('--connection-id=ID', 'set connection id') do |data, id|
-          data[:connection_id] = id
+        use :color
+        use :debug
+        use :my_ip_address
+        use :no_parent
+        use :parent_front
+
+        define(:connection_id) do |item|
+          item.long = '--connection-id=ID'
+          item.desc = 'set connection id'
+          item.value = proc {|id| id}
         end
 
-        # --feature
-        option('--features=FEATURES', 'set features') do |data, features|
-          begin
-            features = DocumentTransformer.new.apply(
-              DocumentParser.new.feature_expr.parse(features)
-            )
-            data[:features] = features
-          rescue Parslet::ParseFailed => e
-            puts "invalid parameters: " + str
-            Util::ErrorReport.print(e)
-            abort
+        define(:features) do |item|
+          item.long = '--features=FEATURES'
+          item.desc = 'set features'
+          item.value = proc do |features|
+            begin
+              DocumentTransformer.new.apply(
+                DocumentParser.new.feature_expr.parse(features)
+              )
+            rescue Parslet::ParseFailed => e
+              puts "invalid parameters: " + str
+              Util::ErrorReport.print(e)
+              abort
+            end
           end
         end
 
-        validate do |data|
+        validate do |option|
           # check requisite options
-          abort("error: no connection id") if data[:connection_id].nil?
+          abort("error: no connection id") if option[:connection_id].nil?
 
           # get the parent front server
           begin
-            data[:parent_front].uuid
+            option[:parent_front].uuid
           rescue => e
             if Pione.debug_mode?
               debug_message "pione-task-worker cannot get the parent front server: %s" % e
@@ -127,8 +132,6 @@ BANNER
 
             # flag
             @terminated = true
-
-            super
           rescue DRb::DRbConnError, DRb::ReplyReaderThreadError => e
             ErrorReport.warn("Disconnected in termination process of task worker agent.", self, e, __FILE__, __LINE__)
           rescue ThreadError => e

data/lib/pione/command/pione-tuple-space-provider.rb

@@ -17,18 +17,14 @@ TXT
       end
 
       define_option do
-        use Option::TupleSpaceProviderOption
-
-        default :notifier_addresses, []
-
-        validate do |data|
-          # broadcast addresses
-          data[:notifier_addresses].each do |uri|
-            unless uri.scheme == "broadcast"
-              abort("error: invalid broadcast address '%s'" % uri.to_s)
-            end
-          end
-        end
+        use :debug
+        use :color
+        use :my_ip_address
+        use :no_parent
+        use :parent_front
+        use :presence_notification_address
+        use :show_communication
+        use :show_presence_notifier
       end
 
       attr_reader :tuple_space_provider
@@ -39,11 +35,6 @@ TXT
       end
 
       prepare do
-        # setup notifier addresses
-        unless option[:notifier_addresses].empty?
-          Global.tuple_space_provider_broadcast_addresses = option[:notifier_addresses]
-        end
-
         # make tuple space provider
         @tuple_space_provider = TupleSpaceProvider.new
       end