cpee-logging-xes-yaml 1.3.14 → 1.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eef13eff4942a9f42979d5cf9f6bcd6b18138e45f430b2d0eaf314261552875f
-  data.tar.gz: f38d433ce4c2d03ebd6e3c5ad70067a02855ac4ad05a82390ed559f23d66afc5
+  metadata.gz: 319fc06991355d553d74750ee81f0f2b8e905a4b51b02f20ee53d607a6040b8b
+  data.tar.gz: 7431834b8b680dcc4e7bd63e444cef6b5f8bfc5919329196397743aa3f5f97a9
 SHA512:
-  metadata.gz: f8855de7b6cd340b6d7579c6ef0ed83da5f717648b364a4fd9b939b4eebb9898c6159c9db3e139332df4debc5170dd8c72dfd2a059101c0b13efdca2119c873b
-  data.tar.gz: 3fb011c791d2a29140ba81328672b7be78c398b869eb3a7e6d8e5538ea0b35fd10e41607f41db960636262135cc023a627e2571ba41b886d73f8f412d2874c20
+  metadata.gz: e078b251d72a50ad164c668a16ca6532cf00f76c2fbf5a70823bd2fd5a09a3c402bc42e596c041570d0bd9cdfc12be2fde5ff87d69aba25ea20733bc4f1cf2ad
+  data.tar.gz: e186cca12d2c1f07e2bacbc33574645fd29024aaa150e6643cd6b0c5abe73e936bd3a17ca43f39e15bfd0db6000d281f673706a8adc2006e2ea1d0f6193c2ce1

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.14"
+  s.version          = "1.3.16"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -348,7 +348,7 @@ module CPEE
       if receiving && !receiving.empty?
         event["data"] = receiving
       end
-      event["time:timestamp"]= notification['timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
+      event["time:timestamp"]= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
       end

data/tools/cpee-logging-xes-yaml

@@ -134,7 +134,7 @@ def follow(fname,io,copy,deep=0,index=nil)
       index.write " " * deep + name + " (#{tname}) - #{e.dig('log','trace','concept:name')}\n"
     end
     if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
-      base = e.dig('event','raw')
+      base = e.dig('event','data')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
@@ -195,14 +195,14 @@ def extract(path)
   info = yaml.shift
   uuid = info.dig('log','trace','cpee:instance')
   yaml.each do |el|
-    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
+    if el['event']['id:id'] == 'external' && (el.dig('event','cpee:lifecycle:transition') == 'endpoints/change' || el.dig('event','cpee:lifecycle:transition') == 'attributes/change' || el.dig('event','cpee:lifecycle:transition') == 'dataelements/change'|| el.dig('event','cpee:lifecycle:transition') == 'description/change')
       changes.push(el)
     end
   end
 
   changes.sort! { |a,b| DateTime.strptime(a.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') <=> DateTime.strptime(b.dig('event','time:timestamp'),'%Y-%m-%dT%H:%M:%S.%L%:z') }
 
-  de = ep = desc = nil
+  de = ep = desc = at = nil
   counter = 0
   changes.each do |change|
     if change.dig('event','cpee:lifecycle:transition') == 'dataelements/change'
@@ -211,11 +211,14 @@ def extract(path)
     if change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
       ep = change.dig('event','data')
     end
+    if change.dig('event','cpee:lifecycle:transition') == 'attributes/change'
+      at = change.dig('event','data')
+    end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change'
       desc = change.dig('event','cpee:description')
     end
     if change.dig('event','cpee:lifecycle:transition') == 'description/change' || change.dig('event','cpee:lifecycle:transition') == 'endpoints/change'
-      yield uuid, de, ep, desc, counter if block_given?
+      yield uuid, de, ep, desc, at, counter if block_given?
       counter += 1
     end
   end
@@ -223,10 +226,11 @@ def extract(path)
   text.close
   text.unlink if unlink
 
-  [de, ep, desc]
+  [de, ep, desc, at]
 end
 
 exname = File.basename($0)
+attr = {}
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
@@ -234,6 +238,7 @@ ARGV.options { |opt|
   opt.banner = "Usage:\n#{opt.summary_indent}#{exname} new [DIR] | view [URI] | copy [URI]\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
+  opt.on("--add [STRING]", "-a [STRING]", "Add attribute for extract-all and extract-last. Example: -a 'filter=me'") { |a| x,y = a.split('='); attr[x] = y }
 	opt.on("")
   opt.on(wrap("\"#{exname}\" will be call \"c\" in the examples for each command."))
   exname = 'c'
@@ -260,7 +265,7 @@ if (ARGV.length < 1 || ARGV.length > 2)
 elsif ARGV.length == 2
   command = ARGV[0]
   path = ARGV[1]
-elsif ARGV.length == 1 && %w{index extract-last to-xes-xml}.include?(ARGV[0])
+elsif (ARGV.length == 1 || ARGV.length == 2) && %w{index extract-last to-xes-xml}.include?(ARGV[0])
   command = ARGV[0]
 end
 
@@ -276,11 +281,12 @@ elsif command == 'view'
 elsif command == 'copy'
   react path, true
 elsif command == 'extract-all'
-  extract(path) do |uuid, de, ep, desc, version|
+  extract(path) do |uuid, de, ep, desc, at, version|
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
     description = xml.root().add('description').add(XML::Smart.string('<description xmlns="http://cpee.org/ns/description/1.0"/>').root())
+    attributes = xml.root().add('attributes')
     unless de.nil?
       de.each do |d|
         dataelements.add(d['name'],d['value'])
@@ -291,6 +297,11 @@ elsif command == 'extract-all'
         endpoints.add(e['name'],e['value'])
       end
     end
+    unless at.nil?
+      at.each do |e|
+        attributes.add(e['name'],e['value'])
+      end
+    end
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
@@ -307,12 +318,13 @@ elsif command == 'extract-last'
   end
 
   path.each do |f|
-    de, ep, desc = extract(f)
+    de, ep, desc, at = extract(f)
 
     xml = XML::Smart.string('<testset xmlns="http://cpee.org/ns/properties/2.0"><executionhandler>ruby</executionhandler></testset>')
     dataelements = xml.root().add('dataelements')
     endpoints = xml.root().add('endpoints')
     description = xml.root().add('description').add(XML::Smart.string('<description xmlns="http://cpee.org/ns/description/1.0"/>').root())
+    attributes = xml.root().add('attributes')
     unless de.nil?
       de.each do |d|
         dataelements.add(d['name'],d['value'])
@@ -326,8 +338,18 @@ elsif command == 'extract-last'
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
+    unless at.nil?
+      attr.each do |k,v|
+        attributes.add(k,v)
+      end
+      at.each do |e|
+        unless attr.keys.include? e['name']
+          attributes.add(e['name'],e['value'])
+        end
+      end
+    end
 
-    File.write(f + '.model', xml.to_s)
+    File.write(File.basename(f) + '.model', xml.to_s)
   end
 elsif command == 'index'
   path = if path