cpee-model-management 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2301d22c5a02dcace2fa736c3b41b88d02866c2cb2f3b68b2554e0766224486e
-  data.tar.gz: d8f20b6c8c5c620dab0f582566a3445f6b48498cecd36ea7670096d80319166c
+  metadata.gz: 9be3465ba484376cc2be761b4d4af2882bfdb5b64d13cb4630e33919682054d4
+  data.tar.gz: e34f9311c42ff440cc4a8e00f082027b6810d17446e431e1f556e510455a39f1
 SHA512:
-  metadata.gz: c8de486ecdffc9c0cf93a7ca043e0d1363210d679223528270f9aa02e97aa2106386bb9a0240237f0c115321ea58127e13d0c24e33e414695ee1896676e88fa7
-  data.tar.gz: 711f92a0d044bd8bfc77cb56cd899df56343fd9fe80f9bc92170f4d86b0c5cced06edfd95f273879dbc59f59a27deaa7be4a25b5e572668621c062df7b9d82bd
+  metadata.gz: 907fff8cc59838e2c9272368ef4606d11324fcb5dcf9f9218e67c0c9a30f0ce462a920f56e9d5d5da19854eb73b7eec6670868672a1cca7c4022a49429776563
+  data.tar.gz: 9039e345f7f75f631d0485702db06aba021fa4412623793ca8a628c31efcee9841c732debb65943ef9d8b88b9f07bc97a8542119086b9a493900e53ec76728ec

data/cpee-model-management.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.5"
+  s.version          = "1.0.10"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{server/**/*,tools/**/*,lib/**/*}'] + %w(LICENSE Rakefile cpee-model-management.gemspec README.md AUTHORS)
+  s.files            = Dir['{server/*,tools/**/*,lib/**/*}'] + %w(LICENSE Rakefile cpee-model-management.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'

data/lib/cpee-model-management/implementation.rb

@@ -35,36 +35,39 @@ module CPEE
       Dir.chdir(File.join(models,File.dirname(old)))
       p1 = Pathname.new(File.dirname(old))
       p2 = Pathname.new(File.dirname(new))
-      old = File.basename(old)
-      new = File.join(p1.relative_path_from(p1).to_s,File.basename(new))
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{old}"                      "#{new}"              2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{old + '.active'}"                                2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{old + '.active-uuid'}"                           2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{old + '.author'}"          "#{new + '.author'}"  2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{old + '.creator'}"         "#{new + '.creator'}" 2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{old + '.stage'}"           "#{new + '.stage'}"   2>/dev/null`
+      told = File.basename(old)
+      tnew = File.join(p1.relative_path_from(p1).to_s,File.basename(new))
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{told}"                      "#{tnew}"              2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{told + '.active'}"                                2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{told + '.active-uuid'}"                           2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{told + '.author'}"          "#{tnew + '.author'}"  2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{told + '.creator'}"         "#{tnew + '.creator'}" 2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple mv     "#{told + '.stage'}"           "#{tnew + '.stage'}"   2>/dev/null`
       Dir.chdir(cdir)
+      CPEE::ModelManagement::fs_mv(models,old,new) # fallback
     end
     def self::git_rm(models,new)
       cdir = Dir.pwd
       Dir.chdir(File.join(models,File.dirname(new)))
-      new = File.basename(new)
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}" 2>/dev/null`
-       FileUtils.rm_rf(new)
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.active"      2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.active-uuid" 2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.author"      2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.creator"     2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.stage"       2>/dev/null`
+      tnew = File.basename(new)
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}" 2>/dev/null`
+       FileUtils.rm_rf(tnew)
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.active"      2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.active-uuid" 2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.author"      2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.creator"     2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.stage"       2>/dev/null`
       Dir.chdir(cdir)
+      CPEE::ModelManagement::fs_rm(models,new) # fallback
     end
     def self::git_shift(models,new)
       cdir = Dir.pwd
       Dir.chdir(File.join(models,File.dirname(new)))
