petasos 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54a5b700fe0b66ec0d9dfd97bf5e27b2d37818af231761b81e40105ae4b4c4a
-  data.tar.gz: 34e1d0416daa3011955f99f323ac6a0538e48f44aae091507e1c058daf29c9d5
+  metadata.gz: 39d93a4f419014e335b1fb03924f369d4bcb7ef14e76418eddcb93105844f6b8
+  data.tar.gz: f63704886a9e202c15608b4cc1369fec219ea349835f23e41816e0ef014a7dfe
 SHA512:
-  metadata.gz: ae3cbe118ea54dd02fb2d0dfa9609b023cc7ba111f8aaab4bf4fd82f315b70d4219aff9e1219631546e9b8db403c0dc6abcc0dc4657057c45f5ef06696ceafc2
-  data.tar.gz: 3b15a8baa046e3281e2fe43b96775a7f2b4956ed3211c6163767b2e5d4366866889137bdaa970c81de6ca31a27c5a8b7e25b28e347c9f6ba1343c8b06f7fa196
+  metadata.gz: 1d23e48b013ef4ae6705d36b869f82c752bdcc8b24c0d7c6bc77be6d57df19301cd2034cfffd297e5e22ab4f5c0d59e835889a1112337bc3b8893e3077a678af
+  data.tar.gz: 98c872d72102e6127a2ff5ccf8a2962750602b217c9e36897ebfd640f96c626bed89669db892eb1caee255a54743b1196fd1ca00b40a4ddde381859ad7dc9f51

data/lib/petasos/distributor.rb

@@ -87,8 +87,7 @@ class Petasos::Distributor
             `scp #{from_node.host}:#{export_path}* #{to_node.host}:#{pool_storage.last}`
           end
         end
-        puts "Running `petasos locations` on #{to_node.name} after export from #{from_node.name}"
-        `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
+        to_node.run_petasos_locations("after export from #{from_node.name}")
       end
       # mark it as completed
       completed_export_file_path = File.join(Dir.pwd, "completed-#{File.basename(exports_file_path)}")
@@ -96,8 +95,7 @@ class Petasos::Distributor
       # and then put it back where it came from
       `scp #{completed_export_file_path} #{from_node.host}:#{from_node.path}`
       `rm #{completed_export_file_path}`
-      puts "Running `petasos locations` on #{from_node.name} after completing its exports"
-      `ssh #{from_node.host} \'cd #{from_node.path} && bash -lc \"petasos locations\"\'`
+      from_node.run_petasos_locations("after completing its exports")
     end
 
     # {"wow-ah"=>
@@ -129,8 +127,7 @@ class Petasos::Distributor
             end
           end
 
-          puts "Running `petasos locations` on #{to_node.name} after backfill from #{from_node.name}"
-          `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
+          to_node.run_petasos_locations("after backfill from #{from_node.name}")
         end
       end
     end

data/lib/petasos/node.rb

@@ -11,8 +11,7 @@ class Petasos::Node
     @manifests = []
     `mkdir -p #{config["name"]}`
 
-    puts "Running `petasos locations` on #{name} before distribution begins"
-    `ssh #{host} \'cd #{path} && bash -lc \"petasos locations\"\'`
+    run_petasos_locations("before distribution begins")
 
     grab_manifest_and_exports
     parse_manifests
@@ -30,6 +29,15 @@ class Petasos::Node
     config["path"]
   end
 
+  def petasos_locations_command
+    config["petasos_command"] || "\'cd #{path} && bash -lc \"petasos locations\"\'"
+  end
+
+  def run_petasos_locations(context = "")
+    puts "Running `petasos locations` on #{name} #{context}"
+    `ssh #{host} #{petasos_locations_command}`
+  end
+
   def grab_manifest_and_exports
     `scp #{config["host"]}:#{config["path"]}/manifest* #{config["name"]}/`
     `scp #{config["host"]}:#{config["path"]}/exports* #{config["name"]}/`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petasos
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Justin Myers