kubetailrb 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d65ae35af371643129787b391585cf8dfe636fdcee05bce4c6e4e5a7d8cb4a0
-  data.tar.gz: 43905900ca1be1ded3263ae2a43605283cbffaa6879016f255b54cbc55858232
+  metadata.gz: 450f0eeb9fe08ebbd667673f0f17f0a230778fa372cf5f026764828fdd83827f
+  data.tar.gz: 0aa99a80f87e37f621feddf7b438b21fc81c1ce2668e241bc9251be49e8ab7b6
 SHA512:
-  metadata.gz: 62b9f8373d2084749148179444317fc80bdc3dfd78e5c83cb437a42874dea9b6f4ce6ab984a9a726938b5e1ebb9903d3cede6da74bc489f12bceeec8cccef99f
-  data.tar.gz: be92b4539793d423e5fdfc59b8b37128c619465b1334a5f06c98dbaade4b33cb5c485865ff1cd8bf5272b2956c0daa29a0e55e19cc3159eb9123892c2fa749f9
+  metadata.gz: 8f5dad93e9a3f922dc1f6b9491454ef1d2f48788d2480ee974b645d9e365ef2872e5d82975529e255eed9847c6feb9c7641a8d0e81e3353d04e3256da940408f
+  data.tar.gz: 4d27521edc71bad91b86bb220b3de32780078cca9c62ba0f1640b61765d9840f1dd2f4e748a62df646d4af018e4927909858f0d7917ea2aafe9e565f2529ef7e

data/.ruby-version

@@ -1 +1 @@
-3.3.6
+4.0.5

data/lib/kubetailrb/cmd/help.rb

@@ -11,7 +11,7 @@ module Kubetailrb
           Tail your Kubernetes pod logs at the same time.
 
           Usage:
-            kubetailrb pod-query [flags]
+            kubetailrb [flags] pod-query
 
           Flags:
             -v, --version       Display version.

data/lib/kubetailrb/cmd/k8s.rb

@@ -21,6 +21,14 @@ module Kubetailrb
 
       MDCS_FLAGS = %w[-m --mdcs].freeze
 
+      FLAGS_WITH_VALUES = (
+        NAMESPACE_FLAGS +
+        [TAIL_FLAG] +
+        CONTAINER_FLAGS +
+        EXCLUDES_FLAGS +
+        MDCS_FLAGS
+      ).freeze
+
       attr_reader :reader
 
       def initialize(pod_query:, container_query:, opts:)
@@ -38,7 +46,7 @@ module Kubetailrb
       class << self
         def create(*args)
           new(
-            pod_query: parse_pod_query(*args),
+            pod_query: parse_pod_query(args),
             container_query: parse_container_query(*args),
             opts: K8sOpts.new(
               namespace: parse_namespace(*args),
@@ -52,15 +60,21 @@ module Kubetailrb
           )
         end
 
-        def parse_pod_query(*args)
-          # TODO: We could be smarter here? For example, if the pod names are
-          # provided at the end of the command, like this:
-          #   kubetailrb --tail 3 some-pod
-          # The above command will not work because this method will return 3
-          # instead of 'some-pod'...
-          args.find { |arg| !arg.start_with? '-' }
+        def parse_pod_query(args)
+          args.each_with_index.find do |arg, idx|
+            !arg.start_with?('-') && !consumed_by_flag?(args, idx)
+          end&.first
         end
 
+        private
+
+        def consumed_by_flag?(args, idx)
+          prev = args[idx - 1]
+          FLAGS_WITH_VALUES.include?(prev)
+        end
+
+        public
+
         #
         # Parse k8s namespace from arguments provided in the CLI, e.g.
         #

data/lib/kubetailrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kubetailrb
-  VERSION = '0.3.2'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kubetailrb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Louis Lin
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient
@@ -224,7 +223,6 @@ description: |
   Tail Kubernetes pod logs at the same time.
 
   Project used for learning Ruby and Rails.
-email:
 executables:
 - kubetailrb
 extensions: []
@@ -275,7 +273,6 @@ metadata:
   bug_tracker_uri: https://github.com/l-lin/kubetailrb/issues
   changelog_uri: https://github.com/l-lin/kubetailrb/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/l-lin/kubetailrb
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -290,8 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Tail k8s pod logs at the same time.
 test_files: []