-      new = File.basename(new)
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.active"      2>/dev/null`
-      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{new}.active-uuid" 2>/dev/null`
+      nnew = File.basename(new)
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{nnew}.active"      2>/dev/null`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{nnew}.active-uuid" 2>/dev/null`
       Dir.chdir(cdir)
+      CPEE::ModelManagement::fs_shift(models,new) # fallback
     end
     def self::git_commit(models,new,author)
       rp = File.realpath(models)
@@ -74,7 +77,7 @@ module CPEE
     def self::fs_mv(models,old,new)
       fname = File.join(models,old)
       fnname = File.join(models,new)
-      FileUtils.mv(fname,fnname)
+      FileUtils.mv(fname,fnname) rescue nil
       File.delete(fname + '.active',fnname + '.active') rescue nil
       File.delete(fname + '.active-uuid',fnname + '.active-uuid') rescue nil
       FileUtils.mv(fname + '.author',fnname + '.author') rescue nil
@@ -104,7 +107,6 @@ module CPEE
       fname = File.join(models,new)
       File.delete(fname + '.active') rescue nil
       File.delete(fname + '.active-uuid') rescue nil
-      Dir.chdir(cdir)
     end
 
     def self::git_dir(models,file)
@@ -187,14 +189,15 @@ module CPEE
         where = @a[0] == :main ? '' : Riddl::Protocols::Utils::unescape(@r.last)
         views = @a[1]
         models = @a[2]
-        stage = @p[0]&.value || 'draft'
-        stage = views[stage] if views && views[stage]
+        stage = [@p[0]&.value] || ['draft']
+        stage << views[stage[0]] if views && views[stage[0]]
+
 
         names = Dir.glob(File.join(models,where,'*.dir')).map do |f|
           { :type => :dir, :name => File.basename(f), :creator => File.read(f + '.creator'), :date => File.mtime(f).xmlschema }
         end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,where,'*.xml')).map do |f|
           fstage = File.read(f + '.stage').strip rescue 'draft'
-          { :type => :file, :name => File.basename(f), :creator => File.read(f + '.creator'), :author => File.read(f + '.author'), :stage => fstage, :date => File.mtime(f).xmlschema } if fstage == stage
+          { :type => :file, :name => File.basename(f), :creator => File.read(f + '.creator'), :author => File.read(f + '.author'), :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
         end.compact.uniq.sort_by{ |e| e[:name] }
 
         Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(names))
@@ -204,14 +207,14 @@ module CPEE
       def response
         views = @a[0]
         models = @a[1]
-        stage = @p[0]&.value || 'draft'
-        stage = views[stage] if views && views[stage]
+        stage = [@p[0]&.value] || ['draft']
+        stage << views[stage[0]] if views && views[stage[0]]
 
         names = Dir.glob(File.join(models,'*.dir/*.xml')).map do |f|
           { :type => :file, :name => File.join(File.basename(File.dirname(f)),File.basename(f)), :creator => File.read(f + '.creator'), :date => File.mtime(f).xmlschema }
         end.compact.uniq.sort_by{ |e| e[:name] } + Dir.glob(File.join(models,'*.xml')).map do |f|
           fstage = File.read(f + '.stage').strip rescue 'draft'
-          { :type => :file, :name => File.basename(f), :creator => File.read(f + '.creator'), :author => File.read(f + '.author'), :stage => fstage, :date => File.mtime(f).xmlschema } if fstage == stage
+          { :type => :file, :name => File.basename(f), :creator => File.read(f + '.creator'), :author => File.read(f + '.author'), :stage => fstage, :date => File.mtime(f).xmlschema } if stage.include?(fstage)
         end.compact.uniq.sort_by{ |e| e[:name] }
 
         Riddl::Parameter::Complex.new('list','application/json',JSON::pretty_generate(names))

data/server/model.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <endpoints>
     <machine>machine</machine>
     <sensor>sensor</sensor>

data/server/testset.xml

@@ -1,6 +1,6 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
+  <executionhandler>ruby</executionhandler>
   <endpoints>
     <timeout>https://cpee.org/services/timeout.php</timeout>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>

data/tools/cpee-moma

@@ -66,6 +66,19 @@ elsif command == 'convert'
         name = File.basename(f,'.xml')
         creator = author = design_dir = design_stage = nil
 
+        if doc.find('/x:testset/x:attributes').length == 0
+          n = doc.root.add('x:attributes')
+        end
+
+        if doc.find('/x:testset/x:attributes/x:theme').length == 0
+          n = doc.find('/x:testset/x:attributes').first
+          n.add('x:theme','extended')
+        end
+        if doc.find('/x:testset/x:attributes/x:info').length == 0
+          n = doc.find('/x:testset/x:attributes').first
+          n.add('x:info',name)
+        end
+
         if (dt = doc.find('/x:testset/x:attributes/x:creator')).length > 0
           dt.each do |e|
             creator = e.text
@@ -102,12 +115,14 @@ elsif command == 'convert'
         end
         File.write(f + '.stage',design_stage)
 
+        dd = ENV['PWD'] || Dir.pwd
+        ma = dd.scan(/\/([^\/]+\.dir)/)
+        design_dir = ma.join('/')
         if (dt = doc.find('/x:testset/x:attributes/x:design_dir')).length > 0
           dt.each do |e|
-            design_dir = e.text
+            e.text = design_dir
           end
         else
-          design_dir = Dir.pwd.sub(/^.*?models\/?/,'')
           doc.find('/x:testset/x:attributes').each do |e|
             e.add('x:design_dir',design_dir)
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -56,12 +56,6 @@ files:
 - lib/cpee-model-management/moma.xml
 - lib/cpee-model-management/stages
 - server/model.xml
-- server/models/agar.xml
-- server/models/agar.xml.active
-- server/models/agar.xml.active-uuid
-- server/models/agar.xml.author
-- server/models/agar.xml.creator
-- server/models/agar.xml.stage
 - server/moma
 - server/moma.conf
 - server/testset.xml

data/server/models/agar.xml

@@ -1,25 +0,0 @@
-<testset xmlns="http://cpee.org/ns/properties/2.0">
-  <dataelements/>
-  <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
-  <endpoints>
-    <timeout>https://cpee.org/services/timeout.php</timeout>
-    <subprocess>https://cpee.org/flow/start/url/</subprocess>
-  </endpoints>
-  <description>
-    <description xmlns="http://cpee.org/ns/description/1.0"/>
-  </description>
-  <transformation>
-    <description type="copy"/>
-    <dataelements type="none"/>
-    <endpoints type="none"/>
-  </transformation>
-  <attributes>
-    <info>agar</info>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
-    <modeltype>CPEE</modeltype>
-    <theme>extended</theme>
-    <design_dir/>
-    <design_stage>development</design_stage>
-  </attributes>
-</testset>

data/server/models/agar.xml.active

@@ -1 +0,0 @@
-https://cpee.org/flow/engine/4842

data/server/models/agar.xml.active-uuid

@@ -1 +0,0 @@
-6945f9e2-105a-4b14-84e6-3a4ca6921e93

data/server/models/agar.xml.author

@@ -1 +0,0 @@
-Christine Ashcreek

data/server/models/agar.xml.creator

@@ -1 +0,0 @@
-Christine Ashcreek

data/server/models/agar.xml.stage

@@ -1 +0,0 @@
-development