idrac 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4faf659d1c3e461b586ef1201dae99bb8e82c099e68d153f1a10577bf9905aaa
-  data.tar.gz: 656f070d756624b34eb78579e2398084dfbf8e9cf6f2ebe85f42d930e505bdef
+  metadata.gz: 5e3c0e2f73e3449a852e4e46ca5838705d9ac5eeb780c7fa2023329747406a94
+  data.tar.gz: 7430d5ee6cf11aee77dd5f01990a7a1fca680cbfeb40fbad9e65a7a933ed7619
 SHA512:
-  metadata.gz: 8e790bf89380f88a3a78f590287732aea452557b908fff4cd9ad2220f1f8d03efeada37536a04b3dfb61d6645e8c570c219098510504f1430cab8a1cb8a72b64
-  data.tar.gz: c67eca58928d95678a58fdd114f723f1178d0cfa6d311afb82c77e49edf3c754e2a6b7e865620ba2332c0fee19fef650a7e85817c7664667105a01c15eca9dd6
+  metadata.gz: 0cbb04e015b2cb0d4c5181355e34c5768250929e99b101b2a23d946b61b6b24f9b4ca8b6e803a7660ffe5f0d388d0f89c8a8b5ef9dda0cb262fcbd580260cfcc
+  data.tar.gz: e5284b739c221f9b96697dfdccb14d148e9a07ff1cc86131fc4975f608526583a13f540ba243b9167455de6325f1ced21bb6416230512f2d71a52f2765d6888b

data/lib/idrac/firmware.rb

@@ -86,9 +86,16 @@ module IDRAC
             
             if component_response.status == 200
               component_data = JSON.parse(component_response.body)
+              # Dell componentID — prefer the Oem field, else parse the inventory
+              # Id ("Installed-<componentID>-<version>"). Used to match DUPs by
+              # componentID rather than by ambiguous display name.
+              fw_id = component_data['Id'].to_s
+              component_id = component_data.dig('Oem', 'Dell', 'DellSoftwareInventory', 'ComponentID')
+              component_id ||= fw_id[/\A(?:Installed|Current|Previous|Available)-(\d+)-/, 1]
               firmware_inventory << {
                 name: component_data['Name'],
                 id: component_data['Id'],
+                component_id: component_id,
                 version: component_data['Version'],
                 updateable: component_data['Updateable'] || false,
                 status: component_data['Status'] ? component_data['Status']['State'] : 'Unknown'
@@ -168,25 +175,16 @@ module IDRAC
         next if displayed_components.include?(firmware_name.downcase)
         displayed_components.add(firmware_name.downcase)
         
-        # Extract key identifiers from the firmware name
-        identifiers = catalog.extract_identifiers(firmware_name)
-        
-        # Try to find a matching update
-        matching_updates = catalog_updates.select do |update|
-          update_name = update[:name] || ""
-          
-          # Check if any of our identifiers match the update name
-          identifiers.any? { |id| update_name.downcase.include?(id.downcase) } ||
-          # Or if the update name contains the firmware name
-          update_name.downcase.include?(firmware_name.downcase) ||
-          # Or if the firmware name contains the update name
-          firmware_name.downcase.include?(update_name.downcase)
-        end
-        
+        # Match the installed component to catalog DUPs. Prefer the Dell
+        # componentID (reliable) — only fall back to the legacy name heuristic
+        # when the inventory doesn't expose one.
+        matching_updates = catalog.updates_for_component(catalog_updates, fw)
+
         if matching_updates.any?
-          # Use the first matching update
-          update = matching_updates.first
-          
+          # Among matches, take the newest available version (the catalog can
+          # list several revisions for one component).
+          update = matching_updates.max_by { |u| catalog.version_key(u[:version]) }
+
           # Check if version is newer
           needs_update = catalog.compare_versions(fw[:version], update[:version])
           
@@ -253,12 +251,7 @@ module IDRAC
         
         # Skip if this update was already matched to a current firmware
         next if inventory[:firmware].any? do |fw|
-          firmware_name = fw[:name] || ""
-          identifiers = catalog.extract_identifiers(firmware_name)
-          
-          identifiers.any? { |id| update_name.downcase.include?(id.downcase) } ||
-          update_name.downcase.include?(firmware_name.downcase) ||
-          firmware_name.downcase.include?(update_name.downcase)
+          catalog.updates_for_component([update], fw).any?
         end
         
         puts "%-30s %-20s %-20s %-10s %-15s %s" % [

data/lib/idrac/firmware_catalog.rb

@@ -161,11 +161,20 @@ module IDRAC
         category_node = component.xpath("./Category/Display[@lang='en']").first
         category = category_node ? category_node.text.strip : ""
         
-        version = component['dellVersion'] || component['vendorVersion'] || ""
-        
+        # Prefer the numeric vendorVersion (e.g. "25.5.9.0001") over dellVersion,
+        # which is just the package revision label ("A17"). Comparing that label
+        # against an installed numeric version falsely flags every component.
+        version = component['vendorVersion'] || component['dellVersion'] || ""
+
+        # Dell componentIDs this DUP actually flashes. This is the reliable key
+        # for matching a DUP to an installed component (see #check_updates) —
+        # names are ambiguous (every NIC DUP says "Ethernet"), so name-matching
+        # picks wrong DUPs and iDRAC rejects them (RED097 / "not compatible").
+        component_ids = component.xpath(".//SupportedDevices/Device/@componentID").map(&:value).uniq
+
         # Skip if missing essential information
         next if name.empty? || path.empty? || version.empty?
-        
+
         # Only include firmware updates
         if component_type.include?("Firmware") ||
            category.include?("BIOS") ||
@@ -174,13 +183,14 @@ module IDRAC
            name.include?("BIOS") ||
            name.include?("Firmware") ||
            name.include?("iDRAC")
-          
+
           updates << {
             name: name,
             version: version,
             path: path,
             component_type: component_type,
             category: category,
+            component_ids: component_ids,
             download_url: "https://downloads.dell.com/#{path}"
           }
         end
@@ -189,7 +199,35 @@ module IDRAC
       puts "Found #{updates.size} firmware updates for system ID #{system_id}"
       updates
     end
-    
+
+    # Select the catalog DUPs that apply to one installed component (`fw` from
+    # the iDRAC inventory). Matches on Dell componentID — the reliable key —
+    # and only falls back to the legacy name heuristic when the inventory
+    # didn't expose a componentID (e.g. it reports "0").
+    def updates_for_component(catalog_updates, fw)
+      component_id = fw[:component_id]
+      if component_id && component_id != "0"
+        catalog_updates.select { |u| Array(u[:component_ids]).include?(component_id) }
+      else
+        name = fw[:name] || ""
+        ids = extract_identifiers(name)
+        catalog_updates.select do |u|
+          un = u[:name] || ""
+          ids.any? { |id| un.downcase.include?(id.downcase) } ||
+            un.downcase.include?(name.downcase) ||
+            name.downcase.include?(un.downcase)
+        end
+      end
+    end
+
+    # Sortable key for a Dell version string (e.g. "25.5.9.0001", "22.00.6").
+    # Non-numeric/odd versions sort lowest rather than raising.
+    def version_key(version)
+      Gem::Version.new(version.to_s[/\d[\d.]*/] || "0")
+    rescue ArgumentError
+      Gem::Version.new("0")
+    end
+
     def extract_identifiers(name)
       return [] unless name
       

data/lib/idrac/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idrac
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Jonathan Siegel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-02 00:00:00.000000000 Z
+date: 2026-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty