kubernetes-cli 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b93bf8e3f620c17f2781d2eb5f2748f970982a854d0aa622d3313b1d74104d3b
-  data.tar.gz: 9c7d170e2ab873b66cfbf6a12532260e3442781330c9e96363e472d354ff997a
+  metadata.gz: 96aca0bc50d59662a5fe419b801b0fa54d80f9c72f70b7fc62661c2a1b740d56
+  data.tar.gz: 3d15ea0644c4ab7dcf8842b935c989349b92f17779fb35e00427924970ac7402
 SHA512:
-  metadata.gz: 0156747413340bab08b571bf13db212d0a8397ceb0b733fbc152c7835080f203400f6f1554829c74dab4fe1b743b3f3eda3d2e11950896f01da6b9bedf5bc3ca
-  data.tar.gz: c21786be60e403d60d2c39fd7be371a7043539412000e9cff2ea197e37092fe38a2bc621a6413266aabd0b8633656375056ce46745ac65726eb08c3e31cd14e3
+  metadata.gz: aaa458e703356f3605a3280bc960961b04b2ff4662997251444169fd55b674cda81d9f8bea83cdcb83b14cde98f9f1f38676a8764c09353e46217ff52aad0642
+  data.tar.gz: b1c72e557eebafa2c9d63b376ae22da6df2cff8e9fc340c0e2c7c6de014a8e2f31fa2bf6d0724b40379b6fe93fc92672ab46aa59f9732283ac11202c35e2ab6f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.0
+* Rescue and re-raise `JSON::ParserError`s.
+
+## 0.5.0
+* Pass environment variables to every command.
+
 ## 0.4.0
 * Add `#version` method to get k8s client/server version info.
 * Add Sorbet type definitions.

data/Gemfile

@@ -16,8 +16,11 @@ group :development do
   gem 'curdle', '~> 1.0'
 
   # lock to same version as kuby-core
-  gem 'sorbet', '= 0.5.6433'
-  gem 'parlour', '~> 6.0'
+  gem 'sorbet', '= 0.5.11865'
+  gem 'parlour', '~> 9.0'
+  gem 'tapioca', '~> 0.16'
+  gem 'racc'
+  gem 'base64'
 end
 
 group :development, :test do

data/lib/kubernetes-cli/version.rb

@@ -1,5 +1,5 @@
 # typed: ignore
 
 class KubernetesCLI
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/kubernetes-cli.rb

@@ -110,7 +110,11 @@ class KubernetesCLI
         "kubectl exited with status code #{last_status.exitstatus}"
     end
 
-    JSON.parse(result)
+    begin
+      JSON.parse(result)
+    rescue JSON::ParserError
+      raise GetVersionError, "json parsing error"
+    end
   end
 
   # T::Sig::WithoutRuntime.sig { params(cmd: T.any(String, T::Array[String])).void }
@@ -214,7 +218,11 @@ class KubernetesCLI
         "in namespace #{namespace}: kubectl exited with status code #{last_status.exitstatus}"
     end
 
-    JSON.parse(result)
+    begin
+      JSON.parse(result)
+    rescue JSON::ParserError
+      raise GetResourceError, "json parsing error"
+    end
   end
 
   # T::Sig::WithoutRuntime.sig {
@@ -248,7 +256,11 @@ class KubernetesCLI
         "in namespace #{namespace}: kubectl exited with status code #{last_status.exitstatus}"
     end
 
-    JSON.parse(result)['items']
+    begin
+      JSON.parse(result)['items']
+    rescue JSON::ParserError
+      raise GetResourceError, "json parsing error"
+    end
   end
 
   # T::Sig::WithoutRuntime.sig {
@@ -440,13 +452,13 @@ class KubernetesCLI
     Thread.current[STDERR_KEY] = new_stderr
   end
 
-  private
-
   # T::Sig::WithoutRuntime.sig { returns(T::Hash[String, String]) }
   def env
     @env ||= {}
   end
 
