aptible-cli 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b91444b0b662e1ab07c80526ba3f5054fd7ea6
-  data.tar.gz: f587f3803827f79e03f917134427cbad12aeff42
+  metadata.gz: f4d9a2c5e7a80842934a122c1a11527ef05c1395
+  data.tar.gz: 58467bec285d73b6931fef00cb3b1f024b04ec08
 SHA512:
-  metadata.gz: 78a8eab1b55ba1e03c80eb102bece4876ac0f9dc873e551d552ee3a79e6a11610548cfc22fcc14e906f7149eb27bf41c0cb2aed94ce146f9dc0abdd0d9772bac
-  data.tar.gz: c44a10640e89b53dee298aa13044d2211ceeeaea3de1cc59173fd694b70f99be98c91e3af29bfdc2bc27e045a39ebd392772343976174453be6ce03d70d0e374
+  metadata.gz: ab3bfc0457f47e32db4082fc86b039426664849528b7146886c7365b7983c09bece8afd360b7bcca230f4a5dd767d499c717a98d9624b83a7ea50f846745a8ee
+  data.tar.gz: c03299b36d7951e4c4d8e42bda9ab949df13c5a3d64237532905c1508fc4ae37343ce9b74002c813922c57955d028a33e8c9a9d6e007264f3fe69732e5b3fbb7

data/aptible-cli.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aptible-resource', '>= 0.3.0'
   spec.add_dependency 'thor', '>= 0.19.0'
   spec.add_dependency 'git'
+  spec.add_dependency 'term-ansicolor'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'

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

@@ -1,3 +1,5 @@
+require 'term/ansicolor'
+
 module Aptible
   module CLI
     module Subcommands
@@ -6,6 +8,7 @@ module Aptible
           thor.class_eval do
             include Helpers::Operation
             include Helpers::Token
+            include Term::ANSIColor
 
             desc 'db:create HANDLE', 'Create a new database'
             option :type, default: 'postgresql'
@@ -40,7 +43,7 @@ module Aptible
             desc 'db:execute HANDLE SQL_FILE', 'Executes sql against a database'
             define_method 'db:execute' do |handle, sql_path|
               execute_local_tunnel(handle) do |url|
-                puts "Executing #{sql_path} against #{handle}"
+                say "Executing #{sql_path} against #{handle}"
                 `psql #{url} < #{sql_path}`
               end
             end
@@ -50,14 +53,16 @@ module Aptible
             define_method 'db:tunnel' do |handle|
               database = database_from_handle(handle)
               local_port = options[:port] || random_local_port
-              puts "Creating tunnel at localhost:#{local_port}..."
+
+              say 'Creating tunnel...', :green
+              say "Connect at #{local_url(database, local_port)}", :green
               establish_connection(database, local_port)
             end
 
             desc 'db:deprovision HANDLE', 'Deprovision a database'
             define_method 'db:deprovision' do |handle|
               database = database_from_handle(handle)
-              puts "Deprovisioning #{handle}..."
+              say "Deprovisioning #{handle}..."
               database.update!(status: 'deprovisioned')
               database.create_operation(type: 'deprovision')
             end
@@ -92,7 +97,7 @@ module Aptible
             end
 
             def clone_database(source_handle, dest_handle)
-              puts "Cloning #{source_handle} to #{dest_handle}"
+              say "Cloning #{source_handle} to #{dest_handle}"
 
               source = database_from_handle(source_handle)
               op = source.create_operation(type: 'clone', handle: dest_handle)
@@ -104,7 +109,7 @@ module Aptible
             def dump_database(handle)
               execute_local_tunnel(handle) do |url|
                 filename = "#{handle}.dump"
-                puts "Dumping to #{filename}"
+                say "Dumping to #{filename}"
                 `pg_dump #{url} > #{filename}`
               end
             end
@@ -135,6 +140,14 @@ module Aptible
               port
             end
 
+            def local_url(database, local_port)
+              remote_url = database.connection_url
+              uri = URI.parse(remote_url)
+
+              "#{uri.scheme}://#{uri.user}:#{uri.password}@" \
+              "127.0.0.1:#{local_port}#{uri.path}"
+            end
+
             def claim_remote_port(database)
               ENV['ACCESS_TOKEN'] = fetch_token
 

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

@@ -15,6 +15,11 @@ module Aptible
             def logs
               app = ensure_app(options)
 
+              unless app.status == 'provisioned' && app.services.any?
+                fail Thor::Error, 'Unable to retrieve logs. ' \
+                                  "Have you deployed #{app.handle} yet?"
+              end
+
               host = app.account.bastion_host
               port = app.account.dumptruck_port
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.5.8'
+    VERSION = '0.5.9'
   end
 end

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

@@ -15,9 +15,9 @@ describe Aptible::CLI::Agent do
   before { subject.stub(:save_token) }
   before { subject.stub(:fetch_token) { double 'token' } }
 
-  service = Service.new(process_type: 'web')
-  op = Operation.new(status: 'succeeded')
-  apps = [App.new(handle: 'hello', services: [service])]
+  let(:service) { Service.new(process_type: 'web') }
+  let(:op) { Operation.new(status: 'succeeded') }
+  let(:apps) { [App.new(handle: 'hello', services: [service])] }
 
   describe '#apps:scale' do
     it 'should pass given correct parameters' do

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

@@ -0,0 +1,39 @@
+require 'ostruct'
+require 'spec_helper'
+
+class Database < OpenStruct
+end
+
+describe Aptible::CLI::Agent do
+  before { subject.stub(:ask) }
+  before { subject.stub(:save_token) }
+  before { subject.stub(:fetch_token) { double 'token' } }
+  before { subject.stub(:random_local_port) { 4242 } }
+  before { subject.stub(:establish_connection) }
+
+  let(:database) do
+    Database.new(
+      type: 'postgresql',
+      handle: 'foobar',
+      passphrase: 'password',
+      connection_url: 'postgresql://aptible:password@10.252.1.125:49158/db'
+    )
+  end
+
+  describe '#db:tunnel' do
+    it 'should fail if database is non-existent' do
+      allow(Aptible::Api::Database).to receive(:all) { [] }
+      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] }
+      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)
+      subject.send('db:tunnel', 'foobar')
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'ostruct'
+require 'spec_helper'
+
+class App < OpenStruct
+end
+
+class Service < 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(:app) do
+    App.new(handle: 'foobar', status: 'provisioned', services: [service])
+  end
+
+  describe '#logs' do
+    it 'should fail if the app is unprovisioned' do
+      allow(app).to receive(:status) { 'pending' }
+      allow(subject).to receive(:ensure_app) { app }
+      expect { subject.send('logs') }.to raise_error(Thor::Error)
+    end
+
+    it 'should fail if the app has no services' do
+      allow(app).to receive(:services) { [] }
+      allow(subject).to receive(:ensure_app) { app }
+      expect { subject.send('logs') }.to raise_error(Thor::Error)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +186,8 @@ files:
 - lib/aptible/cli/version.rb
 - spec/aptible/cli/agent_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/db_spec.rb
+- spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/aptible-cli
@@ -194,12 +210,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
 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/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
 - spec/spec_helper.rb