ecs_helper 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94ec8bc777deff0ff480a06146d0ba2279e43cb69ee8022298ddb1205c97ac12
-  data.tar.gz: d9ecf4394985744a91936dfba1c08c245e889297c1ba8c70153b7a6f82d080a8
+  metadata.gz: 6fcdfa5ea72481d6e07bea7f9bf9ec044ca79ece2c680233f538ed7a4e3a7683
+  data.tar.gz: de5b3ea5643b878c6c27989d8fce5a87771c3da25fef2968494fccd422e0774d
 SHA512:
-  metadata.gz: c043ec8866cdc97ddea947ef173299cd0bf5664eb9c2e9fbc7a5ecb6dff0d93f8321a9ea15bf99a73f1ad688d613f933a6996920598ad7c34bfa398295189a35
-  data.tar.gz: 3f853cb33f3d091367210e1a08fe1dcf0594cde62d4c490213ae85035b475970a815228817d43c50efa6e7cc30b582a2ecdfb817ffe9fb617bc72b44f5dd00aa
+  metadata.gz: 5061f5c736a06834cfd0486891b82aa5d93cd0938acb9d7c8f8e492e01269b4ee6aac18a5d73a1eeacbb5a8c0ee45c34ea31d358a1729cfc8def3771c7a77d6b
+  data.tar.gz: 4c488f4fc1b8badd9a82cee368dc1f21a7b505f047daa16ca51cf93f29e2559211d54a406ef2e05a6c3ffc39bf87d0192595129f7db871d2e0b70b00e0a925f9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecs_helper (0.0.23)
+    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)
@@ -45,9 +45,14 @@ GEM
     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)
+    power_assert (2.0.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -93,6 +98,8 @@ DEPENDENCIES
   bundler (~> 2.2)
   ecs_helper!
   minitest
+  minitest-power_assert
+  mocha
   pry
   pry-byebug
   pry-inline

data/bin/ecs_helper

@@ -3,5 +3,10 @@
 
 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,7 +21,9 @@ 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'

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.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.24'
+  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.24
+  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
@@ -297,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