pione 0.2.2 → 0.3.0

data/lib/pione/version.rb

@@ -1,4 +1,4 @@
 module Pione
   # version of pione
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/pione.gemspec

@@ -1,53 +1,61 @@
 # -*- ruby -*-
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pione/version'
+
+# load PIONE's version
+require File.expand_path('pione/version', File.join(File.dirname(__FILE__), "lib"))
 
 Gem::Specification.new do |gem|
-  gem.name          = "pione"
-  gem.version       = Pione::VERSION
-  gem.authors       = ["Keita Yamaguchi"]
-  gem.email         = ["keita.yamaguchi@gmail.com"]
-  gem.description   = %q{PIONE(Process-rule for Input/Output Negotiation Enviromenment) is a rule-based workflow engine.}
-  gem.summary       = %q{rule-based workflow engine}
-  gem.homepage      = "http://pione.github.com/"
-  gem.license       = "MIT"
-
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  #
+  # basic information
+  #
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.name        = "pione"
+  gem.version     = Pione::VERSION
+  gem.authors     = ["Keita Yamaguchi"]
+  gem.email       = ["keita.yamaguchi@gmail.com"]
+  gem.description = %q{PIONE(Process-rule for Input/Output Negotiation Enviromenment) is a rule-based workflow engine.}
+  gem.summary     = %q{rule-based workflow engine}
+  gem.homepage    = "http://pione.github.com/"
+  gem.license     = "MIT"
+
+  #
+  # files
+  #
+
+  gem.files       = `git ls-files`.split($/)
+  gem.executables = gem.files.grep(%r{^bin/}).map{|f| File.basename(f)}
+  gem.test_files  = gem.files.grep(%r{^(test/|lib/pione/test-helper)})
 
   #
   # dependencies
   #
 
+  # ruby version
+  gem.required_ruby_version = '>= 1.9.3'
+
   # requisite for system
-  gem.add_dependency "parslet", "~> 1.5.0"
-  gem.add_dependency "uuidtools", "~> 2.1.4"
-  gem.add_dependency "highline", "~> 1.6.15"
-  gem.add_dependency "hamster", "~> 0.4.3"
-  gem.add_dependency "naming", "~> 0.1.0"
-  gem.add_dependency "forwardablex", "~> 0.1.4"
-  gem.add_dependency "temppath", "~> 0.2.0"
-  gem.add_dependency "ruby-xes", "~> 0.1.0"
-  gem.add_dependency "sys-uname", "~> 0.9.2"
-  gem.add_dependency "simple-identity", "~> 0.1.1"
-  gem.add_dependency "rainbow", "~> 1.1.4"
-  gem.add_dependency "sys-cpu", "~> 0.7.1"
-  gem.add_dependency "structx", "~> 0.1.0"
-  gem.add_dependency "syslog-logger", "~> 1.6.8"
-  gem.add_dependency "zipruby", "~> 0.3.6"
-  gem.add_dependency "retriable", "~> 1.3.3"
-  gem.add_dependency "childprocess", "~> 0.3.9"
-  gem.add_dependency "git", "~> 1.2.5"
+  gem.add_runtime_dependency "parslet", "~> 1.5.0"
+  gem.add_runtime_dependency "uuidtools", "~> 2.1.4"
+  gem.add_runtime_dependency "highline", "~> 1.6.20"
+  gem.add_runtime_dependency "hamster", "~> 0.4.3"
+  gem.add_runtime_dependency "naming", "~> 0.1.0"
+  gem.add_runtime_dependency "forwardablex", "~> 0.1.4"
+  gem.add_runtime_dependency "temppath", "~> 0.2.0"
+  gem.add_runtime_dependency "ruby-xes", "~> 0.1.0"
+  gem.add_runtime_dependency "sys-uname", "~> 0.9.2"
+  gem.add_runtime_dependency "simple-identity", "~> 0.1.1"
+  gem.add_runtime_dependency "rainbow", "~> 1.1.4"
+  gem.add_runtime_dependency "sys-cpu", "~> 0.7.1"
+  gem.add_runtime_dependency "structx", "~> 0.1.3"
+  gem.add_runtime_dependency "syslog-logger", "~> 1.6.8"
+  gem.add_runtime_dependency "retriable", "~> 1.3.3"
+  gem.add_runtime_dependency "childprocess", "~> 0.3.9"
+  gem.add_runtime_dependency "lettercase", "~> 0.0.3"
+  gem.add_runtime_dependency "rubyzip", "~> 1.0.0"
 
   # for locations
-  gem.add_dependency "dropbox-sdk", "~> 1.5.1"
-  gem.add_dependency "em-ftpd", "~> 0.0.1"
+  gem.add_runtime_dependency "dropbox-sdk", "~> 1.5.1"
+  gem.add_runtime_dependency "em-ftpd", "~> 0.0.1"
 
   # test framework
   gem.add_development_dependency "bacon", "~> 1.2.0"

data/test/agent/spec_basic-agent.rb

