pione 0.3.0 → 0.3.1

data/History.txt

@@ -1,5 +1,14 @@
 # History
 
+## 0.3.1(2013/10/29)
+
+* Fixed performance bug.
+* Enable to generate profile reports of rule application.
+* Added PNML compiler.
+* Changed to stop processing when action rule happens error.
+* Improved pione-clean command and the document, see `man pione-clean`.
+* Added `pione` facade command.
+
 ## 0.3.0(2013/10/20)
 
 * Improved multi-inheritance package system.

data/Rakefile

@@ -69,3 +69,16 @@ task 'clean' do
   sh "rm -rf output/*"
   sh "rm -rf log.txt"
 end
+
+#
+# man
+#
+
+def generate_man(src, dest)
+  sh "pandoc -s --from=markdown+pandoc_title_block --to=man %s > %s" % [src, dest]
+end
+
+desc "generate man documents"
+task "man" do
+  generate_man("doc/man/pione-clean.md", "man/pione-clean.1")
+end

data/bin/pione

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+require 'pione'
+Pione::Command::PioneCommand.run(ARGV)

data/bin/pione-compiler

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+require 'pione'
+Pione::Command::PioneCompiler.run(ARGV)

data/example/ScoreAggregation/ScoreAggregation.pione

@@ -1,3 +1,5 @@
+.@ PackageName :: "ScoreAggregation"
+
 #
 # Main Flow
 #

data/example/ScoreAggregation/bin/apply-template.rb

@@ -4,7 +4,7 @@ require "pione"
 require "erb"
 
 title    = Pione.val "$*"
-content  = Location[Pione.val("$I[1]")].read
+content  = Pione::Location[Pione.val("$I[1]")].read
 template = Pione.val "$I[2]"
 
 puts ERB.new(File.read(template)).result(binding)

data/example/ScoreAggregation/bin/mean-summary.rb

@@ -2,7 +2,7 @@
 
 require "pione"
 
-means = Pione.val("$I[1]").split(":").map{|filename| File.read(filename).chomp.to_f}
+means = Pione.val('$I[1].join(":")').split(":").map{|filename| File.read(filename).chomp.to_f}
 
 10.times do |i|
   count = means.select{|mean| i*10 <= mean and mean < (i+1)*10}.size

data/example/ScoreAggregation/bin/total-mean.rb

@@ -3,7 +3,7 @@
 require "pione"
 
 # info
-means = Pione.val "$I[1]"
+means = Pione.val '$I[1].join(":")'
 
 # calc & output
 totals = means.split(":").map{|filename| File.read(filename).chomp.to_f}

data/example/ScoreAggregation/bin/total-statistics.rb

@@ -2,9 +2,9 @@
 
 require "pione"
 
-name_list = Pione.val "$*"
-scores_f  = Pione.val "$I[1]"
-means_f   = Pione.val "$I[2]"
+name_list = Pione.val '$*.join(":")'
+scores_f  = Pione.val '$I[1].join(":")'
+means_f   = Pione.val '$I[2].join(":")'
 
 total_mean = Pione::Location[Pione.val("$I[3]")].read.to_f
 

data/example/ScoreAggregation/pione-package.json

@@ -0,0 +1,21 @@
+{
+  "PackageName": "ScoreAggregation",
+  "Parents": [
+
+  ],
+  "Documents": [
+    "ScoreAggregation.pione"
+  ],
+  "Scenarios": [
+    "scenario/case1"
+  ],
+  "Bins": [
+    "bin/total-statistics.rb",
+    "bin/apply-template.rb",
+    "bin/mean-summary.rb",
+    "bin/personal-bar-graph.sh",
+    "bin/personal-pre-statistics.rb",
+    "bin/total-mean.rb",
+    "bin/histgram-graph.sh"
+  ]
+}

data/example/ScoreAggregation/scenario/case1/Scenario.pione

@@ -0,0 +1 @@
+.@ ScenarioName :: "case1"

data/example/ScoreAggregation/scenario/case1/pione-scenario.json

