ruby-maven 3.1.1.0.11 → 3.3.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e6381cbeabfcbaf28a01023b8a0403d159a7c9b
-  data.tar.gz: 917f330c39f45613c10a01e1eedb61b392586e40
+  metadata.gz: 8e03da4bc5c0ca4eb74a7972b46c8164d0143a70
+  data.tar.gz: c38d06abd005604e8f09656043c8d497a61d34c3
 SHA512:
-  metadata.gz: f430ef38d9ceec9fd5b59e34de372259302f48ddd199817516402a12c1549b0e0b00c472240ec59bf2025c3f6489917836948c24ca3a03e15039934580e1aba1
-  data.tar.gz: 87ead42262680d5adc6832bed53ac6953f616154847230be231d58e068dbec21b0a780a23fb825716774945b798f46e2567f0221a958c4817dd1d8c21dfbc66c
+  metadata.gz: 4ae0e3c6152bf8c891f0e84d272854feccdbca15c419cd42844bdbf9e6a14669c265cce942ccde26770a2f36f6acd0102433526a3b3ac65ab88097a6d456366c
+  data.tar.gz: 0b97469946062419fcc526c156bdf587154b5827533699d4af108f54213b7195a444a9e16895615f9b62344675d03d6b30a17ba6aa17612a5997a90aa3b4cc59

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+pom*xml

data/.mvn/extensions.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>io.takari.polyglot</groupId>
+    <artifactId>polyglot-ruby</artifactId>
+    <version>0.1.9</version>
+  </extension>
+</extensions>

data/bin/rmvn

@@ -1,9 +1,7 @@
 #!/usr/bin/env ruby
-require 'maven/ruby/maven'
-
-mvn = Maven::Ruby::Maven.new
+require 'ruby-maven'
 
 args = ARGV.dup
-ARGV.clear # clean up in case another script gets executed it gets clear ARGV
+ARGV.clear # clean up in case another script gets executed it gets a clear ARGV
 
-mvn.exec(*args)
+RubyMaven.exec(*args)

data/lib/maven/ruby/maven.rb

@@ -18,12 +18,8 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-unless defined? JRUBY_VERSION
-  require 'maven/tools/model'
-end
-require 'maven/tools/visitor'
+require 'ruby_maven'
 require 'fileutils'
-require 'tesla_maven'
 
 module Maven
   module Ruby
@@ -33,57 +29,6 @@ module Maven
 
       private
 
-      # TODO if this is not needed anymore remove it completely
-      def launch_jruby(args)
-        java.lang.System.setProperty( "classworlds.conf",
-                                      TeslaMaven.bin( "m2jruby.conf" ) )
-
-        java.lang.System.setProperty( 'maven.home', TeslaMaven.maven_home )
-        java.lang.System.setProperty( 'tesla.home', TeslaMaven.home )
-
-        # loading here is needed to let tesla-ruby find jruby on
-        # classloader
-        self.class.require_classpath( TeslaMaven.maven_boot )
-        self.class.require_classpath( TeslaMaven.maven_lib )
-        self.class.require_classpath( TeslaMaven.lib )
-
-        # this is a hack to ensure ruby-maven also works inside the
-        # jruby development itself where the lib/jruby.jar gets build
-        # during the execution of maven and the jar used to launch jruby
-        # will be replaced.
-
-        jar = 'lib/jruby.jar'
-        jar_copy = 'lib/jruby-copy.jar'
-        if File.exists? jar
-          FileUtils.mv( jar, jar_copy )
-        end
-
-        org.codehaus.plexus.classworlds.launcher.Launcher.main_with_exit_code( args )
-      ensure
-        if File.exists? jar_copy
-          FileUtils.mv( jar_copy, jar )
-        end
-      end
-
-      def launch_java(args)
-        # TODO works only on unix like OS
-        system "java -cp #{self.class.classpath( TeslaMaven.maven_boot )} -Dmaven.home=#{TeslaMaven.maven_home} -Dtesla.home=#{TeslaMaven.home} -Dclassworlds.conf=#{TeslaMaven.bin( 'm2.conf' )} org.codehaus.plexus.classworlds.launcher.Launcher #{args.join ' '}"
-      end
-
-      def self.classpath_array( dir )
-        Dir.glob( File.join( dir, "*jar" ) )
-      end
-
-      def self.classpath( dir )
-        classpath_array( dir ).join( File::PATH_SEPARATOR )
-      end
-
-      def self.require_classpath( dir )
-        classpath_array( dir ).each do |jar|
-          require jar
-        end
-      end
-
       def options_array
         options.collect do |k,v|
           if k =~ /^-D/
