container_ship 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81784b5cc4c7f154050767adc86bfa44c61da90de8c3acfe7675317e3c05e8af
-  data.tar.gz: 568d9db35b31697a1892b9f2aaefd26f5c673a872ffda6541dd5ff64ae817a80
+  metadata.gz: 2cbe9992985814e2dcc555ab7ded5238a5c28b7db1a534ed7d67b10bd54f1325
+  data.tar.gz: adc4774f3985977582090746e7ee21bc48293dec2f1fe4aab1bfa4a5ba6f21a8
 SHA512:
-  metadata.gz: 437ddc8b6e673f3a8a76ab4c16e371539cf99a6bfcab0a25257a2a8c1a644d723f7fdb18797612af2061f598910abc3da9cbcecac2b17777127dfa48ba79d0f1
-  data.tar.gz: 8c4d1bd691fc124e83e4335b93e3dd16f70bf97886d46c687167c81b0ebf5c22314faae41a07bbe1f948757452f459bbcaa004c0c82c6403bf9fe18293c5a256
+  metadata.gz: 29cda144a2294bc6445755e7b5ddf5bb3fcf08bfe40c6ac4b6e903286189a613d4934339e90a9f242d22269fc4b89d0e8ed3796c2984f4e0689de65b9dc4fb3c
+  data.tar.gz: 16f8272cfaf3210317f31f210e6ef03b82925279e91e35f3e1e0d016d5cc2f249a70188a8496080f75ac27d70f454b672138af0d3f48f26a49329544672e79d2

data/.circleci/config.yml

@@ -17,7 +17,7 @@ git statusrestore_bundle_cache: &restore_bundle_cache
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.7.2
+      - image: cimg/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache
@@ -29,7 +29,7 @@ jobs:
             - vendor/bundle
   rubocop:
     docker:
-      - image: circleci/ruby:2.7.2
+      - image: cimg/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache
@@ -38,7 +38,7 @@ jobs:
       - run: bundle exec rubocop
   rspec:
     docker:
-      - image: circleci/ruby:2.7.2
+      - image: cimg/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache

data/.github/dependabot.yml

@@ -7,10 +7,6 @@ updates:
     time: "11:00"
     timezone: Asia/Tokyo
   open-pull-requests-limit: 20
-  reviewers:
-  - avexbesuke
-  - amatotsuji
-  - yuta-sanada0089
   allow:
   - dependency-type: direct
   - dependency-type: indirect

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    container_ship (0.1.4)
+    container_ship (0.1.6)
       aws-sdk-cloudwatchlogs
       aws-sdk-ecs
       thor
@@ -9,37 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.560.0)
-    aws-sdk-cloudwatchlogs (1.52.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.895.0)
+    aws-sdk-cloudwatchlogs (1.79.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.127.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-ecs (1.96.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-core (3.191.3)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ecs (1.142.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     docile (1.3.5)
-    faraday (1.10.0)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -54,11 +53,11 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
-    faraday-http-cache (2.2.0)
+    faraday-http-cache (2.4.1)
       faraday (>= 0.8)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -91,9 +90,9 @@ GEM
     guard-rubocop (1.4.0)
       guard (~> 2.0)
       rubocop (< 2.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.6.0)
+    jmespath (1.6.2)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -101,42 +100,42 @@ GEM
     method_source (1.0.0)
     minitest (5.15.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     parallel (1.20.1)
-    parser (3.1.1.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.0)
     retriable (3.1.2)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -150,22 +149,19 @@ GEM
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
-    simplecov (0.21.2)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.4)
     thor (1.2.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby

data/lib/container_ship/cli.rb

@@ -16,10 +16,17 @@ module ContainerShip
     end
 
     desc 'exec CLUSTER_NAME SERVICE_NAME ENVIRONMENT BUILD_NUMBER', 'exec specified task'
-    method_option 'timeout', desc: 'Timeout seconds for executing the task. Default 5 minutes.'
+    method_option 'timeout', default: 300, type: :numeric, desc: 'Timeout seconds for executing the task.'
+    method_option 'no_wait', default: false, type: :boolean,
+                             desc: 'Exit without waiting for the task execution results. Default false.'
     def exec(cluster_name, service_name, environment, build_number)
-      timeout = options['timeout']&.to_i || 300
-      Command::ExecCommand.new.run(cluster_name, service_name, environment, build_number, timeout: timeout)
+      timeout = options['timeout']
+      no_wait = options['no_wait']
+      Command::ExecCommand.new.run(
+        cluster_name, service_name, environment, build_number,
+        timeout: timeout,
+        no_wait: no_wait
+      )
     end
 
     desc 'version', 'display gem version'

data/lib/container_ship/command/exec_command.rb

@@ -17,7 +17,7 @@ module ContainerShip
       include Modules::Ecs
       include Modules::PrintTask
 
-      def run(cluster_name, task_name, environment, build_number, timeout: nil)
+      def run(cluster_name, task_name, environment, build_number, timeout: nil, no_wait: false) # rubocop:disable Metrics/ParameterLists
         task_definition = TaskDefinition.new(cluster_name, 'tasks', task_name, environment, build_number)
 
         push_image task_definition
@@ -30,6 +30,8 @@ module ContainerShip
           run_task task_definition, revision
         end
 
+        return if no_wait
+
         exit_status = print_around_task('Waiting task is completed... ') do
           wait_task task_definition, task_arn, timeout: timeout
         end

data/lib/container_ship/command/modules/docker.rb

@@ -5,20 +5,21 @@ module ContainerShip
     module Modules
       module Docker
         def push_image(task_definition)
-          puts "docker build -t \"#{task_definition.image_name}:#{task_definition.build_number}\" ."
           sh "docker build -t \"#{task_definition.image_name}:#{task_definition.build_number}\" ."
-          puts "docker push #{task_definition.image_name}:#{task_definition.build_number}"
           sh "docker push #{task_definition.image_name}:#{task_definition.build_number}"
         end
 
         private
 
         def sh(command)
+          puts command
+
           status = nil
-          Open3.popen3(command) do |_i, o, e, w|
-            o.each { |line| puts line }
-            e.each { |line| puts line }
-            status = w.value
+          Open3.popen3(command) do |_stdin, stdout, stderr, wait_thr|
+            Thread.new(stdout) { |io| io.each { puts _1 } }
+            Thread.new(stderr) { |io| io.each { puts _1 } }
+
+            status = wait_thr.value
           end
           exit(status.exitstatus) unless status.success?
         end

data/lib/container_ship/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContainerShip
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: container_ship
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Yuji Ueki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -205,6 +205,7 @@ files:
 - ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -233,7 +234,7 @@ metadata:
   homepage_uri: https://github.com/seibii/container_ship
   source_code_uri: https://github.com/seibii/container_ship
   changelog_uri: https://github.com/seibii/container_ship
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +249,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Yet another ECS deployment tool
 test_files: []