petasos 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb623c372e4177df95553923e61d111337bb01b28ace724d443d2a2014631ad2
-  data.tar.gz: b914c31bbd9c6743f662c051b881ca9e9195542e5ec6b7b1c8890b33496470a6
+  metadata.gz: d54a5b700fe0b66ec0d9dfd97bf5e27b2d37818af231761b81e40105ae4b4c4a
+  data.tar.gz: 34e1d0416daa3011955f99f323ac6a0538e48f44aae091507e1c058daf29c9d5
 SHA512:
-  metadata.gz: 8882b063964e50f3c3e6109d652eedac094c619007d173760ccc769c2452b86ab875b1355c5434d431e20a1e634624dd642207484f76d1c13de6bcc96ceaa03d
-  data.tar.gz: 5e545b2c1fbe779f1effa4641fe3fa93b5f46aa60611bacaae6e24d9b57a5809fe5bac79c17ab5f996dfa80a62dfe2258b6289faa3ba9a817653b81f43e1adfd
+  metadata.gz: ae3cbe118ea54dd02fb2d0dfa9609b023cc7ba111f8aaab4bf4fd82f315b70d4219aff9e1219631546e9b8db403c0dc6abcc0dc4657057c45f5ef06696ceafc2
+  data.tar.gz: 3b15a8baa046e3281e2fe43b96775a7f2b4956ed3211c6163767b2e5d4366866889137bdaa970c81de6ca31a27c5a8b7e25b28e347c9f6ba1343c8b06f7fa196

data/lib/petasos/distributor.rb

@@ -88,7 +88,7 @@ class Petasos::Distributor
           end
         end
         puts "Running `petasos locations` on #{to_node.name} after export from #{from_node.name}"
-        `ssh #{to_node.host} \"cd #{to_node.path} && petasos locations\"`
+        `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
       end
       # mark it as completed
       completed_export_file_path = File.join(Dir.pwd, "completed-#{File.basename(exports_file_path)}")
@@ -97,7 +97,7 @@ class Petasos::Distributor
       `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} && petasos locations\"`
+      `ssh #{from_node.host} \'cd #{from_node.path} && bash -lc \"petasos locations\"\'`
     end
 
     # {"wow-ah"=>
@@ -130,7 +130,7 @@ class Petasos::Distributor
           end
 
           puts "Running `petasos locations` on #{to_node.name} after backfill from #{from_node.name}"
-          `ssh #{to_node.host} \"cd #{to_node.path} && petasos locations\"`
+          `ssh #{to_node.host} \'cd #{to_node.path} && bash -lc \"petasos locations\"\'`
         end
       end
     end

data/lib/petasos/node.rb

@@ -12,7 +12,7 @@ class Petasos::Node
     `mkdir -p #{config["name"]}`
 
     puts "Running `petasos locations` on #{name} before distribution begins"
-    `ssh #{host} \"cd #{path} && petasos locations\"`
+    `ssh #{host} \'cd #{path} && bash -lc \"petasos locations\"\'`
 
     grab_manifest_and_exports
     parse_manifests

data/lib/petasos.rb

@@ -7,14 +7,30 @@ class Petasos
   class Error < StandardError; end
 
   def run(mode = "")
-    unless File.file?("petasos_is_running")
-      `touch petasos_is_running`
-      process_locations
-      unless mode == "locations"
-        process_distribution if File.file?(File.join(Dir.pwd, "petasos_distribution-config.yaml"))
+    if mode == "locations"
+      lock_and_run("locations") do
         process_locations
       end
-      `rm petasos_is_running`
+    elsif mode == "distribution"
+      lock_and_run("distribution") do
+        process_distribution
+      end
+    else # mode is neither distribution or locations
+      lock_and_run("locations") do
+        process_locations
+      end
+      lock_and_run("distribution") do
+        process_distribution
+      end
+    end
+  end
+
+  def lock_and_run(mode, &block)
+    lock_filename = "petasos_is_running_#{mode}"
+    if !File.file?(lock_filename)
+      `touch #{lock_filename}`
+      yield
+      `rm #{lock_filename}`
     end
   end
 

metadata

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