cpee 1.4.16 → 1.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c4ab772efbcd09a954265c0dfa57c5421986af3d2eb83c93a63d10888ecae3b
-  data.tar.gz: 9aadf410a77cd0ccaa953ede6245fb2cf8267db5ed3bf44e6b34b310b6209a26
+  metadata.gz: 9baa24fb02ca220f4344cd750fd772d1fc24de52452da1160b02f4a35c91a4d5
+  data.tar.gz: 461b4ba6643115fd138c12279e1e390db6cd90467e03af22b0764c85c777b064
 SHA512:
-  metadata.gz: 0c65df8421ae382688a59ca0b41cdf95a12c9b806ea8cbcbc82e7aca9c519df4b007a7f64f34df5adaf1c7c3480e329dee216554db09529974ad60df8495cbc2
-  data.tar.gz: e6e98a003d8fb24d1648c46eca4de49ccfd7cdfbfa2378aae4378ffcb5eff93f2fa7616686ecb365a62a464f5aaa1bd735962ae5e6517a47b1749a2598606d50
+  metadata.gz: 5f27e270cae8b682f4dade5025886518a901a3490989fb07b677d36c6922c83d8be91f2520cd252f22ef46b4bd471cb9456bd417c571630ac9df0d157fd31f9d
+  data.tar.gz: eda464b04ff47fcf180c0c3da1150ab51887d8627a1e31f28fe1479bddf034fe088ff89c79def55d195fd080d88dd9fe2c62ae6720181e267a24b2ad49a24db8

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.4.16"
+  s.version          = "1.4.17"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/controller.rb

@@ -230,7 +230,18 @@ module CPEE
       end
     end
     def state
-      data.find("string(/p:properties/p:state)")
+      @properties.data.find("string(/p:properties/p:state)")
+    end
+    def state_changed
+      @properties.data.find("string(/p:properties/p:state/@changed)")
+    end
+    def state_change!(state=nil)
+      @properties.modify do |doc|
+        doc.find("/p:properties/p:state").each do |ele|
+          ele.attributes['changed'] = Time.now.xmlschema
+          ele.text = state if state
+        end
+      end
     end
 
     def finalize_if_finished
@@ -263,11 +274,7 @@ module CPEE
       @properties.activate_schema(:inactive) if @instance.state == :stopped || @instance.state == :ready
       @properties.activate_schema(:active)   if @instance.state == :running || @instance.state == :simulating
       if [:finished, :stopped, :ready].include?(@instance.state)
-        @properties.modify do |doc|
-          node = doc.find("/p:properties/p:state").first
-          node.attributes['changed'] = Time.now.xmlschema
-          node.text = @instance.state
-        end
+        state_change! @instance.state
       end
     end # }}}
     def serialize_positions! # {{{
@@ -387,7 +394,6 @@ module CPEE
       state = 'ready'
       @properties.modify do |doc|
         node = doc.find("/p:properties/p:state").first
-        node.attributes['changed'] = Time.now.xmlschema
         state = node.text
       end
       if call_vote("state/change", :instance => @id, :info => info, :state => state)

data/lib/cpee/implementation.rb

@@ -142,7 +142,7 @@ module CPEE
       Riddl::Parameter::Complex.new("wis","text/xml") do
         ins = XML::Smart::string('<instances/>')
         controller.sort{|a,b| b[0] <=> a[0] }.each do |k,v|
-          ins.root.add('instance', v.info,  'uuid' => v.uuid, 'id' => k, 'state' => v.state)
+          ins.root.add('instance', v.info,  'uuid' => v.uuid, 'id' => k, 'state' => v.state, 'state_changed' => v.state_changed )
         end
         ins.to_s
       end
@@ -166,6 +166,7 @@ module CPEE
 
       controller[id] = Controller.new(id,opts)
       controller[id].info = name
+      controller[id].state_change!
 
       Riddl::Parameter::Simple.new("id", id)
     end

data/lib/engine/instances.rng

@@ -34,6 +34,9 @@
       <attribute name='state'>
         <data type="string"/>
       </attribute>
+      <attribute name='state_changed'>
+        <data type="dateTime"/>
+      </attribute>
       <data type="string"/>
     </element>
   </define>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.4.16
+  version: 1.4.17
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl