Merge pull request #4 from deivid-rodriguez/no_bundler_warnings

No bundler warnings

Author: headius

.mvn/extensions.xml

@@ -8,6 +8,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.8</version>
   </extension>
 </extensions>

lib/ruby_maven.rb

@@ -35,8 +35,14 @@ def self.exec( *args )
     elsif defined? Bundler
       # it can be switching from ruby to jruby with invoking maven
       # just keep it clean
-      Bundler.with_clean_env do
-        launch( *args )
+      if Bundler.respond_to?(:with_unbundled_env)
+        Bundler.with_unbundled_env do
+          launch( *args )
+        end
+      else
+        Bundler.with_clean_env do
+          launch( *args )
+        end
       end
     else
       launch( *args )

spec/maven_ruby_maven_spec.rb

@@ -5,19 +5,23 @@
 
   subject { Maven::Ruby::Maven.new }
 
+  let(:pkg) { File.expand_path("../pkg", __dir__) }
+
   it 'shows mvn commandline with verbose flag' do
-    CatchStdout.exec do
+    out, _ = capture_subprocess_io do
       subject.exec( '-Dverbose', 'validate' )
     end
     subject.verbose = false
-    _(CatchStdout.result).must_match /mvn -Dverbose validate/
+    _(out).must_match /mvn -Dverbose validate/
   end
 
   it 'takes declared jruby version' do
     begin
       subject.inherit_jruby_version '9.0.4.0'
-      subject.exec( '-X', 'initialize', '-l', 'pkg/log1.txt' )
-      _(File.read('pkg/log1.txt')).must_match /resolve jruby for version 9.0.4.0/
+      out, _ = capture_subprocess_io do
+        subject.exec( '-X', 'initialize')
+      end
+      _(out).must_match /resolve jruby for version 9.0.4.0/
     ensure
       subject['jruby.version'] = nil
     end
@@ -26,14 +30,18 @@
   if defined? JRUBY_VERSION
     it 'inherits jruby version' do
       subject.inherit_jruby_version
-      subject.exec( '-X', 'initialize', '-l', 'pkg/log2.txt' )
-      _(File.read('pkg/log2.txt')).must_match /resolve jruby for version #{JRUBY_VERSION}/
+      out, _ = capture_subprocess_io do
+        subject.exec( '-X', 'initialize')
+      end
+      _(out).must_match /resolve jruby for version #{JRUBY_VERSION}/
     end
   else
     it 'takes default jruby version with inherit jruby version' do
       subject.inherit_jruby_version
-      subject.exec( '-X', 'initialize', '-l', 'pkg/log3.txt' )
-      _(File.read('pkg/log3.txt')).must_match /resolve jruby for version 9.3.1.0/
+      out, _ = capture_subprocess_io do
+        subject.exec( '-X', 'initialize')
+      end
+      _(out).must_match /resolve jruby for version 9.3.1.0/
     end
   end
  end

spec/ruby_maven_spec.rb

@@ -7,10 +7,10 @@
 
   it 'displays the version info' do
     Dir.chdir 'spec' do
-      CatchStdout.exec do
+      _, err = capture_io do
         RubyMaven.exec( '--version' )
       end
-      _(CatchStdout.result).must_match /Polyglot Maven Extension 0.4.4/
+      _(err).must_match /Polyglot Maven Extension 0.4.8/
       xml = File.read('.mvn/extensions.xml')
       _(xml).must_equal "dummy\n"
     end
@@ -24,12 +24,11 @@
 
   it 'pack the gem' do
     FileUtils.rm_f gem_name
-    CatchStdout.exec do
+      out, _ = capture_subprocess_io do
       # need newer jruby version
       RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=9.3.0.0' )
     end
-    #puts CatchStdout.result
-    _(CatchStdout.result).must_match /mvn -Dverbose package/
+    _(out).must_match /mvn -Dverbose package/
     _(File.exists?( gem_name )).must_equal true
     _(File.exists?( '.mvn/extensions.xml' )).must_equal true
     _(File.exists?( '.mvn/extensions.xml.orig' )).wont_equal true

spec/setup.rb

@@ -1,26 +1,5 @@
 $LOAD_PATH.unshift File.expand_path( '../../lib', __FILE__ )
-begin
-  require 'minitest'
-rescue LoadError
-end
-require 'minitest/autorun'
-
 
-module CatchStdout
+ENV["MT_NO_PLUGINS"] = "true"
 
-  def self.exec
-    out = $stdout
-    err = $stderr
-    @result = StringIO.new
-    $stdout = @result
-    $stderr = @result
-    yield
-  ensure
-    $stdout = out
-    $stderr = err
-  end
-
-  def self.result
-    @result.string
-  end
-end
+require 'minitest/autorun'