pione 0.2.2 → 0.3.0

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

@@ -3,94 +3,115 @@ module Pione
     # PioneRelayClientDB is a command that adds, deletes, or shows clients in
     # relay server.
     class PioneRelayClientDB < BasicCommand
-      define_info do
-        set_name "pione-relay-client-db"
-        set_banner "Add, delete, or show clients in this relay server."
-      end
+      #
+      # basic informations
+      #
 
-      define_option do
-        use :color
-        use :debug
+      command_name "pione-relay-client-db"
+      command_banner "Add, delete, or show clients in this relay server."
 
-        define(:add) do |item|
-          item.short = "-a"
-          item.long = "--add"
-          item.desc = "add a client"
-          item.action = lambda {|option| option[:action] = :add}
-        end
+      #
+      # options
+      #
 
-        define(:delete) do |item|
-          item.short = "-d"
-          item.long = "--delete"
-          item.desc = "delete a client"
-          item.action = lambda {|option| option[:action] = :delete}
-        end
+      use_option :color
+      use_option :debug
 
-        define(:list) do |item|
-          item.short = "-l"
-          item.long = "--list"
-          item.desc = "list clients"
-          item.action = lambda {|option| option[:action] = :list}
-        end
+      define_option(:add) do |item|
+        item.short = "-a"
+        item.long = "--add"
+        item.desc = "add a client"
+        item.action = lambda {|_, option| option[:action] = :add}
+      end
 
-        define(:name) do |item|
-          item.short = "-u"
-          item.long = "--user=NAME"
-          item.desc = "user name"
-          item.value = lambda {|name| name}
-        end
+      define_option(:delete) do |item|
+        item.short = "-d"
+        item.long = "--delete"
+        item.desc = "delete a client"
+        item.action = lambda {|_, option| option[:action] = :delete}
+      end
 
-        define(:password) do |item|
-          item.short = "-p"
-          item.long = "--password=PASSWORD"
-          item.desc = "password"
-          item.value = lambda {|password| password}
-        end
+      define_option(:list) do |item|
+        item.short = "-l"
+        item.long = "--list"
+        item.desc = "list clients"
+        item.action = lambda {|_, option| option[:action] = :list}
+      end
 
-        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
+      define_option(:name) do |item|
+        item.short = "-u"
+        item.long = "--user=NAME"
+        item.desc = "user name"
+        item.value = lambda {|name| name}
+      end
 
-        validate do |option|
-          abort("error: -a, -d, or -l") unless option[:action]
-        end
+      define_option(:password) do |item|
+        item.short = "-p"
+        item.long = "--password=PASSWORD"
+        item.desc = "password"
+        item.value = lambda {|password| password}
+      end
+
+      define_option(: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
 
-      prepare do
-        # set client db
+      validate_option do |option|
+        abort("error: -a, -d, or -l") unless option[:action]
+      end
+
+      #
+      # command lifecycle: setup phase
+      #
+
+      setup :client_db
+      setup [:add, :delete] => :name
+      setup :add => :password
+
+      # set client db
+      def setup_client_db
         Global.relay_client_db = RelayClientDB.new(Global.relay_client_db_path)
+      end
 
-        # set name
-        if [:add, :delete].include?(option[:action])
-          option[:name] = HighLine.new.ask("Name: ") unless option[:name]
-        end
+      # set name
+      def setup_name
+        option[:name] = HighLine.new.ask("Name: ") unless option[:name]
+      end
 
-        # set password
-        if option[:action] == :add
-          unless option[:password]
-            option[:password] = HighLine.new.ask("Password: "){|q| q.echo = "*"}
-            password = HighLine.new.ask("Re-enter password: "){|q| q.echo = "*"}
-            abort("error: password mismatch") unless option[:password] == password
-          end
+      # set password
+      def setup_password
+        unless option[:password]
+          option[:password] = HighLine.new.ask("Password: "){|q| q.echo = "*"}
+          password = HighLine.new.ask("Re-enter password: "){|q| q.echo = "*"}
+          abort("error: password mismatch") unless option[:password] == password
         end
       end
 
-      start do
-        case option[:action]
-        when :add
-          Global.relay_client_db.add(option[:name], option[:password])
-          Global.relay_client_db.save
-        when :delete
-          Global.relay_client_db.delete(option[:name])
-          Global.relay_client_db.save
-        when :list
-          names = Global.relay_client_db.names
-          puts "%s clients in %s" % [names.size, Global.relay_client_db_path]
-          names.each {|user| puts user}
-        end
+      #
+      # command lifecycle: execution phase
+      #
+
+      execute :add => :add
+      execute :delete => :delete
+      execute :list => :list
+
+      def execute_add
+        Global.relay_client_db.add(option[:name], option[:password])
+        Global.relay_client_db.save
+      end
+
+      def execute_delete
+        Global.relay_client_db.delete(option[:name])
+        Global.relay_client_db.save
+      end
+
+      def execute_list
+        names = Global.relay_client_db.names
+        puts "%s clients in %s" % [names.size, Global.relay_client_db_path]
+        names.each {|user| puts user}
       end
     end
   end

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

@@ -1,45 +1,50 @@
 module Pione
   module Command
     # PioneRelay is a command for connecting relay server.
-    class PioneRelay < FrontOwnerCommand
-      define_info do
-        set_name "pione-relay"
-        set_tail {|cmd| "--relay-port %s" % cmd.option[:relay_port]}
-        set_banner "Run relay process for connecting between clients and brokers."
+    class PioneRelay < BasicCommand
+      #
+      # basic informations
+      #
+
+      command_name("pione-relay") {|cmd| "relay-port: %s" % cmd.option[:relay_port]}
+      command_banner "Run relay process for connecting between clients and brokers."
+      command_front Front::RelayFront
+
+      #
+      # options
+      #
+
+      use_option :color
+      use_option :debug
+      use_option :my_ip_address
+
+      define_option(: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
 
-      define_option do
-        use :color
-        use :debug
-        use :my_ip_address
-        use :show_communication
-
-        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
-
-        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 |option|
-          abort("error: no realm name") if Global.relay_realm.nil? or Global.relay_realm.empty?
-          abort("error: no relay port") unless option[:relay_port]
-        end
+      define_option(: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
 
-      def create_front
-        Front::RelayFront.new(self)
+      validate_option do |option|
+        abort("error: no realm name") if Global.relay_realm.nil? or Global.relay_realm.empty?
+        abort("error: no relay port") unless option[:relay_port]
       end
 
-      start do
+      #
+      # command lifecycle: execution phase
+      #
+
+      execute :relay
+
+      def execute_relay
         # wake up tuple space provider process
-        Pione::TupleSpaceProvider.instance
+        Pione::TupleSpaceProvider.spawn
 
         puts DRb.front.uri
         DRb::DRbServer.new(

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

@@ -3,104 +3,98 @@ module Pione
     # PioneSyntaxChecker is a command for checking syntax tree and model of the
     # PIONE document.
     class PioneSyntaxChecker < BasicCommand
-      define_info do
-        set_name "pione-syntax-checker"
-        set_banner "Print syntax tree of PIONE notation."
-      end
+      #
+      # basic informations
+      #
 
-      define_option do
-        use :color
-        use :debug
+      command_name "pione-syntax-checker"
+      command_banner "Print syntax tree of PIONE notation."
 
-        default :readline_mode, true
+      #
+      # options
+      #
 
-        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
+      use_option :color
+      use_option :debug
 
-        define(:syntax) do |item|
-          item.short = '-s'
-          item.long = '--syntax'
-          item.desc = 'show syntax tree'
-          item.default = false
-          item.value = true
-        end
+      option_default(:readline_mode, true)
 
-        define(:transform) do |item|
-          item.short = '-t'
-          item.long = '--transformer'
-          item.desc = 'show transformer result'
-          item.default = false
-          item.value = true
-        end
-
-        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
+      define_option(: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
 
-      def initialize(*argv)
-        super
-        @history = File.join(Global.dot_pione_dir, "pione-history")
+      define_option(:syntax) do |item|
+        item.short = '-s'
+        item.long = '--syntax'
+        item.desc = 'show syntax tree'
+        item.default = false
+        item.value = true
       end
 
-      prepare do
-        require 'pp'
+      define_option(:transform) do |item|
+        item.short = '-t'
+        item.long = '--transformer'
+        item.desc = 'show transformer result'
+        item.default = false
+        item.value = true
       end
 
-      start do
-        case action_mode
-        when :readline
-          action_readline_mode
-        when :file
-          print_result(DocumentParser.new, Pathname.new(option[:document]).read)
-        when :expr
-          print_result(DocumentParser.new.expr, option[:expr])
+      define_option(: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
 
-      terminate(:pre) do
-        save_history if readline_mode?
+      define_option(:parser) do |item|
+        item.long = "--parser=NAME"
+        item.desc = "set parser"
+        item.value = lambda {|name| name}
       end
 
-      private
-
-      # Return action mode.
       #
-      # @return [Symbol]
-      #   action mode
-      def action_mode
-        return :readline if readline_mode?
-        return :file if option[:document]
-        return :expr if option[:expr]
+      # instance methods
+      #
+
+      def initialize(*argv)
+        super
+        @history = File.join(Global.dot_pione_dir, "pione-history")
       end
 
-      # Return true if readline mode is enabled.
       #
-      # @return [Boolean]
-      #   true if readline mode is enabled
-      def readline_mode?
-        option[:readline_mode]
+      # command lifecycle: setup phase
+      #
+
+      setup :pp
+      setup :readline => :readline_mode
+
+      def setup_pp
+        require 'pp'
       end
 
-      # Action readline mode.
-      #
-      # @return [void]
-      def action_readline_mode
+      def setup_readline_mode
         require 'readline'
         restore_history
+      end
+
+      #
+      # command lifecycle: execute phase
+      #
+
+      execute :readline => :readline_mode
+      execute :file => :file
+      execute :expr => :expr
+
+      def execute_readline_mode
         buf = ""
         mark = ">"
 
@@ -128,15 +122,51 @@ module Pione
         end
       end
 
-      # Print parsing result of the string.
+      def execute_file
+        print_result(DocumentParser.new, Pathname.new(option[:document]).read)
+      end
+
+      def execute_expr
+        parser_name = option[:parser] ? option[:parser] : :expr
+        print_result(DocumentParser.new.send(parser_name), option[:expr])
+      end
+
+      #
+      # command lifecycle: termination phase
+      #
+
+      terminate :readline => :history
+
+      def terminate_history
+        save_history if readline_mode?
+      end
+
+      #
+      # helper methods
       #
-      # @param str [String]
-      #   PIONE expression
-      # @return [void]
+
+      private
+
+      # Return action mode.
+      def action_mode
+        return :readline if readline_mode?
+        return :file if option[:document]
+        return :expr if option[:expr]
+      end
+
+      # Return true if readline mode is enabled.
+      def readline_mode?
+        option[:readline_mode]
+      end
+
+      # Print parsing result of the string.
       def print_result(parser, str)
         begin
           stree = parser.parse(str)
-          model = DocumentTransformer.new.apply(stree)
+          transformer_option = {}
+          transformer_option[:package_name] = option[:package_name] || "PioneSyntaxChecker"
+          transformer_option[:filename] = option[:filename] || "NoFile"
+          model = DocumentTransformer.new.apply(stree, transformer_option)
           if option[:syntax]
             puts "syntax:".color(:green)
             pp stree
@@ -148,24 +178,21 @@ module Pione
           if model.kind_of?(Array)
             model.each {|m| p m}
           else
-            p model.eval(VariableTable.new)
+            p model.eval(Lang::Environment.new)
           end
-        rescue Pione::Parser::ParserError, Parslet::ParseFailed => e
+        rescue Lang::ParserError, Parslet::ParseFailed => e
           msg = "Pione syntax error: %s (%s)" % [e.message, e.class.name]
           readline_mode? ? puts(msg) : abort(msg)
-        rescue Pione::Model::PioneModelTypeError,
-          Pione::Model::VariableBindingError => e
+        rescue Lang::PioneTypeError, Lang::VariableBindingError => e
           msg = "Pione model error: %s (%s)" % [e.message, e.class.name]
           readline_mode? ? puts(msg) : abort(msg)
-        rescue Pione::Model::MethodNotFound => e
+        rescue Lang::MethodNotFound => e
           msg = "%s (%s)" % [e.message, e.class.name]
           readline_mode? ? puts(msg) : abort(msg)
         end
       end
 
       # Restore readline's history.
-      #
-      # @return [void]
       def restore_history
         if File.exist?(@history)
           File.readlines(@history).reverse.each do |line|
@@ -175,8 +202,6 @@ module Pione
       end
 
       # Save history to file.
-      #
-      # @return [void]
       def save_history
         File.open(@history, "w+") do |file|
           Readline::HISTORY.to_a.reverse[0..100].each do |line|