ecs_helper 0.0.21 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a134e023494ab0c6d2ba533f5a377f2c9e0a1328239001e776b6523f27dcad80
-  data.tar.gz: 2fa77ec7e58de90005f3ebfbf099011adf4c22e2f3325a19d86ed01c7fb6be65
+  metadata.gz: 6fcdfa5ea72481d6e07bea7f9bf9ec044ca79ece2c680233f538ed7a4e3a7683
+  data.tar.gz: de5b3ea5643b878c6c27989d8fce5a87771c3da25fef2968494fccd422e0774d
 SHA512:
-  metadata.gz: 8b6eef42ab91d82356fd191d2175cc09ad44d68ad0f394ca933db747c23c0f0a1b28158a2f6104c0a1d661fd7c7cbf152d8f13659bb91efe6cefb2b7cce71ad8
-  data.tar.gz: 90a2aa25b21c4d33636663729c93c7724552730a575de445880326a36a8b762dc35c38f91a6c03a2054e4205030a6464e87060af2efa30591adf5f1e532d3525
+  metadata.gz: 5061f5c736a06834cfd0486891b82aa5d93cd0938acb9d7c8f8e492e01269b4ee6aac18a5d73a1eeacbb5a8c0ee45c34ea31d358a1729cfc8def3771c7a77d6b
+  data.tar.gz: 4c488f4fc1b8badd9a82cee368dc1f21a7b505f047daa16ca51cf93f29e2559211d54a406ef2e05a6c3ffc39bf87d0192595129f7db871d2e0b70b00e0a925f9

data/Gemfile

@@ -1,9 +1,4 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '3.0.2'
-
-# Specify your gem's dependencies in kirpich.gemspec
 gemspec
-
-gem 'coveralls', require: false

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.21)
+    ecs_helper (0.0.24)
       aws-sdk-ecr (~> 1.42, >= 1.42)
       aws-sdk-ecrpublic (~> 1.3, >= 1.3)
       aws-sdk-ecs (~> 1.80, >= 1.80)
       colorize (~> 0.8, >= 0.8)
       json (~> 2.5, >= 2.5)
-      rake
       terrapin (~> 0.6, >= 0.6)
 
 GEM
@@ -18,8 +17,8 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.494.0)
-    aws-sdk-core (3.120.0)
+    aws-partitions (1.496.0)
+    aws-sdk-core (3.121.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -33,35 +32,33 @@ GEM
     aws-sdk-ecs (1.85.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.3.0)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     climate_control (0.2.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
     crack (0.4.5)
       rexml
-    docile (1.4.0)
     hashdiff (1.0.1)
     jmespath (1.4.0)
     json (2.5.1)
     method_source (1.0.0)
     minitest (5.14.4)
+    minitest-power_assert (0.3.1)
+      minitest
+      power_assert (>= 1.1)
+    mocha (1.13.0)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    power_assert (2.0.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     pry-inline (1.0.7)
       pry (> 0.10.0)
       unicode (~> 0.4.4)
@@ -84,19 +81,8 @@ GEM
     rubocop-minitest (0.15.0)
       rubocop (>= 0.90, < 2.0)
     ruby-progressbar (1.11.0)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.1.0)
-    tins (1.29.1)
-      sync
     unicode (0.4.4.4)
     unicode-display_width (2.0.0)
     webmock (3.14.0)
@@ -109,18 +95,18 @@ PLATFORMS
 
 DEPENDENCIES
   awesome_print
-  coveralls
+  bundler (~> 2.2)
   ecs_helper!
   minitest
+  minitest-power_assert
+  mocha
   pry
   pry-byebug
   pry-inline
+  rake
   rubocop
   rubocop-minitest
   webmock
 
-RUBY VERSION
-   ruby 3.0.2p107
-
 BUNDLED WITH
    2.2.22

data/bin/console

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
 require 'ecs_helper'
 
 # You can add fixtures and/or initialization code here to make experimenting

data/bin/ecs_helper

@@ -1,8 +1,12 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
 require 'ecs_helper'
 
-helper = ECSHelper.new
-helper.run
+begin
+  helper = ECSHelper.new
+  helper.run
+rescue ECSHelper::Error::Base => e
+  puts e.message
+  exit 1
+end

data/docker-compose.yml

@@ -20,6 +20,7 @@ services:
       - BUNDLE_PATH=/bundle_cache
       - GEM_HOME=/bundle_cache
       - GEM_PATH=/bundle_cache
+      - SKIP_LOGS=true
 
   bundle_cache:
     image: busybox

data/ecs_helper.gemspec

@@ -21,13 +21,18 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'mocha'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'minitest-power_assert'
   s.add_development_dependency 'pry-byebug'
   s.add_development_dependency 'pry-inline'
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'rubocop-minitest'
   s.add_development_dependency 'webmock'
 
+  s.add_development_dependency "bundler", "~> 2.2"
+  s.add_development_dependency "rake"
+
   s.add_runtime_dependency 'aws-sdk-ecr', '~> 1.42', '>= 1.42'
   s.add_runtime_dependency 'aws-sdk-ecrpublic', '~> 1.3', '>= 1.3'
   s.add_runtime_dependency 'aws-sdk-ecs', '~> 1.80', '>= 1.80'
@@ -35,5 +40,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '~> 2.5', '>= 2.5'
   s.add_runtime_dependency 'terrapin', '~> 0.6', '>= 0.6'
 
-  s.add_dependency 'rake'
 end

data/lib/ecs_helper/client.rb

@@ -1,13 +1,11 @@
 require 'aws-sdk-ecs'
 require 'aws-sdk-ecr'
-require 'aws-sdk-ecrpublic'
 
 class ECSHelper::Client
-  attr_accessor :ecs, :ecr, :ecr_public
+  attr_accessor :ecs, :ecr
   def initialize
     @ecs = Aws::ECS::Client.new
     @ecr = Aws::ECR::Client.new
-    @ecr_public = Aws::ECRPublic::Client.new
   end
 
   # ECS
@@ -61,10 +59,6 @@ class ECSHelper::Client
     ecr.describe_repositories(params).repositories
   end
 
-  def public_repositories(params = {})
-    ecr_public.describe_repositories(params).repositories
-  end
-
   def describe_images(params = {})
     ecr.describe_images(params).image_details[0]
   end

data/lib/ecs_helper/command/base.rb

@@ -17,6 +17,14 @@ class ECSHelper::Command::Base
     helper.type
   end
 
+  def project
+    helper.project
+  end
+
+  def application
+    helper.application
+  end
+
   def validate
     required.each do |r|
       value = options[r]

data/lib/ecs_helper/command/build_and_push.rb

@@ -55,7 +55,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     pull_cmd = Terrapin::CommandLine.new("docker pull #{latest_tag}")
     pull_cmd.run
   rescue Terrapin::ExitStatusError => e
-    puts e.message
+    console e.message
   end
 
   def build
@@ -66,7 +66,7 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     command = (build_command + build_args + cache_command + tags_command).join(' ')
     build_cmd = Terrapin::CommandLine.new(command)
 
-    puts "Building with two tags: #{latest_tag} & #{version_tag}"
+    console "Building with two tags: #{latest_tag} & #{version_tag}"
     build_cmd.run
   end
 
@@ -93,6 +93,14 @@ class ECSHelper::Command::BuildAndPush < ECSHelper::Command::Base
     "#{repository}:#{helper.version}"
   end
 
+  def project
+    helper.project
+  end
+
+  def application
+    helper.application
+  end
+
   def repository
     @repository ||= begin
       all = client.private_repositories

data/lib/ecs_helper/command/export_images.rb

@@ -31,7 +31,7 @@ class ECSHelper::Command::ExportImages < ECSHelper::Command::Base
   def export_images
     variables = (['export'] + client.private_repositories.map do |repo|
       container_name = repo.repository_name.scan(/#{project}-#{application}-(.*)/).flatten.first
-      next if conainer_name.nil?
+      next if container_name.nil?
       key = container_name.upcase.gsub("-", "_") + "_IMAGE"
       value = "#{repo.repository_uri}:#{helper.version}"
       "#{key}=#{value}"

data/lib/ecs_helper/command.rb

@@ -26,10 +26,12 @@ class ECSHelper::Command
 
   def klass
     CMD_MAPPING[type] || begin
-      puts "Command not found".light_white
-      puts "Available commands are #{AVAILABLE_COMMANDS}".light_white
-      puts global_option_parser
-      exit
+      messages = [
+        "Command not found".light_white,
+        "Available commands are #{AVAILABLE_COMMANDS}".light_white,
+        global_option_parser
+      ]
+      raise ECSHelper::Error::CommandNotFound.new(messages)
     end
   end
 

data/lib/ecs_helper/error/base.rb

@@ -0,0 +1,10 @@
+class ECSHelper::Error::Base < StandardError
+  def initialize(builder)
+    @builder = builder
+  end
+
+  def message
+    return @builder.join("\n") if @builder
+    "Failed"
+  end
+end

data/lib/ecs_helper/error/command_not_found.rb

@@ -0,0 +1,2 @@
+class ECSHelper::Error::CommandNotFound < ECSHelper::Error::Base
+end

data/lib/ecs_helper/error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class ECSHelper::Error
+  autoload :Base, 'ecs_helper/error/base'
+  autoload :CommandNotFound, 'ecs_helper/error/command_not_found'
+end

data/lib/ecs_helper/logging.rb

@@ -1,16 +1,20 @@
 module ECSHelper::Logging
+  def console(message)
+    puts message if ENV["SKIP_LOGS"].nil?
+  end
+
   def log(title, message = nil, color = "light_white")
     if message
-      puts title.send(color)
-      puts message
+      console title.send(color)
+      console message
     else
-      puts title
+      console title
     end
   end
 
   def error(message, code = 1)
-    puts "Error".red
-    puts message
+    console "Error".red
+    console message
     exit code
   end
 end

data/lib/ecs_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ECSHelper
-  VERSION = '0.0.21'
+  VERSION = '0.0.25'
 end

data/lib/ecs_helper.rb

@@ -11,6 +11,7 @@ class ECSHelper
   autoload :ClusterHelper, 'ecs_helper/cluster_helper'
   autoload :ServiceHelper, 'ecs_helper/service_helper'
   autoload :TaskDefinitionHelper, 'ecs_helper/task_definition_helper'
+  autoload :Error, 'ecs_helper/error'
   autoload :Command, 'ecs_helper/command'
 
   def_delegators :client, :task_definitions, :clusters, :services, :tasks, :repositories, :repositories, :task_definition, :run_task

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_helper
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.25
 platform: ruby
 authors:
 - Artem Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-power_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
@@ -242,20 +298,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
 description: A simple gem which make CI CD process easier for AWS ECS service
 email: artem.petrov@dualbootpartners.com
 executables:
@@ -283,6 +325,9 @@ files:
 - lib/ecs_helper/command/export_images.rb
 - lib/ecs_helper/command/run_command.rb
 - lib/ecs_helper/common_helper.rb
+- lib/ecs_helper/error.rb
+- lib/ecs_helper/error/base.rb
+- lib/ecs_helper/error/command_not_found.rb
 - lib/ecs_helper/logging.rb
 - lib/ecs_helper/service_helper.rb
 - lib/ecs_helper/task_definition_helper.rb