aptible-cli 0.14.1 → 0.15.0

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

@@ -27,7 +27,8 @@ describe Aptible::CLI::Agent do
       Fabricate(:vhost, service: service, **args).tap do |v|
         expect_operation(v, 'provision')
         expect(v).to receive(:reload).and_return(v)
-        expect(subject).to receive(:explain_vhost).with(service, v)
+        expect(Aptible::CLI::ResourceFormatter).to receive(:inject_vhost)
+          .with(an_instance_of(Aptible::CLI::Formatter::Object), v, service)
       end
     end
   end
@@ -36,7 +37,10 @@ describe Aptible::CLI::Agent do
     expect(vhost).to receive(:update!).with(options) do
       expect_operation(vhost, 'provision')
       expect(vhost).to receive(:reload).and_return(vhost)
-      expect(subject).to receive(:explain_vhost).with(vhost.service, vhost)
+      expect(Aptible::CLI::ResourceFormatter).to receive(:inject_vhost)
+        .with(
+          an_instance_of(Aptible::CLI::Formatter::Object), vhost, vhost.service
+        )
     end
   end
 
@@ -94,9 +98,6 @@ describe Aptible::CLI::Agent do
 
     describe 'endpoints:list' do
       it 'lists Endpoints' do
-        lines = []
-        allow(subject).to receive(:say) { |m| lines << m }
-
         s = Fabricate(:service, database: db)
         v1 = Fabricate(:vhost, service: s)
         v2 = Fabricate(:vhost, service: s)
@@ -104,6 +105,8 @@ describe Aptible::CLI::Agent do
         stub_options(database: db.handle)
         subject.send('endpoints:list')
 
+        lines = captured_output_text.split("\n")
+
         expect(lines).to include("Hostname: #{v1.external_host}")
         expect(lines).to include("Hostname: #{v2.external_host}")
 
@@ -539,9 +542,6 @@ describe Aptible::CLI::Agent do
 
     describe 'endpoints:list' do
       it 'lists Endpoints across services' do
-        lines = []
-        allow(subject).to receive(:say) { |m| lines << m }
-
         s1 = Fabricate(:service, app: app)
         v1 = Fabricate(:vhost, service: s1)
 
@@ -551,6 +551,8 @@ describe Aptible::CLI::Agent do
 
         subject.send('endpoints:list')
 
+        lines = captured_output_text.split("\n")
+
         expect(lines).to include("Hostname: #{v1.external_host}")
         expect(lines).to include("Hostname: #{v2.external_host}")
         expect(lines).to include("Hostname: #{v3.external_host}")

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

@@ -6,7 +6,6 @@ describe Aptible::CLI::Agent do
 
   before do
     allow(subject).to receive(:fetch_token).and_return(token)
-    allow(subject).to receive(:say) { |m| messages << m }
   end
 
   describe '#operation:cancel' do

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

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  let(:app) { Fabricate(:app) }
+  let(:operation) { Fabricate(:operation, resource: app) }
+  before { allow(subject).to receive(:ensure_app).and_return(app) }
+
+  describe '#rebuild' do
+    it 'rebuilds the app' do
+      expect(app).to receive(:create_operation!)
+        .with(type: 'rebuild').and_return(operation)
+      expect(subject).to receive(:attach_to_operation_logs).with(operation)
+
+      subject.send('rebuild')
+    end
+  end
+end

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

@@ -4,45 +4,41 @@ describe Aptible::CLI::Agent do
   let(:token) { double 'token' }
   let(:app) { Fabricate(:app) }
 
-  let(:lines) { [] }
-
   before do
     allow(subject).to receive(:fetch_token) { token }
     allow(Aptible::Api::App).to receive(:all).with(token: token)
       .and_return([app])
     allow(subject).to receive(:options).and_return(app: app.handle)
-
-    allow(subject).to receive(:say) { |m| lines << m }
   end
 
   it 'lists a CMD service' do
     Fabricate(:service, app: app, process_type: 'cmd', command: nil)
     subject.send('services')
 
-    expect(lines).to include('Service: cmd')
-    expect(lines).to include('Command: CMD')
+    expect(captured_output_text.split("\n")).to include('Service: cmd')
+    expect(captured_output_text.split("\n")).to include('Command: CMD')
   end
 
   it 'lists a service with command' do
     Fabricate(:service, app: app, process_type: 'cmd', command: 'foobar')
     subject.send('services')
 
-    expect(lines).to include('Service: cmd')
-    expect(lines).to include('Command: foobar')
+    expect(captured_output_text.split("\n")).to include('Service: cmd')
+    expect(captured_output_text.split("\n")).to include('Command: foobar')
   end
 
   it 'lists container size' do
     Fabricate(:service, app: app, container_memory_limit_mb: 1024)
     subject.send('services')
 
-    expect(lines).to include('Container Size: 1024')
+    expect(captured_output_text.split("\n")).to include('Container Size: 1024')
   end
 
   it 'lists container count' do
     Fabricate(:service, app: app, container_count: 3)
     subject.send('services')
 
-    expect(lines).to include('Container Count: 3')
+    expect(captured_output_text.split("\n")).to include('Container Count: 3')
   end
 
   it 'lists multiple services' do
@@ -50,7 +46,7 @@ describe Aptible::CLI::Agent do
     Fabricate(:service, app: app, process_type: 'bar')
     subject.send('services')
 
-    expect(lines).to include('Service: foo')
-    expect(lines).to include('Service: bar')
+    expect(captured_output_text.split("\n")).to include('Service: foo')
+    expect(captured_output_text.split("\n")).to include('Service: bar')
   end
 end

data/spec/aptible/cli_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Aptible::CLI do
+  describe described_class::LogFormatter do
+    subject do
+      Logger.new(File.open(File::NULL, 'w')).tap do |l|
+        l.formatter = described_class.new
+      end
+    end
+
+    it 'formats DEBUG' do
+      subject.debug 'foo'
+    end
+
+    it 'formats INFO' do
+      subject.info 'foo'
+    end
+
+    it 'formats WARN' do
+      subject.warn 'foo'
+    end
+
+    it 'formats ERROR' do
+      subject.error 'foo'
+    end
+
+    it 'formats FATAL' do
+      subject.fatal 'foo'
+    end
+  end
+end

data/spec/fabricators/account_fabricator.rb

@@ -1,4 +1,14 @@
 class StubAccount < OpenStruct
+  def each_app(&block)
+    return enum_for(:each_app) if block.nil?
+    apps.each(&block)
+  end
+
+  def each_database(&block)
+    return enum_for(:each_database) if block.nil?
+    databases.each(&block)
+  end
+
   def each_certificate(&block)
     return enum_for(:each_certificate) if block.nil?
     certificates.each(&block)
@@ -6,6 +16,7 @@ class StubAccount < OpenStruct
 end
 
 Fabricator(:account, from: :stub_account) do
+  id { Fabricate.sequence(:account_id) { |i| i } }
   bastion_host 'localhost'
   dumptruck_port 1234
   handle 'aptible'

data/spec/fabricators/app_fabricator.rb

@@ -3,17 +3,32 @@ class StubApp < OpenStruct
     services.map(&:vhosts).flatten
   end
 
+  def each_vhost(&block)
+    return enum_for(:each_vhost) if block.nil?
+    vhosts.each(&block)
+  end
+
   def each_service(&block)
     return enum_for(:each_service) if block.nil?
     services.each(&block)
   end
+
+  def each_configuration(&block)
+    return enum_for(:each_configuration) if block.nil?
+    configurations.each(&block)
+  end
 end
 
 Fabricator(:app, from: :stub_app) do
+  id { Fabricate.sequence(:app_id) { |i| i } }
   handle 'hello'
   status 'provisioned'
+  git_repo { Fabricate.sequence(:app_git_repo) { |i| "git://#{i}.git" } }
   account
   services { [] }
+  configurations { [] }
+  current_configuration { nil }
+  errors { Aptible::Resource::Errors.new }
 
   after_create { |app| app.account.apps << app }
 end

data/spec/fabricators/configuration_fabricator.rb

@@ -0,0 +1,8 @@
+class StubConfiguration < OpenStruct
+end
+
+Fabricator(:configuration, from: :stub_configuration) do
+  env { {} }
+
+  after_create { |configuration| app.configurations << configuration }
+end

data/spec/fabricators/database_image_fabricator.rb

@@ -0,0 +1,17 @@
+class StubDatabaseImage < OpenStruct
+end
+
+Fabricator(:database_image, from: :stub_database_image) do
+  type { 'postgresql' }
+  version { '9.4' }
+
+  after_create do |image|
+    if image.description.nil?
+      image.description = "#{image.type} #{image.version}"
+    end
+
+    if image.docker_repo.nil?
+      image.docker_repo = "aptible/#{image.type}:#{image.version}"
+    end
+  end
+end

data/spec/fabricators/operation_fabricator.rb

@@ -3,4 +3,5 @@ class StubOperation < OpenStruct; end
 Fabricator(:operation, from: :stub_operation) do
   status 'queued'
   resource { Fabricate(:app) }
+  errors { Aptible::Resource::Errors.new }
 end

data/spec/fabricators/service_fabricator.rb

@@ -8,7 +8,11 @@ end
 Fabricator(:service, from: :stub_service) do
   transient :app, :database
 
+  id { Fabricate.sequence(:service_id) { |i| i } }
   process_type 'web'
+  command { nil }
+  container_count { 1 }
+  container_memory_limit_mb { 512 }
   vhosts { [] }
 
   after_create do |service, transients|

data/spec/spec_helper.rb

@@ -19,8 +19,70 @@ end
 # Require library up front
 require 'aptible/cli'
 
+class SpecRenderer < Aptible::CLI::Renderer::Base
+  def initialize
+    @nodes = []
+  end
+
+  def render(node)
+    # For now, we don't support rendering twice, and we probably never need to.
+    raise 'Rendered twice!' unless @nodes.empty?
+    @nodes << node
+    nil
+  end
+
+  def text
+    Aptible::CLI::Renderer::Text.new.render(@nodes.first)
+  end
+
+  def json
+    JSON.parse(Aptible::CLI::Renderer::Json.new.render(@nodes.first))
+  end
+
+  def text?
+    true
+  end
+
+  def json?
+    true
+  end
+end
+
+module SpecHarness
+  def reset_spec_harness
+    @stream = StringIO.new
+    @renderer = SpecRenderer.new
+
+    logger = Logger.new(@stream)
+
+    allow(Aptible::CLI).to receive(:logger).and_return(logger)
+    allow(Aptible::CLI::Renderer).to receive(:current).and_return(@renderer)
+  end
+
+  def captured_output_text
+    @renderer.text
+  end
+
+  def captured_output_json
+    @renderer.json
+  end
+
+  def captured_logs
+    pos = @stream.pos
+
+    begin
+      @stream.rewind
+      @stream.read
+    ensure
+      @stream.pos = pos
+    end
+  end
+end
+
 RSpec.configure do |config|
-  config.before {}
+  config.before(:each) { reset_spec_harness }
+
+  config.include(SpecHarness)
 
   # We make the CLI believe it's running in a toolbelt context to avoid running
   # the toolbelt nag every time it initializes.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource
@@ -128,6 +128,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +267,16 @@ files:
 - codecov.yml
 - lib/aptible/cli.rb
 - lib/aptible/cli/agent.rb
+- lib/aptible/cli/error.rb
+- lib/aptible/cli/formatter.rb
+- lib/aptible/cli/formatter/grouped_keyed_list.rb
+- lib/aptible/cli/formatter/keyed_list.rb
+- lib/aptible/cli/formatter/keyed_object.rb
+- lib/aptible/cli/formatter/list.rb
+- lib/aptible/cli/formatter/node.rb
+- lib/aptible/cli/formatter/object.rb
+- lib/aptible/cli/formatter/root.rb
+- lib/aptible/cli/formatter/value.rb
 - lib/aptible/cli/helpers/app.rb
 - lib/aptible/cli/helpers/app_or_database.rb
 - lib/aptible/cli/helpers/database.rb
@@ -257,6 +287,11 @@ files:
 - lib/aptible/cli/helpers/tunnel.rb
 - lib/aptible/cli/helpers/vhost.rb
 - lib/aptible/cli/helpers/vhost/option_set_builder.rb
+- lib/aptible/cli/renderer.rb
+- lib/aptible/cli/renderer/base.rb
+- lib/aptible/cli/renderer/json.rb
+- lib/aptible/cli/renderer/text.rb
+- lib/aptible/cli/resource_formatter.rb
 - lib/aptible/cli/subcommands/apps.rb
 - lib/aptible/cli/subcommands/backup.rb
 - lib/aptible/cli/subcommands/config.rb
@@ -275,6 +310,7 @@ files:
 - lib/aptible/cli/version.rb
 - script/sync-readme-usage
 - spec/aptible/cli/agent_spec.rb
+- spec/aptible/cli/formatter_spec.rb
 - spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
 - spec/aptible/cli/helpers/operation_spec.rb
@@ -282,9 +318,12 @@ files:
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
-- spec/aptible/cli/helpers/vhost_spec.rb
+- spec/aptible/cli/renderer/json_spec.rb
+- spec/aptible/cli/renderer/text_spec.rb
+- spec/aptible/cli/resource_formatter_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
+- spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
@@ -292,15 +331,19 @@ files:
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
+- spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/aptible/cli/subcommands/services_spec.rb
 - spec/aptible/cli/subcommands/ssh_spec.rb
+- spec/aptible/cli_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
 - spec/fabricators/certificate_fabricator.rb
+- spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb
 - spec/fabricators/database_fabricator.rb
+- spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/stack_fabricator.rb
@@ -341,6 +384,7 @@ specification_version: 4
 summary: Command-line interface for Aptible services
 test_files:
 - spec/aptible/cli/agent_spec.rb
+- spec/aptible/cli/formatter_spec.rb
 - spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
 - spec/aptible/cli/helpers/operation_spec.rb
@@ -348,9 +392,12 @@ test_files:
 - spec/aptible/cli/helpers/ssh_spec.rb
 - spec/aptible/cli/helpers/token_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
-- spec/aptible/cli/helpers/vhost_spec.rb
+- spec/aptible/cli/renderer/json_spec.rb
+- spec/aptible/cli/renderer/text_spec.rb
+- spec/aptible/cli/resource_formatter_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
 - spec/aptible/cli/subcommands/backup_spec.rb
+- spec/aptible/cli/subcommands/config_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/deploy_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
@@ -358,15 +405,19 @@ test_files:
 - spec/aptible/cli/subcommands/inspect_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/operation_spec.rb
+- spec/aptible/cli/subcommands/rebuild_spec.rb
 - spec/aptible/cli/subcommands/restart_spec.rb
 - spec/aptible/cli/subcommands/services_spec.rb
 - spec/aptible/cli/subcommands/ssh_spec.rb
+- spec/aptible/cli_spec.rb
 - spec/fabricators/account_fabricator.rb
 - spec/fabricators/app_fabricator.rb
 - spec/fabricators/backup_fabricator.rb
 - spec/fabricators/certificate_fabricator.rb
+- spec/fabricators/configuration_fabricator.rb
 - spec/fabricators/database_credential_fabricator.rb
 - spec/fabricators/database_fabricator.rb
+- spec/fabricators/database_image_fabricator.rb
 - spec/fabricators/operation_fabricator.rb
 - spec/fabricators/service_fabricator.rb
 - spec/fabricators/stack_fabricator.rb