ecs-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b782be8674d1202475c5feb01d7db1f60cc44c405728e0d209b36ed73dbf36
-  data.tar.gz: 12b35c703f133f94e98a958100369fa8a55b2f6c5a00ba05fd15f7f45260606a
+  metadata.gz: 2c315c2e992cf5b44e419f99fbca24d590b67bde002ff99c87eace906039d479
+  data.tar.gz: eea04176308d22f38e5c4ae44ce4bf9fff10f5e45f33ac5a1904b794e602791f
 SHA512:
-  metadata.gz: 14993ab00ee2a4c16050dac6e8697164b8ee107d19b0aa6258b4ae69cdc416f8bf3ebc44183b8d74002e717393ded177756ecc73d482f396a4a1c7a92da0c7b9
-  data.tar.gz: 56a7b7c237a810666872fc34b3e376cf7a87bd75b1793602b0fb3d217abc5d0ae786d1515dab745a747af7528b2ad4d03293f178c229143bc3af22365289508c
+  metadata.gz: bd23d26514639ac9f015bb8af4b82491a0896e670c10b701f642981d8a2872b1230c009f570c5dc6a9a7f787842c7972b2573762de69b7b3ac62289a5c7a8142
+  data.tar.gz: e6f6e8043df16a541c81cdba7cf316c301e8a850082de85a694b0b7c1b8e3c27064e29431857fd66764de7ffeaa01c1f7c6983c9e755fdc32e21ffd4e75df244

data/bin/ecs

@@ -1,15 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'byebug'
-
 require 'optparse'
 require_relative '../lib/ecs-rails'
 
-EcsRails.aws_region = ENV['AWS_REGION']
-EcsRails.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
-EcsRails.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-EcsRails.container_name = ENV['CONTAINER_NAME'] || 'webapp'
-
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: ecsconsole [options]"
@@ -25,9 +19,4 @@ end.parse!
 
 command_keyword = ARGV[0]
 
-# byebug
-
-# command = EcsRails::CommandFactory.new(command_keyword, options).command
-# command.call
-
 EcsRails::CommandExecutor.call(command_keyword, options)

data/lib/ecs-rails/cluster_selector.rb

@@ -38,10 +38,7 @@ module EcsRails
       attr_reader :client, :filter
 
       def connecting_to_cluster(cluster_name)
-        puts('')
         puts("Connecting to cluster '#{cluster_name}':")
-        puts('')
-        puts('=' * 50)
       end
 
       def ask_for_cluster(clusters)

data/lib/ecs-rails/command.rb

@@ -31,12 +31,10 @@ module EcsRails
       end
 
       def selected_service
-        puts("Selected cluster: #{selected_cluster}")
         @selected_service ||= EcsRails::ServiceSelector.new(client, selected_cluster, service_name).call
       end
 
       def task_id
-        puts("Selected service: #{selected_service}")
         @task_id ||= EcsRails::TaskSelector.new(client, selected_cluster, selected_service).call
       end
 

data/lib/ecs-rails/ecs_rails_configuration.rb

@@ -12,10 +12,10 @@ module EcsRails
     end
 
     def initialize
-      @aws_region = 'us-east-1'
-      @aws_access_key_id = nil
-      @aws_secret_access_key = nil
-      @container_name = nil
+      @aws_region = ENV['AWS_REGION'] || 'us-east-1'
+      @aws_access_key_id = ENV['AWS_ACCESS_KEY_ID']
+      @aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
+      @container_name = ENV['CONTAINER_NAME'] || 'webapp'
     end
 
     def aws_region=(region)

data/lib/ecs-rails/service_selector.rb

@@ -43,10 +43,7 @@ module EcsRails
       attr_reader :client, :cluster, :service_filter
 
       def connecting_to_service(service_name)
-        puts('')
         puts("Connecting to service '#{service_name}':")
-        puts('')
-        puts('=' * 50)
       end
 
       def ask_for_service(services)

data/lib/ecs-rails/task_selector.rb

@@ -27,20 +27,8 @@ module EcsRails
             puts("      Task: #{task_arns.first}")
               return task_arns.first
           else
-            tasks_for_deployment.each_with_index do |task, index|
-              puts("#{index+1}. Task: #{task.task_arn.split('/').last}, Last Status: #{task.last_status}, Desired Status: #{task.desired_status}")
-            end
+            ask_for_task(tasks_for_deployment)
           end
-
-          selection = $stdin.gets.chomp.to_i
-          puts("Selected task: #{tasks_for_deployment[selection - 1].task_arn}")
-
-            unless selection.between?(1, task_arns.size)
-              puts('Invalid selection.')
-              exit
-            end
-
-          return task_arns[selection - 1]
         end
       end
     end
@@ -48,5 +36,12 @@ module EcsRails
     private
 
       attr_reader :client, :cluster_name, :service_name
+
+      def ask_for_task(tasks)
+        prompt = TTY::Prompt.new
+        choices = tasks.map { |task| task.split('/').last }
+        choice = prompt.enum_select("Select a task:", choices)
+        tasks.grep(Regexp.new(choice)).first
+      end
   end
 end

data/lib/ecs-rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EcsRails
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecs-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Franck D'agostini