aptible-cli 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe6307751ef50d084ce1b378adc2f94b203c289
-  data.tar.gz: 99a3c232ebef3b35e327f958fc4c61628ef6639b
+  metadata.gz: 8713f34b37e6276e5d322d7254ab78b3356d35a4
+  data.tar.gz: 8951124f8a1ca2d50decc963ba0a8f045c01d2f2
 SHA512:
-  metadata.gz: 7f6b5177638c5c3a69215e8bee64e7d560fd22cae00db83112b51b0f53098c2737a92dbf666817b6d0689d513c0d27533e642d9af2a8fb06ed3a981afe30d0b7
-  data.tar.gz: 5f7ed6c2a95c266fe018a7fcb026f5b6ad21d28d005a86b4e013c8eefc4a9d47b3ad4e3d401bdcce72410279cc8624c7934a2cfee19c4471649e68d2ec02b39c
+  metadata.gz: 6211969254e1b930bf5f9387760758f7540d482c8e18f9267cb77ac413e527ed966d037cf4f9b8ef911739457778cb205477e7bed8d8d97b306d0cbec6551f11
+  data.tar.gz: 79526232944a06f47d020c12097de08be45a8b4331f9735fb6808640e2e535f07640c0fbc9a1d44f113320332c042ec08ee336df35268f160111cd02528a8137

data/README.md

@@ -35,6 +35,7 @@ Commands:
   aptible db:create HANDLE            # Create a new 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 help [COMMAND]              # Describe available commands or one specific command
   aptible login                       # Log in to Aptible
@@ -59,7 +60,8 @@ Commands:
 * Graham Melcher ([@melcher](https://github.com/melcher))
 * Pete Browne ([@petebrowne](https://github.com/petebrowne))
 * Rich Humphrey ([@rdh](https://github.com/rdh))
-
+* Daniel Levenson ([@dleve123](https://github.com/dleve123))
+* Ryan Aipperspach ([@ryanaip](https://github.com/ryanaip))
 
 ## Copyright and License
 

data/lib/aptible/cli/agent.rb

@@ -11,6 +11,7 @@ require_relative 'helpers/env'
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
 require_relative 'subcommands/db'
+require_relative 'subcommands/domains'
 require_relative 'subcommands/logs'
 require_relative 'subcommands/ps'
 require_relative 'subcommands/rebuild'
@@ -26,6 +27,7 @@ module Aptible
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
+      include Subcommands::Domains
       include Subcommands::Logs
       include Subcommands::Ps
       include Subcommands::Rebuild

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

@@ -7,6 +7,18 @@ module Aptible
       module Account
         include Helpers::Token
 
+        def scoped_accounts(options)
+          if options[:account]
+            if (account = account_from_handle(options[:account]))
+              [account]
+            else
+              fail Thor::Error, 'Specified account does not exist'
+            end
+          else
+            Aptible::Api::Account.all(token: fetch_token)
+          end
+        end
+
         def ensure_account(options = {})
           if (handle = options[:account])
             account = account_from_handle(handle)

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

@@ -10,13 +10,7 @@ module Aptible
             desc 'apps', 'List all applications'
             option :account
             def apps
-              if options[:account]
-                accounts = [account_from_handle(options[:account])]
-              else
-                accounts = Aptible::Api::Account.all(token: fetch_token)
-              end
-
-              accounts.each do |account|
+              scoped_accounts(options).each do |account|
                 say "=== #{account.handle}"
                 account.apps.each do |app|
                   say app.handle

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

@@ -10,6 +10,14 @@ module Aptible
             include Helpers::Token
             include Term::ANSIColor
 
+            desc 'db:list', 'List all databases'
+            option :account
+            define_method 'db:list' do
+              scoped_accounts(options).each do |account|
+                present_account_databases(account)
+              end
+            end
+
             desc 'db:create HANDLE', 'Create a new database'
             option :type, default: 'postgresql'
             option :size, default: 10
@@ -78,6 +86,12 @@ module Aptible
 
             private
 
+            def present_account_databases(account)
+              say "=== #{account.handle}"
+              account.databases.each { |db| say db.handle }
+              say ''
+            end
+
             def establish_connection(database, local_port)
               ENV['ACCESS_TOKEN'] = fetch_token
               ENV['APTIBLE_DATABASE'] = database.handle

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

@@ -0,0 +1,39 @@
+require 'shellwords'
+
+module Aptible
+  module CLI
+    module Subcommands
+      module Domains
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Operation
+            include Helpers::App
+
+            desc 'domains', "Print an app's current virtual domains"
+            option :app
+            option :verbose, aliases: '-v'
+            option :remote, aliases: '-r'
+            def domains
+              app = ensure_app(options)
+              print_vhosts(app) do |vhost|
+                if options[:verbose]
+                  "#{vhost.virtual_domain} -> #{vhost.external_host}"
+                else
+                  vhost.virtual_domain
+                end
+              end
+            end
+
+            private
+
+            def print_vhosts(app)
+              (app.vhosts || []).each do |vhost|
+                say yield(vhost)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.5.13'
+    VERSION = '0.5.14'
   end
 end

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

@@ -4,6 +4,9 @@ require 'spec_helper'
 class Database < OpenStruct
 end
 
+class Account < OpenStruct
+end
+
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
@@ -39,4 +42,87 @@ describe Aptible::CLI::Agent do
       subject.send('db:tunnel', 'foobar')
     end
   end
+
+  describe '#db:list' do
+    context 'when no account is specified' do
+      it 'prints out the grouped database handles for all accounts' do
+        setup_prod_and_staging_accounts
+        allow(subject).to receive(:say)
+
+        subject.send('db:list')
+
+        expect(subject).to have_received(:say).with('=== staging')
+        expect(subject).to have_received(:say).with('staging-redis-db')
+        expect(subject).to have_received(:say).with('staging-postgres-db')
+
+        expect(subject).to have_received(:say).with('=== production')
+        expect(subject).to have_received(:say).with('prod-elsearch-db')
+        expect(subject).to have_received(:say).with('prod-postgres-db')
+      end
+    end
+
+    context 'when a valid account is specified' do
+      it 'prints out the database handles for the account' do
+        setup_prod_and_staging_accounts
+        allow(subject).to receive(:say)
+
+        subject.options = { account: 'staging' }
+        subject.send('db:list')
+
+        expect(subject).to have_received(:say).with('=== staging')
+        expect(subject).to have_received(:say).with('staging-redis-db')
+        expect(subject).to have_received(:say).with('staging-postgres-db')
+
+        expect(subject).to_not have_received(:say).with('=== production')
+        expect(subject).to_not have_received(:say).with('prod-elsearch-db')
+        expect(subject).to_not have_received(:say).with('prod-postgres-db')
+      end
+    end
+
+    context 'when an invalid account is specified' do
+      it 'prints out an error' do
+        setup_prod_and_staging_accounts
+        allow(subject).to receive(:say)
+
+        subject.options = { account: 'foo' }
+        expect { subject.send('db:list') }.to raise_error(
+          'Specified account does not exist'
+        )
+      end
+    end
+  end
+
+  def setup_prod_and_staging_accounts
+    staging_redis = Database.new(handle: 'staging-redis-db')
+    staging_postgres = Database.new(handle: 'staging-postgres-db')
+    prod_elsearch = Database.new(handle: 'prod-elsearch-db')
+    prod_postgres = Database.new(handle: 'prod-postgres-db')
+
+    stub_local_token_with('the-token')
+    setup_new_accounts_with_dbs(
+      token: 'the-token',
+      account_db_mapping: {
+        'staging' => [staging_redis, staging_postgres],
+        'production' => [prod_elsearch, prod_postgres]
+      }
+    )
+  end
+
+  def setup_new_accounts_with_dbs(options)
+    token = options.fetch(:token)
+    account_db_mapping = options.fetch(:account_db_mapping)
+
+    accounts_with_dbs = []
+    account_db_mapping.each do |account_handle, dbs|
+      account = Account.new(handle: account_handle, databases: dbs)
+      accounts_with_dbs << account
+    end
+
+    allow(Aptible::Api::Account).to receive(:all).with(token: token)
+      .and_return(accounts_with_dbs)
+  end
+
+  def stub_local_token_with(token)
+    allow(subject).to receive(:fetch_token).and_return(token)
+  end
 end

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

@@ -0,0 +1,63 @@
+require 'ostruct'
+require 'spec_helper'
+
+class App < OpenStruct
+end
+
+class Service < OpenStruct
+end
+
+class Operation < OpenStruct
+end
+
+class Vhost < OpenStruct
+end
+
+describe Aptible::CLI::Agent do
+  before { subject.stub(:ask) }
+  before { subject.stub(:save_token) }
+  before { subject.stub(:fetch_token) { double 'token' } }
+
+  let(:service) { Service.new(process_type: 'web') }
+  let(:op) { Operation.new(status: 'succeeded') }
+  let(:app) { App.new(handle: 'hello', services: [service]) }
+  let(:apps) { [app] }
+
+  let(:vhost1) { Vhost.new(virtual_domain: 'domain1', external_host: 'host1') }
+  let(:vhost2) { Vhost.new(virtual_domain: 'domain2', external_host: 'host2') }
+
+  describe '#domains' do
+    it 'should print out the hostnames' do
+      allow(service).to receive(:create_operation) { op }
+      allow(subject).to receive(:options) { { app: 'hello' } }
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect(app).to receive(:vhosts) { [vhost1, vhost2] }
+      expect(subject).to receive(:say).with('domain1')
+      expect(subject).to receive(:say).with('domain2')
+
+      subject.send('domains')
+    end
+
+    it 'should fail if app is non-existent' do
+      allow(service).to receive(:create_operation) { op }
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect do
+        subject.send('domains')
+      end.to raise_error(Thor::Error)
+    end
+
+    it 'should print hostnames if -v is passed' do
+      allow(service).to receive(:create_operation) { op }
+      allow(subject).to receive(:options) { { verbose: true, app: 'hello' } }
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect(app).to receive(:vhosts) { [vhost1, vhost2] }
+      expect(subject).to receive(:say).with('domain1 -> host1')
+      expect(subject).to receive(:say).with('domain2 -> host2')
+
+      subject.send('domains')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -178,6 +178,7 @@ files:
 - lib/aptible/cli/subcommands/apps.rb
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
+- lib/aptible/cli/subcommands/domains.rb
 - lib/aptible/cli/subcommands/logs.rb
 - lib/aptible/cli/subcommands/ps.rb
 - lib/aptible/cli/subcommands/rebuild.rb
@@ -187,6 +188,7 @@ files:
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
+- spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
 - spec/spec_helper.rb
@@ -210,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
@@ -218,6 +220,7 @@ test_files:
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
+- spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
 - spec/spec_helper.rb