pione 0.3.0 → 0.3.1

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

@@ -1,86 +1,151 @@
 module Pione
   module Global
     # relay user database path
-    define_external_item(:relay_client_db_path) do
-      Global.dot_pione_dir + "relay-client.db"
+    define_internal_item(:relay_client_db_path) do |item|
+      item.desc = "relay client database path"
+      item.define_updater {Global.dot_pione_dir + "relay-client.db"}
     end
 
     # relay client database object
-    define_internal_item(:relay_client_db) do
-      Relay::RelayClientDB.new(Global.relay_client_db_path)
+    define_computed_item(:relay_client_db, [:relay_client_db_path]) do |item|
+      item.desc = "relay client database object"
+      item.define_updater do
+        Relay::RelayClientDB.new(Global.relay_client_db_path)
+      end
     end
 
     # relay account database path
-    define_external_item(:relay_account_db_path) do
-      Global.dot_pione_dir + "relay-account.db"
+    define_external_item(:relay_account_db_path) do |item|
+      item.desc = "relay account database path"
+      item.define_updater do
+        Global.dot_pione_dir + "relay-account.db"
+      end
     end
 
     # relay account database object
-    define_internal_item(:relay_account_db) do
-      Relay::RelayAccountDB.new(Global.relay_account_db_path)
+    define_computed_item(:relay_account_db, [:relay_account_db_path]) do |item|
+      item.desc = "relay account database object"
+      item.define_updater do
+        Relay::RelayAccountDB.new(Global.relay_account_db_path)
+      end
     end
 
     # relay server's realm
-    define_external_item(:relay_realm)
+    define_external_item(:relay_realm) do |item|
+      item.desc = "relay server's realm"
+    end
 
     # relay uri
-    define_internal_item(:relay_uri)
+    define_internal_item(:relay_uri) do |item|
+      item.desc = "relay URI"
+    end
 
     # relay port
-    define_external_item(:relay_port, 56001)
+    define_external_item(:relay_port) do |item|
+      item.desc = "relay port"
+      item.type = :integer
+      item.init = 56001
+    end
 
     # certname for relay server
-    define_external_item(:relay_ssl_certname, [["CN", "localhost.localhost"]])
+    define_internal_item(:relay_ssl_certname) do |item|
+      item.desc = "certname for relay server"
+      item.init = [["CN", "localhost.localhost"]]
+    end
 
     # relay-front port range begin
-    define_external_item(:relay_front_port_range_begin, 44000)
+    define_external_item(:relay_front_port_range_begin) do |item|
+      item.desc = "start port number of relay front"
+      item.type = :integer
+      item.init = 44000
+    end
 
     # relay-front port range end
-    define_external_item(:relay_front_port_range_end, 44999)
+    define_external_item(:relay_front_port_range_end) do |item|
+      item.desc = "end port number of relay front"
+      item.type = :integer
+      item.init = 44999
+    end
 
     # relay-front port range
-    define_internal_item(:relay_front_port_range) do
-      Range.new(
-        Global.relay_front_port_range_begin,
-        Global.relay_front_port_range_end
-      )
+    define_computed_item(:relay_front_port_range,
+      [:relay_front_port_range_begin, :relay_front_port_range_end]) do |item|
+      item.desc = "port range of relay front"
+      item.define_updater do
+        Range.new(
+          Global.relay_front_port_range_begin,
+          Global.relay_front_port_range_end
+        )
+      end
     end
 
     # relay-proxy port range begin
-    define_external_item(:relay_proxy_port_range_begin, 45000)
+    define_external_item(:relay_proxy_port_range_begin) do |item|
+      item.desc = "start port number of relay proxy"
+      item.type = :integer
+      item.init = 45000
+    end
 
     # relay-proxy port range end
-    define_external_item(:relay_proxy_port_range_end, 45999)
+    define_external_item(:relay_proxy_port_range_end) do |item|
+      item.desc = "end port number of relay proxy"
+      item.type = :integer
+      item.init = 45999
+    end
 
     # relay-proxy port range
-    define_internal_item(:relay_proxy_port_range) do
-      Range.new(
-        Global.relay_proxy_port_range_begin,
-        Global.relay_proxy_port_range_end
-      )
+    define_computed_item(:relay_proxy_port_range,
+      [:relay_proxy_port_range_begin, :relay_proxy_port_range_end]) do |item|
+      item.desc = "port range of relay proxy"
+      item.define_updater do
+        Range.new(
+          Global.relay_proxy_port_range_begin,
+          Global.relay_proxy_port_range_end
+        )
+      end
     end
 
     # relay-client authentication timeout second
