aptible-cli 0.14.1 → 0.15.0

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

@@ -36,7 +36,7 @@ module Aptible
               end
 
               operation = app.create_operation!(type: type)
-              puts 'Restarting app...'
+              CLI.logger.info 'Restarting app...'
               attach_to_operation_logs(operation)
             end
           end

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

@@ -11,15 +11,14 @@ module Aptible
             def services
               app = ensure_app(options)
 
-              first = true
-              app.each_service do |service|
-                say '' unless first
-                first = false
-
-                say "Service: #{service.process_type}"
-                say "Command: #{service.command || 'CMD'}"
-                say "Container Count: #{service.container_count}"
-                say "Container Size: #{service.container_memory_limit_mb}"
+              Formatter.render(Renderer.current) do |root|
+                root.list do |list|
+                  app.each_service do |service|
+                    list.object do |node|
+                      ResourceFormatter.inject_service(node, service, app)
+                    end
+                  end
+                end
               end
             end
           end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.14.1'.freeze
+    VERSION = '0.15.0'.freeze
   end
 end

data/spec/aptible/cli/agent_spec.rb

@@ -11,16 +11,16 @@ describe Aptible::CLI::Agent do
     it 'should print the version' do
       ClimateControl.modify(APTIBLE_TOOLBELT: nil) do
         version = Aptible::CLI::VERSION
-        expect(STDOUT).to receive(:puts).with "aptible-cli v#{version}"
         subject.version
+        expect(captured_output_text).to eq("aptible-cli v#{version}\n")
       end
     end
 
     it 'should print the version (with toolbelt)' do
       ClimateControl.modify(APTIBLE_TOOLBELT: '1') do
         version = Aptible::CLI::VERSION
-        expect(STDOUT).to receive(:puts).with "aptible-cli v#{version} toolbelt"
         subject.version
+        expect(captured_output_text).to eq("aptible-cli v#{version} toolbelt\n")
       end
     end
   end
@@ -29,7 +29,6 @@ describe Aptible::CLI::Agent do
     let(:token) { double('Aptible::Auth::Token') }
     let(:created_at) { Time.now }
     let(:expires_at) { created_at + 1.week }
-    let(:output) { [] }
 
     before do
       m = -> (code) { @code = code }
@@ -38,7 +37,7 @@ describe Aptible::CLI::Agent do
       allow(token).to receive(:access_token).and_return 'access_token'
       allow(token).to receive(:created_at).and_return created_at
       allow(token).to receive(:expires_at).and_return expires_at
-      allow(subject).to receive(:puts) { |v| output << v }
+      allow(subject).to receive(:puts) {}
     end
 
     it 'should save a token to ~/.aptible/tokens' do
@@ -50,10 +49,8 @@ describe Aptible::CLI::Agent do
     it 'should output the token location and token lifetime' do
       allow(Aptible::Auth::Token).to receive(:create).and_return token
       subject.login
-      expect(output.size).to eq(3)
-      expect(output[0]).to eq('')
-      expect(output[1]).to match(/written to some\.json/)
-      expect(output[2]).to match(/will expire after 7 days/)
+      expect(captured_logs).to match(/token written to.*json/i)
+      expect(captured_logs).to match(/expire after 7 days/i)
     end
 
     it 'should raise an error if authentication fails' do
@@ -181,9 +178,9 @@ describe Aptible::CLI::Agent do
     let(:nag_file) { File.join(nag_dir, 'nag_toolbelt') }
 
     it 'warns if the nag file is not present' do
-      expect($stderr).to receive(:puts).at_least(:once)
       subject.send(:nag_toolbelt)
       expect(Integer(File.read(nag_file))).to be_within(5).of(Time.now.utc.to_i)
+      expect(captured_logs).to match(/from source/)
     end
 
     it 'warns if the nag file contains an old timestamp' do
@@ -192,8 +189,8 @@ describe Aptible::CLI::Agent do
         f.write((Time.now.utc.to_i - 1.day).to_i.to_s)
       end
 
-      expect($stderr).to receive(:puts).at_least(:once)
       subject.send(:nag_toolbelt)
+      expect(captured_logs).to match(/from source/)
     end
 
     it 'does not warn if the nag file contains a recent timestamp' do
@@ -202,8 +199,8 @@ describe Aptible::CLI::Agent do
         f.write((Time.now.utc.to_i - 3.hours).to_i.to_s)
       end
 
-      expect($stderr).not_to receive(:puts)
       subject.send(:nag_toolbelt)
+      expect(captured_logs).to eq('')
     end
 
     it 'does not warn if the nag file contains a recent timestamp (newline)' do
@@ -214,21 +211,21 @@ describe Aptible::CLI::Agent do
         f.write("#{(Time.now.utc.to_i - 3.hours).to_i}\n")
       end
 
-      expect($stderr).not_to receive(:puts)
       subject.send(:nag_toolbelt)
+      expect(captured_logs).to eq('')
     end
 
     it 'warns if the nag file contains an invalid timestamp' do
       Dir.mkdir(nag_dir)
       File.open(nag_file, 'w') { |f| f.write('foobar') }
 
-      expect($stderr).to receive(:puts).at_least(:once)
       subject.send(:nag_toolbelt)
+      expect(captured_logs).to match(/from source/)
     end
 
     it 'is compatible with itself' do
-      expect($stderr).to receive(:puts).once
       2.times { subject.send(:nag_toolbelt) }
+      expect(captured_logs.split("\n").grep(/from source/).size).to eq(1)
     end
   end
 

data/spec/aptible/cli/formatter_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Formatter do
+end

data/spec/aptible/cli/renderer/json_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Renderer::Json do
+  subject { described_class.new }
+
+  let(:root) { Aptible::CLI::Formatter::Root.new }
+
+  it 'renders an object' do
+    root.object { |n| n.value('foo', 'bar') }
+    expect(JSON.parse(subject.render(root))).to eq('foo' => 'bar')
+  end
+
+  it 'renders a list' do
+    root.list do |l|
+      l.value('foo')
+      l.value('bar')
+    end
+    expect(JSON.parse(subject.render(root))).to eq(%w(foo bar))
+  end
+
+  it 'ignores keyed_list' do
+    root.keyed_list('foo') do |l|
+      l.object do |n|
+        n.value('foo', 'bar')
+        n.value('qux', 'baz')
+      end
+    end
+
+    expect(JSON.parse(subject.render(root)))
+      .to eq([{ 'foo' => 'bar', 'qux' => 'baz' }])
+  end
+
+  it 'ignores grouped_keyed_list' do
+    root.grouped_keyed_list('foo', 'qux') do |l|
+      l.object do |n|
+        n.value('foo', 'bar')
+        n.value('qux', 'baz')
+      end
+    end
+
+    expect(JSON.parse(subject.render(root)))
+      .to eq([{ 'foo' => 'bar', 'qux' => 'baz' }])
+  end
+
+  it 'ignores keyed_object' do
+    root.keyed_object('foo') { |n| n.value('foo', 'bar') }
+    expect(JSON.parse(subject.render(root))).to eq('foo' => 'bar')
+  end
+
+  it 'nests objects' do
+    root.object do |n|
+      n.object('foo') { |nn| nn.value('bar', 'qux') }
+    end
+    expect(JSON.parse(subject.render(root))).to eq('foo' => { 'bar' => 'qux' })
+  end
+
+  it 'nests lists' do
+    root.list do |n|
+      n.list { |nn| nn.value('bar') }
+    end
+    expect(JSON.parse(subject.render(root))).to eq([%w(bar)])
+  end
+end

data/spec/aptible/cli/renderer/text_spec.rb

@@ -0,0 +1,150 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Renderer::Text do
+  subject { described_class.new }
+
+  let(:root) { Aptible::CLI::Formatter::Root.new }
+
+  it 'renders an object' do
+    root.object { |n| n.value('foo', 'bar') }
+    expect(subject.render(root)).to eq("Foo: bar\n")
+  end
+
+  it 'renders a list' do
+    root.list do |l|
+      l.value('foo')
+      l.value('bar')
+    end
+    expect(subject.render(root)).to eq("foo\nbar\n")
+  end
+
+  it 'renders the key in a keyed_list' do
+    root.keyed_list('foo') do |l|
+      l.object do |n|
+        n.value('foo', 'bar')
+        n.value('qux', 'baz')
+      end
+
+      l.object do |n|
+        n.value('foo', 'bar2')
+        n.value('qux', 'baz2')
+      end
+    end
+
+    expect(subject.render(root)).to eq("bar\nbar2\n")
+  end
+
+  it 'renders the keys in a grouped_keyed_list, with plain grouping' do
+    root.grouped_keyed_list('foo', 'qux') do |l|
+      l.object do |n|
+        n.value('foo', 'bar')
+        n.value('qux', 'baz')
+      end
+      l.object do |n|
+        n.value('foo', 'bar')
+        n.value('qux', 'baz2')
+      end
+      l.object do |n|
+        n.value('foo', 'bar2')
+        n.value('qux', 'baz3')
+      end
+    end
+
+    expected = [
+      '=== bar',
+      'baz',
+      'baz2',
+      '',
+      '=== bar2',
+      'baz3',
+      ''
+    ].join("\n")
+
+    expect(subject.render(root)).to eq(expected)
+  end
+
+  it 'renders the keys in a grouped_keyed_list, with nested grouping' do
+    root.grouped_keyed_list({ 'foo' => 'nest' }, 'qux') do |l|
+      l.object do |n|
+        n.object('foo') { |nn| nn.value('nest', 'bar') }
+        n.value('qux', 'baz')
+      end
+      l.object do |n|
+        n.object('foo') { |nn| nn.value('nest', 'bar') }
+        n.value('qux', 'baz2')
+      end
+      l.object do |n|
+        n.object('foo') { |nn| nn.value('nest', 'bar2') }
+        n.value('qux', 'baz3')
+      end
+    end
+
+    expected = [
+      '=== bar',
+      'baz',
+      'baz2',
+      '',
+      '=== bar2',
+      'baz3',
+      ''
+    ].join("\n")
+
+    expect(subject.render(root)).to eq(expected)
+  end
+
+  it 'renders the key in a keyed_object' do
+    root.keyed_object('foo') { |n| n.value('foo', 'bar') }
+    expect(subject.render(root)).to eq("bar\n")
+  end
+
+  it 'renders a plain value' do
+    root.value('foo')
+    expect(subject.render(root)).to eq("foo\n")
+  end
+
+  it 'renders a list of objects' do
+    root.list do |l|
+      l.object do |n|
+        n.value('foo', 'bar1')
+        n.value('qux', 'baz1')
+      end
+      l.object do |n|
+        n.value('foo', 'bar2')
+        n.value('qux', 'baz2')
+      end
+      l.object do |n|
+        n.value('foo', 'bar3')
+        n.value('qux', 'baz3')
+      end
+    end
+
+    expected = [
+      'Foo: bar1',
+      'Qux: baz1',
+      '',
+      'Foo: bar2',
+      'Qux: baz2',
+      '',
+      'Foo: bar3',
+      'Qux: baz3',
+      ''
+    ].join("\n")
+
+    expect(subject.render(root)).to eq(expected)
+  end
+
+  it 'capitalizes keys' do
+    root.list do |l|
+      l.object do |n|
+        n.value('this is tls dns and ip', 'foo')
+      end
+    end
+
+    expected = [
+      'This Is TLS DNS And IP: foo',
+      ''
+    ].join("\n")
+
+    expect(subject.render(root)).to eq(expected)
+  end
+end

