ruby-maven 3.3.9 → 3.3.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 807c782954acf707feffc26aed345ea99d62ebae
4
- data.tar.gz: 275062d1e8ccaac102e5a4a486c27e2389556c50
2
+ SHA256:
3
+ metadata.gz: 53d3a1840b8fef43b4e76b82926297649974c1bae2f490d2a63fcef44f844a38
4
+ data.tar.gz: 16b5a979c554429d4bbaa76073bd67603ad5bae23ca0bd7ae527c2faa4ba7990
5
5
  SHA512:
6
- metadata.gz: 6788c4e87be241c50c8e8ba2a5c9f05d8a11bab1f44086e6badf81248f39b291bc0620cc7c378f55c20df976bea4d61389367df77ddf4dfaa38092d49e1f8668
7
- data.tar.gz: a3b8a90e850629739ee3a3de890c5ebbd451f772995f68de2f9b6813f3d8b78fd905570055f76c820b490d51f9de12f952b7ef944d4ff137932d764f5b115456
6
+ metadata.gz: 25e8c568c422c76e94396c87293c5111466e26f9a6d323dee6d0af2bb5cb661e86ce54110a64a3f17f17d3455f579d1fa52b934aa853866bd16b73907c665915
7
+ data.tar.gz: 30b95e0e2b5720e312d1a33e61f7d2aab6ee5e14fa7d5ce039f9d41c3b3ce5eeba7e9bb741826826223571cde285c3a6397547dbbfe9d92cf218aff8d0825b11
data/.mvn/extensions.xml CHANGED
@@ -1,9 +1,13 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!-- from ruby-maven gem -->
3
2
  <extensions>
3
+ <extension>
4
+ <groupId>org.torquebox.mojo</groupId>
5
+ <artifactId>mavengem-wagon</artifactId>
6
+ <version>1.0.3</version>
7
+ </extension>
4
8
  <extension>
5
9
  <groupId>io.takari.polyglot</groupId>
6
10
  <artifactId>polyglot-ruby</artifactId>
7
- <version>0.1.15</version>
11
+ <version>0.4.8</version>
8
12
  </extension>
9
13
  </extensions>
data/Mavenfile CHANGED
@@ -2,22 +2,11 @@
2
2
 
3
3
  gemspec
4
4
 
5
- distribution_management do
6
- repository :id => :ossrh, :url => 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
7
- end
8
-
9
- #plugin :deploy, '2.8.2' do
10
- # execute_goal :deploy, :phase => :deploy, :id => 'deploy gem to maven central', :skip => '${deploy.skip}'
11
- #end
12
-
13
- properties 'push.skip' => true #, 'deploy.skip' => true
5
+ properties 'push.skip': true, 'jruby.version': '9.3.3.0'
14
6
 
15
7
  profile :id => :release do
16
8
  properties 'maven.test.skip' => true, 'invoker.skip' => true
17
- properties 'push.skip' => false #, 'deploy.skip' => false
18
- # plugin :gpg, '1.5' do
19
- # execute_goal :sign, :id => 'sign artifacts', :phase => :verify
20
- # end
9
+ properties 'push.skip' => false
21
10
  build do
22
11
  default_goal :deploy
23
12
  end
data/bin/rmvn CHANGED
@@ -5,3 +5,5 @@ args = ARGV.dup
5
5
  ARGV.clear # clean up in case another script gets executed it gets clear ARGV
6
6
 
7
7
  RubyMaven.exec(*args)
8
+
9
+ exit $?.exitstatus
@@ -1,5 +1,5 @@
1
1
  module Maven
2
2
  module Ruby
3
- VERSION = '3.3.9'.freeze
3
+ VERSION = '3.3.13'.freeze
4
4
  end
5
5
  end
data/lib/ruby_maven.rb CHANGED
@@ -25,14 +25,24 @@ module RubyMaven
25
25
  POLYGLOT_VERSION = "0.1.15"
26
26
 
27
27
  def self.exec( *args )
28
+ if File.exist?('settings.xml') and not args.member?('-s') and not args.member?('--settings')
29
+ args << '-s'
30
+ args << 'settings.xml'
31
+ end
28
32
  if args.member?('-version') or args.member?('--version') or args.member?('-v')
29
33
  warn "Polyglot Maven Extension #{version}"
30
34
  launch( '--version' )
31
35
  elsif defined? Bundler
32
36
  # it can be switching from ruby to jruby with invoking maven
33
37
  # just keep it clean
34
- Bundler.with_clean_env do
35
- launch( *args )
38
+ if Bundler.respond_to?(:with_unbundled_env)
39
+ Bundler.with_unbundled_env do
40
+ launch( *args )
41
+ end
42
+ else
43
+ Bundler.with_clean_env do
44
+ launch( *args )
45
+ end
36
46
  end
37
47
  else
38
48
  launch( *args )
data/ruby-maven.gemspec CHANGED
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
11
11
  s.summary = %q{maven support for ruby projects}
12
12
  s.email = ["m.kristian@web.de"]
13
13
 
14
- s.homepage = %q{https://github.com/takari/ruby-maven}
14
+ s.homepage = %q{https://github.com/jruby/ruby-maven}
15
15
 
16
- s.license = 'EPL'
16
+ s.license = 'EPL-2.0'
17
17
 
18
18
  s.executable = 'rmvn'
19
19
 
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
21
21
 
22
22
  s.rdoc_options = ["--main", "README.md"]
23
23
 
24
- s.add_dependency 'ruby-maven-libs', "~> 3.3.1"
24
+ s.add_dependency 'ruby-maven-libs', "~> 3.3.9"
25
25
  s.add_development_dependency 'minitest', '~> 5.3'
26
- s.add_development_dependency 'rake', '~> 10.3'
26
+ s.add_development_dependency 'rake', '~> 12.3'
27
27
  end
28
28
 
29
29
  # vim: syntax=Ruby
@@ -5,19 +5,23 @@ describe Maven::Ruby::Maven do
5
5
 
6
6
  subject { Maven::Ruby::Maven.new }
7
7
 
8
+ let(:pkg) { File.expand_path("../pkg", __dir__) }
9
+
8
10
  it 'shows mvn commandline with verbose flag' do
9
- CatchStdout.exec do
11
+ out, _ = capture_subprocess_io do
10
12
  subject.exec( '-Dverbose', 'validate' )
11
13
  end
12
14
  subject.verbose = false
13
- CatchStdout.result.must_match /mvn -Dverbose validate/
15
+ _(out).must_match /mvn -Dverbose validate/
14
16
  end
15
17
 
16
18
  it 'takes declared jruby version' do
17
19
  begin
18
20
  subject.inherit_jruby_version '9.0.4.0'
19
- subject.exec( '-X', 'initialize', '-l', 'pkg/log1.txt' )
20
- File.read('pkg/log1.txt').must_match /resolve jruby for version 9.0.4.0/
21
+ out, _ = capture_subprocess_io do
22
+ subject.exec( '-X', 'initialize')
23
+ end
24
+ _(out).must_match /resolve jruby for version 9.0.4.0/
21
25
  ensure
22
26
  subject['jruby.version'] = nil
23
27
  end
@@ -26,14 +30,18 @@ describe Maven::Ruby::Maven do
26
30
  if defined? JRUBY_VERSION
27
31
  it 'inherits jruby version' do
28
32
  subject.inherit_jruby_version
29
- subject.exec( '-X', 'initialize', '-l', 'pkg/log2.txt' )
30
- File.read('pkg/log2.txt').must_match /resolve jruby for version #{JRUBY_VERSION}/
33
+ out, _ = capture_subprocess_io do
34
+ subject.exec( '-X', 'initialize')
35
+ end
36
+ _(out).must_match /resolve jruby for version #{JRUBY_VERSION}/
31
37
  end
32
38
  else
33
39
  it 'takes default jruby version with inherit jruby version' do
34
40
  subject.inherit_jruby_version
35
- subject.exec( '-X', 'initialize', '-l', 'pkg/log3.txt' )
36
- File.read('pkg/log3.txt').must_match /resolve jruby for version 1.7.22/
41
+ out, _ = capture_subprocess_io do
42
+ subject.exec( '-X', 'initialize')
43
+ end
44
+ _(out).must_match /resolve jruby for version 9.3.1.0/
37
45
  end
38
46
  end
39
47
  end
@@ -7,32 +7,31 @@ describe RubyMaven do
7
7
 
8
8
  it 'displays the version info' do
9
9
  Dir.chdir 'spec' do
10
- CatchStdout.exec do
10
+ _, err = capture_io do
11
11
  RubyMaven.exec( '--version' )
12
12
  end
13
- CatchStdout.result.must_match /Polyglot Maven Extension 0.1.15/
13
+ _(err).must_match /Polyglot Maven Extension 0.4.8/
14
14
  xml = File.read('.mvn/extensions.xml')
15
- xml.must_equal "dummy\n"
15
+ _(xml).must_equal "dummy\n"
16
16
  end
17
17
  end
18
18
 
19
- let :gem do
19
+ let :gem_name do
20
20
  v = Maven::Ruby::VERSION
21
21
  v += '-SNAPSHOT' if v =~ /[a-zA-Z]/
22
22
  "pkg/ruby-maven-#{v}.gem"
23
23
  end
24
24
 
25
25
  it 'pack the gem' do
26
- FileUtils.rm_f gem
27
- CatchStdout.exec do
26
+ FileUtils.rm_f gem_name
27
+ out, _ = capture_subprocess_io do
28
28
  # need newer jruby version
29
- RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=1.7.24' )
29
+ RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=9.3.0.0' )
30
30
  end
31
- #puts CatchStdout.result
32
- CatchStdout.result.must_match /mvn -Dverbose package/
33
- File.exists?( gem ).must_equal true
34
- File.exists?( '.mvn/extensions.xml' ).must_equal true
35
- File.exists?( '.mvn/extensions.xml.orig' ).wont_equal true
31
+ _(out).must_match /mvn -Dverbose package/
32
+ _(File.exists?( gem_name )).must_equal true
33
+ _(File.exists?( '.mvn/extensions.xml' )).must_equal true
34
+ _(File.exists?( '.mvn/extensions.xml.orig' )).wont_equal true
36
35
  end
37
36
 
38
37
  end
data/spec/setup.rb CHANGED
@@ -1,26 +1,5 @@
1
1
  $LOAD_PATH.unshift File.expand_path( '../../lib', __FILE__ )
2
- begin
3
- require 'minitest'
4
- rescue LoadError
5
- end
6
- require 'minitest/autorun'
7
-
8
2
 
9
- module CatchStdout
3
+ ENV["MT_NO_PLUGINS"] = "true"
10
4
 
11
- def self.exec
12
- out = $stdout
13
- err = $stderr
14
- @result = StringIO.new
15
- $stdout = @result
16
- $stderr = @result
17
- yield
18
- ensure
19
- $stdout = out
20
- $stderr = err
21
- end
22
-
23
- def self.result
24
- @result.string
25
- end
26
- end
5
+ require 'minitest/autorun'
metadata CHANGED
@@ -1,33 +1,33 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ruby-maven
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.9
4
+ version: 3.3.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Meier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-04 00:00:00.000000000 Z
11
+ date: 2022-01-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
- - - ~>
16
+ - - "~>"
17
17
  - !ruby/object:Gem::Version
18
- version: 3.3.1
18
+ version: 3.3.9
19
19
  name: ruby-maven-libs
20
20
  prerelease: false
21
21
  type: :runtime
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 3.3.1
26
+ version: 3.3.9
27
27
  - !ruby/object:Gem::Dependency
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
30
- - - ~>
30
+ - - "~>"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '5.3'
33
33
  name: minitest
@@ -35,23 +35,23 @@ dependencies:
35
35
  type: :development
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: '5.3'
41
41
  - !ruby/object:Gem::Dependency
42
42
  requirement: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - ~>
44
+ - - "~>"
45
45
  - !ruby/object:Gem::Version
46
- version: '10.3'
46
+ version: '12.3'
47
47
  name: rake
48
48
  prerelease: false
49
49
  type: :development
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '10.3'
54
+ version: '12.3'
55
55
  description: maven support for ruby DSL pom files. MRI needs java/javac installed.
56
56
  email:
57
57
  - m.kristian@web.de
@@ -60,7 +60,7 @@ executables:
60
60
  extensions: []
61
61
  extra_rdoc_files: []
62
62
  files:
63
- - .mvn/extensions.xml
63
+ - ".mvn/extensions.xml"
64
64
  - Gemfile
65
65
  - Mavenfile
66
66
  - README.md
@@ -74,32 +74,30 @@ files:
74
74
  - lib/ruby_maven.rb
75
75
  - ruby-maven.gemspec
76
76
  - spec/maven_ruby_maven_spec.rb
77
- - spec/maven_ruby_maven_spec.rb~
78
77
  - spec/ruby_maven_spec.rb
79
78
  - spec/setup.rb
80
- homepage: https://github.com/takari/ruby-maven
79
+ homepage: https://github.com/jruby/ruby-maven
81
80
  licenses:
82
- - EPL
81
+ - EPL-2.0
83
82
  metadata: {}
84
83
  post_install_message:
85
84
  rdoc_options:
86
- - --main
85
+ - "--main"
87
86
  - README.md
88
87
  require_paths:
89
88
  - lib
90
89
  required_ruby_version: !ruby/object:Gem::Requirement
91
90
  requirements:
92
- - - '>='
91
+ - - ">="
93
92
  - !ruby/object:Gem::Version
94
93
  version: '0'
95
94
  required_rubygems_version: !ruby/object:Gem::Requirement
96
95
  requirements:
97
- - - '>='
96
+ - - ">="
98
97
  - !ruby/object:Gem::Version
99
98
  version: '0'
100
99
  requirements: []
101
- rubyforge_project:
102
- rubygems_version: 2.4.8
100
+ rubygems_version: 3.2.29
103
101
  signing_key:
104
102
  specification_version: 4
105
103
  summary: maven support for ruby projects
@@ -1,55 +0,0 @@
1
- require_relative 'setup'
2
- require 'ruby_maven'
3
- require 'stringio'
4
- require 'maven/ruby/version'
5
-
6
- module CatchStdout
7
-
8
- def self.exec
9
- out = $stdout
10
- err = $stderr
11
- @result = StringIO.new
12
- $stdout = @result
13
- $stderr = @result
14
- yield
15
- ensure
16
- $stdout = out
17
- $stderr = err
18
- end
19
-
20
- def self.result
21
- @result.string
22
- end
23
- end
24
-
25
- describe RubyMaven do
26
-
27
- it 'displays the version info' do
28
- Dir.chdir 'spec' do
29
- CatchStdout.exec do
30
- RubyMaven.exec( '--version' )
31
- end
32
- CatchStdout.result.must_match /Polyglot Maven Extension 0.1.15/
33
- xml = File.read('.mvn/extensions.xml')
34
- xml.must_equal "dummy\n"
35
- end
36
- end
37
-
38
- let :gem do
39
- v = Maven::Ruby::VERSION
40
- v += '-SNAPSHOT' if v =~ /[a-zA-Z]/
41
- "pkg/ruby-maven-#{v}.gem"
42
- end
43
-
44
- it 'pack the gem' do
45
- FileUtils.rm_f gem
46
- CatchStdout.exec do
47
- RubyMaven.exec( '-Dverbose', 'package' )
48
- end
49
- CatchStdout.result.must_match /mvn -Dverbose package/
50
- File.exists?( gem ).must_equal true
51
- File.exists?( '.mvn/extensions.xml' ).must_equal true
52
- File.exists?( '.mvn/extensions.xml.orig' ).wont_equal true
53
- end
54
-
55
- end