container_ship 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db018f1ecfb3983ee58273365e051e81f6920a23eee7a2fa85335587d14a527
-  data.tar.gz: 13cc71f918ddc296f57e1de80bd7371f8cde1e571de6376c4c469afa9e82ce86
+  metadata.gz: 4e4d61c12d557b710b02194829bd50f5addef1e6ec3b54a6b2a63d56f73e7b51
+  data.tar.gz: 5b5594d0a0ceed785efb79aee3a7e923f45afa6898facb6e95c85b975b25d3c7
 SHA512:
-  metadata.gz: 422e4cd9a8e42beaacac3c70680456a3beee93c8afd3295be836838be21182b0479ca18a38f8554c1855e9585c8d4fe00b736d98383be4f149e7d3e75f79f802
-  data.tar.gz: e6e164727eb88af0b947a72fa62235b10d2e159cdb1128319237351c863a6b83cfe65764afff65885293f2f6f90ac9a7769bb147fd472cf39e0cb7d54e421cab
+  metadata.gz: bfe5f36b3b85791da6828d95a11eb566b066da80240fd484bfcd622dde4e04ff6f6229491ea104adfccdaaf50444d7c1403f8dfa571257ff5aa6dee6d2dafc2c
+  data.tar.gz: 2e2a2b9a1b436f741e802c4c4a96299b546770fd669073b3c9de7a961bcde216418bb069dd11b7a0e411980ee4048a63d4698612fe17d4a337c01d335d56675e

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/.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.2)
+    container_ship (0.1.5)
       aws-sdk-cloudwatchlogs
       aws-sdk-ecs
       thor
@@ -15,47 +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.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.465.0)
-    aws-sdk-cloudwatchlogs (1.41.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.595.0)
+    aws-sdk-cloudwatchlogs (1.53.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.114.1)
+    aws-sdk-core (3.131.1)
       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.80.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ecs (1.99.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    codecov (0.5.2)
+    codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     docile (1.3.5)
-    faraday (1.4.2)
+    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.1)
-      multipart-post (>= 1.2, < 3)
+      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-http-cache (2.3.0)
       faraday (>= 0.8)
+    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.1.0)
-    ffi (1.15.1)
-    formatador (0.2.5)
+    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
@@ -64,13 +74,13 @@ GEM
       rainbow (>= 2.2.1)
       rake (>= 10.0)
       retriable (~> 3.0)
-    guard (2.17.0)
+    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)
@@ -81,52 +91,52 @@ GEM
     guard-rubocop (1.4.0)
       guard (~> 2.0)
       rubocop (< 2.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    listen (3.5.1)
+    jmespath (1.6.1)
+    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.4)
+    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.21.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.23.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.11.0)
+    public_suffix (4.0.7)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.5.0)
     retriable (3.1.2)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -139,22 +149,22 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    sawyer (0.8.2)
+    ruby2_keywords (0.0.5)
+    sawyer (0.9.1)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     shellany (0.0.1)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    thor (1.1.0)
+    simplecov_json_formatter (0.1.4)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -174,4 +184,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.17

data/lib/container_ship/cli.rb

@@ -16,8 +16,17 @@ module ContainerShip
     end
 
     desc 'exec CLUSTER_NAME SERVICE_NAME ENVIRONMENT BUILD_NUMBER', 'exec specified task'
+    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)
-      Command::ExecCommand.new.run(cluster_name, service_name, environment, build_number)
+      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)
+      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,8 +30,10 @@ 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
+          wait_task task_definition, task_arn, timeout: timeout
         end
 
         show_log task_definition, task_arn

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

@@ -12,9 +12,12 @@ module ContainerShip
         private
 
         def sh(command)
+          puts 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.2'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: container_ship
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs
@@ -248,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