lib/rake/funnel/support/msbuild/build_tool.rb in rake-funnel-0.18.0 vs lib/rake/funnel/support/msbuild/build_tool.rb in rake-funnel-0.19.0

@@ -3,25 +3,48 @@
     module Support
       module MSBuild
         class BuildTool
           class << self
             def find
-              return 'xbuild' unless Rake::Win32.windows?
+              return 'xbuild'.freeze unless Rake::Win32.windows?
 
-              require 'win32/registry'
+              from_registry.compact.first
+            end
 
-              %w(14.0 12.0 4.0 3.5 2.0).collect { |version|
-                key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{version}"
+            private
 
-                begin
-                  ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
-                    candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
-                    next candidate if File.exist?(candidate)
-                  end
-                rescue
-                  next
+            KEY = 'SOFTWARE\Microsoft\MSBuild\ToolsVersions'.freeze
+
+            def from_registry
+              return nil unless require_registry
+
+              versions.map do |version|
+                version_key(version) do |reg|
+                  candidate = File.join(reg['MSBuildToolsPath'] || '', 'msbuild.exe')
+                  next candidate if File.exist?(candidate)
                 end
-              }.compact.first
+              end
+            end
+
+            def versions
+              %w(14.0 12.0 4.0 3.5 2.0)
+            end
+
+            def require_registry
+              require 'win32/registry'
+              true
+            rescue LoadError
+              false
+            end
+
+            def version_key(version)
+              key = KEY + '\\' + version
+
+              ::Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
+                yield(reg) if block_given?
+              end
+            rescue ::Win32::Registry::Error
+              nil
             end
           end
         end
       end
     end