scalingo_databases_rake_tasks 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269dbd4d78d561cc362f60a0f9025b7fe21f790d
-  data.tar.gz: c85800a8026150a9e4ecd92e28df572a574e7762
+  metadata.gz: 373be3441179822120599f7aa99842d5f68607fe
+  data.tar.gz: 76db07ab5d36be40a3739f88d752568663b0de3c
 SHA512:
-  metadata.gz: 54a07a63f782fbba92d89243a9406c7cb1fdade44fc7e92be17c9ab41b3b8c2acf56296d42c91e5fa8621736f46106fe4c488f323eaf87006f882e9ad4d535e7
-  data.tar.gz: 04a5a03bfa75134cb1f4e1327b0de869c65a316ff8075d4cb985d78e3475ab10086794f71d26f77e9843e6fb8a5f4908201ea49361c35fefb7c975c4eaa37246
+  metadata.gz: 79a7ed16cfb52bf232c304f0ee269d80f10a75411396a39f489ed46d966bd55a90cf542a57588fd2ddd7c00fe20162ead351260e7171a5d2dc991e50ef660f73
+  data.tar.gz: ab9a12e9cea2fe2be89b1bd42399bcc6f0ab67ff0df8df1deea62fa0b911e0ba47fe1eef3846a8fa69934f61c33e08f2e76ed184f007f1722eda7bcbd6596c06

data/README.md

@@ -17,6 +17,20 @@ Available tasks for **each** database:
 
 For remote operations you will have to set your shell's environment variable `APP` as your app name on Scalingo. The variable `DB_ENV_NAME` is optional, by default it will be the one generated when you provisionned the database addon. For example, if your database is a MongoDB then the variable will be `SCALINGO_MONGO_URL`.
 
+### Available Env Vars
+
+Global:
+- `APP`: Scalingo app name (mandatory)
+- `DB_ENV_NAME`: Scalingo database connection var name, e.g. `SCALINGO_MONGO_URL` (optional)
+- `SSH_IDENTITY`: specify a SSH identity file, e.g. `~/.ssh/id_rsa` (optional)
+
+MongoDB:
+- `FILE`: your database config file name, e.g. `database` (optional)
+
+PostgreSQL:
+- `PG_DUMP_CMD`: specify the path or command name of the tool to use, default: `pg_dump` (optional)
+- `PG_RESTORE_CMD`:specify the path or command name of the tool to use, default: `pg_restore` (optional)
+
 ### Commands
 
 To see the complete list of tasks: `rake -T scalingo`

data/lib/scalingo_databases_rake_tasks/tasks/common.rake

@@ -25,17 +25,30 @@ namespace :scalingo do
     FileUtils.mkdir_p 'tmp'
   end
 
+  def app_exists? app
+    `scalingo apps | grep " #{app} "`
+    $?.success?
+  end
+
   def remote_credentials app, variable
+    unless app_exists? app
+      abort "*** App #{app} does not exists."
+    end
+
     output = `scalingo -a #{app} env | grep "^#{variable}=" | cut -d '=' -f2 | tr -d '\n'`
     uri = URI(output.strip)
     if uri.to_s.blank?
-      raise VariableError, "Environment variable #{variable} not found."
+      abort "*** Environment variable #{variable} not found."
     else
       [uri.path[1..-1], uri.user, uri.password]
     end
   end
 
   def start_scalingo_tunnel app, variable
+    unless app_exists? app
+      abort "*** App #{app} does not exists."
+    end
+
     if ENV['SSH_IDENTITY']
       cmd = "scalingo -a #{app} db-tunnel -i #{ENV['SSH_IDENTITY']} -p 27717 #{variable}"
     else
@@ -96,10 +109,10 @@ namespace :scalingo do
     app = ENV["APP"]
     variable = ENV["DB_ENV_NAME"] || default_env_name
     unless app
-      abort "Environment variable APP not found."
+      abort "*** Environment variable APP not found."
     end
     unless variable
-      abort "Environment variable DB_ENV_NAME not found."
+      abort "*** Environment variable DB_ENV_NAME not found."
     end
 
     database, user, password = remote_credentials(app, variable)
@@ -115,9 +128,4 @@ namespace :scalingo do
     yield(database, user, password)
     close_tunnel.call
   end
-
-  class VariableError < StandardError
-
-  end
-
 end

data/lib/scalingo_databases_rake_tasks/tasks/postgresql.rake

@@ -45,6 +45,7 @@ namespace :scalingo do
       end
 
       def self.backup database, user, password, host, port
+        pg_dump_cmd = ENV["PG_DUMP_CMD"] || "pg_dump"
         user_cmd = ""
         password_cmd = ""
         if not user.blank?
@@ -54,7 +55,7 @@ namespace :scalingo do
           end
         end
         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 = "#{pg_dump_cmd} --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}"
@@ -69,6 +70,7 @@ namespace :scalingo do
       end
 
       def self.restore database, user, password, host, port
+        pg_restore_cmd = ENV["PG_RESTORE_CMD"] || "pg_restore"
         if archive_contain_sql(archive_name DUMP_NAME)
           user_cmd = ""
           password_cmd = ""
@@ -96,7 +98,7 @@ namespace :scalingo do
             end
           end
           base_cmd = "tar xvzOf #{archive_name DUMP_NAME} | "
-          pg_cmd = "pg_restore --no-owner --no-privileges --clean"
+          pg_cmd = "#{pg_restore_cmd} --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}"
@@ -108,7 +110,8 @@ namespace :scalingo do
       end
 
       def self.pg_restore_after_9_4?
-        version = `pg_restore --version`.split.last
+        pg_restore_cmd = ENV["PG_RESTORE_CMD"] || "pg_restore"
+        version = `#{pg_restore_cmd} --version`.split.last
         major, minor = version.split('.')
         major.to_i >= 9 && minor.to_i >= 4
       end

data/lib/scalingo_databases_rake_tasks/version.rb

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

metadata

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