awful 0.0.135 → 0.0.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d83a279090cf5d30c21d57fddd942bd56d8124
-  data.tar.gz: cbd9a07005eaafde070e069c7f1d4d7a03f58c6c
+  metadata.gz: afe9345863882bca15eb3e075919d190b50de773
+  data.tar.gz: e9bafe169cbc400fd85676bcfd375281a155a2e0
 SHA512:
-  metadata.gz: 6b99430490b98b315df24ce39c217a51b9a608ef9c48491e0f8fd50ddb52191e4e627e33d555d5f79ab4ca51da4c8f24662c80cef49cceef6dc6643b1f45f4a7
-  data.tar.gz: 9675cd3d6bcbac08755cd6fef86356ceb7690cca55d9b3de6c2e55b392c7f8aafdb1fe7971f1f3a768de3a42c914b4f56ea45bc65fd1e701baa1eaf3ea544621
+  metadata.gz: 327e6d510c2adc410dc2fbf93d4700bc9d1e2d589ebf333fa2857d8a76bd926098a18c85fe8ece14c0efb6eae9e43f322bbe05654d05b0cd6399482f73c32341
+  data.tar.gz: f6915c25c9f5084c6cb77eed91de95266055d58461ab5782a6e6e523e912769488224388479a1f94e4ec7b31c0ef38fbaec52841c4e2a4768769b2a0aaa9152f

data/lib/awful/cloudwatch_logs.rb

@@ -25,7 +25,7 @@ module Awful
       end
 
       ## return and output groups
-      log_groups.tap do |groups|
+      log_groups.output do |groups|
         if options[:long]
           print_table groups.map { |group|
             [
@@ -72,9 +72,11 @@ module Awful
         break if next_token.nil?
         break if log_streams.count >= options[:limit].to_i
       end
-      log_streams.tap do |streams|
+      log_streams.output do |streams|
         if options[:long]
-          print_table streams.map { |s| [s.log_stream_name, Time.at(s.last_event_timestamp.to_i/1000)] }
+          print_table streams.map { |s|
+            [ s.log_stream_name, Time.at(s.creation_time.to_i/1000), Time.at(s.last_event_timestamp.to_i/1000) ]
+          }
         else
           puts streams.map(&:log_stream_name)
         end
@@ -82,44 +84,66 @@ module Awful
     end
 
     no_commands do
-      def latest_stream(group)
+      ## return n-th latest stream for group
+      def latest_stream(group, n = 0)
+        n = n.to_i.abs          # convert string and -ves
         logs.describe_log_streams(
           log_group_name: group,
-          order_by: 'LastEventTime',
-          descending: true,
-          limit: 1
-        ).log_streams.first
+          order_by:       'LastEventTime',
+          descending:     true,
+          limit:          n + 1
+        ).log_streams[n]
       end
     end
 
     desc 'latest GROUP', 'get name of latest stream for GROUP'
-    def latest(group)
-      latest_stream(group).tap do |stream|
+    def latest(group, n = 0)
+      latest_stream(group, n).output do |stream|
         puts stream.log_stream_name
       end
     end
 
     desc 'events GROUP [STREAM]', 'get log events from given, or latest, stream'
-    method_option :long,  aliases: '-l', default: false, desc: 'Long listing'
-    method_option :limit, aliases: '-n', default: 50,    desc: 'Count to limit returned results'
-    def events(group, stream = nil)
+    method_option :long,   aliases: '-l', type: :boolean, default: false,           desc: 'long listing including timestamps'
+    method_option :stream, aliases: '-s', type: :string,  default: nil,             desc: 'specific stream to read instead of latest'
+    method_option :limit,  aliases: '-n', type: :numeric, default: nil,             desc: 'limit results returned per page'
+    method_option :pages,  aliases: '-p', type: :numeric, default: Float::INFINITY, desc: 'limit number of pages to output'
+    method_option :head,   aliases: '-H', type: :boolean, default: true,            desc: 'start from head, ie first page'
+    method_option :tail,   aliases: '-t', type: :numeric, default: nil,             desc: 'show given small number of most recent events'
+    def events(group, nth = 0)
+      opt = options.dup
+      opt[:stream] ||= latest_stream(group, nth).log_stream_name # use latest stream if none requested
+
+      ## magical tail option returns up to requested number of last events
+      if opt[:tail]
+        opt[:head]  = false
+        opt[:pages] = 1
+        opt[:limit] = opt[:tail]
+      end
+
       next_token = nil
       events = []
+      pages = 0
       loop do
         response = logs.get_log_events(
-          log_group_name: group,
-          log_stream_name: stream || latest_stream(group).log_stream_name,
-          start_from_head: true,
-          limit: options[:limit],
-          next_token: next_token
+          log_group_name:  group,
+          log_stream_name: opt[:stream],
+          start_from_head: opt[:head],
+          limit:           opt[:limit],
+          next_token:      next_token,
         )
+
         break if response.events.count == 0 # break on no results as token does not get to nil
         events = events + response.events
+
+        pages += 1
+        break if pages >= opt[:pages]
+
         next_token = response.next_backward_token
-        break if events.count >= options[:limit].to_i
         break if next_token.nil? # not sure if this is ever set to nil
       end
-      events.tap do |ev|
+
+      events.output do |ev|
         if options[:long]
           print_table ev.map { |e| [Time.at(e.timestamp.to_i/1000), e.message] }
         else

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.135'
+  VERSION = '0.0.136'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.135
+  version: 0.0.136
 platform: ruby
 authors:
 - Ric Lister