pione 0.4.0 → 0.4.1

data/lib/pione/command/pione-package-build.rb

@@ -89,12 +89,12 @@ module Pione
         item.process do
           model[:source_locations].each do |location|
             if ppg = try_to_archive(location)
-              Log::SystemLog.info("Package build suceeded: %s" % ppg.address)
+              Log::SystemLog.info("Package build process has succeeded: %s" % ppg.address)
               cmd.terminate
             end
           end
 
-          cmd.abort("Package build has failed to archive.")
+          cmd.abort("Package build process has failed.")
         end
       end
     end
@@ -111,7 +111,7 @@ module Pione
         # archive
         return archiver.archive(model[:output], false)
       rescue => e
-        Log::Debug.system("PIONE failed to archive %s: %s" % [location, e.message])
+        Log::Debug.system("PIONE has failed to archive %s: %s" % [location, e.message])
       end
     end
 

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

@@ -7,24 +7,31 @@ module Pione
       #
 
       # Create a new process of `pione-task-worker` command.
-      def self.spawn(model, features, tuple_space_id)
+      #
+      # @param [Rootage::Model] model
+      # @param [Hash] param
+      # @option param [Array<String>] :features
+      #   list of features that the task worker has
+      # @option param [String] :tuple_space_id
+      #   ID of tuple space that the task worker works in
+      def self.spawn(model, param={})
         spawner = Spawner.new(model, "pione-task-worker")
 
         # debug options
-        spawner.option("--debug=system") if Global.debug_system
-        spawner.option("--debug=ignored_exception") if Global.debug_ignored_exception
-        spawner.option("--debug=rule_engine") if Global.debug_rule_engine
-        spawner.option("--debug=communication") if Global.debug_communication
-        spawner.option("--debug=notification") if Global.debug_notification
+        spawner.option_if(Global.debug_system, "--debug=system")
+        spawner.option_if(Global.debug_ignored_exception, "--debug=ignored_exception")
+        spawner.option_if(Global.debug_rule_engine, "--debug=rule_engine")
+        spawner.option_if(Global.debug_communication, "--debug=communication")
+        spawner.option_if(Global.debug_notification, "--debug=notification")
 
         # requisite options
-        spawner.option("--parent-front", model[:front].uri.to_s)
-        spawner.option("--tuple-space-id", tuple_space_id)
-        spawner.option("--features", features) if features
+        spawner.option_from(model, :front, "--parent-front", lambda {|val| val.uri})
+        spawner.option_from(param, :tuple_space_id, "--tuple-space-id")
+        spawner.option_from(param, :features, "--features")
 
         # others
         spawner.option("--color", Global.color_enabled)
-        spawner.option("--file-cache-method", System::FileCache.cache_method.name.to_s)
+        spawner.option("--file-cache-method", System::FileCache.cache_method.name)
         spawner.option("--file-sliding", Global.file_sliding)
 
         spawner.spawn # this method returns child front
@@ -51,6 +58,9 @@ module Pione
       option CommonOption.file_cache_method
       option CommonOption.file_sliding
 
+      option(SessionOption.request_from)
+      option(SessionOption.session_id)
+
       option(:tuple_space_id) do |item|
         item.type = :string
         item.long = '--tuple-space-id'
@@ -99,6 +109,9 @@ module Pione
             cmd.abort('"%{name}" cannot connect to tuple space.' % {name: cmd.name})
           end
         end
+
+        item.assign(:request_from) {model[:tuple_space].attribute("request_from")}
+        item.assign(:session_id) {model[:tuple_space].attribute("session_id")}
       end
 
       setup(:task_worker_agent) do |item|

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

@@ -11,17 +11,17 @@ module Pione
         spawner = Spawner.new(cmd.model, "pione-tuple-space-provider")
 
         # debug options
-        spawner.option("--debug=system") if Global.debug_system
-        spawner.option("--debug=ignored_exception") if Global.debug_ignored_exception
-        spawner.option("--debug=rule_engine") if Global.debug_rule_engine
-        spawner.option("--debug=communication") if Global.debug_communication
-        spawner.option("--debug=notification") if Global.debug_notification
+        spawner.option_if(Global.debug_system, "--debug=system")
+        spawner.option_if(Global.debug_ignored_exception, "--debug=ignored_exception")
+        spawner.option_if(Global.debug_rule_engine, "--debug=rule_engine")
+        spawner.option_if(Global.debug_communication, "--debug=communication")
+        spawner.option_if(Global.debug_notification, "--debug=notification")
 
         # requisite options
