naether 0.4.1-java → 0.4.2-java

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/naether.rb

@@ -85,6 +85,10 @@ class Naether
     @resolver.addDependency( notation, scope )
   end
   
+  def add_pom_dependencies( pom_path, scopes=['compile'] )
+    @resolver.addDependencies( pom_path, scopes )
+  end
+  
   # Add a dependency Java object
   def add_dependency( dependency )
     #@resolver.addDependency( dependency )
@@ -95,18 +99,35 @@ class Naether
     end
   end
   
-  # Set array of dependencies in the notation: groupId:artifactId:type:version
+  # Array of mixed dependencies
   def dependencies=(dependencies)
     @resolver.clearDependencies()
     dependencies.each do |dependent|
       # Hash of notation => scope
       if dependent.is_a? Hash
         key = dependent.keys.first
-        add_notation_dependency( key, dependent[key] )
         
-      # String notation with compile scope
+        # Add pom dependencies with scopes
+        if key =~ /\.xml$/i
+          add_pom_dependencies( key, dependeny[key] )
+          
+        # Add a dependency notation with scopes
+        else
+          add_notation_dependency( key, dependent[key] )
+        end
+        
       elsif dependent.is_a? String
-        add_notation_dependency( dependent, 'compile' )
+        
+        # Add pom dependencies with default scopes
+        if dependent =~ /\.xml$/i
+          add_pom_dependencies( dependent )
+          
+        # Add a dependency notation with compile scope
+        else
+          add_notation_dependency( dependent, 'compile' )
+        end
+      
+      # Add an Aether dependency
       else
         add_dependency( dependent )
       end
@@ -170,18 +191,17 @@ class Naether
   end
   
   def load_pom( file_path )
-    @project_instance = Naether::Java.create_maven_project
-    @project_instance.loadPOM( file_path )
+    @project_instance = Naether::Java.create_maven_project( file_path )
   end
   
-  # filePath to read the pom
-  #
-  def pom_dependencies( file_path=nil, scopes = nil )
+  def pom_dependencies( file_path=nil, scopes = nil)
     if file_path
       load_pom( file_path )
     end
+
+    deps = Naether::Java.maven_project_dependencies_notation( @project_instance, scopes )
     
-    Naether::Java.convert_to_ruby_array( @project_instance.getDependenciesNotation(scopes, true), true )
+    Naether::Java.convert_to_ruby_array( deps, true )
   end
   
   def pom_version( file_path=nil )

data/lib/naether/java.rb

@@ -45,12 +45,26 @@ class Naether
       end
     end
     
-    def self.create_maven_project
+    def self.create_maven_project(path = nil)
+      projectClass = nil
       if Naether.platform == 'java'
-        return com.slackworks.naether.maven.Project.new 
+        projectClass = com.slackworks.naether.maven.Project 
       else
         projectClass = Rjb::import('com.slackworks.naether.maven.Project') 
-        return projectClass.new
+      end
+      
+      unless path.nil?
+        projectClass.new( path )
+      else
+        projectClass.new
+      end
+    end
+    
+    def self.maven_project_dependencies_notation( instance, scopes = nil )
+      if Naether.platform == 'java'
+        instance.getDependenciesNotation(scopes, true)
+      else
+        instance._invoke('getDependenciesNotation', 'Ljava.util.List;boolean;', scopes, true)
       end
     end
     

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.slackworks</groupId>
     <artifactId>naether</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>naether</name>
     <url>https://github.com/mguymon/naether</url>

metadata

@@ -2,7 +2,7 @@
 name: naether
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: java
 authors: 
   - Michael Guymon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -04:00
+date: 2011-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -74,7 +74,6 @@ files:
   - lib/naether.rb
   - lib/naether/bootstrap.rb
   - lib/naether/java.rb
-  - naether-0.4.1.jar
   - pom.xml
 has_rdoc: true
 homepage: http://github.com/mguymon/naether