cwlog_tail 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 87861cb65c0da5a96f72e0f1614ce9d408a0abfc
-  data.tar.gz: f91dc8400b75c35a9c809837eea0fb5fee6a4d02
+SHA256:
+  metadata.gz: 2e652e0a3346768b3f3662bb12b56bf13408f24624ea474a7ebf9c4cf3782827
+  data.tar.gz: 5b12f0c395c3b83bb9992e60c2d18790a62f8d2db9db5e95dfa9267c0f975b33
 SHA512:
-  metadata.gz: 1d1afa411826702a316093662b577b8372d9210d6fb32c05111c2d21cc7ac259d7b35e7eeb96d2756fadaf156ab72ff48811e5f8a7b3c63fd2b098badefc5356
-  data.tar.gz: c9b6fb271af2d8c28ec84a6789970570fe788ce75a335981adc067bd931333f44646f7c71510b3f7bace2f99b6ee7f6ffac5a0b80e863c7f06f197dc89ce7a8e
+  metadata.gz: 2e77081ea0ca1d76e2c8d0dbb88dbe5befb3e87bbdd5d8785cf4e9e91f438993a1781ceee0d099075a426757d54005b45fc6f9071a2e4e50b5334e384389dbb9
+  data.tar.gz: f10d05a1cea20a7701fe400940b2cb4d15ae448a32c2af2f5b9554640b3cd317f2cd091a7f1106914bed7ba20adad3d29f54796047a4bdb6560fa7e78939e407

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cwlog_tail (0.0.2)
+    cwlog_tail (0.0.3)
       aws-sdk (~> 2.8)
       peco_selector (~> 1.0)
 
@@ -25,7 +25,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.5.0)
+    rake (13.0.6)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -45,11 +45,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
+  bundler (>= 2.2.33)
   cwlog_tail!
   pry
-  rake (~> 10.0)
+  rake (>= 12.3.3)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.7
+   2.2.33

data/README.md