-        spawner.option("--parent-front", cmd.model[:front].uri.to_s)
-        spawner.option("--communication-address", Global.communication_address.to_s)
+        spawner.option("--parent-front", cmd.model[:front].uri)
+        spawner.option("--communication-address", Global.communication_address)
         Global.notification_targets.each do |address|
-          spawner.option("--notification-target", address.to_s)
+          spawner.option("--notification-target", address)
         end
 
         # optionals

data/lib/pione/command/spawner.rb

@@ -49,11 +49,38 @@ module Pione
         end
       end
 
-      # Append arguments to the command.
+      # Add arguments as command arguments.
       def option(*argv)
         @argv += argv.map {|val| val.to_s}
       end
 
+      # Add arguments if the condition is true.
+      def option_if(cond, *args)
+        if cond
+          option(*args)
+        end
+      end
+
+      # Add the option name and the value as command arguments. If the value
+      # doesn't exist in the table or the value is `nil`, no options are
+      # added. This is useful for the case a caller's command option passes
+      # callee's.
+      #
+      # @param [Hash] table
+      #   value table
+      # @param [Symbol] key
+      #   key of the value table
+      # @param [String] option_name
+      #   option name
+      # @return [void]
+      def option_from(table, key, option_name, converter=nil)
+        if table[key]
+          val = table[key]
+          val = converter.call(val) if converter
+          option(option_name, val)
+        end
+      end
+
       # Register the block that is executed when the spawned process is terminated.
       def when_terminated(&b)
         Thread.new do

data/lib/pione/front/interactive-front.rb

@@ -0,0 +1,76 @@
+module Pione
+  module Front
+    # InteractiveFront is a front interface for +pione-interactive+ command.
+    class InteractiveFront < BasicFront
+      def initialize(cmd)
+        super(cmd, Global.interactive_front_port_range)
+      end
+
+      # Read data string from the path. This path should be relative from public
+      # directory of pione-interactive.
+      #
+      # @param [String] path
+      #   relative path from public directory
+      # @param [Hash] params
+      #   parameters to pass to the CGI program
+      def get(path, cgi_info)
+        local_file = (@cmd.model[:public] + path)
+        if local_file.path.executable?
+          return Util::CGIExecutor.new(local_file.path, cgi_info, @cmd.model[:public], @cmd.model[:timeout]).exec
+        else
+          begin
+            local_file.read
+          rescue
+            return nil
+          end
+        end
+      end
+
+      # Create a file with the content. Thie operation returns true only if the
+      # file creation has succeeded.
+      def create(path, content)
+        begin
+          (@cmd.model[:public] + path).write(content)
+          return true
+        rescue => e
+          return false
+        end
+      end
+
+      # Delete the file. Thie operation returns true only if the file deletion
+      # has succeeded.
+      def delete(path)
+        begin
+          (@cmd.model[:public] + path).delete
+          return true
+        rescue => e
+          return false
+        end
+      end
+
+      # Return entry informations in the directory. When the operation returns
+      # nil, the file listing has failed. When this returns false, the path is
+      # file.
+      def list(path, show_all)
+        begin
+          unless (@cmd.model[:public] + path).directory?
+            return false
+          end
+
+          (@cmd.model[:public] + path).entries.each_with_object([]) do |entry, list|
+            if show_all or not(entry.basename.start_with?("."))
+              list << {
+                "name"  => entry.basename,
+                "type"  => entry.directory? ? "dir" : "file",
+                "mtime" => entry.mtime.iso8601,
+                "size"  => entry.size
+              }
+            end
+          end
+        rescue => e
+          return nil
+        end
+      end
+    end
+  end
+end

data/lib/pione/global/interactive-variable.rb

