contexto 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490c0e22ac549bef652ed2eeee1fd5a24ff596a4
-  data.tar.gz: 1ddb6fb3a4761d10558273b97802437f5dd40f8e
+  metadata.gz: '01823bca9a67dc14286c25741fee3192d366192d'
+  data.tar.gz: feee83295be858f3fadd916b9dfa04e1bc220032
 SHA512:
-  metadata.gz: b0b59244e318aa403fdcda073a386246eb90d9d14668a47154c9e0758cccdc2ca6854578a4bb52dc6eb4f22d2c820790a2f38fce1d5db8e116157562ff448437
-  data.tar.gz: '04383e7cd14cee2be6114aae03b67cf7a806198326e2a246775db1a70e9d41de973d1b64ec238919d7387228c83c1a3407fbf2ba60bf6874ab6aa47836788505'
+  metadata.gz: 3c9aecc424407b74ba9dd636f4ae4e022f2a2ef9cd09872d3e0602d4550088e6b901e1666c393ab84f28d3f50efbae8f0e6b5419dd9df19757c227d88e6ab6c0
+  data.tar.gz: 3e303e464d36bbc0493ccda38c8dbe6f4ac7a616622194fea40e2941702e5dd115b9a3302aed6a813fb143d7ff4f41f1a9ecff8d6800cf8847d02e334572c7e4

data/bin/contexto

@@ -11,30 +11,29 @@ require 'English'
 $stderr.sync = true
 
 options = {}
-options[:console] = false
-options[:bash]    = false
-options[:ssh]     = false
+options[:connection_type] = false
 
 optparse = OptionParser.new do |opts|
   opts.banner = 'Usage: contexto [options]'
   opts.on('-c', '--cluster CLUSTER', 'Cluster') { |v| options[:cluster] = v }
   opts.on('-s', '--service SERVICE', 'Service') { |v| options[:service] = v }
-  opts.on('-t', '--container CONTAINER', 'Container') { |v| options[:container] = v }
-  opts.on('-r', '--rake COMMAND', 'Rake command') { |v| options[:rake] = v }
-  opts.on('-b', '--console') { options[:console] = true }
-  opts.on('-e', '--bash') { options[:bash] = true }
-  opts.on('-f', '--ssh') { options[:ssh] = true }
+  opts.on('-v', '--container CONTAINER', 'Container') { |v| options[:container] = v }
+  opts.on('-t', "--type [TYPE]", [:console, :ssh, :bash], "Select connection type (console, ssh, bash)") { |v| options[:connection_type] = v }
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
 end
 
 begin
   optparse.parse!
-  mandatory = []
-  missing = mandatory.select { |param| options[param].nil? }
-  unless missing.empty?
-    raise OptionParser::MissingArgument.new(missing.join(', '))
+  if options[:connection_type] && !options[:container]
+    raise OptionParser::MissingArgument.new("If you want to connect to a container you need to specify a container name.")
+    puts "\n"
   end
-rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts $ERROR_INFO.to_s
+rescue OptionParser::InvalidOption, OptionParser::InvalidArgument, OptionParser::MissingArgument
+  puts $ERROR_INFO.to_s.capitalize
+  puts "\n"
   puts optparse
   exit
 end

data/contexto.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk', '~> 2'
   spec.add_dependency 'command_line_reporter'
   spec.add_dependency 'net-ssh-gateway'
+  spec.add_dependency 'highline'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'pry', '~> 0.10.4'

data/lib/contexto/contextualize.rb

@@ -1,59 +1,75 @@
 require 'aws-sdk'
+require 'highline'
 
 # Context
 module Contexto
   # ECS class
   class Contextualize
-    attr_reader :display, :cluster, :service, :container, :console, :bash, :ssh, :rake
+    attr_reader :display, :cluster, :service, :container, :connection_type
 
     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)
-      @bash = params.fetch(:bash)
-      @ssh = params.fetch(:ssh)
+      @connection_type = params.fetch(:connection_type) if params[:connection_type]
       @display = Contexto::Display.new
     end
 
     def run
-      if connect?
-        task = describe_tasks
-        ec2_instance_id = describe_container_instance(task[:container_instance_arn])
-        @connection = Contexto::SSH.new(describe_instances(ec2_instance_id), cluster, service, container)
-        if console
-          @connection.console
-        elsif bash
-          @connection.bash
-        elsif ssh
-          @connection.ssh
-        elsif rake
-          @connection.rake(rake)
-        end
-        return
+      show
+      if (connection_type && container)
+        connect_to_endpoint
+      elsif container
+        prompt_endpoint
       end
+    end
+
+    def show
       if !cluster
         show_clusters
         return
+      elsif cluster
+        show_cluster
+        puts "\n"
       end
-      show_cluster
-      puts "\n"
       if !service
         show_services
-      end
-      if service
+        return
+      elsif service
         puts "\n"
         show_service
-        puts "\n"
+      end
+      if !container
         show_tasks
+        return
+      elsif container
+        puts "\n"
+        show_tasks(container)
       end
     end
 
-    private
+    def connect
+      task = describe_tasks
+      ec2_instance_id = describe_container_instance(task[:container_instance_arn])
+      Contexto::SSH.new(describe_instances(ec2_instance_id), cluster, service, container)
+    end
 
-    def connect?
-      (console || bash || ssh || rake)
+    def connect_to_endpoint
+      connnect.connection_type.to_sym
+      return
+    end
+
+    def prompt_endpoint
+      cli = HighLine.new
+      cli.choose do |menu|
+        puts "\n"
+        menu.header = "Do you want to connect to container #{container}'s?  "
+        menu.prompt = "Please choose a connection type?  "
+        menu.choice(:console) { connect.console }
+        menu.choice(:bash) { connect.bash }
+        menu.choice(:ssh) { connect.ssh }
+        menu.choice(:nah) { return }
+      end
     end
 
     def show_clusters
@@ -98,9 +114,13 @@ module Contexto
       puts 'Service not found'
     end
 
-    def show_tasks
+    def show_tasks(container = '')
       task = describe_tasks
-      containers = task[:containers]
+      if container
+        containers = task[:containers].select { |c| container == c[:name] }
+      else
+        containers = task[:containers]
+      end
       ec2_instance_id = describe_container_instance(task[:container_instance_arn])
       title = 'Containers'
       headings = %w(Container Status IP)

data/lib/contexto/version.rb

@@ -1,4 +1,4 @@
 # Contexto version
 module Contexto
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contexto
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -153,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Shows you context for ECS services and containers.