+  private
+
   # T::Sig::WithoutRuntime.sig { returns(T::Array[String]) }
   def base_cmd
     [executable, '--kubeconfig', kubeconfig_path]
@@ -456,7 +468,7 @@ class KubernetesCLI
   def execc(cmd)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
-    exec(cmd_s)
+    exec(env, cmd_s)
   end
 
   # T::Sig::WithoutRuntime.sig { params(cmd: T::Array[String]).void }
@@ -472,7 +484,7 @@ class KubernetesCLI
   def systemm_default(cmd)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
-    system(cmd_s).tap do
+    system(env, cmd_s).tap do
       self.last_status = $?
       run_after_callbacks(cmd)
     end
@@ -483,7 +495,7 @@ class KubernetesCLI
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
 
-    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+    Open3.popen3(env, cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
       Thread.new(stdout) do |t_stdout|
         begin
           p_stdout.each { |line| t_stdout.puts(line) }
@@ -507,21 +519,7 @@ class KubernetesCLI
 
   # T::Sig::WithoutRuntime.sig { params(cmd: T::Array[String]).returns(String) }
   def backticks(cmd)
-    if stdout == STDOUT && stderr == STDERR
-      backticks_default(cmd)
-    else
-      backticks_open3(cmd)
-    end
-  end
-
-  # T::Sig::WithoutRuntime.sig { params(cmd: T::Array[String]).returns(String) }
-  def backticks_default(cmd)
-    run_before_callbacks(cmd)
-    cmd_s = cmd.join(' ')
-    `#{cmd_s}`.tap do
-      self.last_status = $?
-      run_after_callbacks(cmd)
-    end
+    backticks_open3(cmd)
   end
 
   # T::Sig::WithoutRuntime.sig { params(cmd: T::Array[String]).returns(String) }
@@ -530,7 +528,7 @@ class KubernetesCLI
     cmd_s = cmd.join(' ')
     result = StringIO.new
 
-    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+    Open3.popen3(env, cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
       Thread.new do
         begin
           p_stdout.each { |line| result.puts(line) }

data/rbi/kubernetes-cli.rbi

@@ -192,9 +192,6 @@ class KubernetesCLI
   sig { params(cmd: T::Array[String]).returns(String) }
   def backticks(cmd); end
 
-  sig { params(cmd: T::Array[String]).returns(String) }
-  def backticks_default(cmd); end
-
   sig { params(cmd: T::Array[String]).returns(String) }
   def backticks_open3(cmd); end
 

data/spec/support/matchers.rb

@@ -2,7 +2,8 @@
 require 'rspec/expectations'
 
 class TestCommand
-  def initialize(cmd_s)
+  def initialize(env, cmd_s)
+    @env = env
     @cmd_s = cmd_s
     @cmd = cmd_s.split(' ')
   end
@@ -32,7 +33,7 @@ module CommandHelpers
     @extra = []
     @missing_redirect = false
 
-    commands.map! { |cmd_s| TestCommand.new(cmd_s) }
+    commands.map! { |env, cmd_s| TestCommand.new(env, cmd_s) }
 
     @matching_commands = commands.select do |cmd|
       missing_for_cmd = []

data/spec/support/test_cli.rb

@@ -17,21 +17,15 @@ class FakeStatus
 end
 
 class TestCLI < KubernetesCLI
-  attr_reader :exec_commands, :system_commands
+  attr_reader :exec_commands
 
   def initialize(kubeconfig_path, executable = KubectlRb.executable)
     @exec_commands = []
-    @system_commands = []
 
     super
   end
 
-  def on_exec(&block)
-    @exec_callback = block
-  end
-
-  def exec(cmd)
-    @exec_commands << cmd
-    @exec_callback.call(cmd) if @exec_callback
+  def exec(env, cmd)
+    @exec_commands << [env, cmd]
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubectl-rb
@@ -51,7 +50,6 @@ homepage: http://github.com/getkuby/kubernetes-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Ruby wrapper around the Kubernetes CLI.
 test_files: []