@@ -103,7 +48,16 @@ module Maven
 
       def initialize( project = nil, temp_pom = nil )
         super()
+        
         if project
+          warn 'deprecated: EOF - just tell maven where you (ruby) pom is'
+          begin
+            require 'maven/tools/model'
+            require 'maven/tools/visitor'
+          rescue LoadError => e
+            warn 'maven-tools gem is not a direct dependency anymore'
+            raise e
+          end
           f = File.expand_path( temp_pom || '.pom.xml' )
           v = ::Maven::Tools::Visitor.new( File.open( f, 'w' ) )
           # parse project and write out to temp_pom file
@@ -125,6 +79,7 @@ module Maven
       def property(key, value = nil)
         options["-D#{key}"] = value
       end
+      alias :[]= :property
 
       def verbose
         if @verbose.nil?
@@ -135,24 +90,11 @@ module Maven
       end
 
       def exec(*args)
-        a = args.dup + options_array
-        if a.delete( '-Dverbose=true' ) || a.delete( '-Dverbose' ) || verbose
-          puts "mvn #{a.join(' ')}"
+        if verbose
+          puts "mvn #{args.join(' ')}"
         end   
-        if defined? Bundler
-          # it can be switching from ruby to jruby with invoking maven
-          # just keep it clean
-          Bundler.with_clean_env do
-            launch( a )
-          end
-        else
-          launch( a )
-        end
-      end
-
-      def launch( args )
-        puts "using java invokation" if verbose
-        result = launch_java( args )
+        
+        result = RubyMaven.exec( *args )
         if @embedded and not result
           raise "error in executing maven #{result}"
         else

data/lib/maven/ruby/tasks.rb

@@ -1,6 +1,8 @@
 require 'maven/ruby/maven'
 require 'rake'
 
+warn 'deprecated: END OF LIFE'
+
 module Maven
   class Tasks
     include Rake::DSL

data/lib/maven/ruby/version.rb

@@ -1,6 +1,5 @@
 module Maven
   module Ruby
-    MAVEN_VERSION = '3.1.1'.freeze
-    VERSION = MAVEN_VERSION + '.0.11'# + '.dev'
+    VERSION = '3.3.0' + '.dev'
   end
 end

data/lib/ruby_maven.rb

@@ -18,4 +18,39 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'maven'
 require 'maven/ruby/maven'
+
+module RubyMaven
+
+  def self.exec( *args )
+    if args.member?('-version') or args.member?('--version') or args.member?('-v')
+      puts "Polyglot Maven Extension #{POLYGLOT_VERSION}\n"
+      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 )
+      end
+    else
+      launch( *args )
+    end
+  end
+
+  def self.dir
+    @dir ||= File.expand_path( '../../', __FILE__ )
+  end
+  
+  def self.launch( *args )
+    Dir.chdir( dir ) do
+      Maven.exec( *args )
+    end
+  end
+    
+  POLYGLOT_VERSION = begin
+                       xml = File.read( File.join( dir, '.mvn/extensions.xml' ) )
+                       xml.sub( /.*<version>/m, '' ).sub(/<\/version>.*/m, '' )
+                                        
+                     end
+end

data/ruby-maven.gemspec

@@ -0,0 +1,29 @@
+# -*- mode:ruby -*-
+
+require './lib/maven/ruby/version'
+
+Gem::Specification.new do |s|
+  s.name = 'ruby-maven'
+  s.version = Maven::Ruby::VERSION
+
+  s.authors = ["Christian Meier"]
+  s.description = %q{maven support for ruby based on tesla maven. MRI needs java/javac command installed.} 
+  s.summary = %q{maven support for ruby projects}
+  s.email = ["m.kristian@web.de"]
+
+  s.homepage = %q{https://github.com/takari/ruby-maven}
+  
+  s.license = 'EPL' 
+
+  s.files = `git ls-files`.split($/)
+
+  s.executables = ['rmvn']
+  s.rdoc_options = ["--main", "README.md"]
+  
+  #s.add_dependency 'maven-tools', "~> 1.0.6" 
+  #s.add_dependency 'ruby-maven-libs', "~> 3.3.1"
+  s.add_development_dependency 'minitest', '~> 5.3'  
+  s.add_development_dependency 'rake', '~> 10.3'
+end
+
+# vim: syntax=Ruby

data/spec/ruby_maven_spec.rb

@@ -0,0 +1,45 @@
+require_relative 'setup'
+require 'ruby_maven'
+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' )
+    end
+    CatchStdout.result.must_match /Polyglot Maven Extension 0.1.9/
+  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 )
+  end
+
+end