data/spec/aptible/cli/resource_formatter_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe Aptible::CLI::ResourceFormatter do
+  def capture(m, *args)
+    node = Aptible::CLI::Formatter::Object.new
+    described_class.public_send(m, node, *args)
+    Aptible::CLI::Renderer::Text.new.render(node).split("\n")
+  end
+
+  describe '#inject_vhost' do
+    it 'explains a VHOST' do
+      service = Fabricate(:service, process_type: 'web')
+      vhost = Fabricate(
+        :vhost,
+        id: 12,
+        service: service,
+        external_host: 'foo.io',
+        status: 'provisioned',
+        type: 'http_proxy_protocol',
+        internal: false,
+        ip_whitelist: [],
+        default: false,
+        acme: false
+      )
+
+      expected = [
+        'Id: 12',
+        'Hostname: foo.io',
+        'Status: provisioned',
+        'Type: https',
+        'Port: default',
+        'Internal: false',
+        'IP Whitelist: all traffic',
+        'Default Domain Enabled: false',
+        'Managed TLS Enabled: false',
+        'Service: web'
+      ]
+      expect(capture(:inject_vhost, vhost, service)).to eq(expected)
+    end
+
+    it 'explains a failed VHOST' do
+      vhost = Fabricate(:vhost, status: 'provision_failed')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Status: provision_failed')
+    end
+
+    it 'explains an internal VHOST' do
+      vhost = Fabricate(:vhost, internal: true)
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Internal: true')
+    end
+
+    it 'explains a default VHOST' do
+      vhost = Fabricate(:vhost, default: true, virtual_domain: 'qux.io')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Default Domain Enabled: true')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Default Domain: qux.io')
+    end
+
+    it 'explains a TLS VHOST' do
+      vhost = Fabricate(:vhost, type: 'tls')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Type: tls')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Ports: all')
+    end
+
+    it 'explains a TCP VHOST' do
+      vhost = Fabricate(:vhost, type: 'tcp')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Type: tcp')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Ports: all')
+    end
+
+    it 'explains a VHOST with a container port' do
+      vhost = Fabricate(:vhost, type: 'http_proxy_protocol', container_port: 12)
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Port: 12')
+    end
+
+    it 'explains a VHOST with container ports' do
+      vhost = Fabricate(:vhost, type: 'tls', container_ports: [12, 34])
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Ports: 12 34')
+    end
+
+    it 'explains a VHOST with IP Filtering' do
+      vhost = Fabricate(:vhost, ip_whitelist: %w(1.1.1.1/1 2.2.2.2/2))
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('IP Whitelist: 1.1.1.1/1 2.2.2.2/2')
+    end
+
+    it 'explains a VHOST with Managed TLS' do
+      vhost = Fabricate(
+        :vhost,
+        acme: true,
+        user_domain: 'foo.io',
+        acme_dns_challenge_host: 'dns.qux.io',
+        acme_status: 'ready'
+      )
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Managed TLS Enabled: true')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Managed TLS Domain: foo.io')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Managed TLS DNS Challenge Hostname: dns.qux.io')
+      expect(capture(:inject_vhost, vhost, vhost.service))
+        .to include('Managed TLS Status: ready')
+    end
+  end
+end