aptible-cli 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a82ca8dc7db1d4eb55e92d7a78f8dda19f3b0e868d913695f9a974079cdf45
-  data.tar.gz: b043caa7662d1406a445e53e02daecdeb08e17a2fadeb448f94155091ac8c6d8
+  metadata.gz: c50391308952a422d84f497808c25fbaf4c405730497266a299e69b632f37887
+  data.tar.gz: 6146d0c3dc58d7ef9786f95a341a22d500689c42f67ed48c0b824f62a2f250c6
 SHA512:
-  metadata.gz: 1d70a4ebaf642e840db0ec5bdfc287a5ca692cf4113173251e6480818b29ad70ee83792672f601a41495b8c55312196835a3e7b12b9364290f95191fae1c2f7c
-  data.tar.gz: f3c1b30a29637d5f872349e45d54d8ce0856a2a467039483bb4cfac872204c15cb2d249650acb5debb7274584aa176459750473ca5cc2d6dc01e63435ce6042b
+  metadata.gz: 156abd2537b61dd8416ce75f6b8389e807306869254bef47db51c80e081a433e3b802483327748c0bb18c9c5691dd537fc14f4f536c55505f01e8c7aa2a86849
+  data.tar.gz: eec30d958642888b92418343ded298ba9ddb49b370395795281e4390494c0a480c771b202b0e7845c1a953c43354cb9aa3404f31589146741fe6d6e2c91f1707

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @usernotfound

data/README.md

@@ -45,7 +45,7 @@ Commands:
   aptible db:create HANDLE [--type TYPE] [--version VERSION] [--container-size SIZE_MB] [--size SIZE_GB]                             # Create a new database
   aptible db:deprovision HANDLE                                                                                                      # Deprovision a database
   aptible db:dump HANDLE [pg_dump options]                                                                                           # Dump a remote database to file
-  aptible db:execute HANDLE SQL_FILE                                                                                                 # Executes sql against a database
+  aptible db:execute HANDLE SQL_FILE [--on-error-stop]                                                                               # Executes sql against a database
   aptible db:list                                                                                                                    # List all databases
   aptible db:reload HANDLE                                                                                                           # Reload a database
   aptible db:restart HANDLE [--container-size SIZE_MB] [--size SIZE_GB]                                                              # Restart a database
@@ -108,6 +108,4 @@ The default format is `text`.
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2016 [Aptible](https://www.aptible.com) and contributors.
-
-[<img src="https://s.gravatar.com/avatar/f7790b867ae619ae0496460aa28c5861?s=60" style="border-radius: 50%;" alt="@fancyremarker" />](https://github.com/fancyremarker)
+Copyright (c) 2019 [Aptible](https://www.aptible.com) and contributors.

data/lib/aptible/cli/subcommands/db.rb

@@ -1,5 +1,6 @@
 require 'term/ansicolor'
 require 'uri'
+require 'English'
 
 module Aptible
   module CLI
@@ -122,16 +123,21 @@ module Aptible
                 filename = "#{handle}.dump"
                 CLI.logger.info "Dumping to #{filename}"
                 `pg_dump #{url} #{dump_options.shelljoin} > #{filename}`
+                exit $CHILD_STATUS.exitstatus unless $CHILD_STATUS.success?
               end
             end
 
-            desc 'db:execute HANDLE SQL_FILE', 'Executes sql against a database'
+            desc 'db:execute HANDLE SQL_FILE [--on-error-stop]',
+                 'Executes sql against a database'
             option :environment
+            option :on_error_stop, type: :boolean
             define_method 'db:execute' do |handle, sql_path|
               database = ensure_database(options.merge(db: handle))
               with_postgres_tunnel(database) do |url|
                 CLI.logger.info "Executing #{sql_path} against #{handle}"
-                `psql #{url} < #{sql_path}`
+                args = options[:on_error_stop] ? '-v ON_ERROR_STOP=true ' : ''
+                `psql #{args}#{url} < #{sql_path}`
+                exit $CHILD_STATUS.exitstatus unless $CHILD_STATUS.success?
               end
             end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.16.1'.freeze
+    VERSION = '0.16.2'.freeze
   end
 end

data/spec/aptible/cli/subcommands/db_spec.rb

@@ -450,59 +450,169 @@ describe Aptible::CLI::Agent do
     context 'valid database' do
       before do
         allow(Aptible::Api::Database).to receive(:all) { [database] }
-        allow(subject).to receive(:`).with(/pg_dump .*/)
       end
 
-      it 'prints a message indicating the dump is happening' do
+      it 'exits with the same code as pg_dump' do
+        exit_status = 123
         cred = Fabricate(:database_credential, default: true, type: 'foo',
                                                database: database)
 
+        allow(subject).to receive(:`).with(/pg_dump/) do
+          `exit #{exit_status}`
+        end
+
         expect(subject).to receive(:with_local_tunnel).with(cred)
           .and_yield(socat_helper)
 
-        subject.send('db:dump', handle)
-
-        expect(captured_logs)
-          .to match(/Dumping to foobar.dump/i)
+        expect do
+          subject.send('db:dump', handle)
+        end.to raise_error { |error|
+          expect(error).to be_a SystemExit
+          expect(error.status).to eq exit_status
+        }
       end
 
-      it 'invokes pg_dump with the tunnel url' do
-        cred = Fabricate(:database_credential, default: true, type: 'foo',
-                                               database: database)
+      context 'successful dump' do
+        before do
+          allow(subject).to receive(:`).with(/pg_dump .*/) do
+            `exit 0`
+          end
+        end
 
-        expect(subject).to receive(:with_local_tunnel).with(cred)
-          .and_yield(socat_helper)
+        it 'prints a message indicating the dump is happening' do
+          cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                                 database: database)
 
-        local_url = 'postgresql://aptible:password@localhost.aptible.in:4242/db'
+          expect(subject).to receive(:with_local_tunnel).with(cred)
+            .and_yield(socat_helper)
 
-        expect(subject).to receive(:`)
-          .with(/pg_dump #{local_url}  > foobar.dump/)
+          subject.send('db:dump', handle)
 
-        subject.send('db:dump', handle)
+          expect(captured_logs)
+            .to match(/Dumping to foobar.dump/i)
+        end
+
+        it 'invokes pg_dump with the tunnel url' do
+          cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                                 database: database)
+
+          expect(subject).to receive(:with_local_tunnel).with(cred)
+            .and_yield(socat_helper)
+
+          local_url = 'postgresql://aptible:password@localhost.aptible.in:4242'\
+            '/db'
+
+          expect(subject).to receive(:`)
+            .with(/pg_dump #{local_url}  > foobar.dump/)
+
+          subject.send('db:dump', handle)
+        end
+
+        it 'sends extra options if given' do
+          cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                                 database: database)
+
+          expect(subject).to receive(:with_local_tunnel).with(cred)
+            .and_yield(socat_helper)
+
+          pg_dump_options = '--exclude-table-data=events ' \
+                          '--exclude-table-data=versions'
+          allow(subject).to receive(:`).with(/pg_dump .* #{pg_dump_options} .*/)
+
+          subject.send('db:dump', handle,
+                       '--exclude-table-data=events',
+                       '--exclude-table-data=versions')
+        end
+
+        it 'fails when the database is not provisioned' do
+          allow(database).to receive(:status) { 'pending' }
+
+          expect { subject.send('db:dump', handle) }
+            .to raise_error(/foobar is not provisioned/im)
+        end
       end
+    end
+  end
+
+  describe '#db:execute' do
+    sql_path = 'file.sql'
+    it 'should fail if database is non-existent' do
+      allow(Aptible::Api::Database).to receive(:all) { [] }
+      expect do
+        subject.send('db:execute', handle, sql_path)
+      end.to raise_error("Could not find database #{handle}")
+    end
 
-      it 'sends extra options if given' do
+    context 'valid database' do
+      before do
+        allow(Aptible::Api::Database).to receive(:all) { [database] }
+        allow(subject).to receive(:`).with(/psql .*/) { `exit 0` }
+      end
+
+      it 'executes the file against the URL' do
         cred = Fabricate(:database_credential, default: true, type: 'foo',
                                                database: database)
 
         expect(subject).to receive(:with_local_tunnel).with(cred)
           .and_yield(socat_helper)
 
-        pg_dump_options = '--exclude-table-data=events ' \
-                          '--exclude-table-data=versions'
-        allow(subject).to receive(:`).with(/pg_dump .* #{pg_dump_options} .*/)
+        local_url = 'postgresql://aptible:password@localhost.aptible.in:4242/db'
+
+        expect(subject).to receive(:`).with(/psql #{local_url} < #{sql_path}/)
 
-        subject.send('db:dump', handle,
-                     '--exclude-table-data=events',
-                     '--exclude-table-data=versions')
+        subject.send('db:execute', handle, sql_path)
+
+        expect(captured_logs)
+          .to match(/Executing #{sql_path} against #{handle}/)
       end
 
       it 'fails when the database is not provisioned' do
         allow(database).to receive(:status) { 'pending' }
 
-        expect { subject.send('db:dump', handle) }
+        expect { subject.send('db:execute', handle, sql_path) }
           .to raise_error(/foobar is not provisioned/im)
       end
+
+      context 'on error stop' do
+        before do
+          subject.options = { on_error_stop: true }
+        end
+
+        it 'adds the ON_ERROR_STOP argument' do
+          cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                                 database: database)
+
+          expect(subject).to receive(:with_local_tunnel).with(cred)
+            .and_yield(socat_helper)
+
+          local_url = 'postgresql://aptible:password@localhost.aptible.in:4242'\
+            '/db'
+
+          expect(subject).to receive(:`)
+            .with(/psql -v ON_ERROR_STOP=true #{local_url} < #{sql_path}/)
+
+          subject.send('db:execute', handle, sql_path)
+        end
+
+        it 'exits with the same code as psql' do
+          exit_status = 123
+          allow(subject).to receive(:`).with(/psql .*/) {
+            `exit #{exit_status}`
+          }
+          cred = Fabricate(:database_credential, default: true, type: 'foo',
+                                                 database: database)
+
+          expect(subject).to receive(:with_local_tunnel).with(cred)
+            .and_yield(socat_helper)
+
+          expect do
+            subject.send('db:execute', handle, sql_path)
+          end.to raise_error { |error|
+            expect(error).to be_a SystemExit
+            expect(error.status).to eq exit_status
+          }
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -248,6 +248,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"