ruby-maven 3.1.0.0.1 → 3.1.1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 79bd459e51846e3410e134191ed92288b9a8bb07
+  data.tar.gz: 4c1afb5022a142a05e8be449e041d613f55cec58
+SHA512:
+  metadata.gz: 69d0e141f9009a7a5f46fb156502d213d71ad447a14964a5ef19fbca6fd94c22568496b6679dc058cd8da7dab2d369aae7b1b01e04d36c74b1f021a4d613b1cb
+  data.tar.gz: 977ea680ae3de2721ea969fb2d4b73c2cc0dacc47a9878257bd3ea76bce83f7d335a8a3cb4a7342c57ae5d0bfe20d78e4161dcee3f4b0cc56a6c3d00320a9dbe

data/bin/m2.conf

@@ -1,8 +1,9 @@
 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
+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

data/bin/m2jruby.conf

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

data/ruby/maven/ruby/maven.rb

@@ -19,9 +19,7 @@
 # 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'
@@ -35,84 +33,41 @@ module Maven
 
       private
 
-      def launch_jruby_embedded(args)
-        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" ) )
+                                      TeslaMaven.bin( "m2jruby.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 )
+        java.lang.System.setProperty( 'tesla.home', TeslaMaven.home )
+
         # loading here is needed to let tesla-ruby find jruby on
-        # classloader, though m2.conf does load those libs as well
+        # classloader
         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!
+        org.codehaus.plexus.classworlds.launcher.Launcher.main_with_exit_code( args )
       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())
+      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 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/
@@ -127,20 +82,15 @@ module Maven
           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
+          # parse project and write out to temp_pom file
           v.accept_project( project )
           # tell maven to use the generated file
           options[ '-f' ] = f
@@ -162,7 +112,7 @@ module Maven
 
       def verbose
         if @verbose.nil?
-          @verbose = options.delete('-Dverbose').to_s != 'false'
+          @verbose = options.delete('-Dverbose').to_s == 'true'
         else
           @verbose
         end
@@ -170,27 +120,38 @@ module Maven
 
       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? 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 )
         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
+          puts "using jruby #{JRUBY_VERSION} invokation" if verbose
+          result = launch_jruby( args )
         else
           puts "using java invokation" if verbose
-          launch_java(a)
+          result = launch_java( args )
+        end
+        if @embedded and not result
+          raise "error in executing maven #{result}"
+        else
+          result
         end
       end
 
       def method_missing( method, *args )
         method = method.to_s.gsub( /_/, '-' ).to_sym
-        exec( [ method ] + args )
+        exec( *([ method ] + args) )
       end
     end
   end

data/ruby/maven/ruby/version.rb

@@ -1,6 +1,7 @@
+require 'maven'
 module Maven
   module Ruby
-    MAVEN_VERSION = '3.1.0'
-    VERSION = MAVEN_VERSION + '.0.1'
+    MAVEN_VERSION = ::Maven::VERSION
+    VERSION = MAVEN_VERSION + '.0.0'
   end
 end

data/ruby/tesla_maven.rb

@@ -6,7 +6,7 @@ end
 
 module TeslaMaven
 
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.9'.freeze
   
   def self.home
     File.expand_path( File.join( File.dirname( File.expand_path( __FILE__ ) ), '..' ) )

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
-  version: 3.1.0.0.1
-  prerelease:
+  version: 3.1.1.0.0
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maven-tools
@@ -18,13 +17,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -33,14 +30,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    none: false
+        version: 3.1.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    none: false
+        version: 3.1.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,13 +45,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -66,13 +59,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   prerelease: false
   type: :development
 description: maven support for ruby based on tesla maven. MRI needs java/javac command installed.
@@ -84,9 +75,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rmvn
+- bin/m2jruby.conf
 - bin/m2.conf
-- ext/ruby/maven-tools-0.33.1-SNAPSHOT.jar
-- ext/ruby/tesla-polyglot-ruby-0.0.1-SNAPSHOT.jar
+- ext/ruby/maven-tools-0.34.1.jar
+- ext/ruby/tesla-polyglot-ruby-0.0.9.jar
 - ruby/ruby-maven.rb
 - ruby/tesla_maven.rb
 - ruby/ruby_maven.rb
@@ -94,11 +86,12 @@ files:
 - 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
+- lib/tesla-polyglot-cli-0.0.9.jar
+- lib/tesla-polyglot-common-0.0.9.jar
 homepage: https://github.com/tesla/tesla-polyglot/tree/master/tesla-polyglot-gem
 licenses:
 - EPL
+metadata: {}
 post_install_message:
 rdoc_options:
 - --main
@@ -110,17 +103,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: maven support for ruby projects
 test_files: []