data/spec/setup.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH << File.expand_path( '../../lib', __FILE__ )
+begin
+  require 'minitest'
+rescue LoadError
+end
+require 'minitest/autorun'

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
-  version: 3.1.1.0.11
+  version: 3.3.0.dev
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: maven-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-maven-libs
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,25 +43,22 @@ email:
 - m.kristian@web.de
 executables:
 - rmvn
-- dumppom
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/rmvn
-- ruby-maven-home/bin/m2jruby.conf
-- ruby-maven-home/bin/m2.conf
-- ruby-maven-home/ext/ruby/tesla-polyglot-ruby-0.1.1.jar
-- lib/ruby-maven.rb
-- lib/tesla_maven.rb
-- lib/ruby_maven.rb
+- .gitignore
+- .mvn/extensions.xml
 - lib/maven/ruby.rb
-- lib/maven/ruby/version.rb
 - lib/maven/ruby/maven.rb
 - lib/maven/ruby/tasks.rb
-- ruby-maven-home/lib/tesla-polyglot-cli-0.1.1.jar
-- ruby-maven-home/lib/tesla-polyglot-common-0.1.1.jar
-- bin/dumppom
-homepage: https://github.com/takari/maven-polyglot/tree/master/tesla-polyglot-gems
+- lib/maven/ruby/version.rb
+- lib/ruby-maven.rb
+- lib/ruby_maven.rb
+- ruby-maven.gemspec
+- spec/ruby_maven_spec.rb
+- spec/setup.rb
+- bin/rmvn
+homepage: https://github.com/takari/ruby-maven
 licenses:
 - EPL
 metadata: {}
@@ -106,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.1.9

data/bin/dumppom

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-require 'maven/ruby/maven'
-
-mvn = Maven::Ruby::Maven.new
-
-args = ARGV.dup + [ 'validate', '-Dtesla.dump.pom=pom.xml' ]
-ARGV.clear # clean up in case another script gets executed it gets clear ARGV
-
-mvn.exec(*args)

data/lib/tesla_maven.rb

@@ -1,56 +0,0 @@
-begin
-  require 'maven'
-rescue LoadError
-  #allow to access the version anyways
-end
-
-module TeslaMaven
-
-  VERSION = '0.1.1'.freeze
-  
-  def self.home
-    File.expand_path( File.join( File.dirname( File.expand_path( __FILE__ ) ), '../ruby-maven-home' ) )
-  end
-
-  def self.bin( file = nil )
-    if file
-      File.join( path( 'bin' ), file )
-    else
-      path( 'bin' )
-    end
-  end
-
-  def self.ext
-    path( 'ext' )
-  end
-
-  def self.lib
-    path( 'lib' )
-  end
-
-  def self.maven_home
-    Maven.home
-  end
-
-  def self.maven_bin
-    Maven.bin
-  end
-
-  def self.maven_lib
-    Maven.lib
-  end
-
-  def self.maven_conf
-    Maven.conf
-  end
-
-  def self.maven_boot
-    Maven.boot
-  end
-  
-  private
-
-  def self.path( name )
-    File.join( home, name )
-  end
-end

data/ruby-maven-home/bin/m2.conf

@@ -1,12 +0,0 @@
-main is org.apache.maven.cli.PolyglotMavenCli from plexus.core
-
-set maven.home default ${user.home}/m2
-set tesla.home default ${user.home}/m2
-set tesla.ext default ${tesla.home}/ext
-set tesla.lib default ${tesla.home}/lib
-
-[plexus.core]
-load ${maven.home}/conf/logging
-load ${maven.home}/lib/*.jar
-load ${tesla.ext}/ruby/*.jar
-load ${tesla.lib}/tesla-*.jar

data/ruby-maven-home/bin/m2jruby.conf

@@ -1,5 +0,0 @@
-main is org.apache.maven.cli.PolyglotMavenCli from plexus.core
-
-[plexus.core]
-load ${maven.home}/conf/logging
-load ${tesla.home}/ext/ruby/*.jar