-    define_external_item(:relay_client_auth_timeout_sec, 5)
+    define_external_item(:relay_client_auth_timeout_sec) do |item|
+      item.desc = "relay-client authentication timeout second"
+      item.type = :integer
+      item.init = 5
+    end
 
     # relay tuple space server
-    define_internal_item(:relay_tuple_space_server)
+    define_internal_item(:relay_tuple_space_server) do |item|
+      item.desc = "relay tuple space server"
+    end
 
     # relay-transmitter proxy side port range begin
-    define_external_item(:relay_transmitter_proxy_side_port_begin, 46000)
+    define_external_item(:relay_transmitter_proxy_side_port_begin) do |item|
+      item.desc = "start port number of relay transmitter"
+      item.type = :integer
+      item.init = 46000
+    end
 
     # relay-transmitter proxy side port range end
-    define_external_item(:relay_transmitter_proxy_side_port_end, 46999)
+    define_external_item(:relay_transmitter_proxy_side_port_end) do |item|
+      item.desc = "end port number of relay transmitter"
+      item.type = :integer
+      item.init = 46999
+    end
 
     # relay-transmitter proxy side port range
-    define_internal_item(:relay_transmitter_proxy_side_port_range) do
-      Range.new(
-        Global.relay_transmitter_proxy_side_port_begin,
-        Global.relay_transmitter_proxy_side_port_end
-      )
+    define_computed_item(:relay_transmitter_proxy_side_port_range,
+      [:relay_transmitter_proxy_side_port_begin, :relay_transmitter_proxy_side_port_end]) do |item|
+      item.desc = "port range of relay transmitter"
+      item.define_updater do
+        Range.new(
+          Global.relay_transmitter_proxy_side_port_begin,
+          Global.relay_transmitter_proxy_side_port_end
+        )
+      end
     end
 
     # relay-receiver
-    define_internal_item(:relay_receiver)
+    define_internal_item(:relay_receiver) do |item|
+      item.desc = "realy receiver"
+    end
   end
 end

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

@@ -5,35 +5,52 @@ module Pione
     #
 
     # This is global lock for PIONE system.
-    define_internal_item(:monitor, Monitor.new)
+    define_internal_item(:monitor) do |item|
+      item.desc = "global lock for PIONE system"
+      item.init = Monitor.new
+    end
 
     #
     # PIONE's process model
     #
 
     # This is the command object of this process.
-    define_internal_item(:command)
+    define_internal_item(:command) do |item|
+      item.desc = "command object of this process"
+    end
 
     # This is the front server of this process.
-    define_internal_item(:front)
+    define_internal_item(:front) do |item|
+      item.desc = "front object of this process"
+    end
 
     # This process exits with this status.
-    define_internal_item(:exit_status, true)
+    define_internal_item(:exit_status) do |item|
+      item.desc = "exit status of this process"
+      item.init = true
+    end
 
     #
     # user interface
     #
 
-    define_external_item(:color_enabled, true)
+    define_external_item(:color_enabled) do |item|
+      item.desc = "availability of color mode"
+      item.init = true
+    end
 
     #
     # misc
     #
 
-    define_external_item(:features, "*")
+    define_external_item(:features) do |item|
+      item.desc = "string of features for this system"
+      item.init = "*"
+    end
 
-    define_internal_item(:expressional_features) {
-      Util.parse_features(Global.features)
-    }
+    define_computed_item(:expressional_features, [:features]) do |item|
+      item.desc = "expression of features for this system"
+      item.define_updater {Util.parse_features(Global.features)}
+    end
   end
 end

data/lib/pione/global/task-worker-variable.rb

@@ -1,17 +1,29 @@
 module Pione
   module Global
     # This is a begin number of task-worker-front port range.
-    define_external_item(:task_worker_front_port_range_begin, 50000)
+    define_external_item(:task_worker_front_port_range_begin) do |item|
+      item.desc = "start port number of task worker front"
+      item.type = :integer
+      item.init = 50000
+    end
 
     # This is an end number of task-worker-front port range.
-    define_external_item(:task_worker_front_port_range_end, 54999)
+    define_external_item(:task_worker_front_port_range_end) do |item|
+      item.desc = "start port number of task worker front"
+      item.type = :integer
+      item.init = 50999
+    end
 
     # This is task-worker-front port range.
