pvcglue 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9582fa0791b38da8006bf4672032b35d97bfa11b
-  data.tar.gz: 3facc6e4e1c64d0baec87d6cc24503958a67f812
+  metadata.gz: 9b41533643419c1df16e610b0ede09ae0ee64857
+  data.tar.gz: 0e1ccf31c5e651d1e7ee97a7258d93c15fff6002
 SHA512:
-  metadata.gz: bc1af302e92fc29daa6bde7a2ac3ab30ee1becf137c055f1b116746d90036303e9c0050124eef04a42bede3fde155f9ab59ae26251696be8e071b45e2bd28ea8
-  data.tar.gz: 03fee3e424a4c4fe9ab2b5fdaf62b4431ed00b9b5ff231bf69d2763fa86c5570639806c7e2a27cbe5bea78e3dd412091881b283b6c378f8b0ea26b773d04c7bc
+  metadata.gz: 26edde8f93741d015d24a278d13ea9163d70f5978d37ac40d7e34786cda3bc1310ada65657f806b3aae5f406553bc0e0073742dc6f8af7b321799ae963cf8bb6
+  data.tar.gz: cde008ef3991255eb23f8f88e8142aaf27834bf50d4c51bca7b2ab466ff808cf9b9f1581eb89b1cdd775f2eefaf9a559a4d7a76bc67e04f217c5a6f187e84f03

data/lib/pvcglue/db.rb

@@ -146,14 +146,36 @@ module Pvcglue
           raise(Thor::Error, "Error:  #{$?}")
         end
 
-        cmd = %{scp -P #{port} #{user}@#{host}:#{file_name} #{self.class.file_helper(file_name)}}
+        cmd = %{scp -P #{port} #{user}@#{host}:#{file_name} #{file_name}}
         puts "Running `#{cmd}`"
 
         unless system cmd
           raise(Thor::Error, "Error:  #{$?}")
         end
+      end
+
+      def pg_restore(db, file_name)
+        Pvcglue.cloud.stage_name == 'production' && destroy_prod?
 
+        host = Pvcglue.cloud.nodes_in_stage('db')['db']['public_ip']
+        port = Pvcglue.cloud.port_in_context(:shell)
+        user = 'deploy'
+        file_name = self.class.file_helper(file_name)
 
+        cmd = %{scp -P #{port} #{file_name} #{user}@#{host}:#{file_name}}
+        unless system cmd
+          raise(Thor::Error, "Error:  #{$?}")
+        end
+
+        cmd = "pg_restore --verbose --clean --no-acl --no-owner -h #{db.host} -p #{db.port}"
+        cmd += " -U #{db.username}" if db.username
+        cmd += " -d #{db.database} #{self.class.file_helper(file_name)}"
+        puts cmd
+
+        unless Pvcglue.run_remote(host, port, user, " PGPASSWORD=#{db.password} #{cmd}")
+          puts "ERROR:"
+          puts $?.inspect
+        end
       end
 
       def pg_destroy(dest)
@@ -191,17 +213,6 @@ module Pvcglue
         end
       end
 
-      def pg_restore(dest, file_name)
-        Pvcglue.cloud.stage_name == 'production' && destroy_prod?
-        cmd = "pg_restore --verbose --clean --no-acl --no-owner -h #{dest.host} -p #{dest.port}"
-        cmd += " -U #{dest.username}" if dest.username
-        cmd += " -d #{dest.database} #{self.class.file_helper(file_name)}"
-        puts cmd
-        unless system({"PGPASSWORD" => dest.password}, cmd)
-          puts "ERROR:"
-          puts $?.inspect
-        end
-      end
     end
 
   end

data/lib/pvcglue/version.rb

@@ -1,3 +1,3 @@
 module Pvcglue
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Andrew Lyric