pfab 0.58.7 → 0.58.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20c68616c45b8a3dfd03878def263856dea71de19c4fdba68f8d486e4b87c9e
-  data.tar.gz: 8c6f90dd1980bc20b99b08946fdb2550de3be07432e68fce4a785b71af1cc042
+  metadata.gz: e7e3d292ab2f6eee610144e871f341ca2bbb128854552b98d2a4e197850d8328
+  data.tar.gz: 6f8c89d9512f0956039fe97c860a8a8e4edfcc66e4a22a992a3bf2e9a3f01871
 SHA512:
-  metadata.gz: cd2b6872de0404da1d7b9a9aa6dd5278c71f93cd311074cb359dcc030ba43f36698f16d7a43f4611ddd336debb7ad8dd2bcea582e91d47312ad8f8efc58619e3
-  data.tar.gz: 41ab35fb28d25efe6d9b31dbe51f52834c75724a22156d8ed410b9bef8b6d23cbad2f3af15eb6897c78ff463d6b081be1e0a36980e2e53bd5f029a856bb0e919
+  metadata.gz: b516b4d73d6e281da4e5ce9bc1af4f1e3697f7046af5a24df4df3e154557e08013cf57ff3c7ce731168d3a9e0ee034cb0ec6da4765330aaa9f2527a74c7d0a39
+  data.tar.gz: eb666a562d7e5f86f0ddda3edaf9d038d23ab60b29e3dd27ed66ca47f9c62035aa20201e9d56c20d81fd5cb16608278741f991905bf6b98a1a93423f7de48686

data/lib/pfab/cli.rb

@@ -5,6 +5,7 @@ require "json"
 require 'active_support/core_ext/hash/indifferent_access'
 require 'styled_yaml'
 require 'digest'
+require 'open3'
 
 module Pfab
   class CLI
@@ -251,12 +252,14 @@ module Pfab
           rollout_success = false
 
           retries.times do |attempt|
-            rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            rollout_result = kubectl_with_output("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            rollout_success = rollout_result.success?
             if rollout_success
               puts "Deployment #{deployment_name} successfully rolled out. Attempt #{attempt + 1}/#{retries}."
               break
             else
               puts "Attempt #{attempt + 1}/#{retries}: Deployment #{deployment_name} failed to roll out within the specified timeout."
+              puts "Output was #{rollout_result}"
               if attempt < retries - 1
                 puts "Retrying in #{sleep_duration} seconds..."
                 sleep(sleep_duration)
@@ -401,6 +404,10 @@ module Pfab
       result == true
     end
 
+    def kubectl_with_output(cmd, post_cmd = "")
+      puts_and_system_with_output("kubectl #{cmd} --namespace=#{yy.namespace} #{post_cmd}")
+    end
+
     def puts_and_system(cmd)
       puts cmd
       if $dryrun
@@ -411,6 +418,18 @@ module Pfab
       end
     end
 
+    def puts_and_system_with_output(cmd)
+      puts cmd
+      if $dryrun
+        dryrun_message = "dry run, didn't run that"
+        puts dryrun_message
+        CommandResult.new(stdout: dryrun_message, stderr: dryrun_message, exit_status_code: 0)
+      else
+        stdout, stderr, status = Open3.capture3(cmd)
+        CommandResult.new(stdout: stdout, stderr: stderr, exit_status_code: status.exitstatus)
+      end
+    end
+
     def deployables
       @_deployables ||= calculate_runnables("deployables")
     end
@@ -466,4 +485,14 @@ module Pfab
       (name == "all") ? deployables.keys : [name]
     end
   end
+
+  CommandResult = Struct.new(:stdout, :stderr, :exit_status_code, keyword_init: true) do
+    def success?
+      exit_status_code == 0
+    end
+
+    def to_s
+      "status: #{status.exitstatus}\n\nstdout: #{stdout}\n\nstderr: #{stderr}\n\n"
+    end
+  end
 end

data/lib/pfab/version.rb

@@ -2,7 +2,7 @@ module Pfab
   module Version
     MAJOR = 0
     MINOR = 58
-    PATCH = 7
+    PATCH = 8
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.58.7 ruby lib
+# stub: pfab 0.58.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.7"
+  s.version = "0.58.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2024-10-10"
+  s.date = "2024-10-21"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.7
+  version: 0.58.8
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander