pione 0.1.1 → 0.1.2

data/History.txt

@@ -1,6 +1,13 @@
 # History
 
-## 0.1.1
+## 0.1.2(2013/04/01)
+
+* Added shorthand notation for setting parameters
+* Added ticket concept for sequential processing
+* Improved termination sequence
+* Refactored parser and transformer
+
+## 0.1.1(2013/03/20)
 
 * Improved performance
 * Added the concept of document parameter
@@ -8,6 +15,6 @@
 * Fixed bugs of features handling
 * Improved comment parser
 
-## 0.1.0
+## 0.1.0(2013/02/19)
 
 * First gem release

data/Rakefile

@@ -9,7 +9,7 @@ end
 
 desc 'Show undocumented function list'
 task 'html:undoc' do
-  sh 'bundle exec yard stats --list-undoc --no-api --private'
+  sh 'bundle exec yard stats --list-undoc --no-api --private --compact'
 end
 
 desc 'count characters in input direcotry'

data/example/Fib/Fib.pione

@@ -3,8 +3,8 @@ param $NUM := 3
 Rule Main
   output 'result.txt'
 Flow
-  rule Fib.params({N: $NUM})
-  rule Result.params({N: $NUM})
+  rule Fib {N: $NUM}
+  rule Result {N: $NUM}
 End
 
 Rule Fib0
@@ -31,9 +31,9 @@ Flow
   else
     $P1 := $N - 2
     $P2 := $N - 1
-    rule Fib.params({N: $P1})
-    rule Fib.params({N: $P2})
-    rule Calc.params({N: $N, P1: $P1, P2: $P2})
+    rule Fib {N: $P1}
+    rule Fib {N: $P2}
+    rule Calc {N: $N, P1: $P1, P2: $P2}
   end
 End
 

data/example/SequentialProcess/SequentialProcess.pione

@@ -0,0 +1,69 @@
+Rule Main
+  output '*.a'.all
+  output '*.b'.all
+Flow
+  rule A ==> <T>
+  rule <T> ==> B
+End
+
+Rule A
+  output '*.a'.all
+Flow
+  rule <T> ==> A4
+  rule A1 >>> A2 >>> A3 ==> <T>
+End
+
+Rule A1
+  output '1.a'
+Action
+  echo "A1" > {$O[1]}
+End
+
+Rule A2
+  output '2.a'
+Action
+  echo "A2" > {$O[1]}
+End
+
+Rule A3
+  output '3.a'
+Action
+  echo "A3" > {$O[1]}
+End
+
+Rule A4
+  output '4.a'
+Action
+  echo "A4" > {$O[1]}
+End
+
+Rule B
+  output '*.b'.all
+Flow
+  rule <T> ==> B4
+  rule B1 >>> B2 >>> B3 ==> <T>
+End
+
+Rule B1
+  output '1.b'
+Action
+  echo "B1" > {$O[1]}
+End
+
+Rule B2
+  output '2.b'
+Action
+  echo "B2" > {$O[1]}
+End
+
+Rule B3
+  output '3.b'
+Action
+  echo "B3" > {$O[1]}
+End
+
+Rule B4
+  output '4.b'
+Action
+  echo "B4" > {$O[1]}
+End

data/lib/pione.rb

@@ -29,6 +29,7 @@ require 'ostruct'
 require 'net/ftp'
 require 'highline'
 require 'dropbox_sdk'
+require 'hamster'
 require 'naming'
 
 #
@@ -41,7 +42,7 @@ require 'pione/version'
 # util
 require 'pione/util/misc'
 require 'pione/util/terminal'
-require 'pione/util/message'
+require 'pione/util/console-message'
 require 'pione/util/log'
 require 'pione/util/waiter-table'
 require 'pione/util/error-report'
@@ -94,6 +95,7 @@ require 'pione/model/variable-table'
 require 'pione/model/data-expr'
 require 'pione/model/parameters'
 require 'pione/model/package'
+require 'pione/model/ticket-expr'
 require 'pione/model/rule-expr'
 require 'pione/model/binary-operator'
 require 'pione/model/message'
@@ -123,6 +125,7 @@ require 'pione/tuple/exception-tuple'
 require 'pione/tuple/log-tuple'
 require 'pione/tuple/rule-tuple'
 require 'pione/tuple/task-worker-resource-tuple'
