idrac 0.1.29 → 0.1.31

data/lib/idrac/firmware_catalog.rb

@@ -2,10 +2,13 @@ require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'nokogiri'
+require 'open-uri'
+require 'colorize'
 
 module IDRAC
   class FirmwareCatalog
-    CATALOG_URL = "https://downloads.dell.com/catalog/Catalog.xml.gz"
+    DELL_CATALOG_BASE = 'https://downloads.dell.com'
+    DELL_CATALOG_URL = "#{DELL_CATALOG_BASE}/catalog/Catalog.xml.gz"
     
     attr_reader :catalog_path
     
@@ -14,40 +17,38 @@ module IDRAC
     end
     
     def download(output_dir = nil)
-      # Use ~/.idrac as the default directory
-      output_dir ||= File.expand_path("~/.idrac")
+      # Default to ~/.idrac directory
+      output_dir ||= File.expand_path('~/.idrac')
       FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)
       
-      catalog_gz_path = File.join(output_dir, "Catalog.xml.gz")
-      catalog_path = File.join(output_dir, "Catalog.xml")
-      
-      puts "Downloading Dell catalog from #{CATALOG_URL}..."
-      
-      uri = URI.parse(CATALOG_URL)
-      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        request = Net::HTTP::Get.new(uri)
-        http.request(request) do |response|
-          if response.code == "200"
-            File.open(catalog_gz_path, 'wb') do |file|
-              response.read_body do |chunk|
-                file.write(chunk)
-              end
-            end
-          else
-            raise Error, "Failed to download catalog: #{response.code} #{response.message}"
-          end
-        end
-      end
+      catalog_gz = File.join(output_dir, 'Catalog.xml.gz')
+      catalog_xml = File.join(output_dir, 'Catalog.xml')
       
-      puts "Extracting catalog..."
-      system("gunzip -f #{catalog_gz_path}")
+      puts "Downloading Dell catalog from #{DELL_CATALOG_URL}...".light_cyan
       
-      if File.exist?(catalog_path)
-        puts "Catalog downloaded and extracted to #{catalog_path}"
-        @catalog_path = catalog_path
-        return catalog_path
-      else
-        raise Error, "Failed to extract catalog"
+      begin
+        # Download the catalog
+        URI.open(DELL_CATALOG_URL) do |remote_file|
+          File.open(catalog_gz, 'wb') do |local_file|
+            local_file.write(remote_file.read)
+          end
+        end
+        
+        puts "Extracting catalog...".light_cyan
+        
+        # Extract the catalog
+        system("gunzip -f #{catalog_gz}")
+        
+        if File.exist?(catalog_xml)
+          puts "Catalog downloaded and extracted to #{catalog_xml}".green
+          @catalog_path = catalog_xml
+          return catalog_xml
+        else
+          raise Error, "Failed to extract catalog"
+        end
+      rescue => e
+        puts "Error downloading catalog: #{e.message}".red.bold
+        raise Error, "Failed to download Dell catalog: #{e.message}"
       end
     end
     

data/lib/idrac/version.rb

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

data/test_firmware_update.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-require_relative 'lib/idrac'
+require 'lib/idrac'
+require 'colorize'
 
 # Create a client
 client = IDRAC::Client.new(
@@ -12,59 +13,56 @@ client = IDRAC::Client.new(
 
 begin
   # Login to iDRAC
+  puts "Logging in to iDRAC...".light_cyan
   client.login
-  puts "Logged in successfully"
+  puts "Logged in successfully".green
   
   # Create a firmware instance
   firmware = IDRAC::Firmware.new(client)
   
   # Get system inventory
-  puts "Getting system inventory..."
+  puts "Getting system inventory...".light_cyan
   inventory = firmware.get_system_inventory
   
-  puts "System Information:"
-  puts "  Model: #{inventory[:system][:model]}"
-  puts "  Manufacturer: #{inventory[:system][:manufacturer]}"
-  puts "  Service Tag: #{inventory[:system][:service_tag]}"
-  puts "  BIOS Version: #{inventory[:system][:bios_version]}"
+  puts "System Information:".green.bold
+  puts "  Model: #{inventory[:system][:model]}".light_cyan
+  puts "  Manufacturer: #{inventory[:system][:manufacturer]}".light_cyan
+  puts "  Service Tag: #{inventory[:system][:service_tag]}".light_cyan
+  puts "  BIOS Version: #{inventory[:system][:bios_version]}".light_cyan
   
-  puts "\nInstalled Firmware:"
+  puts "\nInstalled Firmware:".green.bold
   inventory[:firmware].each do |fw|
-    puts "  #{fw[:name]}: #{fw[:version]} (#{fw[:updateable] ? 'Updateable' : 'Not Updateable'})"
+    puts "  #{fw[:name]}: #{fw[:version]} (#{fw[:updateable] ? 'Updateable'.light_green : 'Not Updateable'.light_red})".light_cyan
   end
   
   # Check for updates
   catalog_path = File.expand_path("~/.idrac/Catalog.xml")
   if File.exist?(catalog_path)
-    puts "\nChecking for updates using catalog: #{catalog_path}"
+    puts "\nChecking for updates using catalog: #{catalog_path}".light_cyan
     updates = firmware.check_updates(catalog_path)
     
-    if updates.empty?
-      puts "No updates available."
-    else
-      puts "\nAvailable Updates:"
+    if updates.any?
+      puts "\nAvailable Updates:".green.bold
       updates.each_with_index do |update, index|
-        puts "#{index + 1}. #{update[:name]}: #{update[:current_version]} -> #{update[:available_version]}"
+        puts "#{index + 1}. #{update[:name]}: #{update[:current_version]} -> #{update[:available_version]}".light_cyan
       end
       
-      # For testing, select the first update
-      if updates.any?
-        selected_update = updates.first
-        puts "\nSelected update: #{selected_update[:name]}: #{selected_update[:current_version]} -> #{selected_update[:available_version]}"
-        
-        # Download and install the update
-        puts "Starting interactive update for selected component..."
-        firmware.interactive_update(catalog_path, [selected_update])
-      end
+      # Interactive update for the first update
+      puts "\nSelected update: #{updates.first[:name]}".light_yellow
+      puts "Starting interactive update for selected component...".light_cyan.bold
+      
+      firmware.interactive_update(catalog_path, [updates.first])
+    else
+      puts "No updates available for your system.".yellow
     end
   else
-    puts "\nCatalog file not found at #{catalog_path}. Please download the catalog first."
+    puts "\nCatalog not found at #{catalog_path}. Run 'idrac firmware:catalog' to download it.".yellow
   end
   
 rescue IDRAC::Error => e
-  puts "Error: #{e.message}"
+  puts "Error: #{e.message}".red.bold
 ensure
   # Logout
-  client.logout if client.instance_variable_get(:@session_id)
-  puts "Logged out"
+  client.logout if client
+  puts "Logged out".light_cyan
 end