cpee-instantiation 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da02ad96d0a1feb31755f5217286eed93f5f1beabe3f535a7d749ab55eb8cb3
-  data.tar.gz: 6b9b6f3ad0f463f050a81759f0685eea7ac69d57f282ec8c9b1f83a0a5bce17f
+  metadata.gz: a8179be00caf9485a82cc72f3180439fa8db27a45ee8ff58b7e642534e7397aa
+  data.tar.gz: 1d9b5a792f4a95a35c5368c78ba03134ed84a751e873c10751771297998aaf2a
 SHA512:
-  metadata.gz: 48cfa7f1a307aabe48cfa73b08d0e9a0d79dc989ecaf30a2d4c871dffe6fcdfd6bb4563bec9da70d2c44c07efe248fe6f2d2a450c96eae47f0d89a791c9852b3
-  data.tar.gz: 885d19ca953bd56e72cf43ea2fe27ea98f3575a0689dc37293b9f0348111d2735a91fbc909f98d541030308eea4278d631667e24b966baa569000e85fad43af0
+  metadata.gz: 852d8a607287b4dfd197c45386ebc9d83bdead3428e454736341586a7166088ac12044000714e91f181c286d8d282c86908b089e9a8a047a2be580f071a29616
+  data.tar.gz: 60982f32ca0a4ebef7628de4b8f444022071ae437b8494e6bef310c6e2bf7a1c70fe65fb527fe1ce444a7e40e67228b6440c89f5c9da58d7a62fc083253fa87e

data/README.md

@@ -7,9 +7,9 @@ To install the instatiation service go to the commandline
  cpee-instantiation instantiation
  cd instantiation
  ./instantiation start
-``` 
+```
 
- The service is running under port 9296. If this port has to be changed (or the
+The service is running under port 9296. If this port has to be changed (or the
 host, or local-only access, ...), create a file instatiation.conf and add one
 or many of the following yaml keys:
 
@@ -28,7 +28,7 @@ To use the service try one of the following:
  curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -d "behavior=wait_running&url=http%3A%2F%2Flink%2Fto%2Ftestset.xml" http://localhost:9296/url
  curl -X POST -H "Content-Type: application/x-www-form-urlencoded" -d "behavior=fork_running&url=http%3A%2F%2Flink%2Fto%2Ftestset.xml&init=%7B%20%22a%22%3A%2037%2C%20%22b%22%3A%20%22test%22%20%7D" http://localhost:9296/url
  curl -X POST -F "behavior=wait_running" -F "xml=@testset.xml" http://localhost:9296/xml
-``` 
+```
 
 The behavior can be either: the process parent process is waiting (wait_) or is
 running in parallel (fork_), the subprocesss is either immediately starting

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0"
+  s.version          = "1.0.1"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"

data/lib/cpee-instantiation/instantiation.rb

@@ -37,7 +37,7 @@ module CPEE
           doc.register_namespace 'desc', 'http://cpee.org/ns/description/1.0'
           doc.register_namespace 'prop', 'http://cpee.org/ns/properties/2.0'
 
-          srv = Riddl::Client.new(cpee, cpee + '?riddl-description')
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource('/')
           if name
             doc.find('/*/prop:attributes/prop:info').each do |e|
@@ -101,7 +101,7 @@ module CPEE
 
           if cb
             cbk = SecureRandom.uuid
-            srv = Riddl::Client.new(cpee, cpee + '?riddl-description')
+            srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
             status, response = srv.resource("/#{instance}/notifications/subscriptions/").post [
               Riddl::Parameter::Simple.new('url',File.join(selfurl,'callback',cbk)),
               Riddl::Parameter::Simple.new('topic','state'),
@@ -118,7 +118,7 @@ module CPEE
       private :handle_waiting
       def handle_starting(cpee,instance,behavior) #{{{
         if behavior =~ /_running$/
-          srv = Riddl::Client.new(cpee, cpee + '?riddl-description')
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/state")
           status, response = res.put [
             Riddl::Parameter::Simple.new('value','running')
@@ -132,7 +132,7 @@ module CPEE
           JSON::parse(data).each do |k,v|
             content.root.add(k,v)
           end
-          srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/dataelements/")
           status, response = res.patch [
             Riddl::Parameter::Complex.new('dataelements','text/xml',content.to_s)
@@ -145,7 +145,7 @@ module CPEE
           JSON::parse(data).each do |k,v|
             content.root.add(k,v)
           end
-          srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/endpoints/")
           status, response = res.patch [
             Riddl::Parameter::Complex.new('endpoints','text/xml',content.to_s)
@@ -271,7 +271,7 @@ module CPEE
         cblist   = @a[2]
         instance = @p[1].value
 
-        srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+        srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
         res = srv.resource("/#{instance}/properties/attributes/uuid")
         status, response = res.get
 
@@ -310,7 +310,7 @@ module CPEE
 
         if notification['content']['state'] == condition
           cblist.del(key)
-          srv = Riddl::Client.new(cpee, cpee + "?riddl-description")
+          srv = Riddl::Client.new(cpee, File.join(cpee,'?riddl-description'))
           res = srv.resource("/#{instance}/properties/dataelements")
           status, response = res.get
           if status >= 200 && status < 300

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl