aptible-cli 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd702a7afbcc8290e375387617c228b388b69918
-  data.tar.gz: bbbcb95f4ebc9deac6671049c7534c83e2127d1e
+  metadata.gz: 7ca32684c92760fd049ba703618258b837950590
+  data.tar.gz: b251f6a123c54002638a7ef0c5567de892f6cb62
 SHA512:
-  metadata.gz: c975747091a4d3232c190baee45865bd38dcde4fe8c585ac78a3b86050f5e382432ed78e719e6fb3ae947fd5e1f213e765ff336d3e07886d97b26feb4ae6fae9
-  data.tar.gz: e2b3152c9a2e6a9398b8dc87031b7791b7ad614836d9a548fa9721db3b7864101f53734cf55701940e8c9cd0db93c73b6fbd0ff694c1a7a5f8e0d6733ee02fac
+  metadata.gz: 28e54b39f91cb892b9ce5443321b9049290a302b9e38de9cd3b7162b3567499fa5c00abc5d860d31d8661190fdbc692b24ce0186af410b98a4922a0b62cdd70d
+  data.tar.gz: 772bb6f34a8a07baee41f1682189dbfa6a31c422802649d74721f028c89cd060ae7cfe4c77f3bfd150c9cb90c04b3ddc52acb6bc52be31f71cf83eafb8b05acf

data/README.md

@@ -28,31 +28,36 @@ From `aptible help`:
 
 ```
 Commands:
-  aptible apps                        # List all applications
-  aptible apps:create HANDLE          # Create a new application
-  aptible apps:deprovision            # Deprovision an app
-  aptible apps:scale TYPE NUMBER      # Scale app to NUMBER of instances
-  aptible config                      # Print an app's current configuration
-  aptible config:add                  # Add an ENV variable to an app
-  aptible config:rm                   # Remove an ENV variable from an app
-  aptible config:set                  # Alias for config:add
-  aptible config:unset                # Alias for config:rm
-  aptible db:clone SOURCE DEST        # Clone a database to create a new one
-  aptible db:create HANDLE            # Create a new database
-  aptible db:deprovision HANDLE       # Deprovision a database
-  aptible db:dump HANDLE              # Dump a remote database to file
-  aptible db:execute HANDLE SQL_FILE  # Executes sql against a database
-  aptible db:list                     # List all databases
-  aptible db:tunnel HANDLE            # Create a local tunnel to a database
-  aptible domains                     # Print an app's current virtual domains
-  aptible help [COMMAND]              # Describe available commands or one specific command
-  aptible login                       # Log in to Aptible
-  aptible logs                        # Follows logs from a running app
-  aptible ps                          # Display running processes for an app - DEPRECATED
-  aptible rebuild                     # Rebuild an app, and restart its services
-  aptible restart                     # Restart all services associated with an app
-  aptible ssh [COMMAND]               # Run a command against an app
-  aptible version                     # Print Aptible CLI version
+  aptible apps                                               # List all applications
+  aptible apps:create HANDLE                                 # Create a new application
+  aptible apps:deprovision                                   # Deprovision an app
+  aptible apps:scale TYPE NUMBER                             # Scale app to NUMBER of instances
+  aptible backup:list DB_HANDLE                              # List backups for a database
+  aptible backup:restore [--handle HANDLE] [--size SIZE_GB]  # Restore a backup
+  aptible config                                             # Print an app's current configuration
+  aptible config:add                                         # Add an ENV variable to an app
+  aptible config:rm                                          # Remove an ENV variable from an app
+  aptible config:set                                         # Alias for config:add
+  aptible config:unset                                       # Alias for config:rm
+  aptible db:backup HANDLE                                   # Backup a database
+  aptible db:clone SOURCE DEST                               # Clone a database to create a new one
+  aptible db:create HANDLE                                   # Create a new database
+  aptible db:deprovision HANDLE                              # Deprovision a database
+  aptible db:dump HANDLE                                     # Dump a remote database to file
+  aptible db:execute HANDLE SQL_FILE                         # Executes sql against a database
+  aptible db:list                                            # List all databases
+  aptible db:reload HANDLE                                   # Reload a database
+  aptible db:tunnel HANDLE                                   # Create a local tunnel to a database
+  aptible domains                                            # Print an app's current virtual domains
+  aptible help [COMMAND]                                     # Describe available commands or one specific command
+  aptible login                                              # Log in to Aptible
+  aptible logs                                               # Follows logs from a running app or database
+  aptible operation:cancel OPERATION_ID                      # Cancel a running operation
+  aptible ps                                                 # Display running processes for an app - DEPRECATED
+  aptible rebuild                                            # Rebuild an app, and restart its services
+  aptible restart                                            # Restart all services associated with an app
+  aptible ssh [COMMAND]                                      # Run a command against an app
+  aptible version                                            # Print Aptible CLI version
 ```
 
 ## Contributing

data/lib/aptible/cli/helpers/tunnel.rb

@@ -11,16 +11,18 @@ module Aptible
                       :SIGHUP
                     end
 
+      STOP_TIMEOUT = 5
+
       # The :new_pgroup key specifies the CREATE_NEW_PROCESS_GROUP flag for
       # CreateProcessW() in the Windows API. This is a Windows only option.
       # true means the new process is the root process of the new process
       # group. This flag is necessary to be able to signal the subprocess on
       # Windows.
-      SPAWN_OPTS =  if Gem.win_platform?
-                      { new_pgroup: true }
-                    else
-                      {}
-                    end
+      SPAWN_OPTS = if Gem.win_platform?
+                     { new_pgroup: true }
+                   else
+                     {}
+                   end
 
       class Tunnel
         def initialize(env, ssh_cmd, socket_path)
@@ -61,18 +63,40 @@ module Aptible
 
         def stop
           raise 'You must call #start before calling #stop' if @pid.nil?
+
           begin
             Process.kill(STOP_SIGNAL, @pid)
           rescue Errno::ESRCH
-            nil # Dear Rubocop: I know what I'm doing.
+            # Already dead.
+            return
+          end
+
+          begin
+            STOP_TIMEOUT.times do
+              return if Process.wait(@pid, Process::WNOHANG)
+              sleep 1
+            end
+            Process.kill(:SIGKILL, @pid)
+          rescue Errno::ECHILD, Errno::ESRCH
+            # Died at some point, that's fine.
           end
-          wait
         end
 
         def wait
-          Process.wait @pid
-        rescue Errno::ECHILD
-          nil
+          # NOTE: Ruby is kind enough to retry when EINTR is thrown, so we
+          # don't need to retry or anything here.
+          _, status = Process.wait2(@pid)
+
+          code = status.exitstatus
+
+          case code
+          when 0
+            # No-op: we're happy with this.
+          when 124
+            raise Thor::Error, 'Tunnel timed out'
+          else
+            raise Thor::Error, "Tunnel crashed (#{code})"
+          end
         end
 
         def port

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

@@ -129,6 +129,15 @@ module Aptible
               op = database.create_operation!(type: 'backup')
               attach_to_operation_logs(op)
             end
+
+            desc 'db:reload HANDLE', 'Reload a database'
+            option :environment
+            define_method 'db:reload' do |handle|
+              database = ensure_database(options.merge(db: handle))
+              say "Reloading #{database.handle}..."
+              op = database.create_operation!(type: 'reload')
+              attach_to_operation_logs(op)
+            end
           end
         end
       end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.8.4'.freeze
+    VERSION = '0.8.5'.freeze
   end
 end

data/spec/aptible/cli/helpers/tunnel_spec.rb

@@ -30,8 +30,21 @@ describe Aptible::CLI::Helpers::Tunnel do
     expect(mock_argv.shift).to eq('5678:/some.sock')
   end
 
+  it 'provides the port it picked' do
+    helper = described_class.new({}, ['ssh'], '/some.sock')
+    helper.start
+    port = helper.port
+    helper.stop
+
+    mock_argv = read_mock_argv
+    expect(mock_argv.size).to eq(4)
+
+    expect(mock_argv.shift).to eq('-L')
+    expect(mock_argv.shift).to eq("#{port}:/some.sock")
+  end
+
   it 'captures and displays tunnel errors' do
-    helper = described_class.new({ 'FAIL_TUNNEL' => '1' }, ['ssh'],
+    helper = described_class.new({ 'SSH_MOCK_FAIL_TUNNEL' => '1' }, ['ssh'],
                                  '/some.sock')
 
     expect { helper.start(0) }
@@ -47,4 +60,28 @@ describe Aptible::CLI::Helpers::Tunnel do
     socat = described_class.new({}, [], '/some.sock')
     expect { socat.stop }.to raise_error(/You must call #start/)
   end
+
+  it 'understands an exit status of 0' do
+    helper = described_class.new(
+      { 'SSH_MOCK_EXITCODE' => '0' }, ['ssh'], '/some.sock'
+    )
+    helper.start
+    helper.wait
+  end
+
+  it 'understands an exit status of 1' do
+    helper = described_class.new(
+      { 'SSH_MOCK_EXITCODE' => '1' }, ['ssh'], '/some.sock'
+    )
+    helper.start
+    expect { helper.wait }.to raise_error(/tunnel crashed/im)
+  end
+
+  it 'understands an exit status of 124' do
+    helper = described_class.new(
+      { 'SSH_MOCK_EXITCODE' => '124' }, ['ssh'], '/some.sock'
+    )
+    helper.start
+    expect { helper.wait }.to raise_error(/tunnel timed out/im)
+  end
 end

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

@@ -199,7 +199,8 @@ describe Aptible::CLI::Agent do
     let(:op) { Fabricate(:operation) }
 
     it 'allows creating a new backup' do
-      expect(database).to receive(:create_operation!).and_return(op)
+      expect(database).to receive(:create_operation!)
+        .with(type: 'backup').and_return(op)
       expect(subject).to receive(:say).with('Backing up foobar...')
       expect(subject).to receive(:attach_to_operation_logs).with(op)
 
@@ -211,4 +212,25 @@ describe Aptible::CLI::Agent do
         .to raise_error(Thor::Error, 'Could not find database nope')
     end
   end
+
+  describe '#db:reload' do
+    before { allow(Aptible::Api::Account).to receive(:all) { [account] } }
+    before { allow(Aptible::Api::Database).to receive(:all) { [database] } }
+
+    let(:op) { Fabricate(:operation) }
+
+    it 'allows reloading a database' do
+      expect(database).to receive(:create_operation!)
+        .with(type: 'reload').and_return(op)
+      expect(subject).to receive(:say).with('Reloading foobar...')
+      expect(subject).to receive(:attach_to_operation_logs).with(op)
+
+      subject.send('db:reload', handle)
+    end
+
+    it 'fails if the DB is not found' do
+      expect { subject.send('db:reload', 'nope') }
+        .to raise_error(Thor::Error, 'Could not find database nope')
+    end
+  end
 end

data/spec/mock/ssh

@@ -0,0 +1 @@
+ssh_mock.rb

data/spec/mock/ssh_mock.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 require 'json'
 
-raise 'Something went wrong!' if ENV['FAIL_TUNNEL']
+raise 'Something went wrong!' if ENV['SSH_MOCK_FAIL_TUNNEL']
 
 # Log arguments to SSH_MOCK_OUTFILE
 File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
   f.write({
+    'pid' => $PID,
     'argc' => ARGV.size,
     'argv' => ARGV,
     'env' => ENV.to_hash
@@ -13,3 +14,5 @@ File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
 end
 
 puts 'TUNNEL READY'
+
+exit Integer(ENV.fetch('SSH_MOCK_EXITCODE', 0))

data/spec/shared/mock_ssh_context.rb

@@ -16,6 +16,12 @@ shared_context 'mock ssh' do
     ClimateControl.modify(env) { example.run }
   end
 
+  def read_mock_pid
+    File.open(ssh_mock_outfile) do |f|
+      return JSON.load(f.read).fetch('pid')
+    end
+  end
+
   def read_mock_argv
     File.open(ssh_mock_outfile) do |f|
       return JSON.load(f.read).fetch('argv')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services

data/spec/mock/ssh

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-require 'json'
-
-raise 'Something went wrong!' if ENV['FAIL_TUNNEL']
-
-# Log arguments to SSH_MOCK_OUTFILE
-File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|
-  f.write({
-    'argc' => ARGV.size,
-    'argv' => ARGV,
-    'env' => ENV.to_hash
-  }.to_json)
-end
-
-puts 'TUNNEL READY'