-    define_internal_item(:task_worker_front_port_range) do
-      Range.new(
-        Global.task_worker_front_port_range_begin,
-        Global.task_worker_front_port_range_end
-      )
+    define_computed_item(:task_worker_front_port_range,
+      [:task_worker_front_port_range_begin, :task_worker_front_port_range_end]) do |item|
+      item.desc = "port range of task worker front"
+      item.define_updater do
+        Range.new(
+          Global.task_worker_front_port_range_begin,
+          Global.task_worker_front_port_range_end
+        )
+      end
     end
   end
 end

data/lib/pione/global/tuple-space-notifier-variable.rb

@@ -5,32 +5,54 @@ module Pione
     #
 
     # presence port
-    define_external_item(:presence_port, 56000)
+    define_external_item(:presence_port) do |item|
+      item.desc = "presence port number"
+      item.type = :integer
+      item.init = 56000
+    end
 
     #
     # pione-tuple-space-provider
     #
 
     # tuple space provider uri
-    define_internal_item(:tuple_space_provider_uri)
+    define_internal_item(:tuple_space_provider_uri) do |item|
+      item.desc = "URI of uple space provider"
+    end
 
     # provider-front port range begin
-    define_external_item(:tuple_space_provider_front_port_range_begin, 42000)
+    define_external_item(:tuple_space_provider_front_port_range_begin) do |item|
+      item.desc = "start port number of tuple space provider front"
+      item.type = :integer
+      item.init = 42000
+    end
 
     # provider-front port range end
-    define_external_item(:tuple_space_provider_front_port_range_end, 42999)
+    define_external_item(:tuple_space_provider_front_port_range_end) do |item|
+      item.desc = "start port number of tuple space provider front"
+      item.type = :integer
+      item.init = 42099
+  end
 
     # provider-front port range
-    define_internal_item(:tuple_space_provider_front_port_range) do
-      Range.new(
-        Global.tuple_space_provider_front_port_range_begin,
-        Global.tuple_space_provider_front_port_range_end
-      )
+    define_internal_item(:tuple_space_provider_front_port_range,
+      [:tuple_space_provider_front_port_range_begin, :tuple_space_provider_front_port_range_end]) do |item|
+      item.desc = "port range of tuple space provider"
+      item.define_updater do
+        Range.new(
+          Global.tuple_space_provider_front_port_range_begin,
+          Global.tuple_space_provider_front_port_range_end
+        )
+      end
     end
 
     # presence notification address
-    define_external_item(:presence_notification_addresses) do
-      [URI.parse("broadcast://%s:%s" % ["255.255.255.255", Global.presence_port])]
+    define_external_item(:presence_notification_addresses) do |item|
+      item.desc = "presence notification addresses"
+      item.init = ["255.255.255.255:56000"]
+      item.define_updater do |vals|
+        vals.map {|val| URI.parse("broadcast://%s" % val)}
+      end
     end
 
     #
@@ -38,23 +60,41 @@ module Pione
     #
 
     # tuple space receiver uri
-    define_internal_item(:tuple_space_receiver_uri)
+    define_internal_item(:tuple_space_receiver_uri) do |item|
+      item.desc = "URI of tuple space receiver"
+    end
 
     # receiver-front port range begin
-    define_external_item(:tuple_space_receiver_front_port_range_begin, 43000)
+    define_external_item(:tuple_space_receiver_front_port_range_begin) do |item|
+      item.desc = "start port number of tuple space receiver front"
+      item.type = :integer
+      item.init = 43000
+    end
 
     # receiver-front port range end
-    define_external_item(:tuple_space_receiver_front_port_range_end, 43999)
+    define_external_item(:tuple_space_receiver_front_port_range_end) do |item|
+      item.desc = "end port number of tuple space receiver front"
+      item.type = :integer
+      item.init = 43999
+    end
 
     # receiver-front port range
-    define_internal_item(:tuple_space_receiver_front_port_range) do
-      Range.new(
-        Global.tuple_space_receiver_front_port_range_begin,
-        Global.tuple_space_receiver_front_port_range_end
-      )
+    define_computed_item(:tuple_space_receiver_front_port_range,
+      [:tuple_space_receiver_front_port_range_begin, :tuple_space_receiver_front_port_range_end]) do |item|
+      item.desc = "port range of tuple space receiver front"
+      item.define_updater do
+        Range.new(
+          Global.tuple_space_receiver_front_port_range_begin,
+          Global.tuple_space_receiver_front_port_range_end
+        )
+      end
     end
 
     # disconnect time for tuple space receiver
