cpee-model-management 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f01249cf02b86d83022b913a2b81ebcfd06e48f19eb307bcf8645c619260da7
-  data.tar.gz: '08805c52f1143242b9e2f675886ab894d33fe28f5a05cc4408e0563eac592937'
+  metadata.gz: d3a70760a747bb5dd295cac87766307d1d3775767af440e3090d2e108757837d
+  data.tar.gz: ed59f63e220bb3c6fb8e096ce21ee41f5542c59fff051e48c0d04ff7ee8ccd79
 SHA512:
-  metadata.gz: 4ea1643623a79c0ad75814965d0ed339591767f7c7d423c4d5f0a15dd88eb4f2626c0246b3f4e72a24989aff9dc8eb6cca2f5f72bea0751f6f0831ee437e5db7
-  data.tar.gz: a36b6d9995c293f6ed8c2eca53ed0231c74cf1a44b07a3e53bd50e6c958349612fd71ce586e1cba65989a334148e35ae7752ca0eaddcd615bfc812ddf9d8084f
+  metadata.gz: fd9497631d3a6d95a98b0f829211aa13712626bf1aac340a4bdb19eb80ee1b26e624bfa3e5766d1f8cceeb37d215f75b8c05478566802daf667a297eb4c4b075
+  data.tar.gz: 04c947de228d452fa277b01213c0a4a5deaa8d47bd3b357a94593c350c1ae15a728c470a38023a4298d9a2db808580bfe187cb1fe19dcf9bd4b634819a25a0a2

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.12"
+  s.version          = "1.0.17"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'json', '~> 2.1'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.7'
 end

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

@@ -7,8 +7,6 @@ new = File.basename(new)
 `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}"             2>/dev/null`
 `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.active"      2>/dev/null`
 `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.active-uuid" 2>/dev/null`
-`git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.author"      2>/dev/null`
-`git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.creator"     2>/dev/null`
-`git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.stage"       2>/dev/null`
+`git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple add "#{new}.attrs"      2>/dev/null`
 `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple commit -m "#{author.gsub(/"/,"'")}"`
 `GIT_TERMINAL_PROMPT=0 git push` rescue nil

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

@@ -24,6 +24,7 @@ require 'riddl/protocols/utils'
 require 'fileutils'
 require 'pathname'
 require 'shellwords'
+require 'securerandom'
 
 module CPEE
   module ModelManagement
@@ -37,12 +38,10 @@ module CPEE
       p2 = Pathname.new(File.dirname(new))
       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`
+      `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 + '.attrs'}"          "#{tnew + '.attrs'}"  2>/dev/null`
       Dir.chdir(cdir)
       CPEE::ModelManagement::fs_mv(models,old,new) # fallback
     end