+require 'pione/tuple/ticket-tuple'
 
 # tuple-space
 require 'pione/tuple-space/tuple-space-server-interface'
@@ -134,7 +137,7 @@ require 'pione/tuple-space/data-finder'
 require 'pione/tuple-space/update-criteria'
 
 # parser
-require 'pione/parser/syntax-error'
+require 'pione/parser/parslet-extension'
 require 'pione/parser/common-parser'
 require 'pione/parser/literal-parser'
 require 'pione/parser/feature-expr-parser'
@@ -145,14 +148,7 @@ require 'pione/parser/rule-definition-parser'
 require 'pione/parser/document-parser'
 
 # transformer
-require 'pione/transformer/transformer-module'
-require 'pione/transformer/literal-transformer'
-require 'pione/transformer/feature-expr-transformer'
-require 'pione/transformer/expr-transformer'
-require 'pione/transformer/flow-element-transformer'
-require 'pione/transformer/block-transformer'
-require 'pione/transformer/rule-definition-transformer'
-require 'pione/transformer/document-transformer'
+require 'pione/transformer'
 
 # resource
 require 'pione/resource/basic-resource'
@@ -227,7 +223,7 @@ module Pione
   include System
   include Relay
   include Util
-  include Util::Message
+  include Util::ConsoleMessage
   include Model
   include TupleSpace
   include Parser

data/lib/pione/agent/input-generator.rb

@@ -73,9 +73,10 @@ module Pione
           end
         end
 
-        # Initializes the generator. This method is called when root rule is
+        # Initialize the generator. This method is called when root rule is
         # requested in stream mode.
-        # @retrun [void]
+        #
+        # @return [void]
         def init
           if @dir_path
             @gen = Resource[@dir_path].entries.to_enum

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

@@ -213,18 +213,21 @@ module Pione
 
         debug_message_end "End Task Execution #{rule.rule_path} by worker(#{uuid})"
 
-        return task, handler, @__result_task_execution__
+        return task, rule, handler, @__result_task_execution__
       end
 
       # State data_outputing.
-      # @param [Task] task
+      # @param task [Task]
       #   task tuple
+      # @param rule [Rule]
+      #   rule model
       # @param [RuleHandler] handler
       #   rule handler
       # @param [Array<Data>] result
       #   result data tuples
       # @return [Array<Task,RuleHandler>]
-      def transit_to_data_outputing(task, handler, result)
+      def transit_to_data_outputing(task, rule, handler, result)
+        # output data
         result.flatten.each do |output|
           begin
             write(output)

data/lib/pione/agent/trivial-routine-worker.rb

@@ -9,17 +9,18 @@ module Pione
       define_state_transition :initialized => :working
       define_state_transition :working => :working
 
-      # Creates a worker.
-      # @param [Proc] action
+      # Create a trivial routine worker.
+      #
+      # @param action [Proc]
       #   worker's action as proc object
-      # @param [Integer] sec
-      #   sleeping time
       def initialize(action)
         raise ArgumentError.new(action) unless action.kind_of?(Proc)
         @action = action
       end
 
-      # Calls the action.
+      # Call the action.
+      #
+      # @return [void]
       def transit_to_working
         @action.call
       end

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

@@ -123,8 +123,14 @@ module Pione
         raise NotImplementedError
       end
 
+      # Terminate the command. Exit from PIONE system.
+      #
+      # @return [void]
       def terminate
-        exit
+        Global.monitor.synchronize do
+          # exit with no exception
+          exit!
+        end
       end
     end
   end

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

@@ -33,10 +33,14 @@ module Pione
         @watchdog.start
       end
 
+      # Terminate the child front. Kill watchdog.
+      #
+      # @return [void]
       def terminate
+        # kill watchdog
         @watchdog.terminate
+        # go to other termination processes
         super
-        abort
       end
     end
   end

data/lib/pione/command/front-owner-command.rb

@@ -6,6 +6,8 @@ module Pione
       end
 
       # Runs the command.
+      #
+      # @return [void]
       def run
         parse_options
         validate_options
@@ -15,22 +17,31 @@ module Pione
         start
       end
 
