cpee-model-management 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 504bfe76b398c792c308759dca4d15f4ff0f52bf2186649c624509d02747a8e7
-  data.tar.gz: 42be25ce8177501439234d6c005a5ef7bc316fb367aca7d19e81c3beadfc2493
+  metadata.gz: ff58402244bdf7eadbd79cebb7c4ef42f302b45354da3bc1634bd866ba273eec
+  data.tar.gz: 3dc2729da1856011a97a42c487117fe2cc7f4e6587e6e54934559bccc68b7148
 SHA512:
-  metadata.gz: 8bd35e768b95189b892e53dcecd2b1ec5d379d63f64e7e3b92e0964d5f3eb8cb4f5594d2c0030afa65b7983abf22f348484c9240347b346a4ddc90000a228390
-  data.tar.gz: 74dc53bb8bba14ec0be5c7836dd72f91caac5961c0b9f3dd5e6c6be6eba7261c97a73435027b3bdc43880892ff0093c3c57556dc2b56167107f60d417552fad1
+  metadata.gz: 130154f25420d1901fa5dd8e83f15e2eecb6609660d7fd2e30f43e202b7a1a25fbc02e408bcf0575e5d4de6dffad5cdd2561926a4824a6127b9a72c2854e0267
+  data.tar.gz: 6be4a1c311486e3364ce6e96192ca4b654e625ae102204150b34989384ba617abe5b7ba77c40b9f59233f61dfa7185c3d88917dd685629cbd1355c2b87bc62b3

data/cpee-model-management.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.4"
+  s.version          = "1.0.9"
   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/commit.rb

@@ -4,11 +4,11 @@ author = ARGV[2]
 
 Dir.chdir(File.join(models,File.dirname(new)))
 new = File.basename(new)
-`git add "#{new}"             2>/dev/null`
-`git add "#{new}.active"      2>/dev/null`
-`git add "#{new}.active-uuid" 2>/dev/null`
-`git add "#{new}.author"      2>/dev/null`
-`git add "#{new}.creator"     2>/dev/null`
-`git add "#{new}.stage"       2>/dev/null`
-`git commit -m "#{author.gsub(/"/,"'")}"`
-`git push` rescue nil
+`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 commit -m "#{author.gsub(/"/,"'")}"`
+`GIT_TERMINAL_PROMPT=0 git push` rescue nil

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

@@ -23,6 +23,7 @@ require 'riddl/client'
 require 'riddl/protocols/utils'
 require 'fileutils'
 require 'pathname'
+require 'shellwords'
 
 module CPEE
   module ModelManagement
@@ -34,46 +35,49 @@ 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 mv     "#{old}"                      "#{new}"              2>/dev/null`
-      `git rm -rf "#{old + '.active'}"                                2>/dev/null`
-      `git rm -rf "#{old + '.active-uuid'}"                           2>/dev/null`
-      `git mv     "#{old + '.author'}"          "#{new + '.author'}"  2>/dev/null`
-      `git mv     "#{old + '.creator'}"         "#{new + '.creator'}" 2>/dev/null`
-      `git 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 rm -rf "#{new}" 2>/dev/null`
-       FileUtils.rm_rf(new)
-      `git rm -rf "#{new}.active"      2>/dev/null`
-      `git rm -rf "#{new}.active-uuid" 2>/dev/null`
-      `git rm -rf "#{new}.author"      2>/dev/null`
-      `git rm -rf "#{new}.creator"     2>/dev/null`
-      `git 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 rm -rf "#{new}.active"      2>/dev/null`
-      `git 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)
-      Process.fork do
-        exec 'ruby', File.join(__dir__,'commit.rb'), File.realpath(models), new, author
-      end
+      rp = File.realpath(models)
+      crb = File.join(__dir__,'commit.rb')
+      system 'ruby ' + crb + ' ' + [rp, new, author].shelljoin + ' &'
     end
     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
@@ -103,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)
@@ -186,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))
@@ -203,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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 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