cpee-logging-xes-yaml 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99c79d272d96fc0194b782ae5f93492b7a50f5daac07cb60da447d2be314cbc8
-  data.tar.gz: ceb9ac1ca98aa9bae3fc4fb15c3e617ec306fa00bc62e8f627888169ee8ca703
+  metadata.gz: aab20ce260e56f4571add36cef8c7fe6f638fad4a723d28f8a13e6e93e99a32c
+  data.tar.gz: 122128fd3e956198fc7096409ff1f64bf47d0e17f5f2e72dd2f4cf3d138ea173
 SHA512:
-  metadata.gz: fe2f39dad68c6a86308811d25df6a1e41e9133984c1c67c6512240128abce5fa57727f915615cbe2fae21ef61bead8ab20b36e5c8bbab43181d7a9a38d116459
-  data.tar.gz: 94fa1197bc3e2b820464c947204aaa3ec376c13d90a87f3f371c11c39548aee98c4ec6fc71de28969ef319e07df780eb024db674e5777e33796cfc8a62b9dc51
+  metadata.gz: f36ec97639c73e0735250eee61c39febc1b43e2bab34912780be9a393ccedc45ef3cffdcfd97cd432145a73fcb0935e10dfc405bdd9500117de9afb53522b9de
+  data.tar.gz: 242461d18564a0c2fb9b2b5992e45a99e7506e79aab3eaa08be4c4a1bc4846733b39bc49b7b6e5c7714f719e74ce6afd6fa8225a91642be3188f61c597dfa4f2

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.2"
+  s.version          = "1.3.4"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

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

@@ -18,10 +18,9 @@ require 'weel'
 require 'digest/sha1'
 
 class StreamPoint
-  attr_accessor :value, :timestamp, :source, :meta
-  attr_reader :id
+  attr_accessor :value, :timestamp, :source, :meta, :id
 
-  def initialize(id)
+  def initialize(id=nil)
     @id = id
     @value = nil
     @timestamp = Time.now
@@ -101,6 +100,7 @@ module CPEE
         tp = nil
         if val.is_a? StreamPoint
           tp = val
+          tp.id = tid if tp.id.nil?
           tp.source = tso if tp.source.nil?
         else
           tp = StreamPoint.new(tid)

data/tools/cpee-logging-xes-yaml

@@ -16,7 +16,6 @@
 # CPEE-LOGGING-XES-YAML (file LICENSE in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
-curpath = __dir__
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
@@ -24,17 +23,21 @@ require 'xml/smart'
 require 'yaml'
 require 'typhoeus'
 require 'stringio'
+require 'typhoeus'
+require 'date'
 
-def wrap(s, width=78, indent=18, extra_indent=4)
+def wrap(s, width=78, indent=19, extra_indent=2)
 	lines = []
-	line, s = s[0..indent-2], s[indent..-1]
-  s.split(/\n/).each do |ss|
-    ss.split(/[ \t]+/).each do |word|
+	line, s = s[0..indent-1], s[indent..-1]
+  s.split(/\n/).each_with_index do |ss,i|
+    ss.split(/[ \t]+/).each_with_index do |word,j|
       if line.size + word.size >= width
         lines << line
-        line = (" " * (indent + extra_indent)) + word
+        line = (" " * (indent)) + word
       else
-        line << " " << word
+        line << " " if i > 0 || j != 0
+        line << (" " * (extra_indent)) if i > 0 && j == 0
+        line << word
       end
     end
     lines << line if line
@@ -91,20 +94,72 @@ def react(name,copy=false,deep=0)
   end
 end
 
+def extract(path)
+  if path =~ /^http.*/
+    response = Typhoeus.get(path)
+    if response.success?
+      text = response.response_body
+    end
+  else
+    text = File.read(path)
+  end
+  yaml = Psych.load_stream(text)
+  changes = []
+
+  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'))
+      changes.push(el)
+    end
+  end
+  #puts "found #{changes.size()} changes"
+
+  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')}
+  #p changes.map() {|el| el.dig('event','time:timestamp')}
+
+  de = ep = desc = nil
+  counter = 0
+  changes.each() do |change|
+    if(change.dig('event','cpee:lifecycle:transition') == 'dataelements/change') then
+      de = change.dig('event','data')
+    end
+    if(change.dig('event','cpee:lifecycle:transition') == 'endpoints/change') then
+      ep = change.dig('event','data')
+    end
+    if(change.dig('event','cpee:lifecycle:transition') == 'description/change') then
+      desc = change.dig('event','cpee:description')
+    end
+    if(change.dig('event','cpee:lifecycle:transition') == 'description/change' || change.dig('event','cpee:lifecycle:transition') == 'endpoints/change') then
+      yield uuid, de, ep, desc, counter if block_given?
+      counter += 1
+    end
+  end
+
+  [de, ep, desc]
+end
+
 exname = File.basename($0)
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
-  opt.summary_width = 15
+  opt.summary_width = 16
   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("")
-  opt.on(wrap("new [DIR]         scaffolds a sample logging service. Add a handler to a cpee instance to experience the pleasure.",78,18,0))
+  opt.on(wrap("\"#{exname}\" will be call \"c\" in the examples for each command."))
+  exname = 'c'
 	opt.on("")
-  opt.on(wrap("view [DIR]        view the dependencies between processes and subprocesses.\nWorks for local and remote logs. Examples:\n#{exname} view https://cpee.org/log/123.xes.yaml\n#{exname} view https://cpee.org/log/a.xes.yaml > index.txt\n#{exname} view ~/log/logs/456.xes.yaml"))
+  opt.on(wrap("new [DIR]          scaffolds a sample logging service. Add a handler to a cpee instance to experience the pleasure."))
 	opt.on("")
-  opt.on(wrap("copy [DIR]        copy dependent processes and subprocesses to the current\ndirectory. Works for local and remote logs. Examples:\n#{exname} copy https://cpee.org/log/123.xes.yaml\n#{exname} copy ~/log/logs/456.xes.yaml"))
+  opt.on(wrap("view [DIR]         view the dependencies between processes and subprocesses. Works for local and remote logs. Examples:\n#{exname} view https://cpee.org/log/123.xes.yaml\n#{exname} view https://cpee.org/log/a.xes.yaml > index.txt\n#{exname} view ~/log/logs/456.xes.yaml"))
+	opt.on("")
+  opt.on(wrap("copy [DIR]         copy dependent processes and subprocesses to the current directory. Works for local and remote logs. Examples: \n#{exname} copy https://cpee.org/log/123.xes.yaml\n#{exname} copy ~/log/logs/456.xes.yaml"))
+	opt.on("")
+  opt.on(wrap("extract-all [LOG]  extract cpee testset from cpee xes-yaml log. Works for local and remote logs. Write logs to files in folder named like the instance uuid contained in the log. Examples: \n#{exname} extract https://cpee.org/log/123.xes.yaml\n#{exname} extract ~/log/logs/456.xes.yaml"))
+	opt.on("")
+  opt.on(wrap("extract-last [LOG] extract cpee testset from cpee xes-yaml log. Works for local and remote logs. Write last revision of the model to stdout. Examples:\n#{exname} extract https://cpee.org/log/123.xes.yaml\n#{exname} extract ~/log/logs/456.xes.yaml"))
   opt.parse!
 }
 if (ARGV.length != 2)
@@ -112,20 +167,66 @@ if (ARGV.length != 2)
   exit
 else
   command = ARGV[0]
-  dir = ARGV[1]
+  path = ARGV[1]
 end
 
 if command == 'new'
-  if !File.exist?(dir)
-    FileUtils.cp_r(File.join(curpath,'..','server'),dir)
-    FileUtils.mkdir(File.join(dir,'logs')) rescue nil
+  if !File.exist?(path)
+    FileUtils.cp_r(File.join(__dir__,'..','server'),path)
+    FileUtils.mkdir(File.join(path,'logs')) rescue nil
   else
     puts 'Directory already exists.'
   end
 elsif command == 'view'
-  react dir, false
+  react path, false
 elsif command == 'copy'
-  react dir, true
+  react path, true
+elsif command == 'extract-all'
+  extract(path) do |uuid, de, ep, desc, 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())
+    unless de.nil?
+      de.each do |d|
+        dataelements.add(d['name'],d['value'])
+      end
+    end
+    unless ep.nil?
+      ep.each do |e|
+        endpoints.add(e['name'],e['value'])
+      end
+    end
+    unless desc.nil?
+      description.replace_by(XML::Smart.string(desc).root())
+    end
+    dirname = File.join(uuid)
+    filename = File.join(dirname,"#{uuid}_#{version}.xml")
+    Dir.mkdir(dirname) unless Dir.exist?(dirname)
+    File.write(filename, xml.to_s())
+  end
+elsif command == 'extract-last'
+  de, ep, desc = extract(path)
+
+  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())
+  unless de.nil?
+    de.each do |d|
+      dataelements.add(d['name'],d['value'])
+    end
+  end
+  unless ep.nil?
+    ep.each do |e|
+      endpoints.add(e['name'],e['value'])
+    end
+  end
+  unless desc.nil?
+    description.replace_by(XML::Smart.string(desc).root())
+  end
+
+  puts xml.to_s
 else
   puts ARGV.options
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)