cpee-instantiation 1.0.16 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d556a9e76088551f9335eb97aa22db0b851198d4d5f58f78035841513a43ac80
-  data.tar.gz: 4d11049fba6354acad20244af8300859c21d293e3d41ba87253628a4d332fff7
+  metadata.gz: 48b61fe23e043cfed4157b397aa1af88953fa552533af459799e5171f30a98fa
+  data.tar.gz: 6b88eecca4869e1b98bab5c3f3d85196817682a1e916abb668f707498b1ea53c
 SHA512:
-  metadata.gz: 697a43f1f77571d08284745129b3645be9050155dcb0abfa88a62755111278cd6a18271bfc27379286ae8f44ba17e7b8954bc260c1593459c567e7641dab05a7
-  data.tar.gz: 9b1e2bc53ed83ea3fd9b6042b710fd1d69ee6676aa5b56716c59bf6507cab432ff2ff0d8bb8206873ca0d5047fbdb3f8ce609cb52942bb454a5b1cde97c89f12
+  metadata.gz: 3e741fd88a4e9409523dc96754ab15d7d1236bc82239f487fce88e4d8d58e6a0ea00928928adb921e291bbf4e7832da1f23d1dc56ba16c0345c1e3d9c5d3966c
+  data.tar.gz: 44e0644281f0dffcd8e143549513563d0cce7d34f481299b0e9ed60050f6a2e4417a39384f63fafc4c9a4e4fffa5cd555e65397a041b239f65144ada56529de2

data/AUTHORS

@@ -1 +1,2 @@
 Jürgen Mangler <juergen.mangler@gmail.com>
+Heinrich Fenkart <hnrch02@gmail.com>

data/README.md

@@ -4,7 +4,7 @@ To install the instatiation service go to the commandline
 
 ```bash
  gem install cpee-instantiation
- cpee-instantiation instantiation
+ cpee-instantiation new instantiation
  cd instantiation
  ./instantiation start
 ```

data/cpee-instantiation.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-instantiation"
-  s.version          = "1.0.16"
+  s.version          = "1.0.21"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Subprocess instantiation service for the cloud process execution engine (cpee.org)"
@@ -15,13 +15,13 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.4.0'
 
-  s.authors          = ['Juergen eTM Mangler']
+  s.authors          = ['Juergen eTM Mangler', 'Heinrich Fenkart']
 
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.99'
+  s.add_runtime_dependency 'riddl', '~> 1.0'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'redis', '~> 4.1'
+  s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
 end

data/lib/cpee-instantiation/instantiation.rb

@@ -38,7 +38,12 @@ module CPEE
               ele.first.text = CPEE::ValueHelper::generate(v)
             else
               ele = tdoc.find("/*/prop:#{what}")
-              ele.first.add(k,CPEE::ValueHelper::generate(v)) if ele.any?
+              ele = if ele.any?
+                ele.first
+              else
+                tdoc.root.add("prop:#{what}")
+              end
+              ele.add(k,CPEE::ValueHelper::generate(v))
             end
           end
         end

data/tools/cpee-instantiation

@@ -26,24 +26,28 @@ end
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
   opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [DIR]\n"
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] new DIR\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[DIR]             scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
+  opt.on(wrap("[new DIR]         scaffolds a sample instantiation service. Post a testset to a model to keep going in one operation."))
   opt.parse!
 }
-if (ARGV.length != 1)
+if (ARGV.length <  2) ||
+   (ARGV.length == 2  && !(%w(new).include?(ARGV[0]))) ||
+   (ARGV.length >  2)
   puts ARGV.options
   exit
-else
-  p1 = ARGV[0]
 end
+command = ARGV[0]
+p1      = ARGV[1]
 
-insta = "#{curpath}/../server/"
-if !File.exist?(p1)
-  FileUtils.cp_r(insta,p1)
-else
-  FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
-  puts 'Directory already exists, updating ...'
+if command == 'new'
+  insta = "#{curpath}/../server/"
+  if !File.exist?(p1)
+    FileUtils.cp_r(insta,p1)
+  else
+    FileUtils.cp_r(Dir.glob(File.join(insta,'*')).delete_if{|e| e =~ /\.conf/ },p1,remove_destination: true)
+    puts 'Directory already exists, updating ...'
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee-instantiation
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.21
 platform: ruby
 authors:
 - Juergen eTM Mangler
+- Heinrich Fenkart
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: cpee
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Subprocess instantiation service for the cloud process execution engine (cpee.org)