container_ship 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0db018f1ecfb3983ee58273365e051e81f6920a23eee7a2fa85335587d14a527
-  data.tar.gz: 13cc71f918ddc296f57e1de80bd7371f8cde1e571de6376c4c469afa9e82ce86
+  metadata.gz: eb9afef88f95f3bb1a71a3280da4dcc0001d6998d9c10c2f18c5e79c5ef64594
+  data.tar.gz: a5b9a286b28d7011632ddadc95634eb34bdef30d2822dcddb08e09594390a9d3
 SHA512:
-  metadata.gz: 422e4cd9a8e42beaacac3c70680456a3beee93c8afd3295be836838be21182b0479ca18a38f8554c1855e9585c8d4fe00b736d98383be4f149e7d3e75f79f802
-  data.tar.gz: e6e164727eb88af0b947a72fa62235b10d2e159cdb1128319237351c863a6b83cfe65764afff65885293f2f6f90ac9a7769bb147fd472cf39e0cb7d54e421cab
+  metadata.gz: d572df8d02e95d6dc8dcf0129a98deb68314481fcce12738db6c11463d12a6aa18fd1f970a20beaf3c152c30e22dd0488655369569afbe32f29ca84ff3843666
+  data.tar.gz: 39b233d530327120d4426b317fb8760e911350ce85f9972d4d85ca1e34ca38a0610a9b4f3ffd3ca5531ab6b5404bad76573537a3ff5328d4f63fbfd782bbcec8

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.3)
       aws-sdk-cloudwatchlogs
       aws-sdk-ecs
       thor
@@ -15,36 +15,38 @@ 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.503.0)
+    aws-sdk-cloudwatchlogs (1.45.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.114.1)
+    aws-sdk-core (3.121.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecs (1.80.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ecs (1.85.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     codecov (0.5.2)
       simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.3.5)
-    faraday (1.4.2)
+    faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -52,10 +54,12 @@ GEM
     faraday-excon (1.1.0)
     faraday-http-cache (2.2.0)
       faraday (>= 0.8)
+    faraday-httpclient (1.0.1)
     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)
+    ffi (1.15.3)
+    formatador (0.3.0)
     github_changelog_generator (1.15.2)
       activesupport
       faraday-http-cache
@@ -64,13 +68,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)
@@ -84,7 +88,7 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    listen (3.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
@@ -100,14 +104,14 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.20.1)
-    parser (3.0.1.1)
+    parser (3.0.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)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -139,7 +143,7 @@ GEM
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -174,4 +178,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   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

@@ -30,8 +30,8 @@ module ContainerShip
             .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 +47,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContainerShip
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 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.3
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-03 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudwatchlogs