idrac 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae19c4ce800e57cb1b15ca37be3d48d1c22f52d2eb455a877fe517f21bd65f4
-  data.tar.gz: 1f772c3a6c316578e572e8b797695e19096e1a04e424f38633f6dfad56b6a12c
+  metadata.gz: f24b2229f786a83cbdcaf74c4511953d92b4081194aec3885e825a83426a8ff7
+  data.tar.gz: d5b0b13b8f51b43936e01601e031617b2704bd5d09b4fffcb8c99f35864fe130
 SHA512:
-  metadata.gz: 51c2314dee2b317013816c1e87aacd0d2f5808bb63921826da788d50248e7b84fb871b14abcbc92f92b56ae7cea18d69b5ed32727939549351ee8026510356a1
-  data.tar.gz: e2fe2aad75892982b41819ac1dafd13a7317c85e7d427ee6379b21a8b2daa1e2563c87b1ac97d1910ff9f5900058562a727b06b3e104e9a3183cb82850843db0
+  metadata.gz: 3d71bfb2ca893fed352c34c4726a9c76bee97c9978933f3d0928e48f8ba4a0a12fe5b3045fdc3f7a33c8ab107156e6b71d14275ca377fb93fb146a64f7be6525
+  data.tar.gz: aca2e4227201a36da2f657bfacbe2109c95ae63ddccca6a85f3c1aee84f08180987cf1b50e9f623214466c6d46701920f56a2182a74ba2616e61bfa263614b04

data/README.md

@@ -36,6 +36,19 @@ Or install it yourself as:
 
     $ gem install idrac
 
+## Compatibility
+
+`activesupport` below 8.1 and `json` 3 cannot be used together: activesupport's
+JSON encoder calls `JSON.generate(..., quirks_mode: true)`, and json 3 removed
+that keyword, so any `hash.to_json` raises `ArgumentError: unknown keyword:
+quirks_mode`. This is not specific to this gem — it bites anything that loads
+`active_support/core_ext` — but idrac depends on activesupport, so pick one of:
+
+- activesupport >= 8.1 with json 3, or
+- activesupport 7.x with json 2.
+
+CI covers both ends.
+
 ## Usage
 
 ### Command Line Interface

data/lib/idrac/utility.rb

@@ -194,11 +194,28 @@ module IDRAC
     # @param data_selector_values [Array] Array of log types to include (optional)
     # @param wait_timeout [Integer] Maximum time to wait for generation in seconds (default: 600)
     # @return [String, nil] Path to downloaded file or nil if failed
-    def generate_and_download_tsr(output_file: nil, data_selector_values: nil, wait_timeout: 600)
+    def generate_and_download_tsr(output_file: nil, data_selector_values: nil, accept_eula: false, wait_timeout: 600)
       debug "Starting TSR generation and download process...", 1
-      
+
       output_file ||= "supportassist_#{@host}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.zip"
-      
+
+      # Accept the EULA up front when asked -- generate_tsr_logs only errors out otherwise.
+      accept_supportassist_eula if accept_eula
+
+      # Wait out a collection that is still running server-side. The iDRAC allows only one
+      # SupportAssist collection at a time, so generating now would fail with "a SupportAssist job
+      # is already running". Give up after wait_timeout seconds and fail the same way the rest of
+      # this method does (return nil).
+      wait_deadline = Time.now + wait_timeout
+      while supportassist_collection_running?
+        if Time.now > wait_deadline
+          debug "Timed out after #{wait_timeout}s waiting for a running SupportAssist collection to finish", 1, :red
+          return nil
+        end
+        debug "A SupportAssist collection is already running; waiting...", 1, :yellow
+        sleep 15
+      end
+
       # First, generate the TSR
       result = generate_tsr_logs(data_selector_values: data_selector_values)
       
@@ -267,8 +284,9 @@ module IDRAC
           collection_in_progress: false
         }
         
-        # Check if there's an active collection job
-        jobs_response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Jobs")
+        # Check if there's an active collection job. The list must be expanded, otherwise each
+        # Members entry is a bare @odata.id with no Name/JobState and the check never fires.
+        jobs_response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Jobs?$expand=*($levels=1)")
         if jobs_response.status == 200
           jobs_data = JSON.parse(jobs_response.body)
           if jobs_data["Members"]
@@ -294,6 +312,25 @@ module IDRAC
       { available: false, error: e.message }
     end
 
+    # True when a SupportAssist Collection job is still running server-side. Reads the expanded Dell
+    # Jobs list (bare @odata.id members carry no Name/JobState) and treats a job as running when its
+    # Name matches SupportAssist Collection, its JobState is not terminal, and it is below 100%.
+    # Use this to wait out a prior collection before starting a new one (the iDRAC allows only one).
+    def supportassist_collection_running?
+      response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Jobs?$expand=*($levels=1)")
+      return false unless response.status == 200
+
+      members = JSON.parse(response.body)["Members"] || []
+      members.any? do |job|
+        job["Name"].to_s =~ /SupportAssist Collection/i &&
+          !IDRAC::Firmware::TERMINAL_JOB_STATES.include?(job["JobState"]) &&
+          job["PercentComplete"].to_i < 100
+      end
+    rescue => e
+      debug "Error checking SupportAssist collection state: #{e.message}", 1, :red
+      false
+    end
+
     # Check SupportAssist EULA status
     # @return [Hash] EULA status information
     def supportassist_eula_status

data/lib/idrac/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IDRAC
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idrac
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-10 00:00:00.000000000 Z
+date: 2026-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty