aptible-cli 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2d5ce00e4dee1e4e0297b184fbfe5c785894953
-  data.tar.gz: c611deaf39a9e0a60b05529f42131cfab4c2cf2c
+  metadata.gz: a4b91444b0b662e1ab07c80526ba3f5054fd7ea6
+  data.tar.gz: f587f3803827f79e03f917134427cbad12aeff42
 SHA512:
-  metadata.gz: 3db13d87a0279091ce6e68ca831a14caf44e986f6168902551ecb61298b4aabfb634ce71580a718fe15e431f208ac3f3ac4f97b8783e78ce0763bf9e8e6d2442
-  data.tar.gz: 7cfef197908c6509531455d7f21d5f840c2f964593e22ff4808c0fe4a969960246bcb8ba953fa90d9a78faf7b2031c111c8d13d94e3e013c8e7c7cf561525590
+  metadata.gz: 78a8eab1b55ba1e03c80eb102bece4876ac0f9dc873e551d552ee3a79e6a11610548cfc22fcc14e906f7149eb27bf41c0cb2aed94ce146f9dc0abdd0d9772bac
+  data.tar.gz: c44a10640e89b53dee298aa13044d2211ceeeaea3de1cc59173fd694b70f99be98c91e3af29bfdc2bc27e045a39ebd392772343976174453be6ce03d70d0e374

data/lib/aptible/cli/agent.rb

@@ -6,11 +6,13 @@ require_relative 'helpers/token'
 require_relative 'helpers/operation'
 require_relative 'helpers/account'
 require_relative 'helpers/app'
+require_relative 'helpers/env'
 
 require_relative 'subcommands/apps'
 require_relative 'subcommands/config'
 require_relative 'subcommands/db'
 require_relative 'subcommands/logs'
+require_relative 'subcommands/ps'
 require_relative 'subcommands/rebuild'
 require_relative 'subcommands/restart'
 require_relative 'subcommands/ssh'
@@ -24,10 +26,11 @@ module Aptible
       include Subcommands::Apps
       include Subcommands::Config
       include Subcommands::DB
+      include Subcommands::Logs
+      include Subcommands::Ps
       include Subcommands::Rebuild
       include Subcommands::Restart
       include Subcommands::SSH
-      include Subcommands::Tail
 
       desc 'version', 'Print Aptible CLI version'
       def version

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

@@ -8,8 +8,9 @@ module Aptible
         include Helpers::Token
 
         def ensure_app(options = {})
+          remote = options[:remote] || ENV['APTIBLE_REMOTE']
           handle = options[:app] ||
-                   handle_from_remote(options[:remote]) ||
+                   handle_from_remote(remote) ||
                    ensure_default_handle
           app = app_from_handle(handle)
           return app if app

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

@@ -0,0 +1,11 @@
+module Aptible
+  module CLI
+    module Helpers
+      module Env
+        def set_env(key, value)
+          ENV[key] = value
+        end
+      end
+    end
+  end
+end

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

@@ -37,6 +37,18 @@ module Aptible
                 say "App #{handle} created!"
               end
             end
+
+            desc 'apps:scale TYPE NUMBER', 'Scale app to NUMBER of instances'
+            option :app
+            option :account
+            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)
+              poll_for_success(op)
+              say "Scaled #{app.handle} to #{num} instances."
+            end
           end
         end
       end

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

@@ -60,6 +60,7 @@ module Aptible
             private
 
             def formatted_config(env)
+              env = Hash[env.sort]
               env.map { |k, v| "#{k}=#{Shellwords.escape(v)}" }.join("\n")
             end
           end

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

@@ -3,7 +3,7 @@ require 'shellwords'
 module Aptible
   module CLI
     module Subcommands
-      module Tail
+      module Logs
         def self.included(thor)
           thor.class_eval do
             include Helpers::Operation
@@ -14,11 +14,13 @@ module Aptible
             option :remote, aliases: '-r'
             def logs
               app = ensure_app(options)
+
               host = app.account.bastion_host
               port = app.account.dumptruck_port
 
               ENV['ACCESS_TOKEN'] = fetch_token
               ENV['APTIBLE_APP'] = app.handle
+              ENV['APTIBLE_CLI_COMMAND'] = 'logs'
 
               opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
                      '-o UserKnownHostsFile=/dev/null'

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

@@ -0,0 +1,35 @@
+require 'shellwords'
+
+module Aptible
+  module CLI
+    module Subcommands
+      module Ps
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Operation
+            include Helpers::App
+            include Helpers::Env
+
+            desc 'ps', 'Display running processes for an app'
+            option :app
+            option :remote, aliases: '-r'
+            def ps
+              app = ensure_app(options)
+
+              host = app.account.bastion_host
+              port = app.account.dumptruck_port
+
+              set_env('ACCESS_TOKEN', fetch_token)
+              set_env('APTIBLE_APP', app.handle)
+              set_env('APTIBLE_CLI_COMMAND', 'ps')
+
+              opts = " -o 'SendEnv=*' -o StrictHostKeyChecking=no " \
+                     '-o UserKnownHostsFile=/dev/null'
+              Kernel.exec "ssh #{opts} -p #{port} root@#{host}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aptible/cli/version.rb

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

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

@@ -0,0 +1,50 @@
+require 'ostruct'
+require 'spec_helper'
+
+class App < OpenStruct
+end
+
+class Service < OpenStruct
+end
+
+class Operation < OpenStruct
+end
+
+describe Aptible::CLI::Agent do
+  before { subject.stub(:ask) }
+  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])]
+
+  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(Aptible::Api::App).to receive(:all) { apps }
+      subject.send('apps:scale', 'web', 3)
+    end
+
+    it 'should fail if app is non-existent' do
+      allow(service).to receive(:create_operation) { op }
+      allow(Aptible::Api::App).to receive(:all) { apps }
+
+      expect do
+        subject.send('apps:scale', 'web', 3)
+      end.to raise_error(Thor::Error)
+    end
+
+    it 'should fail if number is not a valid number' do
+      allow(service).to receive(:create_operation) { op }
+      allow(subject).to receive(:options) { { app: 'hello' } }
+
+      allow(Aptible::Api::App).to receive(:all) { apps }
+      expect do
+        subject.send('apps:scale', 'web', 'potato')
+      end.to raise_error(ArgumentError)
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'ostruct'
+require 'spec_helper'
+
+class App < OpenStruct
+end
+
+class Account < 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(:ensure_app) { app } }
+  before { subject.stub(:set_env) }
+  before { Kernel.stub(:exec) }
+
+  let(:account) do
+    Account.new(bastion_host: 'bastion.com', dumptruck_port: 45022)
+  end
+  let(:app) { App.new(handle: 'hello', account: account) }
+
+  describe '#ps' do
+    it 'should set ENV["APTIBLE_CLI_COMMAND"]' do
+      expect(subject).to receive(:set_env).with('APTIBLE_CLI_COMMAND', 'ps')
+      subject.send('ps')
+    end
+
+    it 'should construct a proper SSH call' do
+      expect(Kernel).to receive(:exec) do |*args|
+        cmd = args.first
+        expect(cmd).to match(/ssh.*-p 45022 root@bastion.com/)
+      end
+      subject.send('ps')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -158,17 +158,21 @@ files:
 - lib/aptible/cli/agent.rb
 - lib/aptible/cli/helpers/account.rb
 - lib/aptible/cli/helpers/app.rb
+- lib/aptible/cli/helpers/env.rb
 - lib/aptible/cli/helpers/operation.rb
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/subcommands/apps.rb
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/logs.rb
+- lib/aptible/cli/subcommands/ps.rb
 - lib/aptible/cli/subcommands/rebuild.rb
 - lib/aptible/cli/subcommands/restart.rb
 - lib/aptible/cli/subcommands/ssh.rb
 - lib/aptible/cli/version.rb
 - spec/aptible/cli/agent_spec.rb
+- spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/ps_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/aptible-cli
 licenses:
@@ -190,10 +194,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 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/ps_spec.rb
 - spec/spec_helper.rb