aptible-cli 0.5.15 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a414273ca1b43ed9ba77b0d60edf901a10f984
-  data.tar.gz: a792785c97710d096c958c89cac6cfa78b5da496
+  metadata.gz: 0e6d976b32bef3e1b4b34c49be4d7bfc524aa908
+  data.tar.gz: b53c2136b9de6bd7f09b87950bdf214f58adfffd
 SHA512:
-  metadata.gz: d9b2f63dd6958f2fbdf26aea08d8ceb07a868eb3a67cb86c507293c008cfda491fa70689d63ca294827fd236907f1cba0864c2203612d9a1af87c5b6fdde3d52
-  data.tar.gz: 3fe1e96e66fdb052f0a3de8bf99b85237a8a75e79a548d416be3dffd58f63c7b45556b7f0d2ac74c7dd923c11d0e37431b8ca8df65b345ee48e72e7395d27428
+  metadata.gz: a7300533f684f475ad4e981d9b9534758ec666c1a57c83a4e605da5fe06286f03877b589303a7027b854fcf6470d1b76ba8cb987f0c4bf1423171abfa2f117db
+  data.tar.gz: 4b6a7f6c26295bdbacdf9093113e32431a9c9ef73bbec8f2017996a89d0955a0c405305dfeec6e418181b96f326cb68551be16ed24b2b68ef83d8c3c7f268488

data/lib/aptible/cli/agent.rb

@@ -4,7 +4,7 @@ require 'json'
 
 require_relative 'helpers/token'
 require_relative 'helpers/operation'
-require_relative 'helpers/account'
+require_relative 'helpers/environment'
 require_relative 'helpers/app'
 require_relative 'helpers/env'
 

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

@@ -6,19 +6,38 @@ module Aptible
     module Helpers
       module App
         include Helpers::Token
+        include Helpers::Environment
+
+        class HandleFromGitRemote
+          PATTERN = %r{
+  :((?<environment_handle>[0-9a-z\-_\.]+?)/)?(?<app_handle>[0-9a-z\-_\.]+)\.git
+  \z
+}x
+
+          def self.parse(url)
+            PATTERN.match(url)
+          end
+        end
 
         def ensure_app(options = {})
           remote = options[:remote] || ENV['APTIBLE_REMOTE']
-          handle = options[:app] ||
-                   handle_from_remote(remote) ||
-                   ensure_default_handle
-          app = app_from_handle(handle)
+          handle = options[:app]
+          if handle
+            environment = ensure_environment(options)
+          else
+            handles = handle_from_remote(remote) || ensure_default_handle
+            handle = handles[:app_handle]
+            env_handle = handles[:environment_handle] || options[:environment]
+            environment = ensure_environment(environment: env_handle)
+          end
+
+          app = app_from_handle(handle, environment)
           return app if app
           fail Thor::Error, "Could not find app #{handle}"
         end
 
-        def app_from_handle(handle)
-          Aptible::Api::App.all(token: fetch_token).find do |a|
+        def app_from_handle(handle, environment)
+          environment.apps.find do |a|
             a.handle == handle
           end
         end
@@ -38,7 +57,7 @@ module Aptible
         def handle_from_remote(remote_name)
           git = Git.open(Dir.pwd)
           aptible_remote = git.remote(remote_name).url || ''
-          aptible_remote[/:(?<name>.+)\.git/, :name]
+          HandleFromGitRemote.parse(aptible_remote)
         rescue
           nil
         end

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

@@ -0,0 +1,49 @@
+require 'aptible/api'
+require 'git'
+
+module Aptible
+  module CLI
+    module Helpers
+      module Environment
+        include Helpers::Token
+
+        def scoped_environments(options)
+          if options[:environment]
+            if (environment = environment_from_handle(options[:environment]))
+              [environment]
+            else
+              fail Thor::Error, 'Specified account does not exist'
+            end
+          else
+            Aptible::Api::Account.all(token: fetch_token)
+          end
+        end
+
+        def ensure_environment(options = {})
+          if (handle = options[:environment])
+            environment = environment_from_handle(handle)
+            return environment if environment
+            fail Thor::Error, "Could not find environment #{handle}"
+          else
+            ensure_default_environment
+          end
+        end
+
+        def environment_from_handle(handle)
+          Aptible::Api::Account.all(token: fetch_token).find do |a|
+            a.handle == handle
+          end
+        end
+
+        def ensure_default_environment
+          environments = Aptible::Api::Account.all(token: fetch_token)
+          return environments.first if environments.count == 1
+
+          fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
+            Multiple environments available, please specify with --environment
+          ERR
+        end
+      end
+    end
+  end
+end

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

@@ -4,15 +4,15 @@ module Aptible
       module Apps
         def self.included(thor)
           thor.class_eval do
-            include Helpers::Account
+            include Helpers::Environment
             include Helpers::Token
 
             desc 'apps', 'List all applications'
-            option :account
+            option :environment
             def apps
-              scoped_accounts(options).each do |account|
-                say "=== #{account.handle}"
-                account.apps.each do |app|
+              scoped_environments(options).each do |env|
+                say "=== #{env.handle}"
+                env.apps.each do |app|
                   say app.handle
                 end
                 say ''
@@ -20,10 +20,10 @@ module Aptible
             end
 
             desc 'apps:create HANDLE', 'Create a new application'
-            option :account
+            option :environment
             define_method 'apps:create' do |handle|
-              account = ensure_account(options)
-              app = account.create_app(handle: handle)
+              environment = ensure_environment(options)
+              app = environment.create_app(handle: handle)
 
               if app.errors.any?
                 fail Thor::Error, app.errors.full_messages.first
@@ -34,6 +34,7 @@ module Aptible
 
             desc 'apps:scale TYPE NUMBER', 'Scale app to NUMBER of instances'
             option :app
+            option :environment
             define_method 'apps:scale' do |type, n|
               num = Integer(n)
               app = ensure_app(options)
@@ -43,6 +44,7 @@ module Aptible
             end
 
             option :app
+            option :environment
             desc 'apps:deprovision', 'Deprovision an app'
             define_method 'apps:deprovision' do
               app = ensure_app(options)

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

@@ -11,21 +11,21 @@ module Aptible
             include Term::ANSIColor
 
             desc 'db:list', 'List all databases'
-            option :account
+            option :environment
             define_method 'db:list' do
-              scoped_accounts(options).each do |account|
-                present_account_databases(account)
+              scoped_environments(options).each do |env|
+                present_environment_databases(env)
               end
             end
 
             desc 'db:create HANDLE', 'Create a new database'
             option :type, default: 'postgresql'
             option :size, default: 10
-            option :account
+            option :environment
             define_method 'db:create' do |handle|
-              account = ensure_account(options)
-              database = account.create_database(handle: handle,
-                                                 type: options[:type])
+              environment = ensure_environment(options)
+              database = environment.create_database(handle: handle,
+                                                     type: options[:type])
 
               if database.errors.any?
                 fail Thor::Error, database.errors.full_messages.first
@@ -38,28 +38,36 @@ module Aptible
             end
 
             desc 'db:clone SOURCE DEST', 'Clone a database to create a new one'
+            option :environment
             define_method 'db:clone' do |source_handle, dest_handle|
-              dest = clone_database(source_handle, dest_handle)
+              environment = ensure_environment(options)
+              dest = clone_database(source_handle, dest_handle, environment)
               say dest.connection_url
             end
 
             desc 'db:dump HANDLE', 'Dump a remote database to file'
+            option :environment
             define_method 'db:dump' do |handle|
-              dump_database(handle)
+              environment = ensure_environment(options)
+              dump_database(handle, environment)
             end
 
             desc 'db:execute HANDLE SQL_FILE', 'Executes sql against a database'
+            option :environment
             define_method 'db:execute' do |handle, sql_path|
-              execute_local_tunnel(handle) do |url|
+              environment = ensure_environment(options)
+              execute_local_tunnel(handle, environment) do |url|
                 say "Executing #{sql_path} against #{handle}"
                 `psql #{url} < #{sql_path}`
               end
             end
 
             desc 'db:tunnel HANDLE', 'Create a local tunnel to a database'
+            option :environment
             option :port, type: :numeric
             define_method 'db:tunnel' do |handle|
-              database = database_from_handle(handle)
+              environment = ensure_environment(options)
+              database = database_from_handle(handle, environment)
               local_port = options[:port] || random_local_port
 
               say 'Creating tunnel...', :green
@@ -77,8 +85,10 @@ module Aptible
             end
 
             desc 'db:deprovision HANDLE', 'Deprovision a database'
+            option :environment
             define_method 'db:deprovision' do |handle|
-              database = database_from_handle(handle)
+              environment = ensure_environment(options)
+              database = database_from_handle(handle, environment)
               say "Deprovisioning #{handle}..."
               database.update!(status: 'deprovisioned')
               database.create_operation!(type: 'deprovision')
@@ -86,9 +96,9 @@ module Aptible
 
             private
 
-            def present_account_databases(account)
-              say "=== #{account.handle}"
-              account.databases.each { |db| say db.handle }
+            def present_environment_databases(environment)
+              say "=== #{environment.handle}"
+              environment.databases.each { |db| say db.handle }
               say ''
             end
 
@@ -104,8 +114,10 @@ module Aptible
               Kernel.exec(command)
             end
 
-            def database_from_handle(handle, options = { postgres_only: false })
-              all = Aptible::Api::Database.all(token: fetch_token)
+            def database_from_handle(handle,
+                                     environment,
+                                     options = { postgres_only: false })
+              all = environment.databases
               database = all.find { |a|  a.handle == handle }
 
               unless database
@@ -119,16 +131,16 @@ module Aptible
               database
             end
 
-            def clone_database(source_handle, dest_handle)
-              source = database_from_handle(source_handle)
+            def clone_database(source_handle, dest_handle, environment)
+              source = database_from_handle(source_handle, environment)
               op = source.create_operation(type: 'clone', handle: dest_handle)
               poll_for_success(op)
 
               database_from_handle(dest_handle)
             end
 
-            def dump_database(handle)
-              execute_local_tunnel(handle) do |url|
+            def dump_database(handle, environment)
+              execute_local_tunnel(handle, environment) do |url|
                 filename = "#{handle}.dump"
                 say "Dumping to #{filename}"
                 `pg_dump #{url} > #{filename}`
@@ -137,8 +149,10 @@ module Aptible
 
             # Creates a local tunnel and yields the url to it
 
-            def execute_local_tunnel(handle)
-              database = database_from_handle(handle, postgres_only: true)
+            def execute_local_tunnel(handle, environment)
+              database = database_from_handle(handle,
+                                              environment,
+                                              postgres_only: true)
 
               local_port = random_local_port
               pid = fork { establish_connection(database, local_port) }

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

@@ -11,6 +11,7 @@ module Aptible
 
             desc 'domains', "Print an app's current virtual domains"
             option :app
+            option :environment
             option :verbose, aliases: '-v'
             option :remote, aliases: '-r'
             def domains

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.5.15'
+    VERSION = '0.6.0'
   end
 end

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

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Helpers::App::HandleFromGitRemote do
+  it 'should parse handle from remote without account' do
+    str = 'git@test.aptible.com:test-app.git'
+    result = described_class.parse(str)[:app_handle]
+    expect(result).not_to be nil
+    expect(result).to eql 'test-app'
+  end
+
+  it 'should parse handle from remote with account' do
+    str = 'git@test.aptible.com:test-account/test-app.git'
+    result = described_class.parse(str)[:app_handle]
+    expect(result).not_to be nil
+    expect(result).to eql 'test-app'
+  end
+end

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

@@ -21,7 +21,11 @@ describe Aptible::CLI::Agent do
 
   let(:service) { Service.new(process_type: 'web') }
   let(:op) { Operation.new(status: 'succeeded') }
-  let(:account) { Account.new(bastion_host: 'localhost', dumptruck_port: 1234) }
+  let(:account) do
+    Account.new(bastion_host: 'localhost',
+                dumptruck_port: 1234,
+                handle: 'aptible')
+  end
   let(:apps) do
     [App.new(handle: 'hello', services: [service], account: account)]
   end
@@ -31,14 +35,27 @@ describe Aptible::CLI::Agent do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { app: 'hello' } }
       allow(op).to receive(:resource) { apps.first }
-      allow(Aptible::Api::App).to receive(:all) { apps }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:apps) { apps }
 
       subject.send('apps:scale', 'web', 3)
     end
 
+    it 'should fail if environment is non-existent' do
+      allow(subject).to receive(:options) { { environment: 'foo', app: 'web' } }
+      allow(service).to receive(:create_operation) { op }
+      allow(Aptible::Api::Account).to receive(:all) { [] }
+      allow(account).to receive(:apps) { [apps] }
+
+      expect do
+        subject.send('apps:scale', 'web', 3)
+      end.to raise_error(Thor::Error)
+    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 }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:apps) { [] }
 
       expect do
         subject.send('apps:scale', 'web', 3)

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

@@ -14,6 +14,11 @@ describe Aptible::CLI::Agent do
   before { subject.stub(:random_local_port) { 4242 } }
   before { subject.stub(:establish_connection) }
 
+  let(:account) do
+    Account.new(bastion_host: 'localhost',
+                dumptruck_port: 1234,
+                handle: 'aptible')
+  end
   let(:database) do
     Database.new(
       type: 'postgresql',
@@ -25,14 +30,16 @@ describe Aptible::CLI::Agent do
 
   describe '#db:tunnel' do
     it 'should fail if database is non-existent' do
-      allow(Aptible::Api::Database).to receive(:all) { [] }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:databases) { [] }
       expect do
         subject.send('db:tunnel', 'foobar')
       end.to raise_error('Could not find database foobar')
     end
 
     it 'should print a message about how to connect' do
-      allow(Aptible::Api::Database).to receive(:all) { [database] }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:databases) { [database] }
       local_url = 'postgresql://aptible:password@127.0.0.1:4242/db'
       expect(subject).to receive(:say).with('Creating tunnel...', :green)
       expect(subject).to receive(:say).with("Connect at #{local_url}", :green)
@@ -66,7 +73,7 @@ describe Aptible::CLI::Agent do
         setup_prod_and_staging_accounts
         allow(subject).to receive(:say)
 
-        subject.options = { account: 'staging' }
+        subject.options = { environment: 'staging' }
         subject.send('db:list')
 
         expect(subject).to have_received(:say).with('=== staging')
@@ -84,7 +91,7 @@ describe Aptible::CLI::Agent do
         setup_prod_and_staging_accounts
         allow(subject).to receive(:say)
 
-        subject.options = { account: 'foo' }
+        subject.options = { environment: 'foo' }
         expect { subject.send('db:list') }.to raise_error(
           'Specified account does not exist'
         )

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

@@ -22,6 +22,11 @@ describe Aptible::CLI::Agent do
   let(:op) { Operation.new(status: 'succeeded') }
   let(:app) { App.new(handle: 'hello', services: [service]) }
   let(:apps) { [app] }
+  let(:account) do
+    Account.new(bastion_host: 'localhost',
+                dumptruck_port: 1234,
+                handle: 'aptible')
+  end
 
   let(:vhost1) { Vhost.new(virtual_domain: 'domain1', external_host: 'host1') }
   let(:vhost2) { Vhost.new(virtual_domain: 'domain2', external_host: 'host2') }
@@ -30,7 +35,8 @@ describe Aptible::CLI::Agent 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 }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:apps) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1')
@@ -41,7 +47,18 @@ describe Aptible::CLI::Agent do
 
     it 'should fail if app is non-existent' do
       allow(service).to receive(:create_operation) { op }
-      allow(Aptible::Api::App).to receive(:all) { apps }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:apps) { apps }
+
+      expect do
+        subject.send('domains')
+      end.to raise_error(Thor::Error)
+    end
+
+    it 'should fail if environment is non-existent' do
+      allow(service).to receive(:create_operation) { op }
+      allow(Aptible::Api::Account).to receive(:all) { [] }
+      allow(account).to receive(:apps) { apps }
 
       expect do
         subject.send('domains')
@@ -51,7 +68,8 @@ describe Aptible::CLI::Agent do
     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 }
+      allow(Aptible::Api::Account).to receive(:all) { [account] }
+      allow(account).to receive(:apps) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1 -> host1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -170,9 +170,9 @@ files:
 - bin/aptible
 - lib/aptible/cli.rb
 - lib/aptible/cli/agent.rb
-- lib/aptible/cli/helpers/account.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/env.rb
+- lib/aptible/cli/helpers/environment.rb
 - lib/aptible/cli/helpers/operation.rb
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/subcommands/apps.rb
@@ -186,6 +186,7 @@ files:
 - lib/aptible/cli/subcommands/ssh.rb
 - lib/aptible/cli/version.rb
 - spec/aptible/cli/agent_spec.rb
+- spec/aptible/cli/helpers/handle_from_git_remote.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
@@ -212,12 +213,13 @@ 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
 test_files:
 - spec/aptible/cli/agent_spec.rb
+- spec/aptible/cli/helpers/handle_from_git_remote.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb

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

@@ -1,49 +0,0 @@
-require 'aptible/api'
-require 'git'
-
-module Aptible
-  module CLI
-    module Helpers
-      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)
-            return account if account
-            fail "Could not find account #{handle}"
-          else
-            ensure_default_account
-          end
-        end
-
-        def account_from_handle(handle)
-          Aptible::Api::Account.all(token: fetch_token).find do |a|
-            a.handle == handle
-          end
-        end
-
-        def ensure_default_account
-          accounts = Aptible::Api::Account.all(token: fetch_token)
-          return accounts.first if accounts.count == 1
-
-          fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
-            Multiple accounts available, please specify with --account
-          ERR
-        end
-      end
-    end
-  end
-end