ecs-rails 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b782be8674d1202475c5feb01d7db1f60cc44c405728e0d209b36ed73dbf36
-  data.tar.gz: 12b35c703f133f94e98a958100369fa8a55b2f6c5a00ba05fd15f7f45260606a
+  metadata.gz: c08e4e91434f407ea8df658c3493bffca339b819540d0c20a9cc6a46e62f8c2c
+  data.tar.gz: 982257395f3f3f4aff5eef242a1a8d3608ffa59c71bf9d87c4e6238ecd6843e1
 SHA512:
-  metadata.gz: 14993ab00ee2a4c16050dac6e8697164b8ee107d19b0aa6258b4ae69cdc416f8bf3ebc44183b8d74002e717393ded177756ecc73d482f396a4a1c7a92da0c7b9
-  data.tar.gz: 56a7b7c237a810666872fc34b3e376cf7a87bd75b1793602b0fb3d217abc5d0ae786d1515dab745a747af7528b2ad4d03293f178c229143bc3af22365289508c
+  metadata.gz: 6fc00dadac2b0d17c2ab0c96312b2157f79b38f6c278e811080636d9d53e90986f8d731eccf2b1b78a994c7e8f5548b9735258aa1949b9352c6e2910d7de34e7
+  data.tar.gz: f18f580b67798d22634fd3e89e4d1fcd7cc96aac200653efb704aeb940ab4c4f8b504f221cd9574e4e8d612b05b5d6bf294d3bd713137a00e761e078d410a5bd

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 
 gem 'byebug'
 gem 'rspec', '~> 3.0'
+gem 'activesupport', '> 5.2'

data/bin/ecs

@@ -1,14 +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'
+require_relative '../lib/ecs-rails'
 
 options = {}
 OptionParser.new do |opts|
@@ -21,13 +16,22 @@ OptionParser.new do |opts|
   opts.on("-s", "--service SERVICE_STRING", "Give a substring present in your service name. Ex: 'ecs console -c prod -s app' to connect to service webapp-app-prod-7c7cad7") do |c|
     options[:service] = c
   end
+
+  opts.on("-f", "--file-path FILE_PATH", "file path to yaml config file") do |c|
+    options[:config_file] = c
+  end
+
 end.parse!
 
 command_keyword = ARGV[0]
 
-# byebug
-
-# command = EcsRails::CommandFactory.new(command_keyword, options).command
-# command.call
+if !options[:config_file].nil?
+  EcsRails.load_settings(options[:config_file])
+else
+  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'
+end
 
 EcsRails::CommandExecutor.call(command_keyword, options)

data/ecs-rails.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "aws-sdk-ecs", "~> 1.132", "> 1.132"
   s.add_runtime_dependency "aws-sdk-ec2", "~> 1.425", "> 1.425"
   s.add_runtime_dependency "tty-prompt", "~> 0.23", "> 0.23"
+  s.add_runtime_dependency "activesupport", "> 5.2"
 end

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

@@ -1,21 +1,37 @@
+require 'yaml'
+require 'singleton'
+
 module EcsRails
   class EcsRailsConfiguration
+    include Singleton
+
     attr_accessor :aws_region
     attr_accessor :aws_access_key_id
     attr_accessor :aws_secret_access_key 
     attr_accessor :container_name
 
-    def self.setup
-      new.tap do |config|
-        yield config if block_given?
-      end
+    def self.delegated
+      public_instance_methods - Singleton.instance_methods
     end
 
     def initialize
       @aws_region = 'us-east-1'
       @aws_access_key_id = nil
       @aws_secret_access_key = nil
-      @container_name = nil
+      @container_name = 'webapp'
+    end
+
+    def load_settings(file_path=nil)
+      file_path ||= default_settings_file_path
+      yaml = YAML.load_file(file_path)
+      yaml_settings = yaml['settings']
+      yaml_settings.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
+    def aws_region
+      @aws_region
     end
 
     def aws_region=(region)
@@ -34,5 +50,11 @@ module EcsRails
       @container_name = container_name
     end
 
+    private
+
+      def default_settings_file_path
+        File.join(Dir.pwd, 'config', 'ecs-rails.yml')
+      end
+
   end
 end

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.4'
 end

data/lib/ecs-rails.rb

@@ -24,21 +24,19 @@ require_relative 'ecs-rails/console'
 require_relative 'ecs-rails/bash'
 require_relative 'ecs-rails/null_command'
 
+# delegate
+require 'active_support/core_ext/module/delegation'
 
 # prompt
 require "tty-prompt"
 
 module EcsRails
 
-  @configuration = EcsRails::EcsRailsConfiguration.setup
-
   class << self
-    extend Forwardable
-
-    def_delegators :@configuration, :aws_region, :aws_region=
-    def_delegators :@configuration, :aws_access_key_id, :aws_access_key_id=
-    def_delegators :@configuration, :aws_secret_access_key, :aws_secret_access_key=
-    def_delegators :@configuration, :container_name, :container_name=
+    def config
+      EcsRails::EcsRailsConfiguration.instance
+    end
+    delegate(*EcsRails::EcsRailsConfiguration.delegated, to: :config)
   end
 
 end

data/spec/ecs-rails/ecs_rails_configuration_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe EcsRails::EcsRailsConfiguration do
+
+
+  describe '#default' do
+
+    it 'sets region to us-east-1' do
+      expect(EcsRails.aws_region).to eq('us-east-1')
+    end
+  end
+
+  describe 'set aws region' do
+    describe 'directly' do
+      it 'sets region to us-west-2' do
+        EcsRails.aws_region = 'us-west-2'
+        expect(EcsRails.aws_region).to eq('us-west-2')
+      end
+    end
+    describe 'via configuration file' do
+      it 'sets region to us-west-2' do
+        EcsRails.load_settings('spec/fixtures/ecs-rails.yml')
+        expect(EcsRails.aws_region).to eq('us-west-2')
+      end
+    end
+  end
+
+
+end

data/spec/fixtures/ecs-rails.yml

@@ -0,0 +1,2 @@
+settings:
+  aws_region: 'us-west-2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Franck D'agostini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-11 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -104,6 +104,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: Connect to your AWS ECS tasks
 email: franck.dagostini@gmail.com
 executables:
@@ -130,7 +144,8 @@ files:
 - lib/ecs-rails/service_selector.rb
 - lib/ecs-rails/task_selector.rb
 - lib/ecs-rails/version.rb
-- spec/bin/ecs_spec.rb
+- spec/ecs-rails/ecs_rails_configuration_spec.rb
+- spec/fixtures/ecs-rails.yml
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/ecs-rails
 licenses:

data/spec/bin/ecs_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe 'Ecs binary' do
-
-  context 'without arguments' do
-    it 'should run ecs help' do
-      output = EcsRails::CommandExecutor.call('', {})
-      expect(output).to include('You must specify a command')
-    end
-  end
-
-  context 'with console command argument' do
-    it 'calls the command factory with correct command keyword' do
-      command_factory_instance = double('command_factory_instance')
-
-      expect(EcsRails::CommandFactory).to receive(:new).with('console', {}).and_return(command_factory_instance)
-
-      command_instance = double('command_instance')
-
-      expect(command_factory_instance).to receive(:command).and_return(command_instance)
-      expect(command_instance).to receive(:call)
-
-      EcsRails::CommandExecutor.call('bash', {})
-    end
-  end
-end