@@ -1,8 +1,14 @@
-cwlog_tail
+cwlog_tail [![Gem Version](https://badge.fury.io/rb/cwlog_tail.svg)](https://badge.fury.io/rb/cwlog_tail) [![CircleCI](https://circleci.com/gh/tomorrowkey/cwlog_tail/tree/master.svg?style=svg)](https://circleci.com/gh/tomorrowkey/cwlog_tail/tree/master)
 ===============
 
 tail AWS CloudWatch logs on terminal
 
+# Installation
+
+```
+$ gem install cwlog_tail
+```
+
 # License
 
 ```

data/circle.yml

@@ -0,0 +1,12 @@
+machine:
+  timezone:
+    Asia/Tokyo
+  ruby:
+    version: 2.2.6
+dependencies:
+  override:
+    - gem update bundler
+    - bundle install --path vendor/bundle --jobs=4 --retry=3
+test:
+  override:
+    - bundle exec rspec spec --format progress

data/cwlog_tail.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk', '~> 2.8'
   spec.add_dependency 'peco_selector', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 2.2.33'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
 end

data/lib/cwlog_tail/cw_client.rb

@@ -2,23 +2,21 @@ require 'aws-sdk'
 
 module CwlogTail
   class CwClient
-    TAIL_INTERVAL = 5
     DEFAULT_LINES = 100
-    DEFAULT_PAGE_COUNT = 3
 
     def client
       @cloudwatch ||= Aws::CloudWatchLogs::Client.new
     end
 
     def log_groups
-      client.describe_log_groups.log_groups
+      client.describe_log_groups.each_page.to_a.map(&:log_groups).flatten
     end
 
     def log_group_names
       log_groups.map(&:log_group_name)
     end
 
-    def log_streams(log_group_name, page_count = DEFAULT_PAGE_COUNT)
+    def log_streams(log_group_name, page_count)
       next_token = nil
       @log_streams ||= page_count.times.each.with_object([]) { |_, results|
         log_streams = client.describe_log_streams(
@@ -39,19 +37,19 @@ module CwlogTail
           log_stream_name: log_stream_name,
           next_token: last_token
         }
-        if options[:lines].nil?
+        if options.lines.nil?
           log_options[:start_from_head] = true
           log_options[:limit] = DEFAULT_LINES
         else
           log_options[:start_from_head] = false
-          log_options[:limit] = options[:lines]
+          log_options[:limit] = options.lines
         end
         pages = client.get_log_events(log_options)
         pages.events.each { |event| yield(event) }
 
         if last_token == pages.next_forward_token
-          if options[:follow]
-            sleep TAIL_INTERVAL
+          if options.follow?
+            sleep options.interval
           else
             break
           end

data/lib/cwlog_tail/options.rb

@@ -0,0 +1,58 @@
+module CwlogTail
+  class Options
+    DEFAULT_INTERVAL = 5
+    DEFAULT_PAGE_COUNT = 3
+
+    def initialize(argv)
+      @argv = argv
+    end
+
+    def follow?
+      @argv.member?('-f') || @argv.member?('--follow')
+    end
+
+    def lines
+      idx = @argv.index('-n') || @argv.index('--lines')
+      return nil unless idx
+
+      lines = @argv[idx + 1].to_i
+      return nil if lines <= 0
+
+      lines
+    end
+
+    def interval
+      idx = @argv.index('--interval')
+      return DEFAULT_INTERVAL unless idx
+
+      interval = @argv[idx + 1].to_i
+      return DEFAULT_INTERVAL if interval <= 0
+
+      interval
+    end
+
+    def page_count
+      idx = @argv.index('--page_count')
+      return DEFAULT_PAGE_COUNT unless idx
+
+      page_count = @argv[idx + 1].to_i
+      return DEFAULT_PAGE_COUNT if page_count <= 0
+
+      page_count
+    end
+
+    def log_group
+      idx = @argv.index('--log_group')
+      return nil unless idx
+
+      @argv[idx + 1]
+    end
+
+    def log_stream
+      idx = @argv.index('--log_stream')
+      return nil unless idx
+
+      @argv[idx + 1]
+    end
+  end
+end

data/lib/cwlog_tail/version.rb

@@ -1,3 +1,3 @@
 module CwlogTail
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/cwlog_tail.rb

@@ -1,33 +1,16 @@
 require 'cwlog_tail/version'
 require 'cwlog_tail/cw_client'
+require 'cwlog_tail/options'
 require 'peco_selector'
 
 module CwlogTail
-  def self.follow?
-    ARGV.member?('-f')
-  end
-
-  def self.lines
-    idx = ARGV.index('-n') || ARGV.index('--lines')
-    if idx.nil?
-      nil
-    else
-      ARGV[idx + 1].to_i
-    end
-  end
-
-  def self.options
-    { follow: follow?,
-      lines: lines,
-    }
-  end
-
   client = CwClient.new
+  options = Options.new(ARGV)
 
-  log_group_name = PecoSelector.select_from(client.log_group_names).first
+  log_group_name = options.log_group || PecoSelector.select_from(client.log_group_names).first
   exit 0 unless log_group_name
 
-  log_stream_name = PecoSelector.select_from(client.log_streams(log_group_name).map{|log_stream|
+  log_stream_name = options.log_stream || PecoSelector.select_from(client.log_streams(log_group_name, options.page_count).map{|log_stream|
     ["#{Time.at(log_stream.last_event_timestamp / 1000)} #{log_stream.log_stream_name}", log_stream]
   }).first&.log_stream_name
   exit 0 unless log_stream_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cwlog_tail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomoki Yamashita
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -108,16 +108,18 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- circle.yml
 - cwlog_tail.gemspec
 - exe/cwlog_tail
 - lib/cwlog_tail.rb
 - lib/cwlog_tail/cw_client.rb
+- lib/cwlog_tail/options.rb
 - lib/cwlog_tail/version.rb
 homepage: http://github.com/tomorrowkey/cwlog_tail
 licenses:
 - Apache License 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Tail CloudWatch log
 test_files: []