container_ship 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7ae1e6c79b424625cdfd5f12eacc00fd546ec046151606984a76c5d50cc489
-  data.tar.gz: 1691ee2c77d5f0ddf8064b4966abc2a326ad748615ec5f1b935037d3bc23b38a
+  metadata.gz: 81784b5cc4c7f154050767adc86bfa44c61da90de8c3acfe7675317e3c05e8af
+  data.tar.gz: 568d9db35b31697a1892b9f2aaefd26f5c673a872ffda6541dd5ff64ae817a80
 SHA512:
-  metadata.gz: 4a11192e9091856be8e69fea92399a8e97977a8a8778bb5b6671162c9d149380938d3f5162418277e05a77f28c2c472c8cf2e37054150a40752ee82f90976485
-  data.tar.gz: 06543a4fd7906c378acd0a8e3f3d4c6725a594672ad6175f3fc215c769a7cdf30e52e7832a87f2b9889e783218debf9bd0eafc32d9249ba653b0db3476bf8a9a
+  metadata.gz: 437ddc8b6e673f3a8a76ab4c16e371539cf99a6bfcab0a25257a2a8c1a644d723f7fdb18797612af2061f598910abc3da9cbcecac2b17777127dfa48ba79d0f1
+  data.tar.gz: 8c4d1bd691fc124e83e4335b93e3dd16f70bf97886d46c687167c81b0ebf5c22314faae41a07bbe1f948757452f459bbcaa004c0c82c6403bf9fe18293c5a256

data/.circleci/config.yml

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

data/.github/dependabot.yml

@@ -0,0 +1,38 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "11:00"
+    timezone: Asia/Tokyo
+  open-pull-requests-limit: 20
+  reviewers:
+  - avexbesuke
+  - amatotsuji
+  - yuta-sanada0089
+  allow:
+  - dependency-type: direct
+  - dependency-type: indirect
+  ignore:
+  - dependency-name: codecov
+    versions:
+    - ">= 0.2.14.a, < 0.2.15"
+  - dependency-name: aws-partitions
+    versions:
+    - 1.431.0
+    - 1.433.0
+    - 1.437.0
+    - 1.448.0
+  - dependency-name: i18n
+    versions:
+    - 1.8.10
+  - dependency-name: aws-sigv4
+    versions:
+    - 1.2.3
+  - dependency-name: aws-eventstream
+    versions:
+    - 1.1.1
+  - dependency-name: aws-sdk-core
+    versions:
+    - 3.112.0

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    container_ship (0.1.1)
+    container_ship (0.1.4)
       aws-sdk-cloudwatchlogs
       aws-sdk-ecs
       thor
@@ -15,37 +15,57 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.365.0)
-    aws-sdk-cloudwatchlogs (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.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-sigv4 (~> 1.1)
-    aws-sdk-core (3.105.0)
+    aws-sdk-core (3.127.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecs (1.68.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ecs (1.96.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    codecov (0.2.10)
-      json
-      simplecov
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    docile (1.3.5)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
-    ffi (1.13.1)
-    formatador (0.2.5)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
+    formatador (1.1.0)
     github_changelog_generator (1.15.2)
       activesupport
       faraday-http-cache
@@ -54,13 +74,13 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    guard (2.16.2)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -68,82 +88,84 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.4.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (1.8.5)
+      rubocop (< 2.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (2.3.1)
-    listen (3.2.1)
+    jmespath (1.6.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.18.0)
+    octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
+    regexp_parser (2.2.1)
     retriable (3.1.2)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.90.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
-    simplecov (0.19.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    thor (1.0.1)
+      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.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -162,4 +184,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.0.2
+   2.2.17

data/lib/container_ship/cli.rb

@@ -16,8 +16,10 @@ 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.'
     def exec(cluster_name, service_name, environment, build_number)
-      Command::ExecCommand.new.run(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)
     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)
+      def run(cluster_name, task_name, environment, build_number, timeout: nil)
         task_definition = TaskDefinition.new(cluster_name, 'tasks', task_name, environment, build_number)
 
         push_image task_definition
@@ -31,7 +31,7 @@ module ContainerShip
         end
 
         exit_status = print_around_task('Waiting task is completed... ') do
-          wait_task task_definition, task_arn
+          wait_task task_definition, task_arn, timeout: timeout
         end
 
         show_log task_definition, task_arn

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

@@ -5,7 +5,9 @@ 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
 
@@ -13,8 +15,9 @@ module ContainerShip
 
         def sh(command)
           status = nil
-          Open3.popen3(command) do |_i, o, _e, w|
+          Open3.popen3(command) do |_i, o, e, w|
             o.each { |line| puts line }
+            e.each { |line| puts line }
             status = w.value
           end
           exit(status.exitstatus) unless status.success?

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

@@ -23,15 +23,16 @@ module ContainerShip
           aws_ecs_client
             .run_task(
               cluster: task_definition.full_cluster_name,
-              task_definition: "#{task_definition.full_name}:#{revision}"
+              task_definition: "#{task_definition.full_name}:#{revision}",
+              **task_definition.run_task_options
             )
             .tasks
             .first
             .task_arn
         end
 
-        def wait_task(task_definition, task_arn)
-          do_every_5_seconds do
+        def wait_task(task_definition, task_arn, timeout: nil)
+          do_every_5_seconds(timeout: timeout) do
             aws_ecs_client.describe_tasks(cluster: task_definition.full_cluster_name, tasks: [task_arn])
               .tasks
               .first
@@ -47,16 +48,21 @@ module ContainerShip
           @aws_ecs_client ||= Aws::ECS::Client.new
         end
 
-        def do_every_5_seconds
-          count = 0
+        def do_every_5_seconds(timeout: nil)
+          timeout ||= 300 # default is 5 minutes
+          start = Time.now
           loop do
             sleep 3
             print '.'
             exit_status = yield
-            count += 1
+            elapsed = Time.now - start
+            if elapsed > timeout
+              puts "Timeout! elapsed: #{elapsed} seconds"
+              return 124
+            end
             next if exit_status.nil?
-            return 124 if count > 60
 
+            puts "exit_code of wait_task is #{exit_status}"
             return exit_status
           end
         end

data/lib/container_ship/task_definition.rb

@@ -49,6 +49,14 @@ module ContainerShip
       "#{prefix}/#{full_name}/#{task_arn.split('/').last}"
     end
 
+    def run_task_options
+      @run_task_options ||= if File.exist?(run_task_options_path)
+                              JSON.parse(File.read(run_task_options_path), symbolize_names: true)
+                            else
+                              {}
+                            end
+    end
+
     private
 
     def task_definition_hash
@@ -62,5 +70,9 @@ module ContainerShip
     def main_container_definition
       task_definition_hash[:container_definitions].find { |definition| definition[:essential] }
     end
+
+    def run_task_options_path
+      File.join('.container_ship', @cluster_name, @type, @name, @environment, 'run_task_options.json')
+    end
   end
 end

data/lib/container_ship/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: container_ship
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2022-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Yet another ECS deployment tool