cody 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53eb7e5d569f9ac01fc442092dc96b291ecb6769b7a392b24fa3158b62afd294
-  data.tar.gz: 812af356ba1149b27a0fdd170b66c1b6d0a16257ce4339c46ae25597c22bc0b0
+  metadata.gz: bb76da799abde0f40871e41fa9ed6bbcaf655c9b2f5ed4646d8e7288af31d7a8
+  data.tar.gz: 7c7c53ed681e4cc7f6cb9441394f6f61c77cc91d4395e408861e73ab1066f0d3
 SHA512:
-  metadata.gz: 563fbd9bffdc2a04a7124e6ce363c40a143dec815d382f6ecc05827e10d865eaa64b2793e56a05f28ae5ed18466a1eddb58eb59c2a9c0765184e5dbd4864b5c5
-  data.tar.gz: 808f60f39fd12071dd5bcc07e110f9b4e735edea2d9096a9fd149bc1ceebc64dc67e54a610aabf419c58ba3846c9e9af7bd919bd551cfa15215efd864efd75e9
+  metadata.gz: 5fdb64cd0da4df5de7de9bd90a418ce94f0768d98d483a557909e4090634591cd5f5cbfb40589a75676b3648f1e9edde197578f3f75cf70fa7744811f62b0640
+  data.tar.gz: fa7410c0edaf38296f01821d544df72f68ad8035265ad891ac31005a4e66877eb2a07ac7e48f70d019126395f6b5cb50da3976afdad0dd12f20f6863f4f7a6c1

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.8.3]
+- #11 sleep on error for cloudwatch logs
+- also add `-t` alias for `--type` option
+
 ## [0.8.2]
 - #9 add cody stop command
 - #10 add evaluate interface methods

data/lib/cody/cli.rb

@@ -11,7 +11,7 @@ module Cody
     register(Init, "init", "init", "Set up initial .cody files.")
 
     common_options = Proc.new do
-      option :type, desc: "folder to use within .cody folder for different build types"
+      option :type, aliases: "t", desc: "folder to use within .cody folder for different build types"
       option :stack_name, desc: "Override the generated stack name. If you use this you must always specify it"
       option :wait, type: :boolean, default: true, desc: "Wait for operation to complete"
     end

data/lib/cody/help/logs.md

@@ -49,7 +49,7 @@
 
 By default, Cody logs searches only 7 days in the past. This is done for speed. If you have an older build and would like to search further in the past.  You can use the `--since option`.  Example:
 
-    cody logs --since 1m # 1 month ago
+    cody logs --since 4w # 4 weeks ago
 
 The since format is from the [aws-logs gem](https://github.com/tongueroo/aws-logs). Since formats:
 
@@ -59,4 +59,4 @@ The since format is from the [aws-logs gem](https://github.com/tongueroo/aws-log
 * d - days
 * w - weeks
 
-Since does not support combining the formats. IE: 5m30s.
+Since does not support combining the formats. IE: 5m30s.

data/lib/cody/tailer.rb

@@ -13,11 +13,6 @@ module Cody
       set_trap
     end
 
-    def find_build
-      resp = codebuild.batch_get_builds(ids: [@build_id])
-      resp.builds.first
-    end
-
     def run
       puts "Showing logs for build #{@build_id}"
 
@@ -32,16 +27,21 @@ module Cody
         set_log_group_name(build)
 
         complete = build.build_complete
-        start_cloudwatch_tail unless ENV["CODY_TEST"]
-        sleep 5 if !@@end_loop_signal && !complete && !ENV["CODY_TEST"]
-      end
 
-      AwsLogs::Tail.stop_follow!
-      @thread.join if @thread
+        next if ENV["CODY_TEST"]
+        start_cloudwatch_tail
+        sleep 5
+      end
 
+      stop_cloudwatch_tail(build)
       puts "The build took #{build_time(build)} to complete."
     end
 
+    def find_build
+      resp = codebuild.batch_get_builds(ids: [@build_id])
+      resp.builds.first
+    end
+
     def start_cloudwatch_tail
       return if @cloudwatch_tail_started
       return unless @log_group_name && @log_stream_name
@@ -64,6 +64,35 @@ module Cody
       cw_tail.run
     end
 
+    def stop_cloudwatch_tail(build)
+      return if ENV["CODY_TEST"]
+
+      # The AwsLogs::Tail.stop_follow! results in a little waiting because it signals to break the polling loop.
+      # Since it's in the middle of the loop process, the loop will finish the sleep 5 first.
+      # So it can pause from 0-5 seconds.
+      #
+      # However, this is sometimes not enough of a pause for CloudWatch to receive and send the logs back to us.
+      # So additionally pause on a failed build so we can receive the final logs at the end.
+      #
+      sleep 10 if complete_failed?(build) # provide extra time for cw tail to report error
+      AwsLogs::Tail.stop_follow!
+      @thread.join if @thread
+    end
+
+    # build.build_status : The current status of the build. Valid values include:
+    #
+    #     FAILED : The build failed.
+    #     FAULT : The build faulted.
+    #     IN_PROGRESS : The build is still in progress.
+    #     STOPPED : The build stopped.
+    #     SUCCEEDED : The build succeeded.
+    #     TIMED_OUT : The build timed out.
+    #
+    def complete_failed?(build)
+      return if ENV["CODY_TEST"]
+      build.build_complete && build.build_status != "SUCCEEDED"
+    end
+
     # Setting enables start_cloudwatch_tail
     def set_log_group_name(build)
       logs = build.logs
@@ -111,11 +140,9 @@ module Cody
       @output.join("\n") + "\n"
     end
 
-    @@end_loop_signal = false
     def set_trap
       Signal.trap("INT") {
         puts "\nCtrl-C detected. Exiting..."
-        @@end_loop_signal = true  # useful to control loop
         exit # immediate exit
       }
     end

data/lib/cody/version.rb

@@ -1,3 +1,3 @@
 module Cody
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cody
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Tung Nguyen