@@ -54,9 +53,7 @@ module CPEE
        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`
+      `git -c user.name='Christine Ashcreek' -c user.email=dev@null.com -c push.default=simple rm -rf "#{tnew}.attrs"      2>/dev/null`
       Dir.chdir(cdir)
       CPEE::ModelManagement::fs_rm(models,new) # fallback
     end
@@ -80,9 +77,7 @@ module CPEE
       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
-      FileUtils.mv(fname + '.creator',fnname + '.creator') rescue nil
-      FileUtils.mv(fname + '.stage',fnname + '.stage') rescue nil
+      FileUtils.mv(fname + '.attrs',fnname + '.attrs') rescue nil
     end
     def self::fs_cp(models,old,new)
       fname = File.join(models,old)
@@ -90,18 +85,14 @@ module CPEE
       FileUtils.cp(fname,fnname)
       File.delete(fname + '.active',fnname + '.active') rescue nil
       File.delete(fname + '.active-uuid',fnname + '.active-uuid') rescue nil
-      FileUtils.cp(fname + '.author',fnname + '.author') rescue nil
-      FileUtils.cp(fname + '.creator',fnname + '.creator') rescue nil
-      FileUtils.cp(fname + '.stage',fnname + '.stage') rescue nil
+      FileUtils.cp(fname + '.attrs',fnname + '.attrs') rescue nil
     end
     def self::fs_rm(models,new)
       fname = File.join(models,new)
       FileUtils.rm_rf(fname)
       File.delete(fname + '.active') rescue nil
       File.delete(fname + '.active-uuid') rescue nil
-      File.delete(fname + '.author') rescue nil
-      File.delete(fname + '.creator') rescue nil
-      File.delete(fname + '.stage') rescue nil
+      File.delete(fname + '.attrs') rescue nil
     end
     def self::fs_shift(models,new)
       fname = File.join(models,new)
@@ -168,14 +159,16 @@ module CPEE
         if  op == 'delete'
           { :op => op, :type => :dir, :name => File.basename(f) }
         else
-          { :op => op, :type => :dir, :name => File.basename(f), :creator => File.read(f + '.creator'), :date => File.mtime(f).xmlschema }
+          attrs = JSON::load File.open(f + '.attrs')
+          { :op => op, :type => :dir, :name => File.basename(f), :creator => attrs['creator'], :date => File.mtime(f).xmlschema }
         end
       else
         if  op == 'delete'
           { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),'') }
         else
-          fstage = File.read(f + '.stage').strip rescue 'draft'
-          { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),''), :creator => File.read(f + '.creator'), :author => File.read(f + '.author'), :stage => fstage, :date => File.mtime(f).xmlschema }
+          attrs = JSON::load File.open(f + '.attrs')
+          fstage = attrs['design_stage'] rescue 'draft'
+          { :op => op, :type => :file, :name => f.sub(Regexp.compile(File.join(models,'/')),''), :creator => attrs['creator'], :author => attrs['author'], :stage => fstage, :date => File.mtime(f).xmlschema }
         end
       end
       what[:source] = s.sub(/models\//,'') unless s.nil?
@@ -192,12 +185,13 @@ module CPEE
         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 }
+          attrs = JSON::load File.open(f + '.attrs')
+          { :type => :dir, :name => File.basename(f), :creator => attrs['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 stage.include?(fstage)
+          attrs = JSON::load File.open(f + '.attrs')
+          fstage = attrs['design_stage'] rescue 'draft'
+          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['guarded'], :guarded_id => attrs['guarded_id'], :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))
@@ -211,10 +205,12 @@ module CPEE
         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 }
+          attrs = JSON::load File.open(f + '.attrs')
+          { :type => :file, :name => File.join(File.basename(File.dirname(f)),File.basename(f)), :creator => attrs['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 stage.include?(fstage)
+          attrs = JSON::load File.open(f + '.attrs')
+          fstage = attrs['design_stage'] rescue 'draft'
+          { :type => :file, :name => File.basename(f), :creator => attrs['creator'], :author => attrs['author'], :guarded => attrs['guarded'], :guarded_id => attrs['guarded_id'], :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))
@@ -240,6 +236,7 @@ module CPEE
         dn = CPEE::ModelManagement::get_dn @h['DN']
         author = dn['GN'] + ' ' + dn['SN']
 
+        attrs = {}
         XML::Smart::modify(fname) do |doc|
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
           doc.find('/p:testset/p:attributes/p:author').each do |ele|
@@ -251,9 +248,11 @@ module CPEE
           doc.find('/p:testset/p:attributes/p:theme').each do |ele|
             ele.text = themes[nstage] || 'model'
           end
+          attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+            [e.qname.name,e.text]
+          end.to_h
         end
-        File.write(fname + '.author',author)
-        File.write(fname + '.stage',nstage)
+        File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op author, 'shift', models, File.join('.', where, name + '.xml'), File.join('.', where, name + '.xml')
         CPEE::ModelManagement::notify conns, 'shift', models, fname, fname
@@ -280,6 +279,7 @@ module CPEE
         dn = CPEE::ModelManagement::get_dn @h['DN']
         author = dn['GN'] + ' ' + dn['SN']
 
+        attrs = {}
         XML::Smart::modify(fname) do |doc|
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
           doc.find('/p:testset/p:attributes/p:info').each do |ele|
@@ -288,8 +288,11 @@ module CPEE
           doc.find('/p:testset/p:attributes/p:author').each do |ele|
             ele.text = author
           end
+          attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+            [e.qname.name,e.text]
+          end.to_h
         end
-        File.write(fname + '.author',author)
+        File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op author, 'mv', models, File.join('.', where, nname + '.xml'), File.join('.', where, name + '.xml')
         CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
@@ -312,7 +315,23 @@ module CPEE
 
         dn = CPEE::ModelManagement::get_dn @h['DN']
         author = dn['GN'] + ' ' + dn['SN']
-        File.write(fname + '.author',author)
+
+        attrs = JSON::load File.open(fname + '.attrs')
+        attrs['author'] = author
+        File.write(fname + '.attrs',JSON::pretty_generate(attrs))
+
+        Dir.glob(File.join(fname + '/*.xml')).each do |f|
+          XML::Smart::modify(f) do |doc|
+            doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
+            doc.find('/p:testset/p:attributes/p:design_dir').each do |ele|
+              ele.text = nname + '.dir'
+            end
+            attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+              [e.qname.name,e.text]
+            end.to_h
+          end
+          File.write(f + '.attrs',JSON::pretty_generate(attrs))
+        end
 
         CPEE::ModelManagement::op author, 'mv', models, File.join(nname + '.dir'), File.join(name + '.dir')
         CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
@@ -338,8 +357,11 @@ module CPEE
 
         Dir.mkdir(fname)
         FileUtils.touch(File.join(fname,'.gitignore'))
-        File.write(fname + '.creator',creator)
-        File.write(fname + '.author',creator)
+
+        attrs = JSON::load File.open(fname + '.attrs')
+        attrs['creator'] = creator
+        attrs['author'] = creator
+        File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op creator, 'add', models, name + '.dir'
         CPEE::ModelManagement::notify conns, 'create', models, fname
@@ -363,7 +385,8 @@ module CPEE
         source = @p[1] ? File.join(models,where,@p[1].value) : (templates[stage] ? templates[stage] : 'testset.xml')
         fname = File.join(models,where,name + '.xml')
 
-        stage = File.read(source + '.stage') if stage.nil? && File.exists?(source + '.stage')
+        attrs = JSON::load File.open(fname + '.attrs') rescue {}
+        stage = attrs['design_stage'] if stage.nil? && attrs['design_stage']
         stage = views[stage] if views && views[stage]
 
         counter = 0
@@ -375,6 +398,7 @@ module CPEE
         dn = CPEE::ModelManagement::get_dn @h['DN']
         creator = dn['GN'] + ' ' + dn['SN']
         FileUtils.cp(source,fname)
+        attrs = {}
         XML::Smart::modify(fname) do |doc|
           doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
           doc.find('/p:testset/p:attributes/p:info').each do |ele|
@@ -389,15 +413,19 @@ module CPEE
           doc.find('/p:testset/p:attributes/p:design_dir').each do |ele|
             ele.text = where
           end
+          doc.find('/p:testset/p:attributes/p:model_uuid').each do |ele|
+            ele.text = SecureRandom.uuid
+          end
           if stage
             doc.find('/p:testset/p:attributes/p:design_stage').each do |ele|
               ele.text = stage
             end
           end
+          attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+            [e.qname.name,e.text]
+          end.to_h
         end
-        File.write(fname + '.creator',creator)
-        File.write(fname + '.author',creator)
-        File.write(fname + '.stage',stage)
+        File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
         CPEE::ModelManagement::op creator, 'add', models, File.join('.', where, name + '.xml')
         CPEE::ModelManagement::notify conns, 'create', models, fname
@@ -492,13 +520,17 @@ module CPEE
         dn = CPEE::ModelManagement::get_dn @h['DN']
         author = dn['GN'] + ' ' + dn['SN']
         if !File.exist?(File.join(models,to,name + '.xml'))
+          attrs = {}
           XML::Smart::modify(fname) do |doc|
             doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
             doc.find('/p:testset/p:attributes/p:design_dir').each do |ele|
               ele.text = to
             end
+            attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+              [e.qname.name,e.text]
+            end.to_h
           end
-          File.write(fname + '.author',author)
+          File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
           CPEE::ModelManagement::op author, 'mv', models, File.join('.', to, name + '.xml'), File.join('.', where, name + '.xml')
           CPEE::ModelManagement::notify conns, 'move', models, File.join(models,to,name + '.xml'), fname
@@ -518,20 +550,25 @@ module CPEE
 
         if File.exists?(fname)
           author = dn['GN'] + ' ' + dn['SN']
+          attrs = {}
           XML::Smart.string(cont) do |doc|
             doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
-            unless File.exists?(File.join(models,where,name + '.xml.creator'))
-              doc.find('/p:testset/p:attributes/p:author').each do |ele|
-                File.write(File.join(models,where,name + '.xml.creator'),ele.text)
-              end
-            end
             doc.find('/p:testset/p:attributes/p:author').each do |ele|
               ele.text = dn['GN'] + ' ' + dn['SN']
             end
+            if doc.find('/p:testset/p:attributes/p:design_stage').empty?
+              doc.find('/p:testset/p:attributes').first.add('p:design_stage','draft')
+            else
+              doc.find('/p:testset/p:attributes/p:design_stage').each do |ele|
+                ele.text = 'draft' if ele.text.strip == ''
+              end
+            end
+            attrs = doc.find('/p:testset/p:attributes/*').map do |e|
+              [e.qname.name,e.text]
+            end.to_h
             File.write(fname,doc.to_s)
-            File.write(fname + '.author',author)
-            File.write(fname + '.stage',doc.find('string(/p:testset/p:attributes/p:design_stage)').sub(/^$/,'draft'))
           end
+          File.write(fname + '.attrs',JSON::pretty_generate(attrs))
           CPEE::ModelManagement::op author, 'add', models, File.join('.', where, name + '.xml')
           CPEE::ModelManagement::notify conns, 'put', models, fname
         else

data/server/model.xml

@@ -25,6 +25,10 @@
     <info>none</info>
     <creator>Juergen Mangler</creator>
     <author>Juergen Mangler</author>
+    <guarded>none</guarded>
+    <guarded_id></guarded_id>
+    <model_uuid></model_uuid>
+    <model_version></model_version>
     <modeltype>CPEE</modeltype>
     <theme>model</theme>
     <design_dir></design_dir>

data/server/moma.conf

@@ -1,5 +1,6 @@
 :port: 9316
 :models: models
+:location: https://cpee.org/design/server/
 :instantiate: https://cpee.org/flow/start/
 :cockpit:
   draft: https://cpee.org/flow/model.html?monitor=

data/server/testset.xml

@@ -18,6 +18,10 @@
     <creator>Juergen Mangler</creator>
     <author>Juergen Mangler</author>
     <modeltype>CPEE</modeltype>
+    <guarded>none</guarded>
+    <guarded_id></guarded_id>
+    <model_uuid></model_uuid>
+    <model_version></model_version>
     <theme>extended</theme>
     <design_dir></design_dir>
     <design_stage>draft</design_stage>

data/tools/cpee-moma

@@ -6,6 +6,8 @@ require 'fileutils'
 require 'xml/smart'
 require 'zip'
 require 'typhoeus'
+require 'json'
+require 'securerandom'
 
 def wrap(s, width=78, indent=18)
 	lines = []
@@ -84,7 +86,7 @@ if command == 'cpui'
     js_libs(p1)
 elsif command == 'convert'
   Dir['*.xml'].each do |f|
-    XML::Smart.modify(f) do |doc|
+    XML::Smart.open(f) do |doc|
       doc.register_namespace 'x', 'http://cpee.org/ns/properties/2.0'
       if doc.root.qname.name == 'testset'
         name = File.basename(f,'.xml')
@@ -94,6 +96,10 @@ elsif command == 'convert'
           n = doc.root.add('x:attributes')
         end
 
+        if doc.find('/x:testset/x:attributes/x:model_uuid').length == 0
+          n = doc.find('/x:testset/x:attributes').first
+          n.add('x:model_uuid',SecureRandom.uuid)
+        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')
@@ -113,7 +119,6 @@ elsif command == 'convert'
             e.add('x:creator',creator)
           end
         end
-        File.write(f + '.creator',creator)
 
         if (dt = doc.find('/x:testset/x:attributes/x:author')).length > 0
           dt.each do |e|
@@ -125,7 +130,6 @@ elsif command == 'convert'
             e.add('x:author',author)
           end
         end
-        File.write(f + '.author',author)
 
         if (dt = doc.find('/x:testset/x:attributes/x:design_stage')).length > 0
           dt.each do |e|
@@ -137,7 +141,6 @@ elsif command == 'convert'
             e.add('x:design_stage',design_stage)
           end
         end
-        File.write(f + '.stage',design_stage)
 
         dd = ENV['PWD'] || Dir.pwd
         ma = dd.scan(/\/([^\/]+\.dir)/)
@@ -157,9 +160,28 @@ elsif command == 'convert'
             e.text = name
           end
         end
+
+
+        attrs = doc.find('/x:testset/x:attributes/*').map do |e|
+          [e.qname.name,e.text]
+        end.to_h
+        File.write(f + '.attrs',JSON::pretty_generate(attrs))
+
+        File.unlink(f + '.creator') rescue nil
+        File.unlink(f + '.author') rescue nil
+        File.unlink(f + '.stage') rescue nil
       end
     end
   end
+  Dir['*.dir'].each do |f|
+    attrs = JSON::load File.open(f + '.attrs') rescue {}
+    attrs['creator'] = File.read(f + '.creator') if File.exists?(f + '.creator')
+    attrs['author'] = File.read(f + '.author') if File.exists?(f + '.author')
+    File.write(f + '.attrs',JSON::pretty_generate(attrs))
+
+    File.unlink(f + '.creator') rescue nil
+    File.unlink(f + '.author') rescue nil
+  end
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.mkdir(File.join(p1)) rescue nil

data/ui/css/design.css

@@ -22,6 +22,12 @@ form input {
 
 ui-behind {
   text-transform: capitalize;
+  font-weight: bold;
+  color: #d0d0d0;
+}
+
+ui-behind span {
+  cursor: pointer;
 }
 
 [is="x-ui-"] table.ui-table {
@@ -48,3 +54,9 @@ ui-behind {
 [is="x-ui-"] table.ui-table tbody tr:hover td[data-class=ops] {
   background-color: #99cee6b0;
 }
+
+[is="x-ui-"] ui-rest > ui-content > ui-area { padding: 1em; }
+
+tr.contextmenuitem .capitalized {
+  text-transform: capitalize;
+}

data/ui/design.js

@@ -0,0 +1,239 @@
+var gstage;
+var gdir;
+
+function move_it(name,todir) {
+  $.ajax({
+    type: "PUT",
+    url: "server/" + gdir + name,
+    data: { dir: todir }
+  });
+}
+function shift_it(name,to) {
+  $.ajax({
+    type: "PUT",
+    url: "server/" + gdir + name,
+    data: { stage: to }
+  });
+}
+function rename_it(name) {
+  var newname;
+  if (newname = prompt('New name please!',name.replace(/\.xml$/,'').replace(/\.dir$/,''))) {
+    $.ajax({
+      type: "PUT",
+      url: "server/" + gdir + name,
+      data: { new: newname }
+    });
+  }
+}
+function duplicate_it(name) {
+  var newname;
+  if (newname = prompt('New name please!',name.replace(/\.xml$/,'').replace(/\.dir$/,''))) {
+    $.ajax({
+      type: "POST",
+      url: "server/" + gdir,
+      data: { new: newname, old: name }
+    });
+  }
+}
+function delete_it(name) {
+  if (confirm('Are you really, really, REALLY sure!')) {
+    $.ajax({
+      type: "DELETE",
+      url: "server/" + gdir + name
+    });
+  }
+}
+
+function es_init(gdir,gstage) {
+  var es = new EventSource('server/');
+  es.onopen = function() {
+    console.log('es open');
+  };
+  es.onmessage = function(e) {
+    paint(gdir,gstage);
+  };
+  es.onerror = function() {
+    console.log('es error');
+    // es_init();
+  };
+}
+
+function paint(gdir,gstage) {
+  $('#models tbody').empty();
+  if (gdir && gdir != '') {
+    var clone = document.importNode(document.querySelector('#up').content,true);
+    $('[data-class=name] a',clone).text('..');
+    $('[data-class=name] a',clone).attr('href',window.location.pathname + '?stage=' + gstage + '&dir=');
+    $('#models tbody').append(clone);
+  }
+  $.ajax({
+    type: "GET",
+    url: "server/" + gdir,
+    data: { stage: gstage },
+    success: function(res) {
+      $(res).each(function(k,data) {
+        if (data.type == 'dir') {
+          var clone = document.importNode(document.querySelector('#folder').content,true);
+          $('[data-class=name] a',clone).text(data['name'].replace(/\.dir$/,''));
+          $('[data-class=name]',clone).attr('data-full-name',data['name']);
+          $('[data-class=name] a',clone).attr('href',window.location.pathname + '?stage=' + gstage + '&dir=' + data['name']);
+        } else {
+          var clone = document.importNode(document.querySelector('#model').content,true);
+          $('[data-class=name] a',clone).text(data['name']);
+          $('[data-class=name]',clone).attr('data-full-name',data['name']);
+          $('[data-class=name] a',clone).attr('href','server/' + gdir + data['name'] + '/open?stage=' + gstage);
+          $('[data-class=force] a',clone).attr('href','server/' + gdir + data['name'] + '/open-new?stage=' + gstage);
+          $('[data-class=raw] a',clone).attr('href','server/' + gdir + data['name']);
+
+          $('[data-class=guarded] abbr',clone).attr('title',data['guarded'] || '');
+          $('[data-class=guarded] abbr',clone).text((data['guarded'] || '').match(/none/i) ? '' : (data['guarded'] || '').charAt(0).toUpperCase());
+          $('[data-class=resource]',clone).text(data['guarded_id'] || '');
+        }
+        $('[data-class=author]',clone).text(data['author']);
+        $('[data-class=date]',clone).text(new Date(data['date']).strftime('%Y-%m-%d, %H:%M:%S'));
+        $('#models tbody').append(clone);
+      });
+    }
+  });
+}
+
+function change_it(gdir,gstage) {
+  window.location.href = window.location.pathname + '?stage=' + gstage + '&dir=' + gdir;
+}
+
+$(document).ready(function() {
+  const queryString = window.location.search;
+  const urlParams = new URLSearchParams(queryString);
+
+  gstage = urlParams.get('stage') || 'draft';
+  gdir = urlParams.get('dir') ? (urlParams.get('dir') + '/').replace(/\/+/,'/') : '';
+
+  es_init(gdir,gstage);
+
+  var shifts = []
+  $.ajax({
+    type: "GET",
+    url: "server/",
+    data: { stages: 'stages' },
+    success: (r) => {
+      shifts = shifts.concat(r);
+      shifts = shifts.filter(item => item !== gstage);
+    }
+  });
+
+  $('input[name=stage]').val(gstage);
+  $('input[name=dir]').val(gdir);
+  $('ui-behind span').text(gstage);
+  $('ui-behind span').click((e) => {
+    if (shifts.length > 0) {
+      var menu = {};
+      menu['Change to'] = [];
+      shifts.forEach(ele => {
+        menu['Change to'].push(
+          {
+            'label': ele,
+            'function_call': change_it,
+            'text_icon': '➔',
+            'type': undefined,
+            'class': 'capitalized',
+            'params': [gdir,ele]
+          }
+        );
+      });
+      new CustomMenu(e).contextmenu(menu);
+    }
+  });
+
+  var dragged;
+  $('#models').on('drag','td[data-class=model]',false);
+  $('#models').on('dragstart','td[data-class=model]',(e) => {
+    dragged = $(e.currentTarget).parents('tr').find('td[data-class=name]').text();
+  });
+  $('#models').on('dragover','td[data-class=folder]',false);
+  $('#models').on('drop','td[data-class=folder]',(e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (dragged) {
+      var todir = $(e.currentTarget).parents('tr').find('td[data-class=name]').text();
+      todir = todir.replace(/\./g,'');
+      if (todir != '') {
+        todir += '.dir';
+      }
+      move_it(dragged,todir);
+      dragged = undefined;
+    }
+  });
+  $('#models').on('click','td[data-class=ops]',(e) => {
+    var menu = {};
+    var name = $(e.currentTarget).parents('tr').find('td[data-class=name]').attr('data-full-name');
+    menu['Operations'] = [
+      {
+        'label': 'Delete',
+        'function_call': delete_it,
+        'text_icon': '❌',
+        'type': undefined,
+        'params': [name]
+      },
+      {
+        'label': 'Rename',
+        'function_call': rename_it,
+        'type': undefined,
+        'text_icon': '📛',
+        'params': [name]
+      }
+    ];
+    if (name.match(/\.xml$/)) {
+      menu['Operations'].unshift(
+        {
+          'label': 'Duplicate',
+          'function_call': duplicate_it,
+          'text_icon': '➕',
+          'type': undefined,
+          'params': [name]
+        }
+      );
+    }
+    if (shifts.length > 0) {
+      menu['Shifting'] = [];
+      shifts.forEach(ele => {
+        menu['Shifting'].push(
+          {
+            'label': 'Shift to ' + ele,
+            'function_call': shift_it,
+            'text_icon': '➔',
+            'type': undefined,
+            'params': [name,ele]
+          }
+        );
+      });
+    }
+    new CustomMenu(e).contextmenu(menu);
+  });
+
+  history.pushState({}, document.title, window.location.pathname + '?stage=' + gstage + '&dir=' + gdir);
+  paint(gdir,gstage);
+
+  $('#newmod').on('submit',(e) => {
+    $.ajax({
+      type: "POST",
+      url: "server/" + gdir,
+      data: { stage: gstage, new: $("#newmod input[name=new]").val() },
+      success: (r) => {
+        uidash_activate_tab($('ui-tab').first());
+      }
+    });
+    return false;
+  });
+
+  $('#newdir').on('submit',(e) => {
+    $.ajax({
+      type: "POST",
+      url: "server/",
+      data: { dir: $("#newdir input[name=newdir]").val() },
+      success: (r) => {
+        uidash_activate_tab($('ui-tab').first());
+      }
+    });
+    return false;
+  });
+});

data/ui/index.html

@@ -61,20 +61,35 @@
         <ui-tab class=""         data-tab="models"  >Models</ui-tab>
         <ui-tab class="inactive" data-tab="newmodel">New Model</ui-tab>
         <ui-tab class="inactive" data-tab="newdir"  >New Dir</ui-tab>
-        <ui-behind                                  ></ui-behind>
+        <ui-space                                   ></ui-space>
+        <ui-tab class="inactive" data-tab="running" >Running</ui-tab>
+        <ui-tab class="inactive" data-tab="stopped" >Stopped</ui-tab>
+        <ui-behind                                  ><span></span></ui-behind>
         <ui-last                                    ><a class="logo" href=".."></a></ui-last>
       </ui-tabbar>
       <ui-content class="noselect">
         <ui-area data-belongs-to-tab="models">
           <p>Your Models are saved/versioned in <a target='_blank' href='https://git-scm.com/'>GIT</a>. So fret not. Just send an email to <a href="mail:helpdesk@acdp.at">helpdesk@acdp.at</a> if you are lost. And as always: <a target='_blank' href='https://www.youtube.com/watch?v=kkxj5xVLyj0&feature=youtu.be&t=56'>get dressed for success</a>.</p>
           <table id="models" class='ui-table'>
+            <thead>
+              <th></th>
+              <th>Name</th>
+              <th><abbr title='force new instance'>F</abbr></th>
+              <th><abbr title='link to model source'>M</abbr></th>
+              <th>Changed By</th>
+              <th><abbr title='Guarded'>G</abbr></th>
+              <th><abbr title='Resource'>R</abbr></th>
+              <th>Changed At</th>
+              <th><abbr title='Operations'>Op</abbr></th>
+            </thead>
             <template id="up">
               <tr>
                 <td data-class='folder' class="noselect">📁</td>
                 <td data-class='name' data-full-name=''><a href=''></a></td>
                 <td></td>
                 <td></td>
-                <td data-class='creator'></td>
+                <td></td>
+                <td></td>
                 <td></td>
                 <td data-class='date'></td>
                 <td data-class=''></td>
@@ -86,7 +101,8 @@
                 <td data-class='name' data-full-name=''><a href=''></a></td>
                 <td></td>
                 <td></td>
-                <td data-class='creator'></td>
+                <td></td>
+                <td></td>
                 <td></td>
                 <td data-class='date'></td>
                 <td data-class='ops' class="noselect"><span>…</span></td>
@@ -98,8 +114,9 @@
                 <td data-class='name' data-full-name=''><a target='_blank' href=''></a></td>
                 <td data-class='force'>[<a target='_blank' href='' title='force new instance'>F</a>]</td>
                 <td data-class='raw'>[<a target='_blank' href='' title='link to model source'>M</a>]</td>
-                <td data-class='creator'></td>
                 <td data-class='author'></td>
+                <td data-class='guarded'><abbr title=''></abbr></td>
+                <td data-class='resource'></td>
                 <td data-class='date'></td>
                 <td data-class='ops' class="noselect"><span>…</span></td>
               </tr>

data/ui/js/design.js

@@ -84,8 +84,17 @@ function paint(gdir,gstage) {
           $('[data-class=name] a',clone).attr('href','server/' + gdir + data['name'] + '/open?stage=' + gstage);
           $('[data-class=force] a',clone).attr('href','server/' + gdir + data['name'] + '/open-new?stage=' + gstage);
           $('[data-class=raw] a',clone).attr('href','server/' + gdir + data['name']);
+
+          $('[data-class=guarded] abbr',clone).attr('title',data['guarded'] || '');
+          $('[data-class=guarded] abbr',clone).text((data['guarded'] || '').match(/none/i) ? '' : (data['guarded'] || '').charAt(0).toUpperCase());
+          $('[data-class=resource]',clone).text(data['guarded_id'] || '');
+
+          if (data['guarded']) {
+            $('[data-class=guarded] abbr',clone).attr('title',data['guarded']);
+            $('[data-class=guarded] abbr',clone).text(data['guarded'].match(/none/i) ? '' : data['guarded'].charAt(0).toUpperCase());
+            $('[data-class=resource]',clone).text(data['guarded_what']);
+          }
         }
-        $('[data-class=creator]',clone).text(data['creator']);
         $('[data-class=author]',clone).text(data['author']);
         $('[data-class=date]',clone).text(new Date(data['date']).strftime('%Y-%m-%d, %H:%M:%S'));
         $('#models tbody').append(clone);
@@ -94,6 +103,10 @@ function paint(gdir,gstage) {
   });
 }
 
+function change_it(gdir,gstage) {
+  window.location.href = window.location.pathname + '?stage=' + gstage + '&dir=' + gdir;
+}
+
 $(document).ready(function() {
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
@@ -103,9 +116,39 @@ $(document).ready(function() {
 
   es_init(gdir,gstage);
 
+  var shifts = []
+  $.ajax({
+    type: "GET",
+    url: "server/",
+    data: { stages: 'stages' },
+    success: (r) => {
+      shifts = shifts.concat(r);
+      shifts = shifts.filter(item => item !== gstage);
+    }
+  });
+
   $('input[name=stage]').val(gstage);
   $('input[name=dir]').val(gdir);
-  $('ui-behind').text(gstage);
+  $('ui-behind span').text(gstage);
+  $('ui-behind span').click((e) => {
+    if (shifts.length > 0) {
+      var menu = {};
+      menu['Change to'] = [];
+      shifts.forEach(ele => {
+        menu['Change to'].push(
+          {
+            'label': ele,
+            'function_call': change_it,
+            'text_icon': '➔',
+            'type': undefined,
+            'class': 'capitalized',
+            'params': [gdir,ele]
+          }
+        );
+      });
+      new CustomMenu(e).contextmenu(menu);
+    }
+  });
 
   var dragged;
   $('#models').on('drag','td[data-class=model]',false);
@@ -117,7 +160,6 @@ $(document).ready(function() {
     e.preventDefault();
     e.stopPropagation();
     if (dragged) {
-      console.log(dragged);
       var todir = $(e.currentTarget).parents('tr').find('td[data-class=name]').text();
       todir = todir.replace(/\./g,'');
       if (todir != '') {
@@ -127,16 +169,6 @@ $(document).ready(function() {
       dragged = undefined;
     }
   });
-  var shifts = []
-  $.ajax({
-    type: "GET",
-    url: "server/",
-    data: { stages: 'stages' },
-    success: (r) => {
-      shifts = shifts.concat(r);
-      shifts = shifts.filter(item => item !== gstage);
-    }
-  });
   $('#models').on('click','td[data-class=ops]',(e) => {
     var menu = {};
     var name = $(e.currentTarget).parents('tr').find('td[data-class=name]').attr('data-full-name');
@@ -181,7 +213,6 @@ $(document).ready(function() {
         );
       });
     }
-    console.log(shifts);
     new CustomMenu(e).contextmenu(menu);
   });
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -38,6 +38,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: cpee
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.7
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -61,6 +81,7 @@ files:
 - server/testset.xml
 - tools/cpee-moma
 - ui/css/design.css
+- ui/design.js
 - ui/index.html
 - ui/js/design.js
 homepage: http://cpee.org/
@@ -82,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: "(Lifecycle) manage your process models in a directory or git repo."