-    define_external_item(:tuple_space_receiver_disconnect_time, 180)
+    define_internal_item(:tuple_space_receiver_disconnect_time) do |item|
+      item.desc = "tuple space receiver disconnect time"
+      item.type = :integer
+      item.init = 180
+    end
   end
 end

data/lib/pione/lang.rb

@@ -43,7 +43,6 @@ require 'pione/lang/context-parser'            # context parser
 require 'pione/lang/conditional-branch-parser' # conditional branch parser
 require 'pione/lang/declaration-parser'        # declaration parser
 require 'pione/lang/document-parser'           # document parser
-require 'pione/lang/interpolator-parser'       # interpolator parser
 
 # inner model transformer
 require 'pione/lang/literal-transformer'            # literal transformer
@@ -52,4 +51,3 @@ require 'pione/lang/context-transformer'            # context transformer
 require 'pione/lang/declaration-transformer'        # declaration transformer
 require 'pione/lang/conditional-branch-transformer' # conditional branch transformer
 require 'pione/lang/document-transformer'           # document transformer
-require 'pione/lang/interpolator-transformer'       # interpolator transformer

data/lib/pione/lang/data-expr.rb

@@ -260,6 +260,14 @@ module Pione
           end
         end
       end
+
+      define_pione_method("join", [TypeString], TypeString) do |env, rec, sep|
+        rec.call_pione_method(env, "str", []).call_pione_method(env, "join", [sep])
+      end
+
+      define_pione_method("join", [], TypeString) do |env, rec, sep|
+        rec.call_pione_method(env, "str", []).call_pione_method(env, "join", [])
+      end
     end
   end
 end

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

@@ -23,7 +23,7 @@ module Pione
       end
 
       def message
-        "invalid package filename \"%s\": %s" % [name, @error.message]
+        "invalid package filename \"%s\": %s" % [@name, @error.message]
       end
     end
 

data/lib/pione/rule-engine/action-handler.rb

@@ -10,7 +10,7 @@ module Pione
 
       def initialize(*args)
         super(*args)
-        @working_directory = Location[make_working_directory]
+        @working_directory = Location[Global.working_directory_generator.mkdir]
         @env.variable_set(
           Lang::Variable.new("__WORKING_DIRECTORY__"),
           Lang::StringSequence.of(@working_directory.path.to_s)
@@ -34,6 +34,9 @@ module Pione
         # write other resources
         write_other_resources
 
+        # clear working directory
+        @working_directory.delete
+
         # return tuples
         return outputs
       end
@@ -46,14 +49,6 @@ module Pione
         @variable_table.set(Variable.new("_"), PackageExprSequence.new([PackageExpr.new(@rule.package_name)]))
       end
 
-      # Make a working directory for the action.
-      #
-      # @return [Location]
-      #   location of working directory
-      def make_working_directory
-        return (Global.working_directory + Util::UUID.generate).tap{|path| path.mkpath}
-      end
-
       # Synchronize input data into working directory.
       def setup_working_directory
         @inputs.flatten.each do |input|
@@ -68,7 +63,7 @@ module Pione
         end
 
         # FIXME: should not copy bin files in the package each time.
-        bin = @base_location + "package" + @package_id + "bin"
+        bin = @base_location + "package" + "bin"
         if bin.exist?
           bin.entries.each do |entry|
             dest = @working_directory + "bin" + entry.basename
@@ -118,12 +113,19 @@ module Pione
         err = ".stderr"
 
         # execute command
-        `cd #{@working_directory.path}; PATH=./bin/:$PATH ; ./#{scriptname} > #{out} 2> #{err}`
+        `cd #{@working_directory.path}; PATH=#{(@working_directory + "bin").path}:$PATH ; ./#{scriptname} > #{out} 2> #{err}`
 
-        # delete unneeded files
+        # the case the script has errored
+        unless $?.success?
+          raise ActionError.new(digest, (@working_directory + err).read)
+        end
+
+        # delete .stdout file if it is empty
         if stdout.nil? and (@working_directory + out).size == 0
           (@working_directory + out).delete
         end
+
+        # delete .stderr file if it is emtpy
         if (@working_directory + err).size == 0
           (@working_directory + err).delete
         end