@@ -0,0 +1,36 @@
+{
+  "ScenarioName": "case1",
+  "ParamSet": null,
+  "Inputs": [
+    "input/S.score",
+    "input/W.score",
+    "input/G.score",
+    "input/Q.score",
+    "input/M.score",
+    "input/X.score",
+    "input/V.score",
+    "input/L.score",
+    "input/K.score",
+    "input/F.score",
+    "input/J.score",
+    "input/Z.score",
+    "input/I.score",
+    "input/E.score",
+    "input/D.score",
+    "input/H.score",
+    "input/U.score",
+    "input/C.score",
+    "input/A.score",
+    "input/P.score",
+    "input/R.score",
+    "input/B.score",
+    "input/stat-template.erb",
+    "input/N.score",
+    "input/Y.score",
+    "input/T.score",
+    "input/O.score"
+  ],
+  "Outputs": [
+
+  ]
+}

data/lib/pione.rb

@@ -1,12 +1,25 @@
 Thread.abort_on_exception = true
 
 #
-# load libraries
+# setup bundler
 #
 
-# bundler
 require 'bundler/setup' rescue nil
 
+#
+# initialize profiler
+#
+
+require 'pione/util/profiler'
+if targets = ENV["PIONE_PROFILE"]
+  Pione::Util::Profiler.init
+  Pione::Util::Profiler.targets.concat(targets.split(":"))
+end
+
+#
+# load libraries
+#
+
 # standard
 require 'set'
 require 'socket'

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

