lib/contexto/contextualize.rb in contexto-0.2.1 vs lib/contexto/contextualize.rb in contexto-0.2.2
- old
+ new
@@ -2,28 +2,31 @@
# Context
module Contexto
# ECS class
class Contextualize
- attr_reader :display, :cluster, :service, :container, :console, :rake
+ attr_reader :display, :cluster, :service, :container, :console, :ssh, :rake
def initialize(params = {})
@cluster = params.fetch(:cluster) if params[:cluster]
@service = params.fetch(:service) if params[:service]
@container = params.fetch(:container) if params[:container]
@rake = params.fetch(:rake) if params[:rake]
@console = params.fetch(:console)
+ @ssh = params.fetch(:ssh)
@display = Contexto::Display.new
end
def run
- if ssh?
+ if connect?
task = describe_tasks
ec2_instance_id = describe_container_instance(task[:container_instance_arn])
@ssh = Contexto::SSH.new(describe_instances(ec2_instance_id), cluster, service, container)
if console
@ssh.console
+ elsif ssh
+ @ssh.ssh
elsif rake
@ssh.rake(rake)
end
return
end
@@ -44,11 +47,11 @@
end
end
private
- def ssh?
- (console || rake)
+ def connect?
+ (console || ssh || rake)
end
def show_clusters
title = "Clusters"
headings = %w(Name)