aptible-cli 0.14.1 → 0.15.0

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

@@ -11,12 +11,19 @@ module Aptible
             desc 'apps', 'List all applications'
             option :environment
             def apps
-              scoped_environments(options).each do |env|
-                say "=== #{env.handle}"
-                env.apps.each do |app|
-                  say app.handle
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list(
+                  { 'environment' => 'handle' },
+                  'handle'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    account.each_app do |app|
+                      node.object do |n|
+                        ResourceFormatter.inject_app(n, app, account)
+                      end
+                    end
+                  end
                 end
-                say ''
               end
             end
 
@@ -29,8 +36,13 @@ module Aptible
               if app.errors.any?
                 raise Thor::Error, app.errors.full_messages.first
               else
-                say "App #{handle} created!"
-                say "Git remote: #{app.git_repo}"
+                CLI.logger.info "App #{handle} created!"
+
+                Formatter.render(Renderer.current) do |root|
+                  root.object do |o|
+                    o.value('git_remote', app.git_repo)
+                  end
+                end
               end
             end
 
@@ -56,9 +68,9 @@ module Aptible
                 # Noop
               when 1
                 if container_count.nil?
-                  m = yellow('Passing container count as a positional ' \
-                             'argument is deprecated, use --container-count')
-                  $stderr.puts m
+                  m = 'Passing container count as a positional ' \
+                      'argument is deprecated, use --container-count'
+                  CLI.logger.warn(m)
                   container_count = Integer(more.first)
                 else
                   raise Thor::Error, 'Container count was passed via both ' \
@@ -77,9 +89,9 @@ module Aptible
 
               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
+                  m = 'Passing container size via the --size keyword ' \
+                      'argument is deprecated, use --container-size'
+                  CLI.logger.warn(m)
                   container_size = options[:size]
                 else
                   raise Thor::Error, 'Container size was passed via both ' \
@@ -106,7 +118,7 @@ module Aptible
             app_options
             define_method 'apps:deprovision' do
               app = ensure_app(options)
-              say "Deprovisioning #{app.handle}..."
+              CLI.logger.info "Deprovisioning #{app.handle}..."
               app.create_operation!(type: 'deprovision')
             end
           end

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

@@ -40,8 +40,13 @@ module Aptible
               }.delete_if { |_, v| v.nil? }
 
               operation = backup.create_operation!(opts)
-              say "Restoring backup into #{handle}"
+              CLI.logger.info "Restoring backup into #{handle}"
               attach_to_operation_logs(operation)
+
+              account = destination_account || backup.account
+
+              database = databases_from_handle(handle, account).first
+              render_database(database, account)
             end
 
             desc 'backup:list DB_HANDLE', 'List backups for a database'
@@ -55,9 +60,22 @@ module Aptible
               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}"
+
+              Formatter.render(Renderer.current) do |root|
+                root.keyed_list('description') do |l|
+                  database.each_backup do |backup|
+                    break if backup.created_at < min_created_at
+                    description = "#{backup.id}: #{backup.created_at}, " \
+                      "#{backup.aws_region}"
+
+                    l.object do |o|
+                      o.value('id', backup.id)
+                      o.value('description', description)
+                      o.value('created_at', backup.created_at)
+                      o.value('region', backup.aws_region)
+                    end
+                  end
+                end
               end
             end
           end

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

@@ -14,8 +14,19 @@ module Aptible
             def config
               app = ensure_app(options)
               config = app.current_configuration
-              env = config ? config.env : nil
-              puts formatted_config(env || {})
+              env = config ? config.env : {}
+
+              Formatter.render(Renderer.current) do |root|
+                root.keyed_list('shell_export') do |list|
+                  env.each_pair do |k, v|
+                    list.object do |node|
+                      node.value('key', k)
+                      node.value('value', v)
+                      node.value('shell_export', "#{k}=#{Shellwords.escape(v)}")
+                    end
+                  end
+                end
+              end
             end
 
             desc 'config:add', 'Add an ENV variable to an app'
@@ -25,7 +36,7 @@ module Aptible
               app = ensure_app(options)
               env = extract_env(args)
               operation = app.create_operation!(type: 'configure', env: env)
-              puts 'Updating configuration and restarting app...'
+              CLI.logger.info 'Updating configuration and restarting app...'
               attach_to_operation_logs(operation)
             end
 
@@ -45,7 +56,7 @@ module Aptible
                 [arg, '']
               end]
               operation = app.create_operation!(type: 'configure', env: env)
-              puts 'Updating configuration and restarting app...'
+              CLI.logger.info 'Updating configuration and restarting app...'
               attach_to_operation_logs(operation)
             end
 
@@ -54,13 +65,6 @@ module Aptible
             define_method 'config:unset' do |*args|
               send('config:rm', *args)
             end
-
-            private
-
-            def formatted_config(env)
-              env = Hash[env.sort]
-              env.map { |k, v| "#{k}=#{Shellwords.escape(v)}" }.join("\n")
-            end
           end
         end
       end

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

@@ -15,28 +15,73 @@ module Aptible
             desc 'db:list', 'List all databases'
             option :environment
             define_method 'db:list' do
-              scoped_environments(options).each do |env|
-                present_environment_databases(env)
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list(
+                  { 'environment' => 'handle' },
+                  'handle'
+                ) do |node|
+                  scoped_environments(options).each do |account|
+                    account.each_database do |db|
+                      node.object do |n|
+                        ResourceFormatter.inject_database(n, db, account)
+                      end
+                    end
+                  end
+                end
               end
             end
 
-            desc 'db:create HANDLE' \
-                 '[--type TYPE] [--container-size SIZE_MB] [--size SIZE_GB]',
+            desc 'db:versions', 'List available database versions'
+            define_method 'db:versions' do
+              Formatter.render(Renderer.current) do |root|
+                root.grouped_keyed_list('type', 'version') do |node|
+                  Aptible::Api::DatabaseImage.all(
+                    token: fetch_token
+                  ).each do |database_image|
+                    node.object do |n|
+                      n.value('type', database_image.type)
+                      n.value('version', database_image.version)
+                      n.value('default', database_image.default)
+                      n.value('description', database_image.description)
+                      n.value('docker_repo', database_image.default)
+                    end
+                  end
+                end
+              end
+            end
+
+            desc 'db:create HANDLE ' \
+                 '[--type TYPE] [--version VERSION] ' \
+                 '[--container-size SIZE_MB] [--size SIZE_GB]',
                  'Create a new database'
-            option :type, default: 'postgresql'
+            option :type, type: :string
+            option :version, type: :string
             option :container_size, type: :numeric
             option :size, default: 10, type: :numeric
             option :environment
             define_method 'db:create' do |handle|
-              environment = ensure_environment(options)
+              account = ensure_environment(options)
 
               db_opts = {
                 handle: handle,
-                type: options[:type],
                 initial_container_size: options[:container_size],
                 initial_disk_size: options[:size]
               }.delete_if { |_, v| v.nil? }
-              database = environment.create_database!(db_opts)
+
+              type = options[:type]
+              version = options[:version]
+
+              if version && type
+                image = find_database_image(type, version)
+                db_opts[:type] = image.type
+                db_opts[:database_image] = image
+              elsif version
+                raise Thor::Error, '--type is required when passing --version'
+              else
+                db_opts[:type] = type || 'postgresql'
+              end
+
+              database = account.create_database!(db_opts)
 
               op_opts = {
                 type: 'provision',
@@ -55,15 +100,17 @@ module Aptible
               end
 
               attach_to_operation_logs(op)
-              say database.reload.connection_url
+
+              render_database(database.reload, account)
             end
 
             desc 'db:clone SOURCE DEST', 'Clone a database to create a new one'
             option :environment
             define_method 'db:clone' do |source_handle, dest_handle|
+              # TODO: Deprecate + recommend backup
               source = ensure_database(options.merge(db: source_handle))
-              dest = clone_database(source, dest_handle)
-              say dest.connection_url
+              database = clone_database(source, dest_handle)
+              render_database(database, database.account)
             end
 
             desc 'db:dump HANDLE', 'Dump a remote database to file'
@@ -72,7 +119,7 @@ module Aptible
               database = ensure_database(options.merge(db: handle))
               with_postgres_tunnel(database) do |url|
                 filename = "#{handle}.dump"
-                say "Dumping to #{filename}"
+                CLI.logger.info "Dumping to #{filename}"
                 `pg_dump #{url} > #{filename}`
               end
             end
@@ -82,7 +129,7 @@ module Aptible
             define_method 'db:execute' do |handle, sql_path|
               database = ensure_database(options.merge(db: handle))
               with_postgres_tunnel(database) do |url|
-                say "Executing #{sql_path} against #{handle}"
+                CLI.logger.info "Executing #{sql_path} against #{handle}"
                 `psql #{url} < #{sql_path}`
               end
             end
@@ -97,37 +144,37 @@ module Aptible
 
               credential = find_credential(database, options[:type])
 
-              say "Creating #{credential.type} tunnel to #{database.handle}...",
-                  :green
+              m = "Creating #{credential.type} tunnel to #{database.handle}..."
+              CLI.logger.info m
 
               if options[:type].nil?
                 types = database.database_credentials.map(&:type)
                 unless types.empty?
                   valid = types.join(', ')
-                  say 'Use --type TYPE to specify a tunnel type', :green
-                  say "Valid types for #{database.handle}: #{valid}", :green
+                  CLI.logger.info 'Use --type TYPE to specify a tunnel type'
+                  CLI.logger.info "Valid types for #{database.handle}: #{valid}"
                 end
               end
 
               with_local_tunnel(credential, desired_port) do |tunnel_helper|
                 port = tunnel_helper.port
-                say "Connect at #{local_url(credential, port)}", :green
+                CLI.logger.info "Connect at #{local_url(credential, port)}"
 
                 uri = URI(local_url(credential, port))
                 db = uri.path.gsub(%r{^/}, '')
-                say 'Or, use the following arguments:', :green
-                say("* Host: #{uri.host}", :green)
-                say("* Port: #{uri.port}", :green)
-                say("* Username: #{uri.user}", :green) unless uri.user.empty?
-                say("* Password: #{uri.password}", :green)
-                say("* Database: #{db}", :green) unless db.empty?
+                CLI.logger.info 'Or, use the following arguments:'
+                CLI.logger.info "* Host: #{uri.host}"
+                CLI.logger.info "* Port: #{uri.port}"
+                CLI.logger.info "* Username: #{uri.user}" unless uri.user.empty?
+                CLI.logger.info "* Password: #{uri.password}"
+                CLI.logger.info "* Database: #{db}" unless db.empty?
 
-                say 'Connected. Ctrl-C to close connection.'
+                CLI.logger.info 'Connected. Ctrl-C to close connection.'
 
                 begin
                   tunnel_helper.wait
                 rescue Interrupt
-                  say 'Closing tunnel'
+                  CLI.logger.warn 'Closing tunnel'
                 end
               end
             end
@@ -136,7 +183,7 @@ module Aptible
             option :environment
             define_method 'db:deprovision' do |handle|
               database = ensure_database(options.merge(db: handle))
-              say "Deprovisioning #{database.handle}..."
+              CLI.logger.info "Deprovisioning #{database.handle}..."
               database.create_operation!(type: 'deprovision')
             end
 
@@ -144,7 +191,7 @@ module Aptible
             option :environment
             define_method 'db:backup' do |handle|
               database = ensure_database(options.merge(db: handle))
-              say "Backing up #{database.handle}..."
+              CLI.logger.info "Backing up #{database.handle}..."
               op = database.create_operation!(type: 'backup')
               attach_to_operation_logs(op)
             end
@@ -153,7 +200,7 @@ module Aptible
             option :environment
             define_method 'db:reload' do |handle|
               database = ensure_database(options.merge(db: handle))
-              say "Reloading #{database.handle}..."
+              CLI.logger.info "Reloading #{database.handle}..."
               op = database.create_operation!(type: 'reload')
               attach_to_operation_logs(op)
             end
@@ -173,7 +220,7 @@ module Aptible
                 disk_size: options[:size]
               }.delete_if { |_, v| v.nil? }
 
-              say "Restarting #{database.handle}..."
+              CLI.logger.info "Restarting #{database.handle}..."
               op = database.create_operation!(opts)
               attach_to_operation_logs(op)
             end
@@ -185,7 +232,11 @@ module Aptible
               database = ensure_database(options.merge(db: handle))
               credential = find_credential(database, options[:type])
 
-              say(credential.connection_url)
+              Formatter.render(Renderer.current) do |root|
+                root.keyed_object('connection_url') do |node|
+                  node.value('connection_url', credential.connection_url)
+                end
+              end
             end
           end
         end

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

@@ -78,7 +78,7 @@ module Aptible
 
               operation = app.create_operation!(opts)
 
-              puts 'Deploying app...'
+              CLI.logger.info 'Deploying app...'
               attach_to_operation_logs(operation)
             end
           end

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

@@ -127,12 +127,15 @@ module Aptible
             define_method 'endpoints:list' do
               resource = ensure_app_or_database(options)
 
-              first = true
-              each_vhost(resource) do |service|
-                service.each_vhost do |vhost|
-                  say '' unless first
-                  first = false
-                  explain_vhost(service, vhost)
+              Formatter.render(Renderer.current) do |root|
+                root.list do |list|
+                  each_service(resource) do |service|
+                    service.each_vhost do |vhost|
+                      list.object do |node|
+                        ResourceFormatter.inject_vhost(node, vhost, service)
+                      end
+                    end
+                  end
                 end
               end
             end
@@ -143,7 +146,7 @@ module Aptible
             app_or_database_options
             define_method 'endpoints:deprovision' do |hostname|
               resource = ensure_app_or_database(options)
-              vhost = find_vhost(each_vhost(resource), hostname)
+              vhost = find_vhost(each_service(resource), hostname)
               op = vhost.create_operation!(type: 'deprovision')
               attach_to_operation_logs(op)
             end
@@ -170,7 +173,7 @@ module Aptible
 
               def modify_app_vhost(flags, options, hostname)
                 app = ensure_app(options)
-                vhost = find_vhost(each_vhost(app), hostname)
+                vhost = find_vhost(each_service(app), hostname)
                 vhost.update!(**flags.prepare(vhost.service.account, options))
                 provision_vhost_and_explain(vhost.service, vhost)
               end

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

@@ -12,7 +12,8 @@ module Aptible
               o = Aptible::Api::Operation.find(operation_id, token: fetch_token)
               raise "Operation ##{operation_id} not found" if o.nil?
 
-              puts "Requesting cancellation on #{prettify_operation(o)}..."
+              m = "Requesting cancellation on #{prettify_operation(o)}..."
+              CLI.logger.info m
               o.update!(cancelled: true)
             end
           end

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

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