@@ -229,7 +229,6 @@ module Pione
         state = nil
 
         Thread.new {
-
           # kill all chain threads
           @chain_threads.list.each do |thread|
             state = thread[:agent_state] # save last state

data/lib/pione/agent/job-terminator.rb

@@ -26,12 +26,17 @@ module Pione
       #
 
       def transit_to_wait
-        read(TupleSpace::CommandTuple.new(name: "terminate"))
+        tuple = read(TupleSpace::CommandTuple.new(name: "terminate"))
+        status = System::Status.success
+        unless tuple.args.empty?
+          status = tuple.args.first
+        end
+        return status
       end
 
-      def transit_to_fire
+      def transit_to_fire(status)
         Log::Debug.system("job terminator fires the action %s." % @action)
-        @action.call
+        @action.call(status)
       end
     end
   end

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

@@ -74,7 +74,14 @@ module Pione
         engine = make_engine(task)
 
         # start the engine
-        @execution_thread = Thread.new {engine.handle}
+        @execution_thread = Thread.new do
+          begin
+            engine.handle
+          rescue RuleEngine::ActionError => e
+            write(TupleSpace::CommandTuple.new("terminate", [System::Status.error(e)]))
+            terminate
+          end
+        end
 
         # spawn child task worker if flow
         if engine.rule_definition.rule_type == "flow"
@@ -135,7 +142,7 @@ module Pione
         # child worker loop
         while @execution_thread.alive? do
           if @execution_thread.status == "sleep"
-            if child_agent.nil? or not(child_agent.terminated?)
+            if child_agent.nil? or child_agent.terminated?
               # when there isn't active child agent
               child_agent = self.class.new(tuple_space_server, @features, @env)
               child_agent.once = true

data/lib/pione/command.rb

@@ -7,6 +7,7 @@ require 'pione/command/command-exception'
 require 'pione/command/spawner'
 require 'pione/command/option'
 require 'pione/command/basic-command'
+require 'pione/command/pione-command'
 require 'pione/command/pione-client'
 require 'pione/command/pione-task-worker'
 require 'pione/command/pione-broker'
@@ -21,4 +22,5 @@ require 'pione/command/pione-syntax-checker'
 require 'pione/command/pione-log'
 require 'pione/command/pione-val'
 require 'pione/command/pione-package'
+require 'pione/command/pione-compiler'
 

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

@@ -39,6 +39,10 @@ module Pione
           end
         end
 
+        def option_parser_mode(mode)
+          @option_definition.parser_mode = mode
+        end
+
         # Set progaram name or return the name.
         def command_name(name=nil, &b)
           if name

data/lib/pione/command/option.rb

@@ -41,12 +41,15 @@ module Pione
 
     # OptionDefinition is a class for holding option definitions.
     class OptionDefinition
+      attr_accessor :parser_mode
+
       # Creata a command option context.
       def initialize
         extend OptionInterface
         @items = []      # option item definitions
         @default = {}    # default value table
         @validators = [] # option validators
+        @parser_mode = :parse!
       end
 
       def item(name)
@@ -73,7 +76,7 @@ module Pione
 
           # setup option parser
           @items.sort{|a,b| a.long <=> b.long}.each {|item| setup_item(command_name, opt, data, item)}
-        end.parse!(argv)
+        end.send(@parser_mode, argv)
 
         # check option's validness
         check(data)

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

@@ -8,7 +8,8 @@ module Pione
       #
 
       command_name "pione-clean"
-      command_banner "Clean working directories and file cache directories."
+      command_banner "remove PIONE's temporary files, cache, and etc."
+      PioneCommand.add_subcommand("clean", self)
 
       #
       # options
@@ -16,6 +17,45 @@ module Pione
 
       use_option :debug
 
+      # --older option
+      define_option(:older) do |item|
+        item.long = '--older=DATE'
+        item.desc = 'remove file older than the date'
+        item.default = false
+        item.value = proc do |str|
+          begin
+            Date.iso8601(str)
+          rescue ArgumentError
+            begin
+              Date.today - str.to_i
+            rescue
+              abort("invalid value of older option: %s" % str)
+            end
+          end
+        end
+      end
+
+      # --type option
+      define_option(:type) do |item|
+        item.long = '--type=NAME'
+        item.desc = 'remove only files of the type'
+        item.default = false
+        item.value = proc do |name|
+          case name
+          when "temporary"
+            :temporary
+          when "file-cache"
+            :file_cache
+          when "package-cache"
+            :package_cache
+          when "profile"
+            :profile
+          else
+            abort("unknown type: %s" % str)
+          end
+        end
+      end
+
       #
       # command lifecycle: setup phase
       #
@@ -30,34 +70,81 @@ module Pione
       # command lifecycle: execution phase
       #
 
-      execute :remove_working_directory
-      execute :remove_cache_directory
-      execute :remove_ppg_cache
-      execute :remove_directory_cache
+      execute :remove_temporary
+      execute :remove_file_cache
+      execute :remove_package_cache
+      execute :remove_profile
 
-      def execute_remove_working_directory
-        FileUtils.remove_entry_secure(Global.working_directory_root)
+      # Remove temporary files. This removes working files based on temporary
+      # directory's mtime.
+      def execute_remove_temporary
+        if type?(:temprary)
+          Location[Global.my_temporary_directory].each_entry do |entry|
+            if delete?(entry)
+              FileUtils.remove_entry_secure(entry.path)
+            end
+          end
+        end
       end
 
-      def execute_remove_cache_directory
-        FileUtils.remove_entry_secure(Global.file_cache_directory_root)
+      # Remove file cache files. This removes it base on cache directory's mtime.
+      def execute_remove_file_cache
+        if type?(:file_cache)
+          Location[Global.my_file_cache_directory].each_entry do |entry|
+            if delete?(entry)
+              FileUtils.remove_entry_secure(entry.path)
+            end
+          end
+        end
       end
 
-      def execute_remove_ppg_cache
-        Global.ppg_package_cache_directory.each_entry do |entry|
-          unless @db.has_digest?(Package::PackageFilename.parse(entry.basename).digest)
-            entry.delete
+      # Remove package cache files.
+      def execute_remove_package_cache
+        if type?(:package_cache)
+          # remove PPG package
+          Global.ppg_package_cache_directory.each_entry do |entry|
+            unless @db.has_digest?(Package::PackageFilename.parse(entry.basename).digest)
+              if delete?(entry)
+                entry.delete
+              end
+            end
+          end
+
+          # remove directory package
+          Global.directory_package_cache_directory.each_entry do |entry|
+            unless @db.has_digest?(entry.basename)
+              if delete?(entry)
+                entry.delete
+              end
+            end
           end
         end
       end
 
-      def execute_remove_directory_cache
-        Global.directory_package_cache_directory.each_entry do |entry|
-          unless @db.has_digest?(entry.basename)
-            entry.delete
+      # Remove profile reports.
+      def execute_remove_profile
+        if type?(:profile)
+          Location[Global.profile_report_directory].each_entry do |entry|
+            if delete?(entry)
+              entry.delete
+            end
           end
         end
       end
+
+      #
+      # helper methods
+      #
+
+      # Return true if the entry has the type.
+      def type?(type)
+        option[:type].nil? or option[:type] == type
+      end
+
+      # Return true if the entry should be removed.
+      def delete?(entry)
+        option[:older].nil? or option[:older] >= entry.mtime.to_date
+      end
     end
   end
 end