-      # Setups font server.
+      # Setup font server.
+      #
       # @return [void]
       def setup_front
         Global.front = create_front
       end
 
-      # Creates a front server. This method should be overridden in subclasses.
+      # Create a front server. This method should be overridden in subclasses.
+      #
       # @return [BasicFront]
       #   front server
       def create_front
         raise NotImplementedError
       end
 
+      # Terminate PIONE front. Stop DRb service.
+      #
+      # @return [void]
       def terminate
-        super
-        DRb.stop_service
+        Global.monitor.synchronize do
+          # stop DRb service
+          DRb.stop_service
+          # go to other termination processes
+          super
+        end
       end
     end
   end

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

@@ -203,19 +203,26 @@ module Pione
         terminate
       end
 
+      # Terminate pione-client command. Kill tuple space provider.
+      #
+      # @return [void]
       def terminate
-        # kill the thread for starting tuple space provider
-        if @start_tuple_space_provider_thread
-          if @start_tuple_space_provider_thread.alive?
-            @start_tuple_space_provider_thread.kill
+        Global.monitor.synchronize do
+          # kill the thread for starting tuple space provider
+          if @start_tuple_space_provider_thread
+            if @start_tuple_space_provider_thread.alive?
+              @start_tuple_space_provider_thread.kill
+            end
           end
-        end
 
-        # terminate tuple space provider
-        if @tuple_space_provider
-          @tuple_space_provider.terminate
+          # terminate tuple space provider
+          if @tuple_space_provider
+            @tuple_space_provider.terminate
+          end
+
+          # go to other termination processes.
+          super
         end
-        super
       end
 
       private

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

@@ -16,6 +16,11 @@ TXT
         @transform = true
       end
 
+      define_option('-f', '--file=PATH', 'check syntax of the document') do |path|
+        @document = path
+        @readline_mode = false
+      end
+
       def initialize
         @readline_mode = true
       end
@@ -28,53 +33,63 @@ TXT
 
       def start
         if @readline_mode
-          require 'readline'
-          restore_history
-          buf = ""
-          mark = ">"
+          start_readline_mode
+        else
+          if @document
+            print_result(Pathname.new(@document).read)
+          else
+            # print parsing result
+            print_result(@expr)
+          end
+        end
+      end
 
-          # start loop
-          while buf += Readline.readline(Terminal.red("#{mark} "), true)
-            if /[^\s]/.match(buf)
-              # don't record if previous line is the same
-              if Readline::HISTORY.size > 1 && Readline::HISTORY[-2] == buf
-                Readline::HISTORY.pop
-              end
-              if buf[-1] == "\\"
-                buf[-1] = "\n"
-                mark = "+"
-                next
-              else
-                # print parsing result
-                puts buf
-                print_result(buf)
-                buf = ""
-                mark = ">"
-              end
-            else
-              # don't record if it is an empty line
+      private
+
+      def start_readline_mode
+        require 'readline'
+        restore_history
+        buf = ""
+        mark = ">"
+
+        # start loop
+        while buf += Readline.readline(Terminal.red("#{mark} "), true)
+          if /[^\s]/.match(buf)
+            # don't record if previous line is the same
+            if Readline::HISTORY.size > 1 && Readline::HISTORY[-2] == buf
               Readline::HISTORY.pop
             end
+            if buf[-1] == "\\"
+              buf[-1] = "\n"
+              mark = "+"
+              next
+            else
+              # print parsing result
+              puts buf
+              print_result(buf)
+              buf = ""
+              mark = ">"
+            end
+          else
+            # don't record if it is an empty line
+            Readline::HISTORY.pop
           end
-        else
           # print parsing result
-          print_result(@expr)
+          print_result(buf)
         end
       end
 
-      private
-
       # Prints parsing result of the string
       def print_result(str)
         begin
           puts Terminal.green("syntax:")
-          stree = DocumentParser.new.parse(str).first
+          stree = DocumentParser.new.parse(str)
           pp stree
           if @transform
             puts Terminal.green("model:")
             pp DocumentTransformer.new.apply(stree)
           end
-        rescue Pione::Parser::ParserError, Parslet::UnconsumedInput, Parslet::ParseFailed => e
+        rescue Pione::Parser::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,