pvcglue 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5317c0a638c5ddacd0a3ee767d7754caa2c04848
-  data.tar.gz: 7342a1125dcc1b35fcbb969043455bc8a99c734c
+  metadata.gz: 9582fa0791b38da8006bf4672032b35d97bfa11b
+  data.tar.gz: 3facc6e4e1c64d0baec87d6cc24503958a67f812
 SHA512:
-  metadata.gz: eac0304984a7caa026023d250da35441a8b95aa3e4755d9c5efc12175b8cee108f1ef5e96af81b4654028905f535f8ce99e72bd0695bf7fdf307a60f788c2838
-  data.tar.gz: a9e4d18207fe3eb2a920125ab4e2df1bf6174957b1f06b874096d62ae7b8d786798b0f17dd9851d2c21847b627d83cb65f068c06a2908d809dddbf6045d25e54
+  metadata.gz: bc1af302e92fc29daa6bde7a2ac3ab30ee1becf137c055f1b116746d90036303e9c0050124eef04a42bede3fde155f9ab59ae26251696be8e071b45e2bd28ea8
+  data.tar.gz: 03fee3e424a4c4fe9ab2b5fdaf62b4431ed00b9b5ff231bf69d2763fa86c5570639806c7e2a27cbe5bea78e3dd412091881b283b6c378f8b0ea26b773d04c7bc

data/README.md

@@ -158,7 +158,7 @@ Add these lines to your application's Gemfile.  `dotenv-rails` must be listed fi
 
 Then add these lines to your application's Gemfile, whereever you like (usually at the end):
 
-    gem 'pvcglue', "~> 0.1.15", :group => :development
+    gem 'pvcglue', "~> 0.1.18", :group => :development
     gem 'pvcglue_dbutils', "~> 0.5.3"
 
 And then execute:

data/lib/pvcglue.rb

@@ -35,6 +35,16 @@ module Pvcglue
     data
   end
 
+  def self.run_remote(host, port, user, cmd)
+    cmd = "ssh -p #{port} #{user}@#{host} '#{cmd}'"
+    # puts "Running `#{cmd}`"
+
+    unless system cmd
+      raise(Thor::Error, "Error:  #{$?}")
+    end
+    true
+  end
+
   class Version
     def self.version
       VERSION

data/lib/pvcglue/db.rb

@@ -15,7 +15,7 @@ module Pvcglue
       pg_restore(self.class.remote, file_name)
     end
 
-    desc "pull", "Pull copy of database from remote stage.  Pass -f to exclude tables defined in the configutation file.  If no tables are specified in the `excluded_db_tables` option, 'versions' will be used by default."
+    desc "pull", "Pull copy of database from remote stage.  Pass -f to exclude tables defined in the configuration file.  If no tables are specified in the `excluded_db_tables` option, 'versions' will be used by default."
     method_option :fast, :type => :boolean, :aliases => "-f"
     def pull(file_name = nil)
       raise(Thor::Error, "Stage required.") if Pvcglue.cloud.stage_name.nil?
@@ -25,14 +25,14 @@ module Pvcglue
     desc "dump", "dump"
 
     def dump(file_name = nil)
-      raise(Thor::Error, "Stage should not be set for this command.") unless Pvcglue.cloud.stage_name.nil?
+      raise(Thor::Error, "Stage should not be set for this command.  (Use 'pull' for remote databases.)") unless Pvcglue.cloud.stage_name.nil?
       pg_dump(self.class.local, file_name)
     end
 
     desc "restore", "restore"
 
     def restore(file_name = nil)
-      raise(Thor::Error, "Stage should not be set for this command.") unless Pvcglue.cloud.stage_name.nil?
+      raise(Thor::Error, "Stage should not be set for this command.  (Use 'push' for remote databases.)") unless Pvcglue.cloud.stage_name.nil?
       pg_restore(self.class.local, file_name)
     end
 
@@ -101,7 +101,7 @@ module Pvcglue
     def self.file_helper(file_name)
       # TODO:  make it more helpful ;)
       stage = Pvcglue.cloud.stage_name || "dev"
-      file_name = "#{Pvcglue.configuration.application_name}_#{stage}_#{Time.now.strftime("%Y-%m-%d")}.dump" unless file_name
+      file_name = "#{Pvcglue.configuration.application_name}_#{stage}_#{Time.now.strftime("%Y-%m-%d-%H%M")}.dump" unless file_name
       # "#{File.dirname(file_name)}/#{File.basename(file_name, '.*')}.dump"
       file_name
     end
@@ -118,26 +118,42 @@ module Pvcglue
 
       def destroy_prod?
         say("Are you *REALLY* sure you want to DESTROY the PRODUCTION database?")
-        input = ask("Type 'destroy production' if you are:")
-        raise(Thor::Error, "Ain't gonna do it.") if input.downcase != "destroy production"
-        puts "ok, going through with the it..."
+        input = ask("Type 'destroy #{source.database}' if you are:")
+        raise(Thor::Error, "Ain't gonna do it.") if input.downcase != "destroy #{source.database}"
+        puts "ok, going through with the it...  (I sure hope you know what you are doing, Keith!)"
       end
 
 
-      def pg_dump(source, file_name, fast)
-        cmd = "pg_dump -Fc --no-acl --no-owner -h #{source.host} -p #{source.port}"
-        cmd += " -U #{source.username}" if source.username
+      def pg_dump(db, file_name, fast)
+        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 = "pg_dump -Fc --no-acl --no-owner -h #{db.host} -p #{db.port}"
+        cmd += " -U #{db.username}" if db.username
         if fast
           Pvcglue.cloud.exclude_tables.each do |table|
             cmd += " --exclude-table=#{table}"
           end
         end
-        cmd += " #{source.database} -v -f #{self.class.file_helper(file_name)}"
+        cmd += " #{db.database} -v -f #{file_name}"
+
         puts cmd
-        unless system({"PGPASSWORD" => source.password}, cmd)
+        unless Pvcglue.run_remote(host, port, user, " PGPASSWORD=#{db.password} #{cmd}")
           puts "ERROR:"
           puts $?.inspect
+          raise(Thor::Error, "Error:  #{$?}")
         end
+
+        cmd = %{scp -P #{port} #{user}@#{host}:#{file_name} #{self.class.file_helper(file_name)}}
+        puts "Running `#{cmd}`"
+
+        unless system cmd
+          raise(Thor::Error, "Error:  #{$?}")
+        end
+
+
       end
 
       def pg_destroy(dest)

data/lib/pvcglue/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pvcglue
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Andrew Lyric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler