refactor CommandLineTools

libraries/command_line_tools.rb

@@ -1,25 +1,38 @@
 include Chef::Mixin::ShellOut
+require 'plist'
 
 module MacOS
   class CommandLineTools
     attr_reader :version
 
     def initialize
-      if history_entry.empty?
-        install_sentinel = '/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress'
-        FileUtils.touch install_sentinel
-        FileUtils.chown 'root', 'wheel', install_sentinel
-        @version = if available.empty?
-                     Chef::Log.warn 'No Command Line Tools available from Software Update Catalog!'
-                   else
-                     latest.tr('*', '').gsub('Label: ', '').strip
-                   end
+      if installed.empty?
+        enable_install_on_demand
+        @version = lastest_from_catalog
       else
-        @version = history_version
+        @version = latest_installed
       end
     end
 
-    def latest
+    def installed
+      install_history = File.open('/Library/Receipts/InstallHistory.plist', 'r')
+      packages = Plist.parse_xml(install_history)
+      packages.select { |package| package['displayName'].match? 'Command Line Tools' }
+    ends
+
+    def latest_installed
+      [installed.last['displayName'], installed.last['displayVersion']].join '-'
+    end
+
+    def latest_from_catalog
+      if available.empty?
+        Chef::Log.warn 'No Command Line Tools available from Software Update Catalog!'
+      else
+        catalog_recommendation_label.tr('*', '').gsub('Label: ', '').strip
+      end
+    end
+
+    def catalog_recommendation_label
       if platform_specific.empty?
         Chef::Log.info "No Command Line Tools specific to #{macos_version} available from Software Update Catalog, selecting by maximum Xcode version."
         versions = available.map { |product| Gem::Version.new xcode_version(product) }
@@ -30,24 +43,18 @@ module MacOS
       end
     end
 
-    def softwareupdate_history
-      shell_out(['softwareupdate', '--history']).stdout.lines
-    end
-
-    def history_entry
-      softwareupdate_history.select { |line| line.include?('Command Line Tools') }
-    end
-
-    def history_version
-      history_entry.first.split('  ').reject(&:empty?).map(&:strip).first(2).join '-'
+    def available
+      softwareupdate_list.select { |product_name| product_name.match /\*.{1,8}Command Line Tools/ }
     end
 
     def platform_specific
       available.select { |product_name| product_name.include? macos_version }
     end
 
-    def available
-      softwareupdate_list.select { |product_name| product_name.match /\*.{1,8}Command Line Tools/ }
+    def enable_install_on_demand
+      install_sentinel = '/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress'
+      FileUtils.touch install_sentinel
+      FileUtils.chown 'root', 'wheel', install_sentinel
     end
 
     def xcode_version(product)