pg_drive 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b02e5bc0c83da33c73670f5b54aa58364fbc51a6
-  data.tar.gz: 649ec87536408c34d4fef8ed06b313d6a3c87067
+  metadata.gz: ad9049fe5eeefab5f1b32cca17b6863feb9a8d12
+  data.tar.gz: 56bc5de109fded551223a9a7cc92ae2aae98caaa
 SHA512:
-  metadata.gz: 98e1fb62ea8da4db5aee8f3669c9dbc7be1af2d949fee9af488e353e56aaeee40b6f690386efa563518ed1d036ce3f8d7926fa767bbed4539a01b9ac9a5eb123
-  data.tar.gz: 4bd24e2ad735ea240baaca5e6227a0c7f8861675560bdc44f880b361df0e39bdb0059f7f7f8c18609d98af3597340289aa3b573f4dcc66831d4910b722a2b049
+  metadata.gz: 4f006f4d57614aa7136dbd6c7715e935c8d505ca18ca6f577435795ab786000b55c2501cc547dd82c45ac4eca128d0b6f5d64fbccf0b85084e61fe31f27d07fc
+  data.tar.gz: 28450a1ebcad83158ae19212a63584335a331eae57fa338d76593de95e8385c8fbf88f98e338856141e6ea23fdae781f8b4215dcb49536dedd24d030bfbf73d3

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+tags

data/README.md

@@ -1,6 +1,6 @@
 # PgDrive
 
