cpee-logging-xes-yaml 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d0f1a3d5cdf89d14a2c7ff96d36f0d331496ca095d4c395c49c770e827ed279
-  data.tar.gz: 67c87266391555e7dd326420e341549314d3b111b036637c965e42300972489d
+  metadata.gz: aab20ce260e56f4571add36cef8c7fe6f638fad4a723d28f8a13e6e93e99a32c
+  data.tar.gz: 122128fd3e956198fc7096409ff1f64bf47d0e17f5f2e72dd2f4cf3d138ea173
 SHA512:
-  metadata.gz: 97bdab2b3cfaafb419e5dd20a87eab3ec096a08a15c22fac43f1a7209e3a440bb31246007c85f38dc51ed60ed28115d651191c4de24aae6d8480341e7d286cc1
-  data.tar.gz: 434309fe76ed0653a8af989e4fd074c21d2164f37518d4808c54fe8bb77bd8c86b2bf1f6aa39fa556070a68d32a13b4262052a7caa2089237e84b14d7394f88b
+  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.3"
+  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/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'
@@ -27,16 +26,18 @@ require 'stringio'
 require 'typhoeus'
 require 'date'
 
-def wrap(s, width=78, indent=19, 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
@@ -100,7 +101,7 @@ def extract(path)
       text = response.response_body
     end
   else
-    text = File.read(File.join(__dir__,path))
+    text = File.read(path)
   end
   yaml = Psych.load_stream(text)
   changes = []
@@ -147,13 +148,16 @@ ARGV.options { |opt|
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
+  opt.on(wrap("\"#{exname}\" will be call \"c\" in the examples for each command."))
+  exname = 'c'
+	opt.on("")
   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("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(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(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!
@@ -168,7 +172,7 @@ end
 
 if command == 'new'
   if !File.exist?(path)
-    FileUtils.cp_r(File.join(curpath,'..','server'),path)
+    FileUtils.cp_r(File.join(__dir__,'..','server'),path)
     FileUtils.mkdir(File.join(path,'logs')) rescue nil
   else
     puts 'Directory already exists.'
@@ -196,7 +200,7 @@ elsif command == 'extract-all'
     unless desc.nil?
       description.replace_by(XML::Smart.string(desc).root())
     end
-    dirname = File.join(__dir__,uuid)
+    dirname = File.join(uuid)
     filename = File.join(dirname,"#{uuid}_#{version}.xml")
     Dir.mkdir(dirname) unless Dir.exist?(dirname)
     File.write(filename, xml.to_s())

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl