aptible-cli 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a00f24436f3849b23c677260e75b31f661eb6e8
-  data.tar.gz: 857e002bd160ca13dbb846d41527d30138be7ee3
+  metadata.gz: 5476287949f6306971e1400683283f93a8a07d5f
+  data.tar.gz: 8e1f9600ebc7787553c8c11e02b35dd80ae5af47
 SHA512:
-  metadata.gz: 6c2da48570c2db9dc2edb39f1455f6ea10131e35c6719d5d0a69b18a4619e30b8585cea0d8d12f0f99258c9ed550b7dd8eb3642a2c712b764aac4a36a4a22a51
-  data.tar.gz: 33fc2f342c37a66c2d0e2684384f7bf65304e9a403fe7de9dbbd540f36cf99ed9b15fdb29bd56c8938ae8e7af6e020be9007c97d414eb83298ece9c6f478d1f5
+  metadata.gz: f63a2b3abaa73cfe3b61fcad53ad1701279e33ae7d2991646dbc1d997c6b5d8049f2e6515d2b79290e369ef5ce02195f6a30293e6439aae3a16e95685d862500
+  data.tar.gz: 1dcfcaad6fd98538bea9a3772c505ee4331d3016ead7ccf4fa42c41e957841617a91c13a1e8a57e3f2f483b79821c06ac37fc9a219e968d5b8cc0230315ecac0

data/Gemfile

@@ -2,5 +2,9 @@ source 'https://rubygems.org'
 
 gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
 
+group :test do
+  gem 'webmock'
+end
+
 # Specify your gem's dependencies in aptible-cli.gemspec
 gemspec

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

@@ -4,10 +4,14 @@ module Aptible
   module CLI
     module Helpers
       module Token
+        TOKEN_ENV_VAR = 'APTIBLE_ACCESS_TOKEN'
+
         def fetch_token
-          @token ||= current_token_hash[Aptible::Auth.configuration.root_url]
+          @token ||= ENV[TOKEN_ENV_VAR] ||
+                     current_token_hash[Aptible::Auth.configuration.root_url]
           return @token if @token
-          fail Thor::Error, 'Could not read token: please run aptible login'
+          fail Thor::Error, 'Could not read token: please run aptible login ' \
+                            "or set #{TOKEN_ENV_VAR}"
         end
 
         def save_token(token)

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

@@ -35,11 +35,31 @@ module Aptible
 
             desc 'apps:scale TYPE NUMBER', 'Scale app to NUMBER of instances'
             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)
               app = ensure_app(options)
               service = app.services.find { |s| s.process_type == type }
-              op = service.create_operation(type: 'scale', container_count: num)
+              if service.nil?
+                valid_types = if app.services.empty?
+                                'NONE (deploy the app first)'
+                              else
+                                app.services.map(&:process_type).join(', ')
+                              end
+                fail Thor::Error, "Service with type #{type} does not " \
+                                  "exist for app #{app.handle}. Valid " \
+                                  "types: #{valid_types}."
+              end
+              op = service.create_operation(type: 'scale',
+                                            container_count: num,
+                                            container_size: options[:size])
               attach_to_operation_logs(op)
             end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.6.4'
+    VERSION = '0.6.6'
   end
 end

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

@@ -26,22 +26,49 @@ describe Aptible::CLI::Agent do
                 dumptruck_port: 1234,
                 handle: 'aptible')
   end
+  let(:services) { [service] }
   let(:apps) do
-    [App.new(handle: 'hello', services: [service], account: account)]
+    [App.new(handle: 'hello', services: services, account: account)]
   end
 
   describe '#apps:scale' do
     it 'should pass given correct parameters' do
       allow(service).to receive(:create_operation) { op }
-      allow(subject).to receive(:options) { { app: 'hello' } }
+      allow(subject).to receive(:options) do
+        { app: 'hello', environment: 'foobar' }
+      end
       allow(op).to receive(:resource) { apps.first }
       allow(Aptible::Api::App).to receive(:all) { apps }
 
+      expect(subject).to receive(:environment_from_handle)
+        .with('foobar')
+        .and_return(account)
+      expect(subject).to receive(:apps_from_handle).and_return(apps)
+      subject.send('apps:scale', 'web', 3)
+    end
+
+    it 'should pass container size param to operation if given' do
+      expect(service).to receive(:create_operation)
+        .with(type: 'scale', container_count: 3, container_size: 90210)
+        .and_return(op)
+      allow(subject).to receive(:options) do
+        { app: 'hello', size: 90210, environment: 'foobar' }
+      end
+
+      allow(op).to receive(:resource) { apps.first }
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect(subject).to receive(:environment_from_handle)
+        .with('foobar')
+        .and_return(account)
+      expect(subject).to receive(:apps_from_handle).and_return(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(subject).to receive(:options) do
+        { environment: 'foo', app: 'web' }
+      end
       allow(service).to receive(:create_operation) { op }
       allow(Aptible::Api::Account).to receive(:all) { [] }
       allow(account).to receive(:apps) { [apps] }
@@ -70,5 +97,40 @@ 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(apps)
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect do
+        subject.send('apps:scale', 'potato', 1)
+      end.to raise_error(Thor::Error, /Service.* potato.* does not exist/)
+    end
+
+    context 'no service' do
+      let(:services) { [] }
+
+      it 'should fail if the app has no services' do
+        expect(subject).to receive(:environment_from_handle)
+          .with('foobar')
+          .and_return(account)
+        expect(subject).to receive(:apps_from_handle).and_return(apps)
+        allow(subject).to receive(:options) do
+          { app: 'hello', environment: 'foobar' }
+        end
+
+        allow(Aptible::Api::App).to receive(:all) { apps }
+
+        expect do
+          subject.send('apps:scale', 'web', 1)
+        end.to raise_error(Thor::Error, /deploy the app first/)
+      end
+    end
   end
 end

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

@@ -33,8 +33,14 @@ describe Aptible::CLI::Agent do
 
   describe '#domains' do
     it 'should print out the hostnames' do
+      expect(subject).to receive(:environment_from_handle)
+        .with('foobar')
+        .and_return(account)
+      expect(subject).to receive(:apps_from_handle).and_return(apps)
       allow(service).to receive(:create_operation) { op }
-      allow(subject).to receive(:options) { { app: 'hello' } }
+      allow(subject).to receive(:options) do
+        { environment: 'foobar', app: 'web' }
+      end
       allow(Aptible::Api::App).to receive(:all) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }
@@ -65,8 +71,14 @@ describe Aptible::CLI::Agent do
     end
 
     it 'should print hostnames if -v is passed' do
+      expect(subject).to receive(:environment_from_handle)
+        .with('foobar')
+        .and_return(account)
+      expect(subject).to receive(:apps_from_handle).and_return(apps)
       allow(service).to receive(:create_operation) { op }
-      allow(subject).to receive(:options) { { verbose: true, app: 'hello' } }
+      allow(subject).to receive(:options) do
+        { verbose: true, app: 'hello', environment: 'foobar' }
+      end
       allow(Aptible::Api::App).to receive(:all) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'webmock/rspec'
+
 # Load shared spec files
 Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each do |file|
   require file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services