aptible-cli 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e384ebaafbe6e17aa8a1acf83c1471ac3889277a
-  data.tar.gz: 63c4f79c0adab02cb49135085b77cd0d5d5dcff3
+  metadata.gz: 08df5d523ff73a1a0d859f2285538f709987a729
+  data.tar.gz: 03b0d0d1e71ec42fb5e1c93fee8612a72d1b86ce
 SHA512:
-  metadata.gz: fba39552ce310d57409a6196186fd2e55d1c84614dc2944039a13c4f70abefd78497d22d76b565cc22ca6438e89c05379c3a856b50013dd8fcc755d9cfac40d0
-  data.tar.gz: 8d2ed064251c2074eb4171477167b10b019921d5ca3aca8858ff3ee714717f9ee947df4669363f4e056c2e8039939b53b5cee42d4f2a93e9c3cbc4ee507a59fb
+  metadata.gz: 5d236987c6f258313027496882c7bbcbd438ceb23ee56027ba96dee02aaf5020e33e7fa12e7695c431594f0c59f82f5a51e33d244061878f4ea18869b9c10f3a
+  data.tar.gz: 1d9b8f8407f61df638451f183cda662a4385c8a34e7d3fda11fe0146d3bb3c97800c483b35a8ff3c0e6a770d2a25298ff8578b6c4cd4bbb862ebb1bcc7dcb976

data/aptible-cli.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aptible-api', '~> 0.9.15'
-  spec.add_dependency 'aptible-auth', '~> 0.11.8'
+  spec.add_dependency 'aptible-api', '~> 0.9.16'
+  spec.add_dependency 'aptible-auth', '~> 0.11.12'
   spec.add_dependency 'aptible-resource', '~> 0.3.6'
   spec.add_dependency 'thor', '~> 0.19.1'
   spec.add_dependency 'git'

data/lib/aptible/cli/agent.rb

@@ -49,17 +49,13 @@ module Aptible
 
       def initialize(*)
         nag_toolbelt unless toolbelt?
+        Aptible::Resource.configure { |conf| conf.user_agent = version_string }
         super
       end
 
       desc 'version', 'Print Aptible CLI version'
       def version
-        bits = [
-          'aptible-cli',
-          "v#{Aptible::CLI::VERSION}"
-        ]
-        bits << 'toolbelt' if toolbelt?
-        puts bits.join ' '
+        puts version_string
       end
 
       desc 'login', 'Log in to Aptible'
@@ -85,7 +81,7 @@ module Aptible
 
           duration = ChronicDuration.parse(lifetime)
           if duration.nil?
-            fail Thor::Error, "Invalid token lifetime requested: #{lifetime}"
+            raise Thor::Error, "Invalid token lifetime requested: #{lifetime}"
           end
 
           token_options[:expires_in] = duration
@@ -148,6 +144,15 @@ module Aptible
         end
       end
 
+      def version_string
+        bits = [
+          'aptible-cli',
+          "v#{Aptible::CLI::VERSION}"
+        ]
+        bits << 'toolbelt' if toolbelt?
+        bits.join ' '
+      end
+
       def toolbelt?
         ENV['APTIBLE_TOOLBELT']
       end

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

@@ -97,7 +97,7 @@ module Aptible
           if s.nil?
             err = 'Could not find app in current working directory, please ' \
                   'specify with --app'
-            fail Thor::Error, err
+            raise Thor::Error, err
           end
 
           environment = nil
@@ -106,7 +106,7 @@ module Aptible
             if environment.nil?
               err_bits = ['Could not find environment', s.env_handle]
               err_bits << s.explain
-              fail Thor::Error, err_bits.join(' ')
+              raise Thor::Error, err_bits.join(' ')
             end
           end
 
@@ -124,11 +124,11 @@ module Aptible
               err_bits << 'in any environment'
             end
             err_bits << s.explain
-            fail Thor::Error, err_bits.join(' ')
+            raise Thor::Error, err_bits.join(' ')
           else
             err = "Multiple apps named #{s.app_handle} exist, please specify " \
                   'with --environment'
-            fail Thor::Error, err
+            raise Thor::Error, err
           end
         end
 

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

@@ -12,21 +12,22 @@ module Aptible
           db_handle = options[:db]
           environment_handle = options[:environment]
 
-          fail Thor::Error, 'Database handle not specified' unless db_handle
+          raise Thor::Error, 'Database handle not specified' unless db_handle
 
           environment = environment_from_handle(environment_handle)
           if environment_handle && !environment
-            fail Thor::Error, "Could not find environment #{environment_handle}"
+            raise Thor::Error,
+                  "Could not find environment #{environment_handle}"
           end
           databases = databases_from_handle(db_handle, environment)
           case databases.count
           when 1
             return databases.first
           when 0
-            fail Thor::Error, "Could not find database #{db_handle}"
+            raise Thor::Error, "Could not find database #{db_handle}"
           else
             err = 'Multiple databases exist, please specify with --environment'
-            fail Thor::Error, err
+            raise Thor::Error, err
           end
         end
 
@@ -74,7 +75,7 @@ module Aptible
 
         def with_postgres_tunnel(database)
           if database.type != 'postgresql'
-            fail Thor::Error, 'This command only works for PostgreSQL'
+            raise Thor::Error, 'This command only works for PostgreSQL'
           end
 
           with_local_tunnel(database) do |tunnel_helper|

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

@@ -11,7 +11,7 @@ module Aptible
             if (environment = environment_from_handle(options[:environment]))
               [environment]
             else
-              fail Thor::Error, 'Specified account does not exist'
+              raise Thor::Error, 'Specified account does not exist'
             end
           else
             Aptible::Api::Account.all(token: fetch_token)
@@ -22,7 +22,7 @@ module Aptible
           if (handle = options[:environment])
             environment = environment_from_handle(handle)
             return environment if environment
-            fail Thor::Error, "Could not find environment #{handle}"
+            raise Thor::Error, "Could not find environment #{handle}"
           else
             ensure_default_environment
           end
@@ -39,7 +39,7 @@ module Aptible
           environments = Aptible::Api::Account.all(token: fetch_token)
           return environments.first if environments.count == 1
 
-          fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
+          raise Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
             Multiple environments available, please specify with --environment
           ERR
         end

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

@@ -12,7 +12,7 @@ module Aptible
           wait_for_completion operation
           return if operation.status == 'succeeded'
 
-          fail Thor::Error, "Operation ##{operation.id} failed."
+          raise Thor::Error, "Operation ##{operation.id} failed."
         end
 
         def wait_for_completion(operation)

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

@@ -37,7 +37,6 @@ module Aptible
 
           # If we're missing *some* files, then we should clean them up.
 
-          # rubocop:disable Lint/HandleExceptions
           key_files.each do |key_file|
             begin
               File.delete(key_file)
@@ -45,7 +44,6 @@ module Aptible
               # We don't care, that's what we want.
             end
           end
-          # rubocop:enable Lint/HandleExceptions
 
           begin
             cmd = ['ssh-keygen', '-t', 'rsa', '-N', '', '-f', private_key_file]
@@ -76,8 +74,6 @@ module Aptible
           log_level = ENV['APTIBLE_SSH_DEBUG'] ? 'DEBUG3' : 'ERROR'
 
           [
-            '-o', 'StrictHostKeyChecking=no',
-            '-o', 'UserKnownHostsFile=/dev/null',
             '-o', 'TCPKeepAlive=yes',
             '-o', 'KeepAlive=yes',
             '-o', 'ServerAliveInterval=60',

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

@@ -10,8 +10,8 @@ module Aptible
           @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 ' \
-                            "or set #{TOKEN_ENV_VAR}"
+          raise Thor::Error, 'Could not read token: please run aptible login ' \
+                             "or set #{TOKEN_ENV_VAR}"
         end
 
         def save_token(token)

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

@@ -60,7 +60,7 @@ module Aptible
         end
 
         def stop
-          fail 'You must call #start before calling #stop' if @pid.nil?
+          raise 'You must call #start before calling #stop' if @pid.nil?
           begin
             Process.kill(STOP_SIGNAL, @pid)
           rescue Errno::ESRCH
@@ -76,7 +76,7 @@ module Aptible
         end
 
         def port
-          fail 'You must call #start before calling #port!' if @local_port.nil?
+          raise 'You must call #start before calling #port!' if @local_port.nil?
           @local_port
         end
 

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

@@ -27,7 +27,7 @@ module Aptible
               app = environment.create_app(handle: handle)
 
               if app.errors.any?
-                fail Thor::Error, app.errors.full_messages.first
+                raise Thor::Error, app.errors.full_messages.first
               else
                 say "App #{handle} created!"
                 say "Git remote: #{app.git_repo}"
@@ -54,9 +54,9 @@ module Aptible
                               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}."
+                raise 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,

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

@@ -13,7 +13,7 @@ module Aptible
             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?
+              raise 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'
@@ -38,7 +38,7 @@ module Aptible
                    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?
+              raise Thor::Error, "Invalid age: #{options[:max_age]}" if age.nil?
               min_created_at = Time.now - age
 
               database = ensure_database(options.merge(db: handle))

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

@@ -30,7 +30,7 @@ module Aptible
                                                      type: options[:type])
 
               if database.errors.any?
-                fail Thor::Error, database.errors.full_messages.first
+                raise Thor::Error, database.errors.full_messages.first
               else
                 op = database.create_operation!(type: 'provision',
                                                 disk_size: options[:size])

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

@@ -16,7 +16,7 @@ module Aptible
             def logs
               if options[:app] && options[:database]
                 m = 'You must specify only one of --app and --database'
-                fail Thor::Error, m
+                raise Thor::Error, m
               end
 
               resource = \
@@ -27,8 +27,8 @@ module Aptible
                 end
 
               unless resource.status == 'provisioned'
-                fail Thor::Error, 'Unable to retrieve logs. ' \
-                                  "Have you deployed #{resource.handle} yet?"
+                raise Thor::Error, 'Unable to retrieve logs. ' \
+                                   "Have you deployed #{resource.handle} yet?"
               end
 
               op = resource.create_operation!(type: 'logs', status: 'succeeded')

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

@@ -10,7 +10,7 @@ module Aptible
             desc 'operation:cancel OPERATION_ID', 'Cancel a running operation'
             define_method 'operation:cancel' do |operation_id|
               o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
-              fail "Operation ##{operation_id} not found" if o.nil?
+              raise "Operation ##{operation_id} not found" if o.nil?
 
               puts "Requesting cancellation on #{prettify_operation(o)}..."
               o.update!(cancelled: true)

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

@@ -31,7 +31,7 @@ module Aptible
                       "but #{app.handle} is deployed in a production " \
                       'environment. Are you sure you want to do this? If ' \
                       'so, use the --force flag.'
-                  fail Thor::Error, e
+                  raise Thor::Error, e
                 end
               end
 

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.8.2'.freeze
   end
 end

data/spec/mock/ssh

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'json'
 
-fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
+raise 'Something went wrong!' if ENV['FAIL_TUNNEL']
 
 # Log arguments to SSH_MOCK_OUTFILE
 File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|

data/spec/mock/ssh_mock.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'json'
 
-fail 'Something went wrong!' if ENV['FAIL_TUNNEL']
+raise 'Something went wrong!' if ENV['FAIL_TUNNEL']
 
 # Log arguments to SSH_MOCK_OUTFILE
 File.open(ENV.fetch('SSH_MOCK_OUTFILE'), 'w') do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.15
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.8
+        version: 0.11.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.8
+        version: 0.11.12
 - !ruby/object:Gem::Dependency
   name: aptible-resource
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md

data/.rubocop.yml

@@ -1,45 +0,0 @@
-GuardClause:
-  Enabled: false
-
-Documentation:
-  Enabled: false
-
-Encoding:
-  Enabled: false
-
-DoubleNegation:
-  Enabled: false
-
-NumericLiterals:
-  Enabled: false
-
-FileName:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-PerceivedComplexity:
-  Enabled: false
-
-AbcSize:
-  Enabled: false
-
-SignalException:
-  Enabled: false
-
-AllCops:
-  Include:
-    - !ruby/regexp /\.rb$/
-    - !ruby/regexp /\.rake$/
-    - !ruby/regexp /\.gemspec$/
-    - !ruby/regexp /Rakefile$/
-  Exclude:
-    # Exclude line length check from autogenerated files
-    - !ruby/regexp /\/db\/schema\.rb$/
-    - !ruby/regexp /node_modules\//
-    - !ruby/regexp /tmp\//
-    - !ruby/regexp /vendor\//