aptible-cli 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710c981d4ee3393bbe00fb09cabb6a45e964aeb7
-  data.tar.gz: 2705459f3698db56a010edce891f49f832dc584c
+  metadata.gz: 5e3e03cae11a2a3bab84c225df322c9fe8c75ab6
+  data.tar.gz: aafef516b5c3bc4996317cf977e3cb403d3f7496
 SHA512:
-  metadata.gz: 67a7478f09bdfcf92839064523ee231e8b84d8b7455a8e0826ab47a5fa1a09dcb7eaea968a7981694921738bf9733b23b90518a7697427a067b4db921e6440d7
-  data.tar.gz: dc845bf331a6644e89352af644eacd95b871b12fdc443feb49ca543594fd2868fb735b4be358ece0753ffe125b546ec08991b7ced562b72d8c1bc2e5dc860703
+  metadata.gz: 0ef871ee863e4f5e49a82acd02b7062e20c93c11138e3aa3eae2918c82090b0991a198c5166f765b8d75b576a71ac5508ec014774bded52518d9008448dc4597
+  data.tar.gz: 6f40a10270be6929ad61c11a42fb11bc3d68dc3a5d62a3d4713a7101fb4eb065005816ed93f7ad2bc561dc0285fadd4f5ca0991b01efde892da59cde25a5da16

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
 gem 'activesupport', '~> 4.0'
+gem 'rack', '~> 1.0'
 
 group :test do
   gem 'webmock'

data/README.md

@@ -28,36 +28,36 @@ From `aptible help`:
 
 ```
 Commands:
-  aptible apps                                               # List all applications
-  aptible apps:create HANDLE                                 # Create a new application
-  aptible apps:deprovision                                   # Deprovision an app
-  aptible apps:scale TYPE NUMBER                             # Scale app to NUMBER of instances
-  aptible backup:list DB_HANDLE                              # List backups for a database
-  aptible backup:restore [--handle HANDLE] [--size SIZE_GB]  # Restore a backup
-  aptible config                                             # Print an app's current configuration
-  aptible config:add                                         # Add an ENV variable to an app
-  aptible config:rm                                          # Remove an ENV variable from an app
-  aptible config:set                                         # Alias for config:add
-  aptible config:unset                                       # Alias for config:rm
-  aptible db:backup HANDLE                                   # Backup a database
-  aptible db:clone SOURCE DEST                               # Clone a database to create a new one
-  aptible db:create HANDLE                                   # Create a new database
-  aptible db:deprovision HANDLE                              # Deprovision a 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:reload HANDLE                                   # Reload a database
-  aptible db:tunnel HANDLE                                   # Create a local tunnel to a database
-  aptible domains                                            # Print an app's current virtual domains
-  aptible help [COMMAND]                                     # Describe available commands or one specific command
-  aptible login                                              # Log in to Aptible
-  aptible logs                                               # Follows logs from a running app or database
-  aptible operation:cancel OPERATION_ID                      # Cancel a running operation
-  aptible ps                                                 # Display running processes for an app - DEPRECATED
-  aptible rebuild                                            # Rebuild an app, and restart its services
-  aptible restart                                            # Restart all services associated with an app
-  aptible ssh [COMMAND]                                      # Run a command against an app
-  aptible version                                            # Print Aptible CLI version
+  aptible apps                                                                  # List all applications
+  aptible apps:create HANDLE                                                    # Create a new application
+  aptible apps:deprovision                                                      # Deprovision an app
+  aptible apps:scale SERVICE [--container-count COUNT] [--container-size SIZE]  # Scale a service
+  aptible backup:list DB_HANDLE                                                 # List backups for a database
+  aptible backup:restore [--handle HANDLE] [--size SIZE_GB]                     # Restore a backup
+  aptible config                                                                # Print an app's current configuration
+  aptible config:add                                                            # Add an ENV variable to an app
+  aptible config:rm                                                             # Remove an ENV variable from an app
+  aptible config:set                                                            # Alias for config:add
+  aptible config:unset                                                          # Alias for config:rm
+  aptible db:backup HANDLE                                                      # Backup a database
+  aptible db:clone SOURCE DEST                                                  # Clone a database to create a new one
+  aptible db:create HANDLE                                                      # Create a new database
+  aptible db:deprovision HANDLE                                                 # Deprovision a 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:reload HANDLE                                                      # Reload a database
+  aptible db:tunnel HANDLE                                                      # Create a local tunnel to a database
+  aptible domains                                                               # Print an app's current virtual domains
+  aptible help [COMMAND]                                                        # Describe available commands or one specific command
+  aptible login                                                                 # Log in to Aptible
+  aptible logs                                                                  # Follows logs from a running app or database
+  aptible operation:cancel OPERATION_ID                                         # Cancel a running operation
+  aptible ps                                                                    # Display running processes for an app - DEPRECATED
+  aptible rebuild                                                               # Rebuild an app, and restart its services
+  aptible restart                                                               # Restart all services associated with an app
+  aptible ssh [COMMAND]                                                         # Run a command against an app
+  aptible version                                                               # Print Aptible CLI version
 ```
 
 ## Contributing

data/lib/aptible/cli/agent.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 require 'aptible/auth'
 require 'thor'
 require 'json'
@@ -22,6 +24,7 @@ require_relative 'subcommands/restart'
 require_relative 'subcommands/ssh'
 require_relative 'subcommands/backup'
 require_relative 'subcommands/operation'
+require_relative 'subcommands/inspect'
 
 module Aptible
   module CLI
@@ -41,6 +44,7 @@ module Aptible
       include Subcommands::SSH
       include Subcommands::Backup
       include Subcommands::Operation
+      include Subcommands::Inspect
 
       # Forward return codes on failures.
       def self.exit_on_failure?

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

@@ -34,20 +34,66 @@ module Aptible
               end
             end
 
-            desc 'apps:scale TYPE NUMBER', 'Scale app to NUMBER of instances'
+            desc 'apps:scale SERVICE ' \
+                 '[--container-count COUNT] [--container-size SIZE]',
+                 'Scale a service'
             app_options
-            option :size, type: :numeric, enum: [512,
-                                                 1024,
-                                                 2048,
-                                                 4096,
-                                                 8192,
-                                                 16384,
-                                                 32768,
-                                                 65536]
-            define_method 'apps:scale' do |type, n|
-              num = Integer(n)
+            option :container_count, type: :numeric
+            option :container_size, type: :numeric
+            option :size, type: :numeric,
+                          desc: 'DEPRECATED, use --container-size'
+            define_method 'apps:scale' do |type, *more|
               app = ensure_app(options)
               service = app.services.find { |s| s.process_type == type }
+
+              container_count = options[:container_count]
+              container_size = options[:container_size]
+
+              # There are two legacy options we have to process here:
+              # - We used to accept apps:scale SERVICE COUNT
+              # - We used to accept --size
+              case more.size
+              when 0
+                # Noop
+              when 1
+                if container_count.nil?
+                  m = yellow('Passing container count as a positional ' \
+                             'argument is deprecated, use --container-count')
+                  $stderr.puts m
+                  container_count = Integer(more.first)
+                else
+                  raise Thor::Error, 'Container count was passed via both ' \
+                                     'the --container-count keyword argument ' \
+                                     'and a positional argument. ' \
+                                     'Use only --container-count to proceed.'
+                end
+              else
+                # Unfortunately, Thor does not want to let us easily hook into
+                # its usage formatting, so we have to work around it here.
+                command = thor.commands.fetch('apps:scale')
+                error = ArgumentError.new
+                args = [type] + more
+                thor.handle_argument_error(command, error, args, 1)
+              end
+
+              if options[:size]
+                if container_size.nil?
+                  m = yellow('Passing container size via the --size keyword ' \
+                             'argument is deprecated, use --container-size')
+                  $stderr.puts m
+                  container_size = options[:size]
+                else
+                  raise Thor::Error, 'Container size was passed via both ' \
+                                     '--container-size and --size. ' \
+                                     'Use only --container-size to proceed.'
+                end
+              end
+
+              if container_count.nil? && container_size.nil?
+                raise Thor::Error,
+                      'Provide at least --container-count or --container-size'
+              end
+
               if service.nil?
                 valid_types = if app.services.empty?
                                 'NONE (deploy the app first)'
@@ -58,9 +104,13 @@ module Aptible
                                    "exist for app #{app.handle}. Valid " \
                                    "types: #{valid_types}."
               end
-              op = service.create_operation!(type: 'scale',
-                                             container_count: num,
-                                             container_size: options[:size])
+
+              # We don't validate any parameters here: API will do that for us.
+              opts = { type: 'scale' }
+              opts[:container_count] = container_count if container_count
+              opts[:container_size] = container_size if container_size
+
+              op = service.create_operation!(opts)
               attach_to_operation_logs(op)
             end
 

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

@@ -0,0 +1,51 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module Inspect
+        class InspectResourceCommand < Thor::HiddenCommand
+          def run(instance, args = [])
+            instance.inspect_resource(*args)
+          end
+        end
+
+        def inspect_resource(raw)
+          begin
+            uri = URI(raw)
+          rescue URI::InvalidURIError
+            raise Thor::Error, "Invalid URI: #{raw}"
+          end
+
+          if uri.scheme != 'https'
+            raise "Invalid scheme: #{uri.scheme} (use https)"
+          end
+
+          apis = [Aptible::Auth, Aptible::Api, Aptible::Billing]
+
+          api = apis.find do |klass|
+            uri.host == URI(klass.configuration.root_url).host
+          end
+
+          if api.nil?
+            hosts = apis.map(&:configuration).map(&:root_url).map do |u|
+              URI(u).host
+            end
+            m = "Invalid API: #{uri.host} (valid APIs: #{hosts.join(', ')})"
+            raise Thor::Error, m
+          end
+
+          res = api::Resource.new(token: fetch_token).find_by_url(uri.to_s)
+          puts JSON.pretty_generate(res.body)
+        end
+
+        def self.included(thor)
+          # We have to manually register a command here since we can't override
+          # the inspect method!
+          desc = 'Inspect a resource as JSON by URL'
+          thor.commands['inspect'] = InspectResourceCommand.new(
+            :inspect, desc, desc, 'inspect URL'
+          )
+        end
+      end
+    end
+  end
+end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.8.6'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

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

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 def dummy_strategy_factory(app_handle, env_handle, usable,
                            options_receiver = [])
   Class.new do
@@ -31,51 +33,129 @@ describe Aptible::CLI::Agent do
       allow(Aptible::Api::Account).to receive(:all) { [account] }
     end
 
-    it 'should pass given correct parameters' do
-      allow(subject).to receive(:options) do
-        { app: 'hello', environment: 'foobar' }
-      end
-      expect(service).to receive(:create_operation!) { op }
-      expect(subject).to receive(:environment_from_handle)
-        .with('foobar')
-        .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return([app])
-      subject.send('apps:scale', 'web', 3)
-    end
+    context 'with environment and app' do
+      let(:base_options) { { app: 'hello', environment: 'foobar' } }
 
-    it 'should pass container size param to operation if given' do
-      allow(subject).to receive(:options) do
-        { app: 'hello', size: 90210, environment: 'foobar' }
-      end
-      expect(service).to receive(:create_operation!)
-        .with(type: 'scale', container_count: 3, container_size: 90210)
-        .and_return(op)
-      expect(subject).to receive(:environment_from_handle)
-        .with('foobar')
-        .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return([app])
-      subject.send('apps:scale', 'web', 3)
+      before do
+        expect(subject).to receive(:environment_from_handle)
+          .with('foobar')
+          .and_return(account)
+
+        expect(subject).to receive(:apps_from_handle)
+          .with('hello', account)
+          .and_return([app])
+      end
+
+      def stub_options(**opts)
+        allow(subject).to receive(:options).and_return(base_options.merge(opts))
+      end
+
+      it 'should scale container size and count together' do
+        stub_options(container_count: 3, container_size: 1024)
+        expect($stderr).not_to receive(:puts)
+        expect(service).to receive(:create_operation!)
+          .with(type: 'scale', container_count: 3, container_size: 1024)
+          .and_return(op)
+        subject.send('apps:scale', 'web')
+      end
+
+      it 'should scale container count alone' do
+        stub_options(container_count: 3)
+        expect($stderr).not_to receive(:puts)
+        expect(service).to receive(:create_operation!)
+          .with(type: 'scale', container_count: 3)
+          .and_return(op)
+        subject.send('apps:scale', 'web')
+      end
+
+      it 'should scale container size alone' do
+        stub_options(container_size: 1024)
+        expect($stderr).not_to receive(:puts)
+        expect(service).to receive(:create_operation!)
+          .with(type: 'scale', container_size: 1024)
+          .and_return(op)
+        subject.send('apps:scale', 'web')
+      end
+
+      it 'should fail if neither container_count nor container_size is set' do
+        stub_options
+        expect { subject.send('apps:scale', 'web') }
+          .to raise_error(/provide at least/im)
+      end
+
+      it 'should scale container count (legacy)' do
+        stub_options
+        expect($stderr).to receive(:puts).once
+        expect(service).to receive(:create_operation!)
+          .with(type: 'scale', container_count: 3)
+          .and_return(op)
+        subject.send('apps:scale', 'web', '3')
+      end
+
+      it 'should scale container size (legacy)' do
+        stub_options(size: 90210)
+        expect($stderr).to receive(:puts).once
+        expect(service).to receive(:create_operation!)
+          .with(type: 'scale', container_size: 90210)
+          .and_return(op)
+        subject.send('apps:scale', 'web')
+      end
+
+      it 'should fail when using both current and legacy count' do
+        stub_options(container_count: 2)
+        expect { subject.send('apps:scale', 'web', '3') }
+          .to raise_error(/count was passed via both/im)
+      end
+
+      it 'should fail when using both current and legacy size' do
+        stub_options(container_size: 1024, size: 512)
+        expect { subject.send('apps:scale', 'web') }
+          .to raise_error(/size was passed via both/im)
+      end
+
+      it 'should fail when using too many arguments' do
+        stub_options
+        expect { subject.send('apps:scale', 'web', '3', '4') }
+          .to raise_error(/usage:.*apps:scale/im)
+      end
+
+      it 'should fail if the service does not exist' do
+        stub_options(container_count: 2)
+
+        expect { subject.send('apps:scale', 'potato') }
+          .to raise_error(Thor::Error, /Service.* potato.* does not exist/)
+      end
+
+      it 'should fail if the app has no services' do
+        app.services = []
+        stub_options(container_count: 2)
+
+        expect { subject.send('apps:scale', 'web') }
+          .to raise_error(Thor::Error, /deploy the app first/)
+      end
     end
 
     it 'should fail if environment is non-existent' do
       allow(subject).to receive(:options) do
-        { environment: 'foo', app: 'web' }
+        { environment: 'foo', app: 'web', container_count: 2 }
       end
       allow(Aptible::Api::Account).to receive(:all) { [] }
       allow(service).to receive(:create_operation!) { op }
 
       expect do
-        subject.send('apps:scale', 'web', 3)
+        subject.send('apps:scale', 'web')
       end.to raise_error(Thor::Error)
     end
 
     it 'should fail if app is non-existent' do
+      allow(subject).to receive(:options) { { container_count: 2 } }
       expect do
-        subject.send('apps:scale', 'web', 3)
+        subject.send('apps:scale', 'web')
       end.to raise_error(Thor::Error)
     end
 
-    it 'should fail if number is not a valid number' do
+    it 'should fail if number is not a valid number (legacy)' do
+      expect($stderr).to receive(:puts).once
       allow(subject).to receive(:options) { { app: 'hello' } }
       allow(service).to receive(:create_operation) { op }
 
@@ -83,38 +163,6 @@ describe Aptible::CLI::Agent do
         subject.send('apps:scale', 'web', 'potato')
       end.to raise_error(ArgumentError)
     end
-
-    it 'should fail if the service does not exist' do
-      allow(subject).to receive(:options) do
-        { app: 'hello', environment: 'foobar' }
-      end
-      expect(subject).to receive(:environment_from_handle)
-        .with('foobar')
-        .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return([app])
-
-      expect do
-        subject.send('apps:scale', 'potato', 1)
-      end.to raise_error(Thor::Error, /Service.* potato.* does not exist/)
-    end
-
-    context 'no service' do
-      before { app.services = [] }
-
-      it 'should fail if the app has no services' do
-        allow(subject).to receive(:options) do
-          { app: 'hello', environment: 'foobar' }
-        end
-        expect(subject).to receive(:environment_from_handle)
-          .with('foobar')
-          .and_return(account)
-        expect(subject).to receive(:apps_from_handle).and_return([app])
-
-        expect do
-          subject.send('apps:scale', 'web', 1)
-        end.to raise_error(Thor::Error, /deploy the app first/)
-      end
-    end
   end
 
   describe '#ensure_app' do

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

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Agent do
+  describe '#inspect_resource' do
+    let(:token) { 'foo token' }
+    before { allow(subject).to receive(:fetch_token).and_return(token) }
+
+    it 'should fail if the URI is invalid' do
+      expect { subject.inspect_resource('^^') }
+        .to raise_error(/invalid uri/im)
+    end
+
+    it 'should fail if the URI is not for a valid host' do
+      expect { subject.inspect_resource('https://foo.com') }
+        .to raise_error(/invalid api/im)
+    end
+
+    it 'should fail if the scheme is invalid' do
+      # Not necessarily a feature per-se, but the URI will be parsed improperly
+      # if we don't have a scheme.
+      expect { subject.inspect_resource('api.aptible.com') }
+        .to raise_error(/invalid scheme/im)
+    end
+
+    it 'should succeed if the URI is complete' do
+      api = double('api')
+      expect(Aptible::Api::Resource).to receive(:new).with(token: token)
+        .and_return(api)
+
+      res = double('resource', body: { foo: 'bar' })
+      expect(api).to receive(:find_by_url).with('https://api.aptible.com/foo')
+        .and_return(res)
+
+      expect(subject).to receive(:puts) do |body|
+        expect(JSON.parse(body)).to eq('foo' => 'bar')
+      end
+
+      subject.inspect_resource('https://api.aptible.com/foo')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -239,6 +239,7 @@ files:
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/domains.rb
+- lib/aptible/cli/subcommands/inspect.rb
 - lib/aptible/cli/subcommands/logs.rb
 - lib/aptible/cli/subcommands/operation.rb
 - lib/aptible/cli/subcommands/ps.rb
@@ -257,6 +258,7 @@ files:
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
+- 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/restart_spec.rb
@@ -312,6 +314,7 @@ test_files:
 - spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
+- 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/restart_spec.rb