naether 0.11.1 → 0.12.0

data/Gemfile.lock

@@ -1,28 +1,60 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    jeweler (1.8.4)
+    addressable (2.3.5)
+    builder (3.2.2)
+    diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.5)
-    kramdown (0.14.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    kramdown (1.2.0)
+    multi_json (1.8.0)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
     rjb (1.4.8)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    yard (0.8.2.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,7 @@
 # Naether
 
+[![Build Status](https://travis-ci.org/mguymon/naether.png?branch=master)](https://travis-ci.org/mguymon/naether)
+
 Naether is a Java Dependency Resolver using Maven's [Aether](https://github.com/sonatype/sonatype-aether) 
 that can be used by Ruby or Java.
 
@@ -11,7 +13,7 @@ that can be used by Ruby or Java.
 
 ### Ruby
 
-JRuby 1.6.8 is natively supported. 1.9.3 uses [Rjb](http://rjb.rubyforge.org) to proxy over JNI.
+JRuby is natively supported. Vanilla Ruby uses [Rjb](http://rjb.rubyforge.org) to proxy over JNI.
 
     gem install naether
     
@@ -22,7 +24,7 @@ The jar dependencies for Naether will automatically be downloaded when the gem i
     <dependency>
       <groupId>com.tobedevoured.naether</groupId>
       <artifactId>naether</artifactId>
-      <version>0.10.0</version>
+      <version>0.12.0</version>
     </dependency>
    
 May have to add the Sonatype Repo if the sync to Maven Central is slow.

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.12.0

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/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

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: naether
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 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: rjb
@@ -186,7 +186,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- core-0.11.1.jar
+- core-0.12.0.jar
 - jar_dependencies.yml
 - lib/naether.rb
 - lib/naether/bootstrap.rb
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -727109738576140739
+      hash: 3696932954984177963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: