workmesh 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41375949fd691423ac3b677de62b756450c29f1992fdf032667de7d10beaf092
-  data.tar.gz: 32c1dbeef3502c7a4fe23dfc555adaa507a48a3e8b14e26cf849215a2e6a964a
+  metadata.gz: 255b5cf5609d4a94c1a6ddeb7ae7a0cdcc448999c25f7d86e0714d4882ae66dc
+  data.tar.gz: ab3bd85f5e3b7c8944c5680a79d3d07be5256b3ce5d36a86abdfe2413d86443c
 SHA512:
-  metadata.gz: d2c231f9d54f104e16a11308e4060c805763973d5d188f58dba6b5d6af87e5db3206e0bb21d105518f2627bef7227d155e1036623a99246deeed4716636b8152
-  data.tar.gz: 2bda3a87ccab98c3d6df49b6ec578c40d69f29bb25b8a4cf2910cd9fb38a00b24cc73d987bf374c0fe81ab3e00d0144f0aa3d6a4ef764fabb8034d6ca129a9d9
+  metadata.gz: 3fd0f3ecac7a857015e3d26670e43e76344ba57569137b198782af8810450d89c214824c0e0f5c7c7548abaaf3753a6ccfef3105edc23888a62f84d34178c73a
+  data.tar.gz: e255c8ce3f9bb80090589f29f551bc509ab50e30a4624f9d258ff046c9f5ea626bd109491dfd4f2f6b093deacadfc5d8857dade51f7e86cc2eac614c0c43203c

data/deployment-routines/update-source.rb

@@ -6,10 +6,15 @@ BlackStack::Deployer::add_routine({
         :command => 'mkdir ~/code;',
         :matches => [ /^$/i, /File exists/i ],
         :sudo => false,
+    }, { 
+        :command => 'mkdir -p ~/code/%workmesh_service%;',
+        :matches => [ /^$/i, /File exists/i ],
+        :sudo => false,
     }, { 
         :command => '
-            cd ~/code; 
-            git clone https://github.com/%git_user%/%workmesh_service%;
+            cd ~/code/%workmesh_service%;
+            rm -r ./*;
+            git clone https://github.com/%workmesh_service% .;
         ',
         :matches => [ 
             /already exists and is not an empty directory/i,

data/lib/workmesh.rb

@@ -2,7 +2,6 @@ require 'colorize'
 require 'sequel'
 require 'blackstack-core'
 require 'blackstack-nodes'
-require 'blackstack-deployer'
 require 'simple_command_line_parser'
 require 'simple_cloud_logging'
 
@@ -76,18 +75,6 @@ module BlackStack
         ret[:workmesh_service] = self.workmesh_service
         ret
       end
-      # run deployment routines
-      def deploy(l=nil)
-        l = BlackStack::DummyLogger.new(nil) if l.nil?
-
-        l.logs 'Updating config.rb... '
-          BlackStack::Deployer::run_routine(self.name, 'workmesh-update-config')
-        l.done
-
-        l.logs 'Updating source... '
-          BlackStack::Deployer::run_routine(self.name, 'workmesh-update-source')
-        l.done
-      end
     end # class Node
 
     class Protocol
@@ -95,7 +82,7 @@ module BlackStack
       attr_accessor :entity_table, :entity_field_id, :entity_field_sort
       attr_accessor :push_function, :entity_field_push_time, :entity_field_push_success, :entity_field_push_error_description
       attr_accessor :pull_status_access_point
-      attr_accessor :pull_function, :enttity_field_pull_time, :entity_field_pull_success, :entity_field_pull_error_description 
+      attr_accessor :pull_function #, :enttity_field_pull_time, :entity_field_pull_success, :entity_field_pull_error_description 
 
       def self.descriptor_errors(h)
         errors = []
@@ -122,14 +109,14 @@ module BlackStack
         errors << "The key :entity_field_push_error_description is missing" if h[:push_function] && h[:entity_field_push_error_description].nil?
 
         # valiudate: if :pull_function exists, the key :pull_status_access_point exists and it is a string
-        errors << "The key :pull_status_access_point is missing" if h[:pull_function] && h[:pull_status_access_point].nil?
-        errors << "The key :pull_status_access_point must be an String" unless h[:pull_function].nil? || h[:pull_status_access_point].is_a?(String)
+        #errors << "The key :pull_status_access_point is missing" if h[:pull_function] && h[:pull_status_access_point].nil?
+        #errors << "The key :pull_status_access_point must be an String" unless h[:pull_function].nil? || h[:pull_status_access_point].is_a?(String)
         # validate: if :pull_function exists, the key :entity_field_pull_time exists and it is a symbol
-        errors << "The key :entity_field_pull_time is missing" if h[:pull_function] && h[:entity_field_pull_time].nil?
+        #errors << "The key :entity_field_pull_time is missing" if h[:pull_function] && h[:entity_field_pull_time].nil?
         # validate: if :pull_function exists, the key :entity_field_pull_success exists and it is a symbol
-        errors << "The key :entity_field_pull_success is missing" if h[:pull_function] && h[:entity_field_pull_success].nil?
+        #errors << "The key :entity_field_pull_success is missing" if h[:pull_function] && h[:entity_field_pull_success].nil?
         # validate: if :pull_function exists, the key :entity_field_pull_error_description exists and it is a symbol
-        errors << "The key :entity_field_pull_error_description is missing" if h[:pull_function] && h[:entity_field_pull_error_description].nil?
+        #errors << "The key :entity_field_pull_error_description is missing" if h[:pull_function] && h[:entity_field_pull_error_description].nil?
 
         # return list of errors
         errors.uniq
@@ -147,9 +134,9 @@ module BlackStack
         self.entity_field_push_success = h[:entity_field_push_success]
         self.entity_field_push_error_description = h[:entity_field_push_error_description]
         self.pull_function = h[:pull_function]
-        self.enttity_field_pull_time = h[:entity_field_pull_time]
-        self.entity_field_pull_success = h[:entity_field_pull_success]
-        self.entity_field_pull_error_description = h[:entity_field_pull_error_description]
+        #self.enttity_field_pull_time = h[:entity_field_pull_time]
+        #self.entity_field_pull_success = h[:entity_field_pull_success]
+        #self.entity_field_pull_error_description = h[:entity_field_pull_error_description]
       end
 
       def to_hash()
@@ -163,18 +150,19 @@ module BlackStack
         ret[:entity_field_push_success] = self.entity_field_push_success
         ret[:entity_field_push_error_description] = self.entity_field_push_error_description
         ret[:pull_function] = self.pull_function
-        ret[:enttity_field_pull_time] = self.enttity_field_pull_time
-        ret[:entity_field_pull_success] = self.entity_field_pull_success
-        ret[:entity_field_pull_error_description] = self.entity_field_pull_error_description
+        #ret[:enttity_field_pull_time] = self.enttity_field_pull_time
+        #ret[:entity_field_pull_success] = self.entity_field_pull_success
+        #ret[:entity_field_pull_error_description] = self.entity_field_pull_error_description
         ret
       end
 
       # execute the push function of this protocol, and update the push flags
-      def push(entity, node)
+      def push(entity, node, l=nil)
+        l = BlackStack::DummyLogger.new(nil) if l.nil?
         raise 'The push function is not defined' if self.push_function.nil?
         entity[entity_field_push_time] = now()
         begin
-          self.push_function.call(entity, node)
+          self.push_function.call(entity, node, l)
           entity[entity_field_push_success] = true
           entity[entity_field_push_error_description] = nil
           entity.save
@@ -184,7 +172,19 @@ module BlackStack
           entity.save
           raise e
         end
-      end
+      end # def push(entity, node, l=nil)
+
+      # execute the pull function of this protocol, and update the push flags
+      def pull(node, l=nil)
+        l = BlackStack::DummyLogger.new(nil) if l.nil?
+        raise 'The pull function is not defined' if self.pull_function.nil?
+        begin
+          self.pull_function.call(node, l)
+        rescue => e
+          raise e
+        end
+      end # def pull(node, l=nil)
+
     end # class Protocol
 
     # stub worker class
@@ -209,7 +209,8 @@ module BlackStack
         if h[:protocols].is_a?(Array)
           h[:protocols].each do |protocol|
             errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class" unless protocol.is_a?(Hash)
-            errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class" unless Protocol.descriptor_errors(protocol).length == 0
+            z = Protocol.descriptor_errors(protocol)
+            errors << "The key :protocols must be an Array of valid hash descritors of the Protocol class (errors: #{z.join('. ')})" unless z.length == 0
           end
         end
         # validate: the key :assignation is nil or it is a symbol belonging the array ASSIGANTIONS
@@ -223,7 +224,7 @@ module BlackStack
       # setup dispatcher configuration here
       def initialize(h)
         errors = BlackStack::Workmesh::Service.descriptor_errors(h)
-        raise "The worker descriptor is not valid: #{errors.uniq.join(".\n")}" if errors.length > 0
+        raise "The service descriptor is not valid: #{errors.uniq.join(".\n")}" if errors.length > 0
         self.name = h[:name]
         self.entity_table = h[:entity_table]
         self.entity_field_assignation = h[:entity_field_assignation]
@@ -299,8 +300,6 @@ module BlackStack
     # add a node to the infrastructure
     def self.add_node(h)
       @@nodes << BlackStack::Workmesh::Node.new(h)
-      # add to deployer
-      BlackStack::Deployer.add_node(h) #if @@integrate_with_blackstack_deployer
     end
 
     def self.nodes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workmesh
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-28 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -70,26 +70,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.11
-- !ruby/object:Gem::Dependency
-  name: blackstack-deployer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.24
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.24
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.24
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.24
 - !ruby/object:Gem::Dependency
   name: simple_command_line_parser
   requirement: !ruby/object:Gem::Requirement