ruby-maven 3.3.9 → 3.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 807c782954acf707feffc26aed345ea99d62ebae
-  data.tar.gz: 275062d1e8ccaac102e5a4a486c27e2389556c50
+SHA256:
+  metadata.gz: 53d3a1840b8fef43b4e76b82926297649974c1bae2f490d2a63fcef44f844a38
+  data.tar.gz: 16b5a979c554429d4bbaa76073bd67603ad5bae23ca0bd7ae527c2faa4ba7990
 SHA512:
-  metadata.gz: 6788c4e87be241c50c8e8ba2a5c9f05d8a11bab1f44086e6badf81248f39b291bc0620cc7c378f55c20df976bea4d61389367df77ddf4dfaa38092d49e1f8668
-  data.tar.gz: a3b8a90e850629739ee3a3de890c5ebbd451f772995f68de2f9b6813f3d8b78fd905570055f76c820b490d51f9de12f952b7ef944d4ff137932d764f5b115456
+  metadata.gz: 25e8c568c422c76e94396c87293c5111466e26f9a6d323dee6d0af2bb5cb661e86ce54110a64a3f17f17d3455f579d1fa52b934aa853866bd16b73907c665915
+  data.tar.gz: 30b95e0e2b5720e312d1a33e61f7d2aab6ee5e14fa7d5ce039f9d41c3b3ce5eeba7e9bb741826826223571cde285c3a6397547dbbfe9d92cf218aff8d0825b11

data/.mvn/extensions.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- from ruby-maven gem -->
 <extensions>
+  <extension>
+    <groupId>org.torquebox.mojo</groupId>
+    <artifactId>mavengem-wagon</artifactId>
+    <version>1.0.3</version>
+  </extension>
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.15</version>
+    <version>0.4.8</version>
   </extension>
 </extensions>

data/Mavenfile

@@ -2,22 +2,11 @@
 
 gemspec
 
-distribution_management do
-  repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-end
-
-#plugin :deploy, '2.8.2' do
-#  execute_goal :deploy, :phase => :deploy, :id => 'deploy gem to maven central', :skip => '${deploy.skip}'
-#end
-
-properties 'push.skip' => true #, 'deploy.skip' => true
+properties 'push.skip': true, 'jruby.version': '9.3.3.0'
 
 profile :id => :release do
   properties 'maven.test.skip' => true, 'invoker.skip' => true
-  properties 'push.skip' => false #, 'deploy.skip' => false
-#  plugin :gpg, '1.5' do
-#    execute_goal :sign, :id => 'sign artifacts', :phase => :verify
-#  end
+  properties 'push.skip' => false
   build do
     default_goal :deploy
   end

data/bin/rmvn

@@ -5,3 +5,5 @@ args = ARGV.dup
 ARGV.clear # clean up in case another script gets executed it gets clear ARGV
 
 RubyMaven.exec(*args)
+
+exit $?.exitstatus

data/lib/maven/ruby/version.rb

@@ -1,5 +1,5 @@
 module Maven
   module Ruby
-    VERSION = '3.3.9'.freeze
+    VERSION = '3.3.13'.freeze
   end
 end

data/lib/ruby_maven.rb

@@ -25,14 +25,24 @@ module RubyMaven
   POLYGLOT_VERSION = "0.1.15"
 
   def self.exec( *args )
+    if File.exist?('settings.xml') and not args.member?('-s') and not args.member?('--settings')
+      args << '-s'
+      args << 'settings.xml'
+    end
     if args.member?('-version') or args.member?('--version') or args.member?('-v')
       warn "Polyglot Maven Extension #{version}"
       launch( '--version' )
     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 )

data/ruby-maven.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.summary = %q{maven support for ruby projects}
   s.email = ["m.kristian@web.de"]
 
-  s.homepage = %q{https://github.com/takari/ruby-maven}
+  s.homepage = %q{https://github.com/jruby/ruby-maven}
 
-  s.license = 'EPL'
+  s.license = 'EPL-2.0'
 
   s.executable = 'rmvn'
 
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--main", "README.md"]
 
-  s.add_dependency 'ruby-maven-libs', "~> 3.3.1"
+  s.add_dependency 'ruby-maven-libs', "~> 3.3.9"
   s.add_development_dependency 'minitest', '~> 5.3'
-  s.add_development_dependency 'rake', '~> 10.3'
+  s.add_development_dependency 'rake', '~> 12.3'
 end
 
 # vim: syntax=Ruby

data/spec/maven_ruby_maven_spec.rb

@@ -5,19 +5,23 @@ describe Maven::Ruby::Maven do
 
   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 @@ describe Maven::Ruby::Maven do
   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 1.7.22/
+      out, _ = capture_subprocess_io do
+        subject.exec( '-X', 'initialize')
+      end
+      _(out).must_match /resolve jruby for version 9.3.1.0/
     end
   end
  end

data/spec/ruby_maven_spec.rb

@@ -7,32 +7,31 @@ describe RubyMaven do
 
   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.1.15/
+      _(err).must_match /Polyglot Maven Extension 0.4.8/
       xml = File.read('.mvn/extensions.xml')
-      xml.must_equal "dummy\n"
+      _(xml).must_equal "dummy\n"
     end
   end
 
-  let :gem do
+  let :gem_name do
     v = Maven::Ruby::VERSION
     v += '-SNAPSHOT' if v =~ /[a-zA-Z]/
     "pkg/ruby-maven-#{v}.gem"
   end
 
   it 'pack the gem' do
-    FileUtils.rm_f gem
-    CatchStdout.exec do
+    FileUtils.rm_f gem_name
+      out, _ = capture_subprocess_io do
       # need newer jruby version
-      RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=1.7.24' )
+      RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=9.3.0.0' )
     end
-    #puts CatchStdout.result
-    CatchStdout.result.must_match /mvn -Dverbose package/
-    File.exists?( gem ).must_equal true
-    File.exists?( '.mvn/extensions.xml' ).must_equal true
-    File.exists?( '.mvn/extensions.xml.orig' ).wont_equal true
+    _(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
   end
   
 end

data/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'

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.3.13
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.9
   name: ruby-maven-libs
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
   name: minitest
@@ -35,23 +35,23 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
   name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
 description: maven support for ruby DSL pom files. MRI needs java/javac installed.
 email:
 - m.kristian@web.de
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .mvn/extensions.xml
+- ".mvn/extensions.xml"
 - Gemfile
 - Mavenfile
 - README.md
@@ -74,32 +74,30 @@ files:
 - lib/ruby_maven.rb
 - ruby-maven.gemspec
 - spec/maven_ruby_maven_spec.rb
-- spec/maven_ruby_maven_spec.rb~
 - spec/ruby_maven_spec.rb
 - spec/setup.rb
-homepage: https://github.com/takari/ruby-maven
+homepage: https://github.com/jruby/ruby-maven
 licenses:
-- EPL
+- EPL-2.0
 metadata: {}
 post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: maven support for ruby projects

data/spec/maven_ruby_maven_spec.rb~

@@ -1,55 +0,0 @@
-require_relative 'setup'
-require 'ruby_maven'
-require 'stringio'
-require 'maven/ruby/version'
-
-module CatchStdout
-
-  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
-
-describe RubyMaven do
-
-  it 'displays the version info' do
-    Dir.chdir 'spec' do
-      CatchStdout.exec do
-        RubyMaven.exec( '--version' )
-      end
-      CatchStdout.result.must_match /Polyglot Maven Extension 0.1.15/
-      xml = File.read('.mvn/extensions.xml')
-      xml.must_equal "dummy\n"
-    end
-  end
-
-  let :gem do
-    v = Maven::Ruby::VERSION
-    v += '-SNAPSHOT' if v =~ /[a-zA-Z]/
-    "pkg/ruby-maven-#{v}.gem"
-  end
-
-  it 'pack the gem' do
-    FileUtils.rm_f gem
-    CatchStdout.exec do
-      RubyMaven.exec( '-Dverbose', 'package' )
-    end
-    CatchStdout.result.must_match /mvn -Dverbose package/
-    File.exists?( gem ).must_equal true
-    File.exists?( '.mvn/extensions.xml' ).must_equal true
-    File.exists?( '.mvn/extensions.xml.orig' ).wont_equal true
-  end
-  
-end