rake-funnel 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d994a7aee19d9d6394f52bd560fceb3e7c1d0dba
-  data.tar.gz: 845d2b7a7862dcb29bfbdc3c06bc7a4620ccb585
+  metadata.gz: b99056aebd3a09e71ec855cade4b7f6264438eeb
+  data.tar.gz: 48d023a394a4186fc41ddc5d0d23364130b17636
 SHA512:
-  metadata.gz: f473e9b4620d0c95e97a729ae1eb65fd148e5088203218a377ece7900f5283d38f57b57fa04411a669e05b7d185096e045fb63af063f1084eeaf777f8fd3d8b6
-  data.tar.gz: 8dad0dae6e75d942e9e04045ff3d1cdf0d6e953bba0001d3dd87f548f721f29711f0698481eb56addcbca58ab23b57c5acc91da0428952a7b9c0c4d7c464d491
+  metadata.gz: 98ebf19ad3366a58385c196c966b6c4d98f51dc3a258673893390a34a03af3ad3cc271fe2d691c349246e83c9167145589bcd8c25eb1621774557fa7120610f2
+  data.tar.gz: 0e7958003263910ff6d441cfd62c8654c10885cd260ad4a27def148fecc3761a1f1bdb459b9512048b0766640491d0f1795dc0eaaa692898a2ecd391cdb9a3e3

data/lib/rake/funnel/support/msbuild/build_tool.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 module Rake
   module Funnel
     module Support
@@ -5,13 +7,26 @@ module Rake
         class BuildTool
           class << self
             def find
-              return 'xbuild'.freeze unless Rake::Win32.windows?
-
-              from_registry.compact.first
+              [mono_build, from_registry].compact.first
             end
 
             private
 
+            def mono_build
+              return nil if Rake::Win32.windows?
+
+              begin
+                out, status = Open3.capture2('mono', '--version')
+                return nil unless status.success?
+              rescue Errno::ENOENT
+                return nil
+              end
+
+              return 'msbuild'.freeze if out[/^Mono JIT compiler version ([\d\.]+)/, 1] >= '5.0'
+
+              'xbuild'.freeze
+            end
+
             KEY = 'SOFTWARE\Microsoft\MSBuild\ToolsVersions'.freeze
 
             def from_registry

data/lib/rake/funnel/tasks/msbuild.rb

@@ -7,7 +7,7 @@ module Rake
         include Rake::Funnel::Support
         include Rake::Funnel::Support::MSBuild
 
-        attr_accessor :name, :msbuild, :project_or_solution, :args, :search_pattern
+        attr_accessor :name, :msbuild, :msbuild_finder, :project_or_solution, :args, :search_pattern
         attr_writer :project_or_solution
 
         def initialize(*args, &task_block)
@@ -25,19 +25,20 @@ module Rake
         def setup_ivars(args)
           @name = args.shift || :compile
 
-          @msbuild = BuildTool.find
+          @msbuild = nil
+          @msbuild_finder = ->() { BuildTool.find }
           @args = {}
           @search_pattern = %w(**/*.sln)
         end
 
-        def define(args, &task_block) # rubocop:disable Metrics/MethodLength
+        def define(args, &task_block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           desc 'Compile MSBuild projects' unless Rake.application.last_description
 
           task(name, *args) do |_, task_args|
             yield(*[self, task_args].slice(0, task_block.arity)) if task_block
 
             cmd = [
-              msbuild,
+              msbuild || msbuild_finder.call,
               project_or_solution.single,
               *Mapper.new(:MSBuild).map(@args)
             ]

data/lib/rake/funnel/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Funnel
-    VERSION = '0.19.0'.freeze
+    VERSION = '0.20.0'.freeze
   end
 end

data/spec/rake/funnel/support/msbuild/build_tool_spec.rb

@@ -1,5 +1,7 @@
 # rubocop:disable RSpec/FilePath
 
+require 'ostruct'
+
 describe Rake::Funnel::Support::MSBuild::BuildTool do
   before do
     allow(Rake::Win32).to receive(:windows?).and_return(windows?)
@@ -18,6 +20,16 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
       expect(::Win32::Registry::HKEY_LOCAL_MACHINE).to have_received(:open).at_least(:once)
     end
 
+    context 'key not found' do
+      before do
+        allow(::Win32::Registry::HKEY_LOCAL_MACHINE).to receive(:open).and_raise(::Win32::Registry::Error.new(3))
+      end
+
+      it 'finds nothing' do
+        expect(described_class.find).to be_nil
+      end
+    end
+
     context 'MSBuild exists' do
       before do
         allow(File).to receive(:exist?).with('path/msbuild.exe').and_return(true)
@@ -42,8 +54,64 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
   context 'not on Windows' do
     let(:windows?) { false }
 
-    it 'should find xbuild' do
-      expect(described_class.find).to eq('xbuild')
+    before do
+      allow(Open3).to receive(:capture2).with('mono', '--version').and_return(mono_version)
+    end
+
+    context 'mono not installed' do
+      let(:mono_version) do
+        [
+          'mono crashed',
+          OpenStruct.new(success?: false)
+        ]
+      end
+
+      before do
+        allow(Open3).to receive(:capture2).with('mono', '--version').and_raise(Errno::ENOENT)
+      end
+
+      it 'should find nothing' do
+        expect(described_class.find).to be_nil
+      end
+    end
+
+    context 'mono fails' do
+      let(:mono_version) do
+        [
+          'mono crashed',
+          OpenStruct.new(success?: false)
+        ]
+      end
+
+      it 'should find nothing' do
+        expect(described_class.find).to be_nil
+      end
+    end
+
+    context 'mono < 5.0' do
+      let(:mono_version) do
+        [
+          'Mono JIT compiler version 4.8.1 (mono-4.8.0-branch/22a39d7 Fri Apr  7 12:00:08 EDT 2017)',
+          OpenStruct.new(success?: true)
+        ]
+      end
+
+      it 'should find xbuild' do
+        expect(described_class.find).to eq('xbuild')
+      end
+    end
+
+    context 'mono >= 5.0' do
+      let(:mono_version) do
+        [
+          'Mono JIT compiler version 5.0.0.100 (2017-02/9667aa6 Fri May  5 09:12:57 EDT 2017)',
+          OpenStruct.new(success?: true)
+        ]
+      end
+
+      it 'should find msbuild' do
+        expect(described_class.find).to eq('msbuild')
+      end
     end
   end
 end

data/spec/rake/funnel/tasks/msbuild_spec.rb

@@ -15,14 +15,15 @@ describe Rake::Funnel::Tasks::MSBuild do
     its(:project_or_solution) { should be_instance_of(Finder) }
     its(:args) { should == {} }
     its(:search_pattern) { should == %w(**/*.sln) }
+    its(:msbuild) { should be_nil }
 
-    describe 'build tool' do
+    describe 'build tool finder' do
       before do
         allow(BuildTool).to receive(:find).and_return('build tool')
       end
 
       it 'should use build tool finder' do
-        expect(subject.msbuild).to eq('build tool')
+        expect(subject.msbuild_finder.call).to eq('build tool')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A build pipeline targeted at .NET projects. Supports environment configuration