contexto 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70a1d561afdac4ad1e724a0f4e5174b2e302b5c6
-  data.tar.gz: 899491e29583693bcde3f42d5f02b17dfb943765
+  metadata.gz: de77f650841b467399bee6dbf2d29a5696109e56
+  data.tar.gz: 828dd1907ca53b14b6a157993f60e7c4ca2582f2
 SHA512:
-  metadata.gz: ed11c289dd07940251a6a75eb67f6d8d1f158a0b36b98380871103f503203ae84a728cebd400c117eb6c2819de7259eea377c3055211caa0cf5a1b3f074e7b79
-  data.tar.gz: e0c9492d095b2af5b3284295c9a47e1e4839a84579d49b0006053e00e0532439c289f71eb7091e39fe5f57b2b0366bd071cc6ebb2710823f2ec5cc945cf1a8fa
+  metadata.gz: 89c7a8bd03f7354bdebe06e4160801f19984ed5ff55da37366287733ce8f74f2241a7d6e0410c0c8709c3484ad02525427d48d173fc7914e4391dce37156bacf
+  data.tar.gz: 041afed7733f84b832d593498cacce3bc7ae833f93d8c8e5e7c70ba4a44c4759328109f425fb5419801b6b5f55520d6a062e50b0cdd96cd682a0e406d5825ed5

data/lib/contexto/contextualize.rb

@@ -4,7 +4,7 @@ require 'aws-sdk'
 module Contexto
   # ECS class
   class Contextualize
-    attr_reader :display, :cluster, :service
+    attr_reader :display, :cluster, :service, :container, :console, :rake
 
     def initialize(params = {})
       @cluster = params.fetch(:cluster) if params[:cluster]
@@ -16,37 +16,41 @@ module Contexto
     end
 
     def run
-      if (@console || @rake)
+      if ssh?
         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 = Contexto::SSH.new(describe_instances(ec2_instance_id), cluster, service, container)
+        if console
           @ssh.console
-        elsif @rake
-          @ssh.rake(@rake)
+        elsif rake
+          @ssh.rake(rake)
         end
         return
       end
-      if !@cluster
-        clusters
+      if !cluster
+        show_clusters
         return
       end
-      cluster
+      show_cluster
       puts "\n"
-      if !@service
-        services
+      if !service
+        show_services
       end
-      if @service
+      if service
         puts "\n"
-        service
+        show_service
         puts "\n"
-        tasks
+        show_tasks
       end
     end
 
     private
 
-    def clusters
+    def ssh?
+      (console || rake)
+    end
+
+    def show_clusters
       title = "Clusters"
       headings = %w(Name)
       clusters = list_clusters
@@ -57,8 +61,8 @@ module Contexto
       @display.create_display(title, headings, rows)
     end
 
-    def cluster
-      title = "Cluster #{@cluster}"
+    def show_cluster
+      title = "Cluster #{cluster}"
       headings = %w(Name Status Instances Services RunningTasks PendingTasks)
       cluster = describe_clusters
       rows = []
@@ -66,7 +70,7 @@ module Contexto
       @display.create_display(title, headings, rows)
     end
 
-    def services
+    def show_services
       title = "Services"
       headings = %w(Name)
       services = list_services
@@ -77,8 +81,8 @@ module Contexto
       @display.create_display(title, headings, rows)
     end
 
-    def service
-      title = "Service #{@service}"
+    def show_service
+      title = "Service #{service}"
       headings = %w(Name Status Desired Running Pending)
       service = describe_services
       rows = []
@@ -88,7 +92,7 @@ module Contexto
       puts 'Service not found'
     end
 
-    def tasks
+    def show_tasks
       task = describe_tasks
       containers = task[:containers]
       ec2_instance_id = describe_container_instance(task[:container_instance_arn])
@@ -109,7 +113,7 @@ module Contexto
     def describe_clusters
       resp = ecs_client.describe_clusters(
         clusters: [
-          @cluster
+          cluster
         ]
       )
       resp.clusters[0].to_h
@@ -117,16 +121,16 @@ module Contexto
 
     def list_services
       resp = ecs_client.list_services(
-        cluster: @cluster
+        cluster: cluster
       )
       resp.service_arns
     end
 
     def describe_services
       resp = ecs_client.describe_services(
-        cluster: @cluster,
+        cluster: cluster,
         services: [
-          @service
+          service
         ]
       )
       resp.services[0].to_h
@@ -134,7 +138,7 @@ module Contexto
 
     def describe_tasks
       resp = ecs_client.describe_tasks(
-        cluster: @cluster,
+        cluster: cluster,
         tasks: [task_arn]
       )
       resp.tasks[0].to_h
@@ -142,15 +146,15 @@ module Contexto
 
     def task_arn
       resp = ecs_client.list_tasks(
-        cluster: @cluster,
-        service_name: @service
+        cluster: cluster,
+        service_name: service
       )
       resp.task_arns[0]
     end
 
     def describe_container_instance(container_instance_arn)
       resp = ecs_client.describe_container_instances(
-        cluster: @cluster,
+        cluster: cluster,
         container_instances: [
           container_instance_arn
         ]

data/lib/contexto/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contexto
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk