cpee 2.1.103 → 2.1.104

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89afb8a2610ae012039da0f247086f5512de982659d2b1c71321add823a28235
-  data.tar.gz: deb4fb653b1ca9323d017c2777d5206765d5334b318383331388e1eee54f6bd0
+  metadata.gz: 8f641a0e013ea34d5fcde9985698e424b88fc1083da2fa409a7ff49961e6ee7d
+  data.tar.gz: 49b128e338257b1929c5bf7898479702542ee2612fc25aa447692480a1a72796
 SHA512:
-  metadata.gz: fe1c1382d75a729659f646dae9c0de4a2a8296578f16e64d964ee0813a33cefb8964e823a306138a4f4473b70f0f81043c28a036f18d6dc2fdc21a7089591975
-  data.tar.gz: 7b9cb494d6b622fa1d4f3e56c2aba7190803188a83bfb75468d292d05055d449deb6de0ea8e2906a036d9f8eb50a8276966df6004e338da1510e2d8884b2e4be
+  metadata.gz: 26e968160d080857bf4931dec48692c9dc049ee5c30eb72a9c555cc7eaae7cd9d72cb84a50284a75fcdb028dfe4b5634d1d7c5214a08d880b0ef31a47bf2a20a
+  data.tar.gz: dc955cbfec7ac4d81a6528dd31c15eced6c07d34044551a8bcd3f0e8cce4e6289aaefd11928b7011e55789f06b9705aca8248f03c005179a0a43120c98805aa7

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.103"
+  s.version          = "2.1.104"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/lib/cpee/constants.rb

@@ -0,0 +1,18 @@
+# This file is part of CPEE.
+#
+# CPEE is free software: you can redistribute it and/or modify it under the terms
+# of the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+#
+# CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# CPEE (file COPYING in the main directory).  If not, see
+# <http://www.gnu.org/licenses/>.
+
+module CPEE
+  LIBPATH = __dir__
+  GLOBAL_EXECUTIONHANDLERS = File.expand_path(File.join(__dir__,'..','..','server','executionhandlers'))
+end

data/lib/cpee/implementation.rb

@@ -24,6 +24,7 @@ require_relative 'statemachine'
 require_relative 'implementation_properties'
 require_relative 'implementation_notifications'
 require_relative 'implementation_callbacks'
+require_relative 'constants'
 
 module CPEE
 
@@ -94,6 +95,9 @@ module CPEE
     opts[:libs_preloader]             ||= '~/bin/by-server'
     opts[:libs_preloaderrun]          ||= '~/bin/by'
 
+    ### for remote deployment (attribute remote)
+    opts[:ssh_key]                    ||= '~/.ssh/dist.key'
+
     CPEE::redis_connect opts, 'Server Main'
 
     ### start by server

data/server/executionhandlers/ruby/backend/run.rb

@@ -1,22 +1,18 @@
+require 'cpee/constants'
 require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'
 opts[:pid] = Process.pid
 
-global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
-controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
-if File.exist? global_controller
-  require global_controller
-elsif File.exist? controller
-  require controller
-end
-
-global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
-connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
-if File.exist? global_connectionhandler
-  require global_connectionhandler
-elsif File.exist? connectionhandler
-  require connectionhandler
+opts[:global_executionhandlers] = CPEE::GLOBAL_EXECUTIONHANDLERS unless opts[:global_executionhandlers]
+['controller.rb','connection.rb'].each do |f|
+  global_thing = File.join(opts[:global_executionhandlers],opts[:executionhandler],f)
+  thing        = File.join(opts[:executionhandlers],       opts[:executionhandler],f)
+  if File.exist? global_thing
+    require global_thing
+  elsif File.exist? thing
+    require thing
+  end
 end
 
 require_relative 'instance'

data/server/executionhandlers/ruby/execution.rb

@@ -12,6 +12,9 @@
 # CPEE (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
 
+require 'net/ssh'
+require 'net/scp'
+
 module CPEE
 
   module ExecutionHandler
@@ -29,13 +32,14 @@ module CPEE
       end
 
       def self::prepare(id,opts) # write result to disk
+        FileUtils.rm_rf(Dir.glob(File.join(opts[:instances],id.to_s,'*')) + Dir.glob(File.join(opts[:instances],id.to_s,'.remote')))
         Dir.mkdir(File.join(opts[:instances],id.to_s)) rescue nil
         FileUtils.copy(ExecutionHandler::Ruby::BACKEND_RUN,File.join(opts[:instances],id.to_s))
         dsl = CPEE::Persistence::extract_item(id,opts,'dsl')
         hw = CPEE::Persistence::extract_item(id,opts,'executionhandler')
         endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
         dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
-        attributes = CPEE::Persistence::extract_list(id,opts,'attributes')
+        attributes = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
         positions = CPEE::Persistence::extract_set(id,opts,'positions')
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
@@ -46,9 +50,14 @@ module CPEE
         iopts[:redis_url] = opts[:redis_url]
         iopts[:redis_db] = opts[:redis_db]
         iopts[:workers] = opts[:workers]
-        iopts[:global_executionhandlers] = opts[:global_executionhandlers]
-        iopts[:executionhandlers] = opts[:executionhandlers]
         iopts[:executionhandler] = hw
+        if attributes.has_key?('remote')
+          uri = URI::parse(attributes['remote'])
+          iopts[:executionhandlers] = File.join(uri.path,File.basename(opts[:executionhandlers]))
+        else
+          iopts[:executionhandlers] = opts[:executionhandlers]
+          iopts[:global_executionhandlers] = opts[:global_executionhandlers]
+        end
 
         File.open(File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_OPTS)),'w') do |f|
           YAML::dump(iopts,f)
@@ -56,10 +65,14 @@ module CPEE
         template = ERB.new(File.read(ExecutionHandler::Ruby::BACKEND_TEMPLATE), trim_mode: '-')
         res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
         File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_INSTANCE),res)
-        # if attributes['remote']
-        #   ### scp instance files to the remote server under run (under instance id)
-        #   ### touch local .remote with connection details
-        # end
+        if attributes.has_key?('remote')
+          uri = URI::parse(attributes['remote'])
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            ssh.exec!("rm -rf #{File.join(uri.path,id.to_s,'*')}")
+            ssh.scp.upload!(File.join(opts[:instances],id.to_s),uri.path,:recursive=>true)
+          end
+          File.write(File.join(opts[:instances],id.to_s,'.remote'),attributes['remote'])
+        end
       end
 
       def self::run(id,opts)

data/server/routing/end.pid

@@ -1 +1 @@
-383733
+577032

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-383775
+577074

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-383761
+577060

data/server/routing/persist.pid

@@ -1 +1 @@
-383747
+577046

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.103
+  version: 2.1.104
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -986,6 +986,7 @@ files:
 - lib/callbacks/callbacks.rng
 - lib/cpee.xml
 - lib/cpee/attributes_helper.rb
+- lib/cpee/constants.rb
 - lib/cpee/fail.rb
 - lib/cpee/implementation.rb
 - lib/cpee/implementation_callbacks.rb