rake-funnel 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99056aebd3a09e71ec855cade4b7f6264438eeb
-  data.tar.gz: 48d023a394a4186fc41ddc5d0d23364130b17636
+  metadata.gz: efcb711ed0c28cb743403fe49b0f9e77e4be0f0b
+  data.tar.gz: 312ba1064c4efba5368d1e0ef3b1970c3fb9c9c5
 SHA512:
-  metadata.gz: 98ebf19ad3366a58385c196c966b6c4d98f51dc3a258673893390a34a03af3ad3cc271fe2d691c349246e83c9167145589bcd8c25eb1621774557fa7120610f2
-  data.tar.gz: 0e7958003263910ff6d441cfd62c8654c10885cd260ad4a27def148fecc3761a1f1bdb459b9512048b0766640491d0f1795dc0eaaa692898a2ecd391cdb9a3e3
+  metadata.gz: 7a4c201b91e54ca4370bd78b58d1e47599b93cf04e85ce716a8805122ec2f93d54837980d43fb5c740c2c8ad3b04292f44be3216b45604bf82390a5973bd17b2
+  data.tar.gz: 727d346345f4ec56c59a047fc1e27de71a47ce799059be672863fefc41b685fe7620b0498f3f1bd35f2d85a246dfa32b6e8820e9f88a08f1d9e1e368fe3117a7

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

@@ -7,7 +7,7 @@ module Rake
         class BuildTool
           class << self
             def find
-              [mono_build, from_registry].compact.first
+              mono_build || from_registry.compact.first
             end
 
             private
@@ -17,9 +17,9 @@ module Rake
 
               begin
                 out, status = Open3.capture2('mono', '--version')
-                return nil unless status.success?
+                raise "Could not determine mono version: #{status}" unless status.success?
               rescue Errno::ENOENT
-                return nil
+                raise 'mono is not installed'
               end
 
               return 'msbuild'.freeze if out[/^Mono JIT compiler version ([\d\.]+)/, 1] >= '5.0'

data/lib/rake/funnel/version.rb

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

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

@@ -54,63 +54,58 @@ describe Rake::Funnel::Support::MSBuild::BuildTool do
   context 'not on Windows' do
     let(:windows?) { false }
 
-    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
+      it 'fails' do
+        expect { described_class.find }.to raise_error('mono is not installed')
       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)
-        ]
+    context 'mono installed' do
+      before do
+        allow(Open3).to receive(:capture2).with('mono', '--version').and_return(mono_version)
       end
 
-      it 'should find xbuild' do
-        expect(described_class.find).to eq('xbuild')
+      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 raise_error(/^Could not determine mono version:/)
+        end
       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)
-        ]
+      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
 
-      it 'should find msbuild' do
-        expect(described_class.find).to eq('msbuild')
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-funnel
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Alexander Groß
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-05-17 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.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A build pipeline targeted at .NET projects. Supports environment configuration