pampa 2.0.8 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb720f9cd75fa6fc476e465d48e1222a1066e07ab361d7eacc69d67c3c130f83
-  data.tar.gz: afa28eaccc192fe352b7356224e69cff0266f3c1eeae5fef28f1921a7963ca07
+  metadata.gz: 12b10c740765e17db6cac653a32a366138ecbe993d9eff0cced1cef9a0a12bbd
+  data.tar.gz: 38230377115a54b5e429f31f82677283e2f5db6e0dbc46f723a8c5ceccf2aac6
 SHA512:
-  metadata.gz: c42bed41e80885cf36078211abe5304f9b9dbffac43defadfad55fe9fe5f30a02b53b38dbc194d10e3528710443e75d0ca09d45335abecfacc7e51e3b16369fe
-  data.tar.gz: 7d720e7f7392867208719906f04d286f99e16c3df1ce3fc2b57e4b6e9281684c3ab81b3ff420adcab9306e0b102077d88c8559f94c758c85f25c3b149cd112d2
+  metadata.gz: 7e7b63204f3c0015edfa356a1449df5b1b815f5433935301320c8737f54c6e33de179895f7eb4103b9ea3a7102c2daab2419fb253db5ab3a7e7fc7d5c9756da9
+  data.tar.gz: c0d8589ed8da6ede820ff70c718b28f8c7162f15eceaea279f0ddeb97defbeb66e5c44d06c52ed6fc51e830f284f3c7c4b6a45f6719f83a8e7450ea9452adcf5

data/lib/pampa.rb

@@ -1,12 +1,14 @@
 require 'sequel'
 require 'blackstack-core'
 require 'blackstack-nodes'
-#require 'blackstack-deployer'
+require 'blackstack-deployer'
 require 'simple_command_line_parser'
 require 'simple_cloud_logging'
 
 module BlackStack
     module Pampa
+        # activate this flag if you want to add pampa nodes to blackstack-deployer.
+        @@integrate_with_blackstack_deployer = false 
         # arrays of workers, nodes, and jobs.
         @@nodes = []
         @@jobs = []
@@ -31,6 +33,15 @@ module BlackStack
           @@logger = l
         end
 
+        # @@integrate_with_blackstack_deployer
+        def self.integrate_with_blackstack_deployer()
+            @@integrate_with_blackstack_deployer
+        end
+
+        def self.set_integrate_with_blackstack_deployer(b)
+            @@integrate_with_blackstack_deployer = b
+        end
+
         # return the log filename.
         def self.log_filename()
             @@log_filename
@@ -49,6 +60,8 @@ module BlackStack
         # add a node to the cluster.
         def self.add_node(h)
             @@nodes << BlackStack::Pampa::Node.new(h)
+            # add to deployer
+            BlackStack::Deployer.add_node(h) if @@integrate_with_blackstack_deployer
         end # def self.add_node(h)
 
         # add an array of nodes to the cluster.
@@ -355,7 +368,7 @@ module BlackStack
         # run the number of workers specified in the configuration of the Pampa module.
         # return an array with the IDs of the workers.
         # 
-        def self.start()
+        def self.start(config_filename='~/pampa/config.rb', worker_filename='~/pampa/worker.rb')
           # validate: the connection string is not nil
           raise "The connection string is nil" if @@connection_string.nil?
           # validate: the connection string is not empty
@@ -380,7 +393,7 @@ module BlackStack
                       # run the worker
                       # add these parameters for debug: debug=yes pampa=~/code/pampa/lib/pampa.rb
                       l.logs "Running worker #{worker.id}... "
-                      s = "nohup ruby worker.rb id=#{worker.id} config=~/pampa/config.rb >/dev/null 2>&1 &" 
+                      s = "nohup ruby #{worker_filename} id=#{worker.id} config=#{config_filename} >/dev/null 2>&1 &" 
                       node.exec(s, false)
                       l.done
                   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pampa
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.10
 platform: ruby
 authors:
 - Leandro Daniel Sardi
@@ -70,6 +70,26 @@ 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