kubetailrb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d65ae35af371643129787b391585cf8dfe636fdcee05bce4c6e4e5a7d8cb4a0
-  data.tar.gz: 43905900ca1be1ded3263ae2a43605283cbffaa6879016f255b54cbc55858232
+  metadata.gz: 5ef04b916de92589cb98bac04813a76ea95f763250af27f9212271088b144bc3
+  data.tar.gz: c928856a0949ea26bdbdddeeb31754fc83edc8f1b9d4f9680197d1bb209bcb3c
 SHA512:
-  metadata.gz: 62b9f8373d2084749148179444317fc80bdc3dfd78e5c83cb437a42874dea9b6f4ce6ab984a9a726938b5e1ebb9903d3cede6da74bc489f12bceeec8cccef99f
-  data.tar.gz: be92b4539793d423e5fdfc59b8b37128c619465b1334a5f06c98dbaade4b33cb5c485865ff1cd8bf5272b2956c0daa29a0e55e19cc3159eb9123892c2fa749f9
+  metadata.gz: b28fe6c39843832ed4cd944455024cb4169226d1cc508b486cb1ebc5770a7492c6abc7bff34ada5244b1b301730d20a04978243fbb0be82871a149f4d66fb690
+  data.tar.gz: 16de81e80ae6f367adf781b5a217650662f4fe6ed17018726ce0306fcdc91e697413b98edf4a38dc2dd704c9da61effd3fc8ea2dd76dc3a997751f9d49860985

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.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubetailrb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Louis Lin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient