albacore 2.3.14 → 2.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c50249d1a72bc4beed76959ad1ac9a02e3a42a0
-  data.tar.gz: 896b92c247f60f601fcf95f7ae82a83c17a821e8
+  metadata.gz: 0da77c2d44c76b9e85484297991551716b0f3e10
+  data.tar.gz: 73544e15bc9e13ca859edcac57989c0aa8840269
 SHA512:
-  metadata.gz: 4a3cb569aa3331683d0232d50d9843ecb586b7cb940539157c9e1b121e6a1b4cb970d10f2c24602c13cb6e1ed0b55e6af4ea38b4a271307b067c1492054f4dee
-  data.tar.gz: b5690a04227e68d44818b0dc33643dd028627979a3e0791e9a4d4cec47c042ed4db70732dd00cc51e7445431cbf041982dd2e7c469b60198f1b8e69fe1b5c61c
+  metadata.gz: e3a314a065e6106535381c126292dfc8f62701a741187e562daf887bd2d10f723552c445854da76652979e0f762f58c838693c6282c5cd6e75f5d9304be2f3c3
+  data.tar.gz: a7dd2d53250e685e6a3cc4db93ae1d2d52c9466c559bbf69d43e5d795162df14ed780651fc79e90e2d36282fd9e54b5d7387d4e63d5d00c78fb00dd73b3dc246

data/README.md

@@ -103,7 +103,7 @@ You can also try chocolatey [`ruby`](https://chocolatey.org/packages/ruby) and [
 
 ``` bash
 brew install rbenv ruby-build
-rbenv install 2.1.3
+rbenv install 2.2.0
 gem install bundler
 ```
 

data/lib/albacore/task_types/build.rb

@@ -184,15 +184,25 @@ module Albacore
 
       def heuristic_executable
         if ::Rake::Win32.windows?
+          require 'win32/registry'
           trace 'build tasktype finding msbuild.exe'
-          %w{v4.0.30319 v4.0 v3.5 v2.0}.collect { |fw_ver|
-            msb = File.join ENV['WINDIR'], 'Microsoft.NET', 'Framework', fw_ver, 'msbuild.exe'
+          %w{12.0 4.0 3.5 2.0}.collect { |msbuild_ver|
+            msb = "msbuild_not_found"
+            key = "SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\#{msbuild_ver}"
+            begin
+              Win32::Registry::HKEY_LOCAL_MACHINE.open(key) do |reg|
+                  msb = "#{reg['MSBuildToolsPath']}\\msbuild.exe"
+              end
+            rescue
+              error "failed to open HKLM\\#{key}\\MSBuildToolsPath"
+            end
             CrossPlatformCmd.which(msb) ? msb : nil
           }.compact.first
         else
           nil
         end
       end
+
     end
     class Task
       def initialize command_line

data/lib/albacore/version.rb

@@ -1,3 +1,3 @@
 module Albacore
-  VERSION = "2.3.14"
+  VERSION = "2.3.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: albacore
 version: !ruby/object:Gem::Version
-  version: 2.3.14
+  version: 2.3.15
 platform: ruby
 authors:
 - Henrik Feldt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake