naether 0.11.1-java → 0.12.0-java

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Fri Sep 27 17:59:42 2013 by
+  Generated on Tue Oct 01 15:16:15 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.2 (ruby-1.9.3).
 </div>

data/jar_dependencies.yml

@@ -5,6 +5,7 @@
 - com.jcraft:jsch:jar:0.1.44-1
 - com.ning:async-http-client:jar:1.6.5
 - commons-io:commons-io:jar:2.0.1
+- org.apache.maven.shared:maven-invoker:jar:2.1.1
 - org.apache.maven:maven-aether-provider:jar:3.0.3
 - org.apache.maven:maven-model:jar:3.0.3
 - org.apache.maven:maven-model-builder:jar:3.0.3
@@ -19,7 +20,7 @@
 - org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
 - org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-6
 - org.codehaus.plexus:plexus-interpolation:jar:1.14
-- org.codehaus.plexus:plexus-utils:jar:2.0.7
+- org.codehaus.plexus:plexus-utils:jar:3.0.8
 - org.jsoup:jsoup:jar:1.6.1
 - org.slf4j:slf4j-api:jar:1.6.6
 - org.slf4j:jcl-over-slf4j:jar:1.6.6

data/lib/naether/java/ruby.rb

@@ -23,7 +23,15 @@ module Naether
               
         # Call Rjb::load with an empty classpath, incase Rjb::load has already been called
         java_opts = (ENV['JAVA_OPTS'] || ENV['JAVA_OPTIONS']).to_s.split
-        Rjb::load("", java_opts)
+
+        begin
+          Rjb::load("", java_opts)
+        rescue StandardError => e
+          if e.message == "can't create Java VM"
+            puts "RJB was unable to find JVM, try setting JAVA_HOME env"
+          end
+          raise e
+        end
         
         @loaded_paths = []
         load_paths( naether_jar )

data/lib/naether/maven.rb

@@ -82,17 +82,14 @@ module Naether
           deps = @project.getDependenciesNotation( scopes )
         end
         
+      elsif scopes
+        list = Naether::Java.convert_to_java_list( scopes )
+
+        deps = @project._invoke('getDependenciesNotation', 'Ljava.util.List;', list)
       else
-        list = nil
-        if scopes
-          list = Naether::Java.convert_to_java_list( scopes )
-          
-          deps = @project._invoke('getDependenciesNotation', 'Ljava.util.List;', list)
-        else
-          deps = @project.getDependenciesNotation()
-        end
-        
+        deps = @project.getDependenciesNotation()
       end
+
       
       Naether::Java.convert_to_ruby_array( deps, true )
     end
@@ -148,5 +145,23 @@ module Naether
     def write_pom( file_path )
       @project.writePom( file_path )
     end
+
+    def invoke( *opts )
+      #defaults
+      config = {
+        :maven_home => ENV['maven.home'] || '/usr/share/maven',
+        :local_repo => File.expand_path('~/.m2/repository')
+      }
+
+      if opts.last.is_a? Hash
+        config = defaults.merge( opts.pop )
+      end
+      goals = opts
+
+      pom = @project.getPomFile().getAbsolutePath()
+
+      invoker = Naether::Java.create("com.tobedevoured.naether.maven.Invoker", config[:local_repo], config[:maven_home] )
+      invoker.execute( pom, Naether::Java.convert_to_java_list(goals) )
+    end
   end
 end

data/naether.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "naether"
-  s.version = "0.11.1"
+  s.version = "0.12.0"
   s.platform = "java"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = "2013-09-27"
+  s.date = "2013-10-01"
   s.description = "Java dependency resolver using Maven's Aether"
   s.email = "michael@tobedevoured.com"
   s.extensions = ["Rakefile"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "core-0.11.1.jar",
+    "core-0.12.0.jar",
     "doc/Naether.html",
     "doc/Naether/Bootstrap.html",
     "doc/Naether/Configurator.html",

data/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.tobedevoured.naether</groupId>
     <artifactId>core</artifactId>
-    <version>0.11.1</version>
+    <version>0.12.0</version>
     <name>Naether</name>
     <packaging>jar</packaging>
     <url>https://github.com/mguymon/naether</url>
@@ -70,6 +70,13 @@
             <version>${org.slf4j.version}</version>
         </dependency>
 
+        <!-- Maven Invoker -->
+        <dependency>
+            <groupId>org.apache.maven.shared</groupId>
+            <artifactId>maven-invoker</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
         <!-- Aeth -->
         <dependency>
             <groupId>org.sonatype.aether</groupId>
@@ -137,8 +144,14 @@
         <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
+            <artifactId>junit-dep</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
             <scope>test</scope>
         </dependency>
 
@@ -204,6 +217,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>target/dependencies</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
 

metadata

@@ -2,14 +2,14 @@
 name: naether
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.11.1
+  version: 0.12.0
 platform: java
 authors:
 - Michael Guymon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -186,7 +186,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- core-0.11.1.jar
+- core-0.12.0.jar
 - doc/Naether.html
 - doc/Naether/Bootstrap.html
 - doc/Naether/Configurator.html