ruby-maven 3.0.4.1.4 → 3.1.0.0

data/bin/m2.conf

@@ -1,7 +1,11 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
-
-set maven.home default ${user.home}/m2
-
-[plexus.core]
-optionally ${maven.home}/lib/ext/*.jar
-load       ${maven.home}/lib/*.jar
+main is org.apache.maven.cli.PolyglotMavenCli from plexus.core
+
+set maven.home default ${user.home}/m2
+set tesla.ext default ${maven.home}/ext
+set tesla.lib default ${maven.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/bin/rmvn

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

data/ruby/maven/ruby/maven.rb

@@ -0,0 +1,199 @@
+#
+# Copyright (C) 2013 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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 'java'
+  require 'maven/tools/model'
+  require 'maven/tools/pom'
+end
+require 'maven/tools/visitor'
+require 'fileutils'
+require 'tesla_maven'
+
+module Maven
+  module Ruby
+    class Maven
+
+      attr_accessor :embedded
+
+      private
+
+      def launch_jruby_embedded(args)
+        p File.expand_path '.'
+        p java.lang.System.getProperty( 'user.dir' )
+        classloader = self.class.class_world.get_realm( 'plexus.core' )
+        
+        cli = classloader.load_class( 'org.apache.maven.cli.PolyglotMavenCli' )
+
+        a = java.util.ArrayList.new
+        args.each { |arg| a << arg.to_s }
+        unless org.apache.maven.cli.PolyglotMavenCli.main( a, self.class.class_world )
+          raise 'error executing maven'
+        end
+      end
+
+      def launch_jruby(args)
+        java.lang.System.setProperty( "classworlds.conf",
+                                      TeslaMaven.bin( "m2.conf" ) )
+
+        java.lang.System.setProperty( 'maven.home', TeslaMaven.maven_home )
+        java.lang.System.setProperty( 'tesla.ext', TeslaMaven.ext )
+        java.lang.System.setProperty( 'tesla.lib', TeslaMaven.lib )
+        # loading here is needed to let tesla-ruby find jruby on
+        # classloader, though m2.conf does load those libs as well
+        self.class.require_classpath( TeslaMaven.maven_boot )
+        self.class.require_classpath( TeslaMaven.maven_lib )
+        self.class.require_classpath( TeslaMaven.lib )
+        # NOTE that execution will call System.exit on the java side
+        org.codehaus.plexus.classworlds.launcher.Launcher.main( args )
+      end
+
+      def self.class_world
+        @class_world ||= class_world!
+      end
+
+      def self.class_world!
+        require_classpath( TeslaMaven.ext )
+        require_classpath( TeslaMaven.lib )
+        require_classpath( TeslaMaven.maven_boot )
+        require_classpath( TeslaMaven.maven_lib )
+        org.codehaus.plexus.classworlds.ClassWorld.new( "plexus.core",
+                                                        java.lang.Thread.currentThread().getContextClassLoader())
+      end
+
+      def self.classpath_array( dir )
+        Dir.glob( File.join( dir, "*jar" ) )
+      end
+
+      def self.require_classpath( dir )
+        classpath_array( dir ).each do |jar|
+          require jar
+        end
+      end
+
+      def adjust_args( args )
+        if ! defined?( JRUBY_VERSION ) &&
+           ( args.index( '-f' ) || args.index( '--file' ) ).nil?
+
+          pom = ::Maven::Tools::POM.new
+          pom_file = '.pom.xml'
+          if pom.to_file( pom_file )
+            args = args + [ '-f', pom_file ]
+          else
+            args
+          end
+        else
+          args
+        end
+      end
+
+      def launch_java(*args)
+        # TODO works only on unix like OS
+        result = system "java -cp #{self.class.classpath_array( ::Maven.boot ).join(':')} -Dmaven.home=#{::Maven.home} -Dclassworlds.conf=#{::Maven.bin( 'm2.conf' )} org.codehaus.plexus.classworlds.launcher.Launcher #{args.join ' '}"
+
+        if @embedded and not result
+          raise 'error in executing maven'
+        else
+          result
+        end
+      end
+
+      def options_array
+        options.collect do |k,v|
+          if k =~ /^-D/
+            v = "=#{v}" unless v.nil?
+            "#{k}#{v}"
+          else
+            if v.nil?
+              "#{k}"
+            else
+              ["#{k}", "#{v}"]
+            end
+          end
+        end.flatten
+      end
+      private :options_array
+
+      public
+
+      def self.class_world
+        @class_world ||= class_world!
+      end
+
+      def initialize( project = nil, temp_pom = nil )
+        super()
+        if project
+          f = File.expand_path( temp_pom || '.pom.xml' )
+          v = ::Maven::Tools::Visitor.new( File.open( f, 'w' ) )
+          # parse block and write out to temp_pom file
+          v.accept_project( project )
+          # tell maven to use the generated file
+          options[ '-f' ] = f
+          @embedded = true
+        end
+      end
+
+      def options
+        @options ||= {}
+      end
+
+      def verbose= v
+        @verbose = v
+      end
+
+      def property(key, value = nil)
+        options["-D#{key}"] = value
+      end
+
+      def verbose
+        if @verbose.nil?
+          @verbose = options.delete('-Dverbose').to_s != 'false'
+        else
+          @verbose
+        end
+      end
+
+      def exec(*args)
+        a = args.dup + options_array
+        a = adjust_args( a.flatten )
+        if a.delete( '-Dverbose=true' ) || a.delete( '-Dverbose' ) || verbose
+          puts "mvn #{a.join(' ')}"
+        end
+        if defined? JRUBY_VERSION
+          if @embedded
+            puts "using jruby #{JRUBY_VERSION} embedded invokation" if verbose
+            launch_jruby_embedded(a)            
+          else
+            puts "using jruby #{JRUBY_VERSION} invokation" if verbose
+            launch_jruby(a)
+          end
+        else
+          puts "using java invokation" if verbose
+          launch_java(a)
+        end
+      end
+
+      def method_missing( method, *args )
+        method = method.to_s.gsub( /_/, '-' ).to_sym
+        exec( [ method ] + args )
+      end
+    end
+  end
+end

data/ruby/maven/ruby/tasks.rb

@@ -0,0 +1,75 @@
+require 'maven/ruby/maven'
+require 'maven/tools/dsl'
+require 'rake'
+
+module Maven
+  class Tasks
+    include Rake::DSL
+
+    def self.instance( maven = nil )
+      @maven = maven if maven
+      @maven
+    end
+
+    def install
+
+      desc "Setup Maven instance."
+      task :maven do
+      end
+
+      desc "Clean up the build directory."
+      task :clean => :maven do
+        maven.clean
+      end
+
+      desc "Run the java unit tests from src/test/java directory."
+      task :junit => :maven do
+        maven.exec( 'compile', 'resources:testResources', 'compiler:testCompile', 'surefire:test' )
+      end
+
+      desc "Build gem into the pkg directory."
+      task :build => :maven do
+        maven.package
+      end
+
+      desc "Compile any java source configured - default java files are in src/main/java."
+      task :compile => :maven do
+        maven.compile
+      end
+
+      desc "Package jar-file with the compiled classes - default jar-file lib/{name}.jar"
+      task :jar => :maven do
+        maven.prepare_package( '-Dmaven.test.skip' )
+      end
+
+      desc "Build the gem"
+      task :build => :maven do
+        maven.package( '-Dmaven.test.skip' )
+      end
+
+      desc "Push gem to rubygems.org"
+      task :push => :maven do
+        maven.deploy( '-Dmaven.test.skip' )
+      end
+    end
+  end
+  Tasks.new.install
+end
+
+#include Maven::Tools::DSL
+
+def maven( &block )
+  if block
+    require 'maven/tools/model'
+    Maven::Tasks.instance( Maven::Ruby::Maven.new( tesla( &block ),
+                                                   '.rake.pom.xml' ) )
+  else
+    if Maven::Tasks.instance
+      Maven::Tasks.instance
+    else
+      m = Maven::Ruby::Maven.new
+      m.embedded = true
+      Maven::Tasks.instance( m )
+    end
+  end
+end

data/ruby/maven/ruby/version.rb

@@ -0,0 +1,6 @@
+module Maven
+  module Ruby
+    MAVEN_VERSION = '3.1.0'
+    VERSION = MAVEN_VERSION + '.0'
+  end
+end

data/ruby/tesla_maven.rb

@@ -0,0 +1,56 @@
+begin
+  require 'maven'
+rescue LoadError
+  #allow to access the version anyways
+end
+
+module TeslaMaven
+
+  VERSION = '0.0.1'.freeze
+  
+  def self.home
+    File.expand_path( File.join( File.dirname( File.expand_path( __FILE__ ) ), '..' ) )
+  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

metadata

@@ -1,53 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
+  version: 3.1.0.0
   prerelease:
-  version: 3.0.4.1.4
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: maven-tools
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.14.6
-    - - !binary |-
-        PA==
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.33'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
-    - - !binary |-
-        PA==
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.33'
     none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: maven-tools
+  name: ruby-maven-libs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.3
+        version: 3.1.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.3
+        version: 3.1.0
     none: false
   prerelease: false
   type: :runtime
@@ -55,15 +47,15 @@ dependencies:
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
     none: false
   prerelease: false
   type: :development
@@ -71,118 +63,64 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
     none: false
   prerelease: false
   type: :development
-description: maven support for rubygems based on maven 3.0. it allows to use xyz.gemspec file as pom file or the usual pom.xml files. with a rails3 application with a Gemfile (suitable for jruby). you need java installed or jruby but it will run with MRI (without installed jruby) since the maven will take care of the jruby to use.
+description: maven support for ruby based on tesla maven. MRI needs java/javac command installed.
 email:
 - m.kristian@web.de
 executables:
 - rmvn
 extensions: []
-extra_rdoc_files:
-- NOTICE.txt
-- LICENSE.txt
-- README.txt
-- MIT-LICENSE
+extra_rdoc_files: []
 files:
-- LICENSE.txt
-- NOTICE.txt
-- README.txt
-- bin/mvnDebug.bat
-- bin/mvn
-- bin/mvn.bat
-- bin/mvnyjp
-- bin/mvnDebug
 - bin/rmvn
 - bin/m2.conf
-- boot/plexus-classworlds-2.4.jar
-- conf/settings.xml
-- lib/maven-settings-3.0.4.jar
-- lib/sisu-guava-0.9.9.jar
-- lib/wagon-http-2.2-shaded.jar
-- lib/aether-api-1.13.1.jar
-- lib/plexus-component-annotations-1.5.5.jar
-- lib/aether-spi-1.13.1.jar
-- lib/maven-repository-metadata-3.0.4.jar
-- lib/maven-compat-3.0.4.jar
-- lib/maven-core-3.0.4.jar
-- lib/aether-impl-1.13.1.jar
-- lib/plexus-cipher-1.7.jar
-- lib/plexus-utils-2.0.6.jar
-- lib/maven-artifact-3.0.4.jar
-- lib/maven-model-builder-3.0.4.jar
-- lib/sisu-inject-bean-2.3.0.jar
-- lib/maven-aether-provider-3.0.4.jar
-- lib/wagon-provider-api-2.2.jar
-- lib/maven-settings-builder-3.0.4.jar
-- lib/maven-model-3.0.4.jar
-- lib/maven-plugin-api-3.0.4.jar
-- lib/plexus-interpolation-1.14.jar
-- lib/aether-connector-wagon-1.13.1.jar
-- lib/wagon-file-2.2.jar
-- lib/aether-util-1.13.1.jar
-- lib/maven-embedder-3.0.4.jar
-- lib/commons-cli-1.2.jar
-- lib/sisu-guice-3.1.0-no_aop.jar
-- lib/plexus-sec-dispatcher-1.3.jar
-- lib/sisu-inject-plexus-2.3.0.jar
-- lib/ext/README.txt
-- lib/ruby/ruby_maven.rb
-- lib/ruby/ruby-maven.rb
-- lib/ruby/maven/cli.rb~
-- lib/ruby/maven/ruby_maven.rb~
-- lib/ruby/maven/cucumber_steps.rb~
-- lib/ruby/maven/ruby_cli.rb~
-- lib/ruby/maven/ruby.rb
-- lib/ruby/maven/pom_magic.rb~
-- lib/ruby/maven/ruby/pom_magic.rb
-- lib/ruby/maven/ruby/Mavenfile~
-- lib/ruby/maven/ruby/cli.rb~
-- lib/ruby/maven/ruby/version.rb
-- lib/ruby/maven/ruby/cli.rb
-- lib/ruby/maven/ruby/pom_magic.rb~
-- lib/ruby/maven/ruby/version.rb~
-- lib/ruby/maven/ruby/maven.rb
-- lib/ruby/maven/ruby/Mavenfile
-- lib/ruby/maven/ruby/maven.rb~
-- MIT-LICENSE
-homepage: http://github.com/mkristian/ruby-maven
+- ext/ruby/maven-tools-0.33.0.jar
+- ext/ruby/tesla-polyglot-ruby-0.0.1-SNAPSHOT.jar
+- ruby/ruby-maven.rb
+- ruby/tesla_maven.rb
+- ruby/ruby_maven.rb
+- ruby/maven/ruby.rb
+- ruby/maven/ruby/version.rb
+- ruby/maven/ruby/maven.rb
+- ruby/maven/ruby/tasks.rb
+- lib/tesla-polyglot-common-0.0.1-SNAPSHOT.jar
+- lib/tesla-polyglot-cli-0.0.1-SNAPSHOT.jar
+homepage: https://github.com/tesla/tesla-polyglot/tree/master/tesla-polyglot-gem
 licenses:
-- MIT
+- EPL
 post_install_message:
 rdoc_options:
-- "--main"
+- --main
 - README.md
 require_paths:
-- lib/ruby
+- ruby
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: maven support for ruby projects with gemspec, Gemfile
+summary: maven support for ruby projects
 test_files: []