ruby-maven 3.3.12 → 3.9.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 353675a68b5c78b2881c78e5cd733918ce4435c6
-  data.tar.gz: c12df9df6022b941f902fc4cccc4af55e8425b10
+SHA256:
+  metadata.gz: 29154bba20759798d7b6a27da61ed17b2ad0118832134578061f4e9cf087854d
+  data.tar.gz: 8e6bf3f976a9adb958760d98f827ea5765a0e96b79463ee095fcffe863d11e05
 SHA512:
-  metadata.gz: 26ffe21557bb8285597220dde6ffad747cf44c2f4996f05f98e37963f28a8ad61e14630508aa363508a0c022864937fdc7b604a5fa470977186bca4ec895752e
-  data.tar.gz: 59b36d0b7760943ff30544dd950db7fb0c103dd14d4ecb3e20ca00f913f100ec61767c637392d45704da4e07c670d41e7609ab1365fb404f27dcc24fa6e63a22
+  metadata.gz: c3c94673e8166f355fdf547e8a580788cdb3ebf089c73493fa5d8ae5d2026191ee548c74a3958876c6e067aa0c0a367689b45f4cd29b7d0e5811b0f2d7cae642
+  data.tar.gz: 50557d2de2712a58916b40d48462ffd81e9b19ce21d8c5cffebc995cb8d5eee0f85b736d63a3207b67518444ab1722d72b66248938cd0713bfa9cff6f52300f8

data/.mvn/extensions.xml

@@ -1,14 +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>0.2.1</version>
+    <version>1.0.3</version>
   </extension>
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.18</version>
+    <version>0.7.1</version>
   </extension>
 </extensions>

data/Mavenfile

@@ -1,8 +1,25 @@
 # -*- mode:ruby -*-
 
 gemspec
+properties 'push.skip': true, 'jruby.version': '9.3.1.0'
 
-properties 'push.skip' => true
+load File.join( basedir,'lib/maven/ruby/version.rb')
+
+jar "io.takari.polyglot:polyglot-ruby:#{Maven::Ruby::POLYGLOT_VERSION}", scope: :provided
+
+execute 'cleanup extensions', 'initialize' do |ctx|
+  FileUtils.rm_rf "#{ctx.project.build.directory}/../lib/extensions"
+end
+
+plugin :dependency do
+
+  execute_goal(:"copy-dependencies",
+               phase: 'prepare-package',
+               includeScope: :provided,
+               includeGroupIds: 'io.takari.polyglot',
+               outputDirectory: '${project.build.directory}/../lib/extensions')
+
+end
 
 profile :id => :release do
   properties 'maven.test.skip' => true, 'invoker.skip' => true

data/README.md

@@ -56,7 +56,19 @@ other is closer to maven in its naming.
 
 it is licensed under (EPL-1.0)[https://www.eclipse.org/legal/epl-v10.html]
 
-## contributing #
+## building ##
+
+Prepare and pack the gem under ./pkg
+```
+./mvnw install
+```
+
+Push the gem to rubygems.org
+```
+./mvnw deploy -Prelease
+```
+
+## contributing ##
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

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,6 @@
 module Maven
   module Ruby
-    VERSION = '3.3.12'.freeze
+    VERSION = '3.9.0.pre1'.freeze
+    POLYGLOT_VERSION = "0.7.1".freeze
   end
 end

data/lib/ruby_maven.rb

@@ -20,9 +20,9 @@
 #
 require 'maven'
 require 'maven/ruby/maven'
+require 'maven/ruby/version'
 
 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')
@@ -30,13 +30,18 @@ module RubyMaven
       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 )
@@ -52,40 +57,37 @@ module RubyMaven
                          xml = File.read( File.join( dir, '.mvn/extensions.xml' ) )
                          xml.sub( /.*<version>/m, '' ).sub(/<\/version>.*/m, '' )
                        rescue Errno::ENOENT => e
-                         nil
+                         Maven::Ruby::POLYGLOT_VERSION
                        end
-    POLYGLOT_VERSION.replace(polyglot_version) if polyglot_version
-    POLYGLOT_VERSION
   end
 
   def self.launch( *args )
+    if args.member?('--version') or args.member?('--show-version')
+      warn "Polyglot Maven Extension #{Maven::Ruby::POLYGLOT_VERSION} via ruby-maven #{Maven::Ruby::VERSION}"
+    end
     old_maven_home = ENV['M2_HOME']
     ENV['M2_HOME'] = Maven.home
-
-    extensions = File.join( '.mvn/extensions.xml' )
-    if has_extensions = File.exists?( extensions )
-      # tests need copy instead of move
-      FileUtils.cp( extensions, extensions + ".orig" )
-    else
-      FileUtils.mkdir_p( '.mvn' )
+    ext_dir = File.join(Maven.lib, 'ext')
+    FileUtils.mkdir_p(ext_dir)
+    local_dir = File.join(__dir__, 'polyglot_jars')
+    Dir.new(local_dir).select do |file|
+      file =~ /.*\.jar$/
+    end.each do |jar|
+      source = File.join(local_dir, jar)
+      if jar =~ /polyglot-.*-#{Maven::Ruby::POLYGLOT_VERSION}.jar/
+        # ruby maven defines the polyglot version and this jar sets up its classpath
+        # i.e. on upgrade or downgrade the right version will be picked
+        FileUtils.cp(source, File.join(ext_dir, jar.sub(/-[0-9.]*(-SNAPSHOT)?.jar$/, '.jar')))
+      elsif not File.exists?(File.join(ext_dir, jar)) and not jar =~ /jruby-(core|stdlib).*/
+        # jar files are immutable as they carry the version
+        warn jar
+        FileUtils.cp(source, File.join(ext_dir, jar.sub(/-9.4.5.0/, '')))
+      end
     end
-    FileUtils.cp( File.join( dir, extensions ), extensions ) rescue nil
-
-    # setup version
-    self.version
 
     Maven.exec( *args )
 
   ensure
     ENV['M2_HOME'] = old_maven_home
-    
-    FileUtils.rm_f( extensions )
-    if has_extensions
-      FileUtils.move( extensions + '.orig', extensions )
-    else
-      dir = File.dirname( extensions )
-      # delete empty .mvn directory
-      FileUtils.rm_rf( dir ) if Dir[File.join(dir, '*')].size == 0
-    end
   end
 end

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.9"
+  s.add_dependency 'ruby-maven-libs', "~> 3.9.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,29 @@ 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 #{RubyMaven::POLYGLOT_VERSION}/
+      _(err).must_match /Polyglot Maven Extension 0.7/
       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.exist?( gem_name )).must_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.12
+  version: 3.9.0.pre1
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.9.9
   name: ruby-maven-libs
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.9.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,12 +60,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .mvn/extensions.xml
+- ".mvn/extensions.xml"
 - Gemfile
 - Mavenfile
 - README.md
 - Rakefile
 - bin/rmvn
+- lib/extensions/polyglot-common-0.7.1.jar
+- lib/extensions/polyglot-ruby-0.7.1.jar
 - lib/maven/ruby.rb
 - lib/maven/ruby/maven.rb
 - lib/maven/ruby/tasks.rb
@@ -74,32 +76,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'
+      version: 1.3.1
 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