scalingo_databases_rake_tasks 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef412338d874cf4bc5f097a9d3a95b904308211
-  data.tar.gz: 5588bdef817f1dc48de78b3d445a8b558eb8b446
+  metadata.gz: 269dbd4d78d561cc362f60a0f9025b7fe21f790d
+  data.tar.gz: c85800a8026150a9e4ecd92e28df572a574e7762
 SHA512:
-  metadata.gz: 4f9d42eedb22b09311d12e7a9ab654051df1b3047e383ada1d760cc14d77347a1a382e85a6c354f73385e2d4579a6a88ed8a2f916b7811eca1be4465a6ba6bfd
-  data.tar.gz: 1bbab205f75415dbb7d13a8dfb567b182288b9138cfb10ae5a1217283c1215e53db4e6538f865a1cb3650592d52e98f228ca694fea8772b5d0543b7da31b5107
+  metadata.gz: 54a07a63f782fbba92d89243a9406c7cb1fdade44fc7e92be17c9ab41b3b8c2acf56296d42c91e5fa8621736f46106fe4c488f323eaf87006f882e9ad4d535e7
+  data.tar.gz: 04a5a03bfa75134cb1f4e1327b0de869c65a316ff8075d4cb985d78e3475ab10086794f71d26f77e9843e6fb8a5f4908201ea49361c35fefb7c975c4eaa37246

data/README.md

@@ -33,6 +33,10 @@ Backups are stored under the `tmp` folder of your project, the database type is
 
 To restore from a specific archive, you'll have to give it the default archive name and put it inside of `tmp` folder before running the rake command.
 
+### SSH Identity
+
+If you are not using a SSH agent and your default SSH identity file is not `id_rsa` you can specify your custom identity file path with the `SSH_IDENTITY` variable.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/scalingo_databases_rake_tasks/tasks/common.rake

@@ -1,5 +1,6 @@
 require 'uri'
 require 'open3'
+require 'timeout'
 
 namespace :scalingo do
   private
@@ -16,6 +17,10 @@ namespace :scalingo do
     "#{Rails.root}/tmp/#{name}.tar.gz"
   end
 
+  def archive_contain_sql path
+    `tar tf #{path} | grep "\.sql$" | wc -l`.to_i > 0
+  end
+
   def make_tmp_dir
     FileUtils.mkdir_p 'tmp'
   end
@@ -31,23 +36,44 @@ namespace :scalingo do
   end
 
   def start_scalingo_tunnel app, variable
-    cmd = "scalingo -a #{app} db-tunnel -p 27717 #{variable}"
+    if ENV['SSH_IDENTITY']
+      cmd = "scalingo -a #{app} db-tunnel -i #{ENV['SSH_IDENTITY']} -p 27717 #{variable}"
+    else
+      cmd = "scalingo -a #{app} db-tunnel -p 27717 #{variable}"
+    end
     puts "*** Executing #{cmd}"
     i, o, thr = Open3::pipeline_rw cmd
+    pid = thr[0].pid
+    puts '*** Tunnel opened'
+
+    close_tunnel = lambda {
+      if thr[0].status
+        thr[0].kill
+        Process.kill("INT", pid) if pid != -1
+        puts '*** Tunnel closed'
+      end
+    }
+    at_exit do
+      close_tunnel.call
+    end
 
-    while true
+    loop do
       read_line(o) do |line|
         # puts line # debug
         if line.include?("Encrypted")
           abort "*** Your SSH key is encrypted. This gem is only compatible with SSH agents or unencrypted keys."
         end
 
+        if line.include?("An error occured")
+          abort "*** #{line}"
+        end
+
         if line.include?("address already in use")
           abort "*** Address 127.0.0.1:27717 is already in use."
         end
 
         if line.include?("'127.0.0.1:27717'")
-          return thr[0].pid
+          return [pid, close_tunnel]
         elsif line.include?("'127.0.0.1:")
           abort "*** Address 127.0.0.1:27717 is already in use."
         end
@@ -77,13 +103,17 @@ namespace :scalingo do
     end
 
     database, user, password = remote_credentials(app, variable)
-    pid = start_scalingo_tunnel(app, variable)
-    at_exit do
-      Process.kill("INT", pid) if pid != -1
-      puts '*** Tunnel closed'
+
+    begin
+      pid, close_tunnel = Timeout::timeout(15) do
+        start_scalingo_tunnel(app, variable)
+      end
+    rescue Timeout::Error => e
+      abort "*** Error in tunnel: #{e}"
     end
-    puts '*** Tunnel opened'
+
     yield(database, user, password)
+    close_tunnel.call
   end
 
   class VariableError < StandardError

data/lib/scalingo_databases_rake_tasks/tasks/postgresql.rake

@@ -53,7 +53,9 @@ namespace :scalingo do
             password_cmd = "PGPASSWORD=#{password}"
           end
         end
-        base_cmd = "pg_dump -O -n public --format=c #{user_cmd} -h #{host} -p #{port} -d #{database}"
+        exclude_cmd = "-N 'information_schema' -N '^pg_*'"
+        base_cmd = "pg_dump --no-owner --no-privileges --clean #{exclude_cmd} --format=c #{user_cmd} -h #{host} -p #{port} -d #{database}"
+        base_cmd << " --if-exists" if pg_restore_after_9_4?
         output = "rm -rf #{DUMP_PATH} 2>/dev/null && /usr/bin/env PGPASSWORD=[FILTERED] #{base_cmd}"
         cmd = "rm -rf #{DUMP_PATH} 2>/dev/null && /usr/bin/env #{password_cmd} #{base_cmd}"
 
@@ -67,27 +69,45 @@ namespace :scalingo do
       end
 
       def self.restore database, user, password, host, port
-        user_cmd = ""
-        password_cmd = ""
-        if not user.blank?
-          user_cmd = " -U #{user}"
-          if not password.blank?
-            password_cmd = "PGPASSWORD=#{password}"
+        if archive_contain_sql(archive_name DUMP_NAME)
+          user_cmd = ""
+          password_cmd = ""
+          if not user.blank?
+            user_cmd = " -U #{user}"
+            if not password.blank?
+              password_cmd = "PGPASSWORD=#{password}"
+            end
           end
-        end
 
-        base_cmd = "tar xvzOf #{archive_name DUMP_NAME} | "
-        pg_cmd = "pg_restore -O -n public --clean"
-        pg_cmd << " --if-exists" if pg_restore_after_9_4
-        pg_cmd << " #{user_cmd} -h #{host} -p #{port} -d #{database}"
-        output = "#{base_cmd} PGPASSWORD=[FILTERED] #{pg_cmd}"
-        cmd = "#{base_cmd} #{password_cmd} #{pg_cmd}"
+          base_cmd = "tar xvzOf #{archive_name DUMP_NAME} | "
+          pg_cmd = "psql #{user_cmd} -h #{host} -p #{port} -d #{database} -f -"
+          output = "#{base_cmd} PGPASSWORD=[FILTERED] #{pg_cmd}"
+          cmd = "#{base_cmd} #{password_cmd} #{pg_cmd}"
 
-        puts "*** Executing #{output}"
-        system(cmd)
+          puts "*** Executing #{output}"
+          system(cmd)
+        else
+          user_cmd = ""
+          password_cmd = ""
+          if not user.blank?
+            user_cmd = " -U #{user}"
+            if not password.blank?
+              password_cmd = "PGPASSWORD=#{password}"
+            end
+          end
+          base_cmd = "tar xvzOf #{archive_name DUMP_NAME} | "
+          pg_cmd = "pg_restore --no-owner --no-privileges --clean"
+          pg_cmd << " --if-exists" if pg_restore_after_9_4?
+          pg_cmd << " #{user_cmd} -h #{host} -p #{port} -d #{database}"
+          output = "#{base_cmd} PGPASSWORD=[FILTERED] #{pg_cmd}"
+          cmd = "#{base_cmd} #{password_cmd} #{pg_cmd}"
+
+          puts "*** Executing #{output}"
+          system(cmd)
+        end
       end
 
-      def pg_restore_after_9_4?
+      def self.pg_restore_after_9_4?
         version = `pg_restore --version`.split.last
         major, minor = version.split('.')
         major.to_i >= 9 && minor.to_i >= 4

data/lib/scalingo_databases_rake_tasks/version.rb

@@ -1,3 +1,3 @@
 module ScalingoDbTasks
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_databases_rake_tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Scalingo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler