cpee-model-management 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb70d01ebeeb6576722a378ec65514aa3118432737caf27d979c54ac3f4d73e
-  data.tar.gz: a69e9dc695583d226724283e2364c03a51978d488c8f718cb088708ec29468e8
+  metadata.gz: e0dba813806b528c9a04f3852938e621b74e736f813c73796ac05560ed47975e
+  data.tar.gz: 066f46470ecd3f580f742bba5596e20f8737f3c3e0c02d3cedf4b1470461b3af
 SHA512:
-  metadata.gz: 00aa163e4d9be3bc7e55d37116e33c4e99f47e3d8dad2a570d24648993c1a5016f79385c5fdbdf3cbd62783023441a93d073f3be40ebef2da75bdbd058b43917
-  data.tar.gz: 8ae2de3be4e438df6d5e0f99223d25bab844fc2663b79c42f465bada4bd9916eec111258eed21a2fda6e6c61db19d3b742f9087cb67cffcc230bb4d7c2073a45
+  metadata.gz: 9da118eb3836c211aa4ddafff4c5bc8c066f5ad059b80ae03c6b0d2913216836cdef391327378153e90285c48cc6fcca998a3e4e1f77f33701d7ec5e45c1c866
+  data.tar.gz: 9a0a983fb62d4b30c06eaf054661fdb98fe450f359ab26536619df6e0e0a174833c257b1ca544c521f6c6d29ba6af53f6a2599540295454f45f8f3ff3253b4ba

data/cpee-model-management.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.0.2"
+  s.version          = "1.0.7"
   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

@@ -0,0 +1,14 @@
+models = ARGV[0]
+new = ARGV[1]
+author = ARGV[2]
+
+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 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
@@ -36,39 +37,39 @@ module CPEE
       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'}"      "#{new + '.active'}" 2>/dev/null`
-      `git rm -rf "#{old + '.active-uuid'}" "#{new + '.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`
+      `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`
       Dir.chdir(cdir)
     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`
+      `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 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`
+      `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`
       Dir.chdir(cdir)
     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`
+      `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`
       Dir.chdir(cdir)
     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)
@@ -186,14 +187,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 +205,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))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -51,16 +51,11 @@ files:
 - README.md
 - Rakefile
 - cpee-model-management.gemspec
+- lib/cpee-model-management/commit.rb
 - lib/cpee-model-management/implementation.rb
 - 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