ruby-maven 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1cfb899e3c89b8d5d80109f9f6f14514f9dd27
-  data.tar.gz: f566dc4f070441de3439906b6bcebf3dc9c70a53
+  metadata.gz: 807c782954acf707feffc26aed345ea99d62ebae
+  data.tar.gz: 275062d1e8ccaac102e5a4a486c27e2389556c50
 SHA512:
-  metadata.gz: 97ebfae189a8b3eb2a7c8f2ed19676ab881bc04367d06b3939ba8fb9668e5e701840e6573ec6f4878134bcafe3bafa6c5298e18f5de7933068c27e8520858226
-  data.tar.gz: c08cfe8b268f1cb401533f451d799043b038eaf4b7c16fa37b09f1bdfb4683796e40e6674e37cfe3713b85cace5a94bba386bb77e01a6430522d3e953c08dbf3
+  metadata.gz: 6788c4e87be241c50c8e8ba2a5c9f05d8a11bab1f44086e6badf81248f39b291bc0620cc7c378f55c20df976bea4d61389367df77ddf4dfaa38092d49e1f8668
+  data.tar.gz: a3b8a90e850629739ee3a3de890c5ebbd451f772995f68de2f9b6813f3d8b78fd905570055f76c820b490d51f9de12f952b7ef944d4ff137932d764f5b115456

data/.mvn/extensions.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- from ruby-maven gem -->
 <extensions>
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.13</version>
+    <version>0.1.15</version>
   </extension>
 </extensions>

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Mavenfile

@@ -6,18 +6,18 @@ 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
+#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 #, 'deploy.skip' => true
 
 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 #, 'deploy.skip' => false
+#  plugin :gpg, '1.5' do
+#    execute_goal :sign, :id => 'sign artifacts', :phase => :verify
+#  end
   build do
     default_goal :deploy
   end

data/README.md

@@ -0,0 +1,71 @@
+# ruby maven #
+
+this is a ruby wrapper around [maven-3.3.x](http://maven.apache.org)
+and comes with the ruby DSL from
+[Polyglot Maven](https://github.com/takari/polyglot-maven)
+preconfigured.
+
+## command line ###
+
+just execute it with ```rmvn``` or
+
+```
+$ rmvn --version
+Polyglot Maven Extension 0.1.13
+Apache Maven 3.3.3 (7994120775791599e205a5524ec3e0dfe41d4a06; 2015-04-22T13:57:37+02:00)
+Maven home: /usr/local/lib/ruby/gems/2.2.0/gems/ruby-maven-libs-3.3.3/maven-home
+Java version: 1.8.0_51, vendor: Oracle Corporation
+Java home: /Library/Java/JavaVirtualMachines/jdk1.8.0_51.jdk/Contents/Home/jre
+Default locale: en_US, platform encoding: UTF-8
+OS name: "mac os x", version: "10.10.5", arch: "x86_64", family: "mac"
+```
+
+## using it from ruby ##
+
+```
+require 'ruby-maven'
+
+RubyMaven.exec( '--version' )
+```
+
+this will run the same maven as the above command execution.
+
+## Mavenfile, pom.rb and pom.xml ##
+
+the polyglot maven part will look for either of those files
+
+* Mavenfile
+* pom.rb
+* pom.xml
+
+in this order. the first two are ruby files using a ruby DSL for POM.
+
+best see these files for a more examples on this ruby DSL
+
+* [maven style](https://github.com/torquebox/maven-tools/blob/master/spec/pom_maven_style/pom.rb) - almost like the original pom.xml with nested blocks
+* [hash style](https://github.com/torquebox/maven-tools/blob/master/spec/pom_maven_hash_style/pom.rb)
+* [some alternatives](https://github.com/torquebox/maven-tools/blob/master/spec/pom_maven_alternative_style/pom.rb)
+
+all three examples are equivalent to
+[pom.xml](https://github.com/torquebox/maven-tools/blob/master/spec/pom.xml).
+
+Mavenfile and pom.rb are the same thing, one is closer to ruby and the
+other is closer to maven in its naming.
+
+## license ##
+
+it is licensed under (EPL-1.0)[https://www.eclipse.org/legal/epl-v10.html]
+
+## contributing #
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+# meta-fu #
+
+enjoy :) 
+
+

data/Rakefile

@@ -0,0 +1,33 @@
+#-*- mode: ruby -*-
+
+task :default => [ :specs ]
+
+desc 'run specs'
+task :specs do
+  $LOAD_PATH << "spec"
+
+  Dir['spec/*_spec.rb'].each do |f| 
+    require File.basename( f.sub(/.rb$/, '' ) )
+  end
+end
+
+task :headers do
+  require 'copyright_header'
+
+  s = Gem::Specification.load( Dir["*gemspec"].first )
+
+  args = {
+    :license => s.license, 
+    :copyright_software => s.name,
+    :copyright_software_description => s.description,
+    :copyright_holders => s.authors,
+    :copyright_years => [Time.now.year],
+    :add_path => "lib",
+    :output_dir => './'
+  }
+
+  command_line = CopyrightHeader::CommandLine.new( args )
+  command_line.execute
+end
+
+# vim: syntax=Ruby

data/lib/maven/ruby/maven.rb

@@ -93,9 +93,13 @@ module Maven
         end
       end
 
-      def inherit_jruby_version
-        if defined? JRUBY_VERSION
-          self['jruby.version'] = JRUBY_VERSION
+      def inherit_jruby_version( version = nil )
+        if version == nil
+          if defined? JRUBY_VERSION
+            self['jruby.version'] = JRUBY_VERSION
+          end
+        elsif version
+          self['jruby.version'] = version
         end
       end
 

data/lib/maven/ruby/version.rb

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

data/lib/ruby_maven.rb

@@ -22,10 +22,11 @@ require 'maven'
 require 'maven/ruby/maven'
 
 module RubyMaven
+  POLYGLOT_VERSION = "0.1.15"
 
   def self.exec( *args )
     if args.member?('-version') or args.member?('--version') or args.member?('-v')
-      puts "Polyglot Maven Extension #{POLYGLOT_VERSION}\n"
+      warn "Polyglot Maven Extension #{version}"
       launch( '--version' )
     elsif defined? Bundler
       # it can be switching from ruby to jruby with invoking maven
@@ -42,31 +43,45 @@ module RubyMaven
     @dir ||= File.expand_path( '../../', __FILE__ )
   end
 
+  def self.version
+    polyglot_version = begin
+                         xml = File.read( File.join( dir, '.mvn/extensions.xml' ) )
+                         xml.sub( /.*<version>/m, '' ).sub(/<\/version>.*/m, '' )
+                       rescue Errno::ENOENT => e
+                         nil
+                       end
+    POLYGLOT_VERSION.replace(polyglot_version) if polyglot_version
+    POLYGLOT_VERSION
+  end
+
   def self.launch( *args )
     old_maven_home = ENV['M2_HOME']
     ENV['M2_HOME'] = Maven.home
 
     extensions = File.join( '.mvn/extensions.xml' )
-    unless has_extensions = File.exists?( extensions )
+    if has_extensions = File.exists?( extensions )
+      # tests need copy instead of move
+      FileUtils.cp( extensions, extensions + ".orig" )
+    else
       FileUtils.mkdir_p( '.mvn' )
-      FileUtils.cp( File.join( dir, extensions), extensions )
     end
+    FileUtils.cp( File.join( dir, extensions ), extensions ) rescue nil
+
+    # setup version
+    self.version
+
     Maven.exec( *args )
 
   ensure
     ENV['M2_HOME'] = old_maven_home
-    unless has_extensions
-      FileUtils.rm_f( extensions )
+    
+    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
-
-  POLYGLOT_VERSION = begin
-                       xml = File.read( File.join( dir, '.mvn/extensions.xml' ) )
-                       xml.sub( /.*<version>/m, '' ).sub(/<\/version>.*/m, '' )
-                     rescue Errno::ENOENT => e
-                      '0.1.11'
-                     end
 end

data/ruby-maven.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.executable = 'rmvn'
 
-  s.files = `git ls-files`.split($/)
+  s.files = Dir['lib/**/*'] + Dir['spec/**/*'] + Dir['bin/*'] + Dir['*file'] + Dir['.mvn/*'] + ['README.md', 'ruby-maven.gemspec']
 
   s.rdoc_options = ["--main", "README.md"]
 

data/spec/maven_ruby_maven_spec.rb

@@ -0,0 +1,39 @@
+require_relative 'setup'
+require 'maven/ruby/maven'
+
+describe Maven::Ruby::Maven do
+
+  subject { Maven::Ruby::Maven.new }
+
+  it 'shows mvn commandline with verbose flag' do
+    CatchStdout.exec do
+      subject.exec( '-Dverbose', 'validate' )
+    end
+    subject.verbose = false
+    CatchStdout.result.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/
+    ensure
+      subject['jruby.version'] = nil
+    end
+  end
+
+  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}/
+    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/
+    end
+  end
+ end

data/spec/maven_ruby_maven_spec.rb~

@@ -0,0 +1,55 @@
+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

data/spec/ruby_maven_spec.rb

@@ -1,30 +1,19 @@
 require_relative 'setup'
 require 'ruby_maven'
+require 'stringio'
 require 'maven/ruby/version'
 
-module CatchStdout
-
-  def self.exec
-    out = $stdout
-    @result = StringIO.new
-    $stdout = @result
-    yield
-  ensure
-    $stdout = out
-  end
-
-  def self.result
-    @result.string
-  end
-end
-
 describe RubyMaven do
 
   it 'displays the version info' do
-    CatchStdout.exec do
-      RubyMaven.exec( '--version' )
+    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
-    CatchStdout.result.must_match /Polyglot Maven Extension 0.1.9/
   end
 
   let :gem do
@@ -36,10 +25,14 @@ describe RubyMaven do
   it 'pack the gem' do
     FileUtils.rm_f gem
     CatchStdout.exec do
-      RubyMaven.exec( '-Dverbose', 'package' )
+      # need newer jruby version
+      RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=1.7.24' )
     end
+    #puts CatchStdout.result
     CatchStdout.result.must_match /mvn -Dverbose package/
-    File.exists?( gem )
+    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

data/spec/setup.rb

@@ -1,6 +1,26 @@
-$LOAD_PATH << File.expand_path( '../../lib', __FILE__ )
+$LOAD_PATH.unshift File.expand_path( '../../lib', __FILE__ )
 begin
   require 'minitest'
 rescue LoadError
 end
 require 'minitest/autorun'
+
+
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -60,9 +60,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - .mvn/extensions.xml
+- Gemfile
 - Mavenfile
+- README.md
+- Rakefile
 - bin/rmvn
 - lib/maven/ruby.rb
 - lib/maven/ruby/maven.rb
@@ -71,6 +73,8 @@ files:
 - lib/ruby-maven.rb
 - 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

data/.gitignore

@@ -1,3 +0,0 @@
-pkg
-pom*xml
-*.gem