cpee-model-management 1.1.1 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/cpee-model-management.gemspec +1 -1
  3. data/lib/cpee-model-management/implementation.rb +1 -1
  4. data/tools/cpee-moma +6 -7
  5. data/ui/favicon.ico +0 -0
  6. data/ui/index.html +3 -2
  7. data/ui/instances.html +2 -1
  8. data/ui/instances_view.html +2 -1
  9. data/ui/resources.html +2 -1
  10. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6fc783f8350eac7d65fbda35f275d4ea319878f2265e5d3e02eaf234eb0d4fd1
4
- data.tar.gz: c16ceedc6068a9d0114ddc5456625f55a8a7072770d2e3af28479198a988282c
3
+ metadata.gz: 916a9427ac9b715a51bf13d05bbe54960e4f88d2116fdb45f178b52619d4568b
4
+ data.tar.gz: 950a1a9b758481af6694088939f75aa3eb2f32995af21173277d3521fb04ecdc
5
5
  SHA512:
6
- metadata.gz: 12fe97b8aa17301c3863fb983d0527efae7aacecfb313d5963a0a0d19aa30d73c00ff2b85275a1a0d50a48010d4185df3ff7fd9c4eae15c467ee230b8cc35154
7
- data.tar.gz: 3a657a24d96ebde89e77378f35aed645e3548148c5c33ba28b064362030c5f9b35394e7704cf64b818d5d85b083ab0da84790575f1e8e601d25ae2e6ed0967d2
6
+ metadata.gz: f92fd3bc3ccad9f06114d4f68885373a5aca274d8465082c96989a7dc4ab25fe956c574449f629978f753de35a68894762ac05d6bc3765f6acc8f7a09b3db91e
7
+ data.tar.gz: a74fb8111ad4f1e501eca54d400e3dc5b62479214fc0d59030fcedcd844e02cf34be659e0ef469447a4400aa7eb90331a87abfa213970487e48ad01d86e87907
data/cpee-model-management.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee-model-management"
3
- s.version = "1.1.1"
3
+ s.version = "1.1.3"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  s.summary = "(Lifecycle) manage your process models in a directory or git repo."
data/lib/cpee-model-management/implementation.rb CHANGED
@@ -493,7 +493,7 @@ module CPEE
493
493
  nil
494
494
  end
495
495
  end
496
- rescue
496
+ rescue => e
497
497
  retry
498
498
  end
499
499
 
data/tools/cpee-moma CHANGED
@@ -193,10 +193,12 @@ elsif command == 'consistent'
193
193
  redis.lrange(instances,0,-1).each do |i|
194
194
  prefix = File.join(engine,i.to_s)
195
195
  url = redis.get(File.join(prefix,'instance-url'))
196
- res = Typhoeus.get(url, :followlocation => true)
197
- if res.success?
198
- oldstate = redis.get(File.join(prefix,'state'))
199
- case oldstate
196
+ res = Typhoeus.get(File.join(url,'properties','state'), :followlocation => true)
197
+ parent = redis.get(File.join(prefix,'parent'))
198
+ oldstate = redis.get(File.join(prefix,'state'))
199
+ children = redis.lrange(File.join(prefix,'children'),0,-1)
200
+ if res.success? && res.response_body != 'finished' && res.response_body != 'abandoned'
201
+ case res.response_body
200
202
  when 'ready'
201
203
  s_ready += 1
202
204
  when 'running'
@@ -205,9 +207,6 @@ elsif command == 'consistent'
205
207
  s_stopped += 1
206
208
  end
207
209
  else
208
- parent = redis.get(File.join(prefix,'parent'))
209
- oldstate = redis.get(File.join(prefix,'state'))
210
- children = redis.lrange(File.join(prefix,'children'),0,-1)
211
210
  redis.multi do |multi|
212
211
  multi.decr(File.join(engine,oldstate)) rescue nil
213
212
  multi.incr(File.join(engine,'total_abandoned'))
data/ui/favicon.ico ADDED
Binary file
data/ui/index.html CHANGED
@@ -20,7 +20,8 @@
20
20
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
21
21
  <head>
22
22
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
23
- <title>Design</title>
23
+ <title>Process Hub</title>
24
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
24
25
 
25
26
  <!-- libs, do not modify. When local than load local libs. -->
26
27
  <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
@@ -72,7 +73,7 @@
72
73
  </ui-tabbar>
73
74
  <ui-content class="noselect">
74
75
  <ui-area data-belongs-to-tab="models">
75
- <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>
76
+ <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@cpee.org">helpdesk@cpee.org</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>
76
77
  <table id="models" class='ui-table'>
77
78
  <thead>
78
79
  <th></th>
data/ui/instances.html CHANGED
@@ -20,7 +20,8 @@
20
20
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
21
21
  <head>
22
22
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
23
- <title>Instances</title>
23
+ <title>Process Hub Instances</title>
24
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
24
25
 
25
26
  <!-- libs, do not modify. When local than load local libs. -->
26
27
  <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
data/ui/instances_view.html CHANGED
@@ -20,7 +20,8 @@
20
20
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
21
21
  <head>
22
22
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
23
- <title>Instances</title>
23
+ <title>Process Hub Instances</title>
24
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
24
25
 
25
26
  <!-- libs, do not modify. When local than load local libs. -->
26
27
  <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
data/ui/resources.html CHANGED
@@ -20,7 +20,8 @@
20
20
  <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
21
21
  <head>
22
22
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
23
- <title>Resources</title>
23
+ <title>Process Hub Resources</title>
24
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
24
25
 
25
26
  <!-- libs, do not modify. When local than load local libs. -->
26
27
  <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee-model-management
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
8
8
  autorequire:
9
9
  bindir: tools
10
10
  cert_chain: []
11
- date: 2022-06-22 00:00:00.000000000 Z
11
+ date: 2023-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: riddl
@@ -84,6 +84,7 @@ files:
84
84
  - ui/css/design.css
85
85
  - ui/css/stats.css
86
86
  - ui/css/stats_standalone.css
87
+ - ui/favicon.ico
87
88
  - ui/index.html
88
89
  - ui/instances.html
89
90
  - ui/instances_view.html
@@ -109,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
109
110
  - !ruby/object:Gem::Version
110
111
  version: '0'
111
112
  requirements: []
112
- rubygems_version: 3.3.7
113
+ rubygems_version: 3.3.26
113
114
  signing_key:
114
115
  specification_version: 4
115
116
  summary: "(Lifecycle) manage your process models in a directory or git repo."