@@ -0,0 +1,26 @@
+module Pione
+  module Global
+    # This is a begin number of port range for pione-interactive's front.
+    define_external_item(:interactive_front_port_range_begin) do |item|
+      item.desc = "start port number of interactive front"
+      item.init = 40900
+    end
+
+    # This is an end number of port range for pione-interactive's front.
+    define_external_item(:interactive_front_port_range_end) do |item|
+      item.desc = "end port number of interactive front"
+      item.init = 40999
+    end
+
+    # This is port range for pione-interactive's front.
+    define_computed_item(:interactive_front_port_range, [:interactive_front_port_range_begin, :interactive_front_port_range_end]) do |item|
+      item.desc = "port range of interactive front"
+      item.define_updater do
+        Range.new(
+          Global.interactive_front_port_range_begin,
+          Global.interactive_front_port_range_end
+        )
+      end
+    end
+  end
+end

data/lib/pione/log/message-log-receiver.rb

@@ -12,7 +12,9 @@ module Pione
       #   message header
       # @param color [String]
       #   message color
-      def receiver(message, level, header, color)
+      # @param session_id [String]
+      #   session_id
+      def receiver(message, level, header, color, session_id)
         raise NotImplementedError.new
       end
     end
@@ -24,7 +26,7 @@ module Pione
         @out = out
       end
 
-      def receive(message, level, header, color)
+      def receive(message, level, header, color, session_id)
         @out.puts "%s%s %s" % ["  "*level, ("%5s" % header).color(color), message]
       end
     end

data/lib/pione/model/task-worker-broker-model.rb

@@ -35,8 +35,14 @@ module Pione
 
           # spawn a new process of pione-task-worker command
           if self[:spawn_task_worker]
+            # make task worker's parameters
+            param = {
+              :features => Global.features,
+              :tuple_space_id => tuple_space.uuid
+            }
+
             begin
-              spawner = Command::PioneTaskWorker.spawn(self, Global.features, tuple_space.uuid)
+              spawner = Command::PioneTaskWorker.spawn(self, param)
               @task_workers << spawner.child_front
               spawner.when_terminated {delete_task_worker(spawner.child_front)}
             rescue Command::SpawnError => e

data/lib/pione/package/package-archiver.rb

@@ -31,6 +31,7 @@ module Pione
           archive_documents(zip, info)
           archive_scenarios(zip)
           archive_bins(zip, info)
+          archive_etcs(zip, info)
           archive_digest(zip, digest)
         end
 
@@ -57,13 +58,13 @@ module Pione
 
       # Archive package info file.
       def archive_package_info(zip)
-        add_file_with_keeping_time(zip, "pione-package.json", @location + "pione-package.json")
+        add_file_with_time(zip, "pione-package.json", @location + "pione-package.json")
       end
 
       # Archive documents based on package info file.
       def archive_documents(zip, info)
         info.documents.each do |document|
-          add_file_with_keeping_time(zip, document, @location + document)
+          add_file_with_time(zip, document, @location + document)
         end
       end
 
@@ -87,13 +88,13 @@ module Pione
       # Archive scenario document file.
       def archive_scenario_document(zip, scenario)
         document_location = @location + scenario + "Scenario.pione"
-        add_file_with_keeping_time(zip, File.join(scenario, "Scenario.pione"), document_location)
+        add_file_with_time(zip, File.join(scenario, "Scenario.pione"), document_location)
       end
 
       # Archive scenario info file.
       def archive_scenario_info(zip, scenario)
         info_location = @location + scenario + "pione-scenario.json"
-        add_file_with_keeping_time(zip, File.join(scenario, "pione-scenario.json"), info_location)
+        add_file_with_time(zip, File.join(scenario, "pione-scenario.json"), info_location)
       end
 
       # Archive input data of the scenario.
@@ -105,7 +106,7 @@ module Pione
           # archive input data
           info.inputs.each do |input|
             input_location = @location + scenario + input
-            add_file_with_keeping_time(zip, File.join(scenario, input), input_location)
+            add_file_with_time(zip, File.join(scenario, input), input_location)
           end
         end
       end
@@ -118,21 +119,27 @@ module Pione
 
           info.outputs.each do |output|
             output_location = @location + scenario + output
-            add_file_with_keeping_time(zip, File.join(scenario, output), output_location)
+            add_file_with_time(zip, File.join(scenario, output), output_location)
           end
         end
       end
 
       def archive_bins(zip, info)
         info.bins.each do |bin|
-          add_file_with_keeping_time(zip, bin, @location + bin)
+          add_file_with_time(zip, bin, @location + bin)
+        end
+      end
+
+      def archive_etcs(zip, info)
+        info.etcs.each do |file|
+          add_file_with_time(zip, file, @location + file)
         end
       end
 
       def archive_digest(zip, digest)
         digest_location = Location[Temppath.create]
         digest_location.write(digest)
-        add_file_with_keeping_time(zip, ".digest", digest_location)
+        add_file_with_time(zip, ".digest", digest_location)
       end
 
       def mkdir_with_time(zip, path, time)
@@ -142,7 +149,7 @@ module Pione
         entry.extra.delete("UniversalTime")
       end
 
-      def add_file_with_keeping_time(zip, path, orig_location)
+      def add_file_with_time(zip, path, orig_location)
         entry = zip.add(path, orig_location.path.to_s)
         entry.time = Zip::DOSTime.at(orig_location.mtime)
         entry.extra.delete("UniversalTime")

data/lib/pione/package/package-handler.rb

@@ -69,9 +69,15 @@ module Pione
 
       # Upload the package files to the location.
       def upload(dest)
+        # upload bins
         @info.bins.each do |entry|
           (@location + entry).copy(dest + entry)
         end
+
+        # upload etc files
+        @info.etcs.each do |entry|
+          (@location + entry).copy(dest + entry)
+        end
       end
 
       # Find scenario that have the name.

data/lib/pione/package/package-info.rb

@@ -9,6 +9,7 @@ module Pione
       member :documents, default: lambda { Array.new }
       member :scenarios, default: lambda { Array.new }
       member :bins, default: lambda { Array.new }
+      member :etcs, default: lambda { Array.new }
 
       # Read package information from the string.
       def self.read(str)
@@ -21,6 +22,7 @@ module Pione
         args[:documents] = data["Documents"]
         args[:scenarios] = data["Scenarios"]
         args[:bins] = data["Bins"]
+        args[:etcs] = data["Etcs"]
         new(args)
       end
 
@@ -29,6 +31,7 @@ module Pione
         list = []
         list += documents
         list += bins
+        list += etcs
         return list
       end
 
@@ -42,6 +45,7 @@ module Pione
         data["Documents"] = documents
         data["Scenarios"] = scenarios
         data["Bins"] = bins
+        data["Etcs"] = etcs
         data.to_json(*args)
       end
     end

data/lib/pione/package/package-reader.rb

@@ -114,14 +114,12 @@ module Pione
         # make temporary directory
         local_location = Location[Temppath.create]
 
-        # copy files to local
-
         # pione-package.json
         info = PackageInfo.read((@location + "pione-package.json").read)
         (@location + "pione-package.json").copy(local_location + "pione-package.json")
 
-        # documents
-        (info.documents + info.bins).each do |path|
+        # copy files
+        (info.documents + info.bins + info.etcs).each do |path|
           (@location + path).copy(local_location + path)
         end
 

data/lib/pione/package/package-scanner.rb

@@ -18,10 +18,17 @@ module Pione
           name, editor, tag, parents = scan_annotations(documents)
           scenarios = scan_scenarios(@package_location)
           bins = scan_bins(@package_location)
+          etcs = scan_etcs(@package_location)
 
           return PackageInfo.new(
-            name: name, editor: editor, tag: tag, parents: parents,
-            documents: documents, scenarios: scenarios, bins: bins
+            name: name,
+            editor: editor,
+            tag: tag,
+            parents: parents,
+            documents: documents,
+            scenarios: scenarios,
+            bins: bins,
+            etcs: etcs
           )
         else
           # the case for single document package
@@ -116,7 +123,7 @@ module Pione
         end
       end
 
-      # Scan script files.
+      # Scan executable files.
       def scan_bins(location)
         if (location + "bin").exist?
           (location + "bin").entries.each_with_object([]) do |entry, list|
@@ -128,6 +135,19 @@ module Pione
           return []
         end
       end
+
+      # Scan etc files.
+      def scan_etcs(location)
+        if (location + "etc").exist?
+          (location + "etc").entries.each_with_object([]) do |entry, list|
+            if entry.file?
+              list << entry.path.relative_path_from(@package_location.path).to_s
+            end
+          end
+        else
+          return []
+        end
+      end
     end
   end
 end