@@ -1,66 +1,117 @@
-require_relative '../test-util'
+require 'pione/test-helper'
 
 class TestAgentType < Agent::BasicAgent
-  set_agent_type :test_agent_type
+  set_agent_type :test_agent_type, self
 end
 
 class TestStateTransition < Agent::BasicAgent
-  define_state :test1
-  define_state :test2
-  define_state :test3
-
-  define_state_transition :initialized => :test1
-  define_state_transition :test1 => :test2
-  define_state_transition :test2 => :test3
-  define_state_transition :test3 => :terminated
+  define_transition :test1
+  define_transition :test2
+  define_transition :test3
+
+  chain :init => :test1
+  chain :test1 => :test2
+  chain :test2 => :test3
+  chain :test3 => :terminate
+
+  attr_reader :history
+
+  def initialize
+    super()
+    @history = []
+  end
+
+  def transit_to_init
+    @history << :init
+  end
+
+  def transit_to_test1
+    @history << :test1
+  end
+
+  def transit_to_test2
+    @history << :test2
+  end
+
+  def transit_to_test3
+    @history << :test3
+  end
+
+  def transit_to_terminate
+    @history << :terminate
+  end
 end
 
 class TestLoopStateTransition < Agent::BasicAgent
-  define_state :test
+  define_transition :test
 
-  define_state_transition :initialized => :test
-  define_state_transition :test => :test
+  chain :init => :test
+  chain :test => :test
 end
 
 class TestConditionalStateTransition < Agent::BasicAgent
-  define_state :test
-  define_state :testA
-  define_state :testB
-
-  define_state_transition :initialized => :test
-  define_state_transition :test => lambda{|agent,result| agent.next_state }
-  define_state_transition :testA => :test
-  define_state_transition :testB => :test
-
-  attr_reader :next_state
+  define_transition :test
+  define_transition :testA
+  define_transition :testB
+
+  chain :init => :test
+  chain :test => lambda{|agent,result| agent.next_transition }
+  chain :testA => :test
+  chain :testB => :test
+
+  attr_reader :next_transition
+  attr_reader :a
+  attr_reader :b
+
+  def initialize
+    super()
+    @a = 0
+    @b = 0
+  end
 
   def transit_to_test
-    case @next_state
+    case @next_transition
     when nil
-      @next_state = :testA
+      @next_transition = :testA
     when :testA
-      @next_state = :testB
+      @next_transition = :testB
     when :testB
-      @next_state = :terminated
+      @next_transition = :terminate
     end
   end
+
+  def transit_to_testA
+    @a += 1
+  end
+
+  def transit_to_testB
+    @b += 1
+  end
 end
 
 class TestExceptionTransition < Agent::BasicAgent
-  define_state :test
-  define_state :ehandler
+  define_transition :test
+  define_transition :ehandler
 
-  define_state_transition :initialized => :test
-  define_state_transition :test => :terminated
-  define_state_transition :ehandler => :terminated
+  chain :init => :test
+  chain :test => :terminate
+  chain :ehandler => :terminate
 
   define_exception_handler RuntimeError => :ehandler
 
+  attr_reader :ehandled
+
+  def initialize
+    super()
+    @ehandled = 0
+  end
+
   def transit_to_test
     raise RuntimeError.new(:test_exception)
   end
 
   def transit_to_ehandler(e)
+    @ehandled +=1
   end
 end
 
@@ -73,98 +124,64 @@ describe 'Pione::Agent::BasicAgent' do
   end
 
   describe 'simple transition' do
-    it 'should return states' do
-      states = TestStateTransition.states
-      states.should.include :initialized
-      states.should.include :test1
-      states.should.include :test2
-      states.should.include :test3
-      states.should.include :terminated
-      states.should.include :error
-    end
-
     it 'should transit' do
-      ts = TestStateTransition.new
-      ts.current_state.should == nil
-      ts.transit
-      ts.should.initialized
-      ts.transit
-      ts.should.test1
-      ts.transit
-      ts.should.test2
-      ts.transit
-      ts.should.test3
-      ts.transit
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.transit }
+      agent = TestStateTransition.start
+      agent.wait_until_terminated
+      agent.should.terminated
+      agent.history.should == [:init, :test1, :test2, :test3, :terminate]
     end
 
     it 'should run' do
-      ts = TestStateTransition.start
-      ts.wait_till(:terminated)
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.start }
+      agent = TestStateTransition.start
+      agent.wait_until_terminated
+      agent.should.terminated
     end
 
     it 'should terminate' do
-      ts = TestStateTransition.new
-      ts.transit # to initialized
-      ts.transit # to test1
-      ts.terminate
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.transit }
+      agent = TestStateTransition.start
+      agent.terminate
+      agent.wait_until_terminated
+      agent.should.terminated
     end
   end
 
   describe 'loop transition' do
     it 'should loop' do
-      ts = TestLoopStateTransition.new
-      100.times { ts.transit }
-      ts.should.test
+      agent = TestLoopStateTransition.new
+      should.raise(Timeout::Error) do
+        timeout(3) do
+          agent.start
+          agent.chain_threads.list.each {|th| th.join}
+        end
+      end
+      agent.terminate
+      agent.should.terminated
     end
 
     it 'should terminate' do
-      ts = TestLoopStateTransition.start
-      sleep 0.1
-      ts.terminate
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.transit }
+      agent = TestLoopStateTransition.start
+      sleep 1
+      agent.terminate
+      agent.should.terminated
     end
   end
 
   describe 'conditional transition' do
     it 'should transit' do
-      ts = TestConditionalStateTransition.new
-      ts.current_state.should.nil
-      ts.transit
-      ts.should.initialized
-      ts.transit
-      ts.should.test
-      ts.transit
-      ts.should.testA
-      ts.transit
-      ts.should.test
-      ts.transit
-      ts.should.testB
-      ts.transit
-      ts.should.test
-      ts.transit
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.transit }
+      agent = TestConditionalStateTransition.start
+      agent.wait_until_terminated
+      agent.should.terminated
+      agent.a.should == 1
+      agent.b.should == 1
     end
   end
 
   describe 'exception handling transition' do
     it 'should handle an exception' do
-      ts = TestExceptionTransition.new
-      ts.current_state.should.nil
-      ts.transit
-      ts.should.initialized
-      ts.transit
-      ts.should.ehandler
-      ts.transit
-      ts.should.terminated
-      should.raise(Agent::TransitionError) { ts.transit }
+      agent = TestExceptionTransition.start
+      agent.wait_until_terminated
+      agent.should.terminated
+      agent.ehandled.should == 1
     end
   end
 end

data/test/agent/spec_broker.rb

@@ -1,36 +1,52 @@
-require_relative '../test-util'
+require 'pione/test-helper'
 
 describe "Pione::Agent::Broker" do
   before do
-    DRb.start_service
-    @broker_front = Pione::Front::BrokerFront.new(self)
-    @ts_server1 = TupleSpaceServer.new(task_worker_resource: 1)
-    @ts_server2 = TupleSpaceServer.new(task_worker_resource: 2)
-    @ts_server3 = TupleSpaceServer.new(task_worker_resource: 3)
-    @broker1 = Agent[:broker].new(task_worker_resource: 5)
+    # setup language environment
+    @env = TestHelper::Lang.env
+
+    # setup tuple spaces
+    @space1 = TupleSpaceServer.new({task_worker_resource: 1}, false)
+    @space2 = TupleSpaceServer.new({task_worker_resource: 2}, false)
+    @space3 = TupleSpaceServer.new({task_worker_resource: 3}, false)
+    [@space1, @space2, @space3].each {|space| space.write(TupleSpace::EnvTuple.new(obj: @env))}
+
+    # setup broker
+    Global.expressional_features = Util.parse_features("*")
+    @broker = Agent::Broker.new(spawn_task_worker: false, task_worker_resource: 5)
   end
 
   after do
-    @broker_front.terminate
+    @broker.terminate
+    [@space1, @space2, @space3].each {|space| space.terminate}
   end
 
   it "should run workers" do
-    @broker1.start
-    @broker1.task_workers.size.should == 0
-    @broker1.add_tuple_space_server @ts_server1
-    sleep 2
-    @broker1.task_workers.size.should == 5
-    @ts_server1.current_task_worker_size.should == 5
-    @broker1.add_tuple_space_server @ts_server2
-    sleep 2
-    @broker1.task_workers.size.should == 5
-    @ts_server1.current_task_worker_size.should == 2
-    @ts_server2.current_task_worker_size.should == 3
-    @broker1.add_tuple_space_server @ts_server3
-    sleep 2
-    @broker1.task_workers.size.should == 5
-    @ts_server1.current_task_worker_size.should == 1
-    @ts_server2.current_task_worker_size.should == 2
-    @ts_server3.current_task_worker_size.should == 2
+    @broker.start
+    @broker.quantity.should == 0
+
+    # with space1
+    @broker.add_tuple_space @space1
+    @broker.wait_until_before(:sleep)
+    @broker.quantity.should == 5
+    sleep 0.1 # wait workers to join the space
+    @space1.current_task_worker_size.should == 5
+
+    # with space1 and space2
+    @broker.add_tuple_space @space2
+    @broker.wait_until_before(:sleep)
+    @broker.quantity.should == 5
+    sleep 0.1 # wait workers to join the space
+    @space1.current_task_worker_size.should == 2
+    @space2.current_task_worker_size.should == 3
+
+    # with space1, space2, and space3
+    @broker.add_tuple_space @space3
+    @broker.wait_until_before(:sleep)
+    @broker.quantity.should == 5
+    sleep 0.1 # wait workers to join the space
+    @space1.current_task_worker_size.should == 1
+    @space2.current_task_worker_size.should == 2
+    @space3.current_task_worker_size.should == 2
   end
 end