cpee-model-management 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684d2a9f94f7110a2f207e688a2ef7a8da53bba2848effdf4086e4c5a4dd4f80
-  data.tar.gz: 329fbd356f4dd5e1fb8e096cbfd5663cc9b7649047392fa02adf92b4488b74da
+  metadata.gz: 4430fd225a84ddf6d4023c904490a86c25297a0843bd033a88e78007fb9df8bc
+  data.tar.gz: 193403968732591b1dc2274f6106041efecc8da3440efe50540fc175031ac7df
 SHA512:
-  metadata.gz: '08595da884d0f3dd930163bee205f473c8bb4542b3e6f7751b29c8aa6ef62544ea5c2336d301b965f90dbb02da90d7a7956a8ae4e4fd0a15692bbd0b382b9445'
-  data.tar.gz: f4965adaaa306efd9800b2fffe972f139bd52259056e54d4b068bd20577351ffee6ed31b743c6a32732466e6b7cb7f48dbf2c7a637e00d2a473a93ebf145460f
+  metadata.gz: 86d21dfba406d9f4a4ad52d1b05de835cb58ee21c1779901057e3f0e637c42bbf7d6bf862ba96db1d0246c6ebfc2cc24199af3469d4eacb3c59f6e6a00847dcb
+  data.tar.gz: 52b53c7da24cbcd8ebc45bfce9860763befbaa62b5a130ddc350e32380b0b0d7b11d8e698a30751699770bb1bf86890ea94bf60f46a57799e055718cda1aa8fb

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.1.2"
+  s.version          = "1.1.4"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

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

@@ -272,7 +272,7 @@ module CPEE
         fnname = File.join(models,where,nname + '.xml')
         counter = 0
         stage = 'draft'
-        while File.exists?(fnname)
+        while File.exist?(fnname)
           counter += 1
           fnname = File.join(models,where,nname + counter.to_s + '.xml')
         end
@@ -309,7 +309,7 @@ module CPEE
         fname  = File.join(models,name + '.dir')
         fnname = File.join(models,nname + '.dir')
         counter = 0
-        while File.exists?(fnname)
+        while File.exist?(fnname)
           counter += 1
           fnname = File.join(models,nname + counter.to_s + '.dir')
         end
@@ -348,7 +348,7 @@ module CPEE
 
         fname = File.join(models,name + '.dir')
         counter = 0
-        while File.exists?(fname)
+        while File.exist?(fname)
           counter += 1
           fname = File.join(models,name + counter.to_s + '.dir')
         end
@@ -391,7 +391,7 @@ module CPEE
         stage = views[stage] if views && views[stage]
 
         counter = 0
-        while File.exists?(fname)
+        while File.exist?(fname)
           counter += 1
           fname = File.join(models,where,name + counter.to_s + '.xml')
         end
@@ -440,7 +440,7 @@ module CPEE
         models = @a[1]
         name   = File.basename(@r[-1],'.xml')
         fname = File.join(models,where,name + '.xml')
-        if File.exists? fname
+        if File.exist? fname
           Riddl::Parameter::Complex.new('content','application/xml',File.read(fname))
         else
           @status = 400
@@ -462,7 +462,7 @@ module CPEE
 
         inst = nil
         begin
-          inst = if File.exists?(fname + '.active') && File.exists?(fname + '.active-uuid') && !force
+          inst = if File.exist?(fname + '.active') && File.exist?(fname + '.active-uuid') && !force
             t = {
               'CPEE-INSTANCE-URL'  => File.read(fname + '.active'),
               'CPEE-INSTANCE-UUID' => File.read(fname + '.active-uuid')
@@ -569,7 +569,7 @@ module CPEE
 
         fname = File.join(models,where,name + '.xml')
 
-        if File.exists?(fname)
+        if File.exist?(fname)
           author = dn['GN'] + ' ' + dn['SN']
           attrs = {}
           XML::Smart.string(cont) do |doc|

data/tools/cpee-moma

@@ -80,7 +80,7 @@ p2      = ARGV[2]
 ui       = "#{curpath}/../ui/"
 
 if command == 'cpui'
-    if !File.exists?(p1)
+    if !File.exist?(p1)
       FileUtils.cp_r(ui,p1)
     else
       FileUtils.cp_r(Dir.glob(File.join(ui,'*')),p1,remove_destination: true)
@@ -178,8 +178,8 @@ elsif command == 'convert'
   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')
+    attrs['creator'] = File.read(f + '.creator') if File.exist?(f + '.creator')
+    attrs['author'] = File.read(f + '.author') if File.exist?(f + '.author')
     File.write(f + '.attrs',JSON::pretty_generate(attrs))
 
     File.unlink(f + '.creator') rescue nil
@@ -193,10 +193,12 @@ elsif command == 'consistent'
     redis.lrange(instances,0,-1).each do |i|
       prefix = File.join(engine,i.to_s)
       url = redis.get(File.join(prefix,'instance-url'))
-      res = Typhoeus.get(url, :followlocation => true)
-      if res.success?
-        oldstate = redis.get(File.join(prefix,'state'))
-        case oldstate
+      res = Typhoeus.get(File.join(url,'properties','state'), :followlocation => true)
+      parent = redis.get(File.join(prefix,'parent'))
+      oldstate = redis.get(File.join(prefix,'state'))
+      children = redis.lrange(File.join(prefix,'children'),0,-1)
+      if res.success? && res.response_body != 'finished' && res.response_body != 'abandoned'
+        case res.response_body
           when 'ready'
             s_ready += 1
           when 'running'
@@ -205,9 +207,6 @@ elsif command == 'consistent'
             s_stopped += 1
         end
       else
-        parent = redis.get(File.join(prefix,'parent'))
-        oldstate = redis.get(File.join(prefix,'state'))
-        children = redis.lrange(File.join(prefix,'children'),0,-1)
         redis.multi do |multi|
           multi.decr(File.join(engine,oldstate)) rescue nil
           multi.incr(File.join(engine,'total_abandoned'))
@@ -242,12 +241,12 @@ elsif command == 'consistent'
     end
   end
 elsif command == 'new'
-  if !File.exists?(p1)
+  if !File.exist?(p1)
     FileUtils.mkdir(File.join(p1)) rescue nil
-    FileUtils.cp_r("#{curpath}/../server/moma",p1) unless File.exists?(File.join('p1','moma'))
-    FileUtils.cp_r("#{curpath}/../server/moma.conf",p1) unless File.exists?(File.join('p1','moma.conf'))
-    FileUtils.cp_r("#{curpath}/../server/testset.xml",p1) unless File.exists?(File.join('p1','testset.xml'))
-    FileUtils.cp_r("#{curpath}/../server/model.xml",p1) unless File.exists?(File.join('p1','model.xml'))
+    FileUtils.cp_r("#{curpath}/../server/moma",p1) unless File.exist?(File.join('p1','moma'))
+    FileUtils.cp_r("#{curpath}/../server/moma.conf",p1) unless File.exist?(File.join('p1','moma.conf'))
+    FileUtils.cp_r("#{curpath}/../server/testset.xml",p1) unless File.exist?(File.join('p1','testset.xml'))
+    FileUtils.cp_r("#{curpath}/../server/model.xml",p1) unless File.exist?(File.join('p1','model.xml'))
     FileUtils.mkdir(File.join(p1,'models')) rescue nil
   else
     puts 'Directory already exists.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: "(Lifecycle) manage your process models in a directory or git repo."