weel 1.2.5 → 1.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 498fe6c4aea9417706e1fae8604ebd83487badb7
+  data.tar.gz: a04cc4c473ab811e5dad4c2cf25190f0cd2d8410
+SHA512:
+  metadata.gz: 51923871cbb6ddfeacf71dc30e819d1a3229148e91a1840fa30378c6ac3e02725ce5472c30f13b6999aa40cbd59e3653bd25c6641fad9511fb3c7f608a39b4ce
+  data.tar.gz: a1749f5b4d98d23d23967c152c0834ad9c88762a9c12069665a0ebd1853808ac80e26c6df4a08c8a7d109dfbc34bba23f8555a324991530dbaaf389b97e16ac3

data/lib/weel.rb

@@ -854,7 +854,7 @@ public
 
   def sim # {{{
     stat = @dslr.__weel_state
-    return nil if stat != :ready && stat != :stopped
+    return nil unless stat == :ready || stat == :stopped
     @dslr.__weel_main = Thread.new do
       __weel_control_flow :simulating, stat
     end

data/test/SimHandlerWrapper.rb

@@ -77,8 +77,6 @@ class Trace #{{{
           next unless options[:otherwise]
           options[:otherwise] = false
           tmp = recursive_generate_list(ele,options)
-          p tmp
-          p '---'
           add_traces(traces,tmp)
           options[:otherwise] = true
       end  
@@ -89,7 +87,6 @@ class Trace #{{{
   def add_traces(before,newones)
     before.each do |trc|
       newones.each do |no|
-        p trc
         trc += no
       end
     end

data/test/basic/tc_parallel.rb

@@ -32,8 +32,7 @@ class TestParallel < Test::Unit::TestCase
     @wf.description do
       parallel :wait do
         parallel_branch do
-          activity :a_1, :call, :endpoint1
-          Thread.pass 
+          activity :a_1, :call, :endpoint1, :call =>  Proc.new{ sleep 0.2 }
         end
         parallel_branch do
           activity :a_2, :call, :endpoint1, :call =>  Proc.new{ sleep 0.5 }

data/test/wfp_adv_branching/tc_generalsynchronizingmerge.rb

@@ -1,10 +1,10 @@
 require 'test/unit'
 require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
 
-class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
+class TestWFPGeneralSynchronizingMerge < Test::Unit::TestCase
   include TestMixin
 
-  def test_localsyncmerge
+  def test_generalsyncmerge
     @wf.data[:cont] = true
     @wf.description do
       parallel do
@@ -16,7 +16,7 @@ class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
         end
         choose do
           alternative(true) do
-            loop post_test{puts data.break; data.break} do
+            loop post_test{data.break} do
               parallel_branch do
                 activity :a2_1, :call, :endpoint1
               end  
@@ -33,7 +33,7 @@ class TestWFPLocalSynchronizingMerge < Test::Unit::TestCase
       activity :a3, :call, :endpoint1
     end
     @wf.start.join
-    wf_sassert('|running|Ca2_decideDa2_decide')
+    wf_sassert('|running|Ca2_decideMa2_decideDa2_decide')
     wf_assert('CALL a1_1:')
     wf_assert('CALL a1_2:')
     wf_assert('CALL a2_1:')

data/test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb

@@ -28,11 +28,12 @@ class TestWFPMultiChoice < Test::Unit::TestCase
           parallel_branch do
             alternative(data.x == 1) do
               activity :a1_1, :call, :endpoint1
+              Thread.pass
             end
           end
           parallel_branch do
             alternative(data.x > 0) do
-              activity :a1_2, :call, :endpoint1, :call => Proc.new{sleep 0.1}
+              activity :a1_2, :call, :endpoint1, :call => Proc.new{sleep 0.5}
             end
           end
         end
@@ -42,6 +43,6 @@ class TestWFPMultiChoice < Test::Unit::TestCase
     @wf.start.join
     wf_assert('CALL a1_1')
     wf_assert('CALL a1_2')
-    wf_sassert('Da1_1Da1_2Ca2Da2|finished|')
+    wf_sassert('Da1_2Ca2Da2|finished|')
   end
 end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.2.5"
+  s.version          = "1.2.6"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.2.5
-  prerelease: 
+  version: 1.2.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
@@ -65,27 +64,26 @@ files:
 homepage: http://cpee.org/
 licenses:
 - LGPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
 - test/SimHandlerWrapper.rb