-This library is intended to be a minimalist backup solution for Postgres, Rails and Goodle Drive.
+This library is intended to be a minimalist backup solution for Postgres, Rails and Goodle Drive. Basically a free aletrnative to [dumper](https://dumper.io).
 
 ## Installation
 
@@ -18,13 +18,13 @@ Or install it yourself as:
 
     $ gem install pg_drive
 
-You need to (https://console.developers.google.com)[create] a new project and credential in order to use google drive. Make sure the credential is for "Oauth Client" and the application type is "Other".
+You need to [create](https://console.developers.google.com) a new project and credential in order to use google drive. Make sure the credential is for "Oauth Client" and the application type is "Other".
 Set the following environment variables:
 ```
 ENV['PG_DRIVE_GOOGLE_KEY']="Your credential client id"
 ENV['PG_DRIVE_GOOGLE_SECRET']="Your credential secret"
 ```
-These values should be easy to find after you created new credentials.
+These values should be easy to find after you created new credentials in google's developer console.
 
 After that you should run the following command inside rails console and follow the instructions.
 ```ruby

data/lib/pg_drive.rb

@@ -1,5 +1,5 @@
 require "pg_drive/version"
-require 'open3'
+require "open3"
 require "google/apis/drive_v2"
 require "googleauth"
 require "pg_drive/uploader"
@@ -13,12 +13,12 @@ module PgDrive
   DEFAULT_BACKUP_TIMEOUT_SECONDS = 60 * 5 # 5 minutes
   MISSING_CRED_WARNING = "Please use the run #{self}.setup_credentials"\
     " from console to set up credentials".freeze
-  CREDENTIALS_INTRO = "Please open your browser and go to the following url."\
+  CREDENTIALS_INTRO = "Please open your browser and go to the following url:"\
     "Login with the user you wish to use as target for backup".freeze
   CREDENTIALS_ENV_INSTRUCTIONS = "Please set the following line as the value of "\
-  '"PG_DRIVE_CREDENTIALS" key in the environment hash:'.freeze
+  '"PG_DRIVE_CREDENTIALS" key the environment:'.freeze
 
-  BACKUP_CMD = "pg_dump -c -C -b".freeze
+  BACKUP_CMD = "pg_dump -Fc -c -C -b".freeze
   PG_ENV_MAP = {
     "PGPASSWORD" => "password",
     "PGDATABASE" => "database",
@@ -26,32 +26,26 @@ module PgDrive
     "PGPORT" => "port",
     "PGUSER" => "username",
   }.freeze
-  GZIP_MIME_TYPE = "application/x-gzip".freeze
+  BINARY_MIME_TYPE = "application/octet-stream".freeze
 
   class << self
     def perform
-      Uploader.call(Dump.call)
+      Dump.call do |pipe|
+        Uploader.call(pipe)
+      end
     end
 
     def setup_credentials
       puts CREDENTIALS_INTRO
-      puts authorizer.get_authorization_url(base_url: OOB_URI)
+      puts Uploader.authorizer.get_authorization_url(base_url: OOB_URI)
       puts "Please enter the token you receive for further instructions"
       code = gets
       puts CREDENTIALS_ENV_INSTRUCTIONS
       puts refresh_token_from_code(code)
     end
 
-    def authorizer
-      Google::Auth::UserAuthorizer.new(
-        Uploader.client_id,
-        Uploader::AUTH_SCOPE,
-        nil
-      )
-    end
-
     def refresh_token_from_code(code)
-      authorizer.get_credentials_from_code(
+      Uploader.authorizer.get_credentials_from_code(
         user_id: :owner,
         code: code,
         base_url: OOB_URI

data/lib/pg_drive/dump.rb

@@ -2,33 +2,24 @@ module PgDrive
   module Dump
     class << self
       def call
-        stdin, out_and_error, wait_thr = exec_pg_dump
-        read_with_timeout(out_and_error, wait_thr)
-      ensure
-        stdin&.close
-        out_and_error&.close
-      end
-
-      def read_with_timeout(input, wait_thr)
-        result = Timeout.timeout(backup_timeout_seconds) { input.read }
-
-        unless wait_thr.value.success? || result.blank?
-          raise BackupFailed, "Exit status: #{wait_thr.value.exitstatus}: #{result}"
-        end
-        result
-      rescue Timeout::Error
-        if (kill_pid = wait_thr[:pid])
-          Process.kill(9, Process.getpgid(kill_pid))
-        end
-        raise BackupFailed, "Timeout error for backup_command #{kill_pid}"
-      end
-
-      def exec_pg_dump
-        Open3.popen2e(
+        stdin, stdout, stderr, wait_thr = Open3.popen3(
           pg_env,
           BACKUP_CMD,
           pgroup: true
         )
+
+        tmpfile = Tempfile.new("pg_backup")
+        tmpfile.write(stdout)
+        tmpfile.rewind
+
+        errors = stderr.read
+        unless wait_thr.value.success? && errors.empty?
+          raise BackupFailed, "Exit status: #{wait_thr.value.exitstatus}: #{errors}"
+        end
+
+        yield tmpfile
+      ensure
+        [stdin, stdout, stderr, tmpfile].compact.each(&:close)
       end
 
       def pg_env
@@ -38,10 +29,6 @@ module PgDrive
       def db_conf
         @db_conf ||= Rails.configuration.database_configuration[Rails.env]
       end
-
-      def backup_timeout_seconds
-        DEFAULT_BACKUP_TIMEOUT_SECONDS
-      end
     end
   end
 end

data/lib/pg_drive/uploader.rb

@@ -5,24 +5,24 @@ module PgDrive
     RETRY_COUNT = 3
 
     class << self
-      def call(content)
+      def call(pipe)
         drive = Drive::DriveService.new
         drive.authorization = credentials
         app_name = Rails.application.class.parent_name
         drive.insert_file(
-          Drive::File.new(title: "backup-#{app_name}-#{Time.now.to_i}"),
-          upload_source: gzip(content),
-          content_type: GZIP_MIME_TYPE,
+          Drive::File.new(title: "#{app_name}-#{Time.now.utc.iso8601}.dmp"),
+          upload_source: pipe,
+          content_type: BINARY_MIME_TYPE,
           options: { retries: RETRY_COUNT }
         )
       end
 
-      def gzip(string)
-        gzipped_io = StringIO.new
-        writer = Zlib::GzipWriter.new(gzipped_io)
-        writer.write(string)
-        writer.close
-        StringIO.new(gzipped_io.string)
+      def authorizer
+        Google::Auth::UserAuthorizer.new(
+          Uploader.client_id,
+          Uploader::AUTH_SCOPE,
+          nil
+        )
       end
 
       def client_id

data/lib/pg_drive/version.rb

@@ -1,3 +1,3 @@
 module PgDrive
-  VERSION = "0.1.2".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_drive
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Gal Tsubery
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler