aptible-cli 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58858b887b9868e017e93d7248f4e7d1f898dc2
-  data.tar.gz: 7b2d52cc1b316205abb7d35c13722a32dccda29a
+  metadata.gz: 4b335a0f359338d92dff7ff3e0a267c0da5a6790
+  data.tar.gz: 28fa0a1b6c4129e361df287757fc8436f540fb9f
 SHA512:
-  metadata.gz: 2c326bb7a9cc09e2689804e43b0fa00643eb759dbe838f572b0dc44df32caba6f6b76f1a14375e4aa6c1d5cac83457b8a37274c72f14ed843b6afcaa6acb2287
-  data.tar.gz: 07bd87aa8c414600d845ce133c868ad1a0df02e9c6518f6202717eabd7f12d8d7b95df42cc5a1f4177bb4f315e6950fc4fa6e13b64059ce2f12f8b0b0a6bf2c3
+  metadata.gz: e0c6bb5308aa87d7696a6b4cd1ae85923429084b5bfa3c6882114cbc0932c001e60f4e3045f686bc4e7c5827874c9a53e2685bee2268210baee5479395c1fd99
+  data.tar.gz: 9604c082e3d8a4b47ab0bad5bd1686fcf2dd27cefa0404f2fffd2f685b8c93fb8b3b19a9348a74aba98c4debfe6bfd14d539b16fec2f1dc67dba93b319a2c667

data/Gemfile

@@ -4,6 +4,7 @@ gem 'pry', github: 'fancyremarker/pry', branch: 'aptible'
 
 group :test do
   gem 'webmock'
+  gem 'codecov', require: false
 end
 
 # Specify your gem's dependencies in aptible-cli.gemspec

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/aptible-cli.png)](https://rubygems.org/gems/aptible-cli)
 [![Build Status](https://travis-ci.org/aptible/aptible-cli.png?branch=master)](https://travis-ci.org/aptible/aptible-cli)
 [![Dependency Status](https://gemnasium.com/aptible/aptible-cli.png)](https://gemnasium.com/aptible/aptible-cli)
-
+[![codecov](https://codecov.io/gh/aptible/aptible-cli/branch/master/graph/badge.svg)](https://codecov.io/gh/aptible/aptible-cli)
 [![Roadmap](https://badge.waffle.io/aptible/aptible-cli.svg?label=ready&title=roadmap)](http://waffle.io/aptible/aptible-cli)
 
 Command-line interface for Aptible services.

data/aptible-cli.gemspec

@@ -20,11 +20,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aptible-api', '>= 0.9.5'
-  spec.add_dependency 'aptible-auth', '>= 0.11.3'
-  spec.add_dependency 'thor', '>= 0.19.0'
+  spec.add_dependency 'aptible-api', '~> 0.9.7'
+  spec.add_dependency 'aptible-auth', '~> 0.11.7'
+  spec.add_dependency 'aptible-resource', '~> 0.3.6'
+  spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'git'
   spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'chronic_duration', '~> 0.10.6'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks', '>= 0.2.0'
@@ -32,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 2.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'climate_control'
+  spec.add_development_dependency 'fabrication', '~> 2.15.2'
 end

data/bin/aptible

@@ -12,6 +12,8 @@ begin
 rescue HyperResource::ClientError => e
   if e.body['error'] == 'invalid_token'
     STDERR.puts 'API authentication error: please run aptible login'
-    exit 1
+  else
+    STDERR.puts "An error occurred: #{e.body['message']}"
   end
+  exit 1
 end

data/codecov.yml

@@ -0,0 +1,12 @@
+# Only report coverage, don't set a failing status on branches or PRs
+coverage:
+  status:
+    project:
+      default:
+        target: 0
+    patch:
+      default:
+        target: 0
+    changes:
+      default:
+        target: 0

data/lib/aptible/cli/agent.rb

@@ -1,6 +1,7 @@
 require 'aptible/auth'
 require 'thor'
 require 'json'
+require 'chronic_duration'
 
 require_relative 'helpers/token'
 require_relative 'helpers/operation'
@@ -19,6 +20,7 @@ require_relative 'subcommands/ps'
 require_relative 'subcommands/rebuild'
 require_relative 'subcommands/restart'
 require_relative 'subcommands/ssh'
+require_relative 'subcommands/backup'
 
 module Aptible
   module CLI
@@ -37,6 +39,7 @@ module Aptible
       include Subcommands::Rebuild
       include Subcommands::Restart
       include Subcommands::SSH
+      include Subcommands::Backup
 
       # Forward return codes on failures.
       def self.exit_on_failure?

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

@@ -8,6 +8,18 @@ module Aptible
         include Helpers::Token
         include Helpers::Environment
 
+        module ClassMethods
+          def app_options
+            option :app
+            option :environment
+            option :remote, aliases: '-r'
+          end
+        end
+
+        def self.included(base)
+          base.extend ClassMethods
+        end
+
         class HandleFromGitRemote
           PATTERN = %r{
             :((?<environment_handle>[0-9a-z\-_\.]+?)/)?
@@ -20,61 +32,114 @@ module Aptible
           end
         end
 
-        def self.included(base)
-          base.extend ClassMethods
+        class OptionsHandleStrategy
+          attr_reader :app_handle, :env_handle
+
+          def initialize(options)
+            @app_handle = options[:app]
+            @env_handle = options[:environment]
+          end
+
+          def usable?
+            !app_handle.nil?
+          end
+
+          def explain
+            '(options provided via CLI arguments)'
+          end
         end
 
-        module ClassMethods
-          def app_options
-            option :app
-            option :environment
-            option :remote, aliases: '-r'
+        class GitRemoteHandleStrategy
+          def initialize(options)
+            @remote_name = options[:remote] || ENV['APTIBLE_REMOTE'] ||
+                           'aptible'
+            @repo_dir = Dir.pwd
+          end
+
+          def app_handle
+            handles_from_remote[:app_handle]
+          end
+
+          def env_handle
+            handles_from_remote[:environment_handle]
+          end
+
+          def usable?
+            !app_handle.nil? && !env_handle.nil?
+          end
+
+          def explain
+            "(options derived from git remote #{@remote_name})"
+          end
+
+          private
+
+          def handles_from_remote
+            @handles_from_remote ||= \
+              begin
+                git = Git.open(@repo_dir)
+                remote_url = git.remote(@remote_name).url || ''
+                HandleFromGitRemote.parse(remote_url)
+              rescue StandardError
+                # TODO: Consider being more specific here (ArgumentError?)
+                {}
+              end
           end
         end
 
         def ensure_app(options = {})
-          remote = options[:remote] || ENV['APTIBLE_REMOTE'] || 'aptible'
-          app_handle = options[:app] || handles_from_remote(remote)[:app_handle]
-          environment_handle = options[:environment] ||
-                               handles_from_remote(remote)[:environment_handle]
-
-          unless app_handle
-            fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
-              Could not find app in current working directory, please specify
-              with --app
-            ERR
+          s = handle_strategies.map { |cls| cls.new(options) }.find(&:usable?)
+
+          if s.nil?
+            err = 'Could not find app in current working directory, please ' \
+                  'specify with --app'
+            fail Thor::Error, err
           end
 
-          environment = environment_from_handle(environment_handle)
-          if environment_handle && !environment
-            fail Thor::Error, "Could not find environment #{environment_handle}"
+          environment = nil
+          if s.env_handle
+            environment = environment_from_handle(s.env_handle)
+            if environment.nil?
+              err_bits = ['Could not find environment', s.env_handle]
+              err_bits << s.explain
+              fail Thor::Error, err_bits.join(' ')
+            end
           end
-          apps = apps_from_handle(app_handle, environment)
+
+          apps = apps_from_handle(s.app_handle, environment)
+
           case apps.count
           when 1
             return apps.first
           when 0
-            fail Thor::Error, "Could not find app #{app_handle}"
+            err_bits = ['Could not find app', s.app_handle]
+            if environment
+              err_bits << 'in environment'
+              err_bits << environment.handle
+            else
+              err_bits << 'in any environment'
+            end
+            err_bits << s.explain
+            fail Thor::Error, err_bits.join(' ')
           else
-            fail Thor::Error, 'Multiple apps exist, please specify environment'
+            err = "Multiple apps named #{s.app_handle} exist, please specify " \
+                  'with --environment'
+            fail Thor::Error, err
           end
         end
 
         def apps_from_handle(handle, environment)
           if environment
-            apps = environment.apps
+            environment.apps
           else
-            apps = Aptible::Api::App.all(token: fetch_token)
-          end
-          apps.select { |a| a.handle == handle }
+            Aptible::Api::App.all(token: fetch_token)
+          end.select { |a| a.handle == handle }
         end
 
-        def handles_from_remote(remote_name)
-          git = Git.open(Dir.pwd)
-          aptible_remote = git.remote(remote_name).url || ''
-          HandleFromGitRemote.parse(aptible_remote)
-        rescue
-          {}
+        private
+
+        def handle_strategies
+          [OptionsHandleStrategy, GitRemoteHandleStrategy]
         end
       end
     end

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

@@ -24,8 +24,8 @@ module Aptible
           when 0
             fail Thor::Error, "Could not find database #{db_handle}"
           else
-            fail Thor::Error,
-                 'Multiple databases exist, please specify environment'
+            err = 'Multiple databases exist, please specify with --environment'
+            fail Thor::Error, err
           end
         end
 
@@ -45,7 +45,7 @@ module Aptible
         end
 
         def clone_database(source, dest_handle)
-          op = source.create_operation(type: 'clone', handle: dest_handle)
+          op = source.create_operation!(type: 'clone', handle: dest_handle)
           poll_for_success(op)
 
           databases_from_handle(dest_handle, source.account).first

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

@@ -30,6 +30,7 @@ module Aptible
                 fail Thor::Error, app.errors.full_messages.first
               else
                 say "App #{handle} created!"
+                say "Git remote: #{app.git_repo}"
               end
             end
 
@@ -57,9 +58,9 @@ 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])
+              op = service.create_operation!(type: 'scale',
+                                             container_count: num,
+                                             container_size: options[:size])
               attach_to_operation_logs(op)
             end
 

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

@@ -0,0 +1,55 @@
+module Aptible
+  module CLI
+    module Subcommands
+      module Backup
+        def self.included(thor)
+          thor.class_eval do
+            include Helpers::Token
+            include Helpers::Database
+
+            desc 'backup:restore [--handle HANDLE] [--size SIZE_GB]',
+                 'Restore a backup'
+            option :handle
+            option :size, type: :numeric
+            define_method 'backup:restore' do |backup_id|
+              backup = Aptible::Api::Backup.find(backup_id, token: fetch_token)
+              fail Thor::Error, "Backup ##{backup_id} not found" if backup.nil?
+              handle = options[:handle]
+              unless handle
+                ts_suffix = backup.created_at.getgm.strftime '%Y-%m-%d-%H-%M-%S'
+                handle = "#{backup.database.handle}-at-#{ts_suffix}"
+              end
+
+              opts = {
+                type: 'restore',
+                handle: handle,
+                disk_size: options[:size]
+              }.delete_if { |_, v| v.nil? }
+
+              operation = backup.create_operation!(opts)
+              say "Restoring backup into #{handle}"
+              attach_to_operation_logs(operation)
+            end
+
+            desc 'backup:list DB_HANDLE', 'List backups for a database'
+            option :environment
+            option :max_age,
+                   default: '1mo',
+                   desc: 'Limit backups returned (example usage: 1w, 1y, etc.)'
+            define_method 'backup:list' do |handle|
+              age = ChronicDuration.parse(options[:max_age])
+              fail Thor::Error, "Invalid age: #{options[:max_age]}" if age.nil?
+              min_created_at = Time.now - age
+
+              database = ensure_database(options.merge(db: handle))
+              database.each_backup do |backup|
+                break if backup.created_at < min_created_at
+                say "#{backup.id}: #{backup.created_at}, #{backup.aws_region}"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,7 +24,7 @@ module Aptible
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
               env = Hash[args.map { |arg| arg.split('=', 2) }]
-              operation = app.create_operation(type: 'configure', env: env)
+              operation = app.create_operation!(type: 'configure', env: env)
               puts 'Updating configuration and restarting app...'
               attach_to_operation_logs(operation)
             end
@@ -41,7 +41,7 @@ module Aptible
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
               env = Hash[args.map { |arg| [arg, ''] }]
-              operation = app.create_operation(type: 'configure', env: env)
+              operation = app.create_operation!(type: 'configure', env: env)
               puts 'Updating configuration and restarting app...'
               attach_to_operation_logs(operation)
             end

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

@@ -32,8 +32,8 @@ module Aptible
               if database.errors.any?
                 fail Thor::Error, database.errors.full_messages.first
               else
-                op = database.create_operation(type: 'provision',
-                                               disk_size: options[:size])
+                op = database.create_operation!(type: 'provision',
+                                                disk_size: options[:size])
                 attach_to_operation_logs(op)
                 say database.reload.connection_url
               end
@@ -106,6 +106,15 @@ module Aptible
               say "Deprovisioning #{database.handle}..."
               database.create_operation!(type: 'deprovision')
             end
+
+            desc 'db:backup HANDLE', 'Backup a database'
+            option :environment
+            define_method 'db:backup' do |handle|
+              database = ensure_database(options.merge(db: handle))
+              say "Backing up #{database.handle}..."
+              op = database.create_operation!(type: 'backup')
+              attach_to_operation_logs(op)
+            end
           end
         end
       end

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

@@ -11,7 +11,7 @@ module Aptible
             app_options
             def rebuild
               app = ensure_app(options)
-              operation = app.create_operation(type: 'rebuild')
+              operation = app.create_operation!(type: 'rebuild')
               puts 'Rebuilding app...'
               attach_to_operation_logs(operation)
             end

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

@@ -11,7 +11,7 @@ module Aptible
             app_options
             def restart
               app = ensure_app(options)
-              operation = app.create_operation(type: 'restart')
+              operation = app.create_operation!(type: 'restart')
               puts 'Restarting app...'
               attach_to_operation_logs(operation)
             end

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.6.9'
+    VERSION = '0.7.0'
   end
 end

data/spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Aptible::CLI::Helpers::App::GitRemoteHandleStrategy do
+  let!(:work_dir) { Dir.mktmpdir }
+  after { FileUtils.remove_entry work_dir }
+  around { |example| Dir.chdir(work_dir) { example.run } }
+
+  context 'with git repo' do
+    before { `git init` }
+
+    context 'with aptible remote' do
+      before do
+        `git remote add aptible git@beta.aptible.com:some-env/some-app.git`
+        `git remote add prod git@beta.aptible.com:prod-env/prod-app.git`
+      end
+
+      it 'defaults to the Aptible remote' do
+        s = described_class.new({})
+        expect(s.app_handle).to eq('some-app')
+        expect(s.env_handle).to eq('some-env')
+        expect(s.usable?).to be_truthy
+      end
+
+      it 'allows explicitly passing a remote' do
+        s = described_class.new(remote: 'prod')
+        expect(s.app_handle).to eq('prod-app')
+        expect(s.env_handle).to eq('prod-env')
+        expect(s.usable?).to be_truthy
+      end
+
+      it 'accepts a remote from the environment' do
+        ClimateControl.modify APTIBLE_REMOTE: 'prod' do
+          s = described_class.new(remote: 'prod')
+          expect(s.app_handle).to eq('prod-app')
+        end
+      end
+
+      it 'is not usable when the remote does not exist' do
+        s = described_class.new(remote: 'foobar')
+        expect(s.usable?).to be_falsey
+      end
+
+      it 'outputs the remote when explaining' do
+        s = described_class.new(remote: 'prod')
+        expect(s.explain).to match(/derived from git remote prod/)
+      end
+    end
+  end
+
+  it 'is not usable outside of a git repo' do
+    s = described_class.new({})
+    expect(s.usable?).to be_falsey
+  end
+end