naether 0.6.1-java → 0.7.0-java

data/README.rdoc

@@ -1,14 +1,23 @@
 = Naether
 
-Naether is a Java Dependency Resolver using Maven's {Aether}[https://github.com/sonatype/sonatype-aether]
+Naether is a Java Dependency Resolver using Maven's {Aether}[https://github.com/sonatype/sonatype-aether] 
+that can be used by Ruby or Java.
 
 https://github.com/mguymon/naether
 
-
 === Install
 
-gem install naether
+==== Ruby
+
+  gem install naether
+
+==== Java
 
+  <dependency>
+    <groupId>com.slackworks</groupId>
+    <artifactId>naether</artifactId>
+    <version>0.7.0</version>
+  </dependency>
 
 === About
 

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/naether/bootstrap.rb

@@ -105,7 +105,7 @@ class Naether
         local_repo = local_repo || ENV['M2_REPO'] || File.expand_path('~/.m2/repository')
         local_repo = File.expand_path(local_repo)
         
-        puts "Checking #{local_repo} for jars to bootstrap Naether"
+        #puts "Checking #{local_repo} for jars to bootstrap Naether"
         
         deps = {:exists => [], :missing => [] }
         

data/lib/naether/java.rb

@@ -27,7 +27,6 @@ class Naether
       instance.java.loaded_jars
     end
     
-  
     # Loads all jars from the array of paths
     def self.load_jars_dir(paths)
       unless paths.is_a? Array
@@ -48,12 +47,22 @@ class Naether
       instance.java.load_jars(jars)
     end
     
-    def self.set_log_level( level )
-      instance.java.set_log_level( level )
+    # Paths loaded
+    def self.loaded_paths
+      instance.java.loaded_paths
     end
     
-    def self.create( java_class, *args )
-      instance.java.create( java_class, *args )
+    # Load paths for the runtime platform
+    def self.load_paths(paths)
+      instance.java.load_paths(paths)
+    end
+    
+    def self.create( target_class, *args )
+      instance.java.create( target_class, *args )
+    end
+    
+    def self.java_class( target_class ) 
+      instance.java.java_class( target_class )
     end
     
     def self.convert_to_ruby_array( java_array, to_string = false )
@@ -70,25 +79,44 @@ class Naether
     class JRuby
       include Singleton
       
-      attr_reader :loaded_jars
+      attr_reader :loaded_jars, :loaded_paths
       
       def initialize
         require 'java'
         
         @loaded_jars = []
+        @loaded_paths = []
       end
       
-      def create( java_class, *args )
-        java_class = eval(java_class)
+      def create( target_class, *args )
+        java_class = java_class(target_class)
         java_class.new( *args )
       end
       
-      def set_log_level( level )
-        com.slackworks.naether.LogUtil.changeLevel( 'com.slackworks', level )
+      def java_class( target_class ) 
+        eval(target_class)
+      end
+      
+      def load_paths(paths)
+        load_paths = []
+        unless paths.is_a? Array
+          paths = [paths]
+        end
+        
+        paths.each do |path|
+          expanded_path = File.expand_path(path)
+          if !@loaded_paths.include? expanded_path
+            $CLASSPATH << expanded_path
+            load_paths << expanded_path
+            @loaded_paths << expanded_path
+          end
+        end
+        
+        load_paths
       end
       
       def load_jars(jars)
-        loaded_jars = []
+        load_jars = []
         unless jars.is_a? Array
           jars = [jars]
         end
@@ -97,12 +125,12 @@ class Naether
           expanded_jar = File.expand_path(jar)
           if !@loaded_jars.include? expanded_jar
             require expanded_jar
-            loaded_jars << expanded_jar
+            load_jars << expanded_jar
             @loaded_jars << expanded_jar
           end
         end
         
-        loaded_jars
+        load_jars
       end
       
       def convert_to_ruby_array( java_array, to_string = false )
@@ -121,7 +149,7 @@ class Naether
     class Ruby
       include Singleton
       
-      attr_reader :loaded_jars
+      attr_reader :loaded_jars, :loaded_paths
       
       def initialize()
         require 'rjb' 
@@ -131,15 +159,35 @@ class Naether
         Rjb::load("", java_opts)
         
         @loaded_jars = []
+        @loaded_paths = []
       end
       
-      def create( java_class, *args )
-        java_class = Rjb::import(java_class) 
-        java_class.new( *args )
+      def create( target_class, *args )
+        target_class = java_class(target_class) 
+        target_class.new( *args )
       end
       
-      def set_log_level( level )
-        Rjb::import('com.slackworks.naether.LogUtil').changeLevel( 'com.slackworks', level )
+      def java_class( target_class ) 
+        Rjb::import( target_class )
+      end
+      
+      def load_paths(paths)
+        loadable_paths = []
+        unless paths.is_a? Array
+          paths = [paths]
+        end
+        
+        paths.each do |path|
+          expanded_path = File.expand_path(path)
+          if !@loaded_paths.include? expanded_path
+            @loaded_paths << expanded_path
+            loadable_paths << expanded_path
+          end
+        end
+        
+        Rjb::load(loadable_paths.join(File::PATH_SEPARATOR))
+        
+        loadable_paths
       end
       
       def load_jars(jars)

data/lib/naether.rb

@@ -51,18 +51,13 @@ class Naether
       
       Naether.new
     end
+    
   end
   
   # Create new instance. Naether.create_from_paths and Naether.create_from_jars should be
   # used instead of Naether.new to ensure the dependencies for Naether are set into the classpath
-  def initialize()
-    
-    if Naether.platform == 'java'
-      @resolver = com.slackworks.naether.Naether.new 
-    else
-      naetherClass = Rjb::import('com.slackworks.naether.Naether') 
-      @resolver = naetherClass.new
-    end
+  def initialize
+    @resolver = Naether::Java.create('com.slackworks.naether.Naether')
   end
   
   # Clear all remote repositories
@@ -94,6 +89,39 @@ class Naether
     @resolver.setLocalRepoPath( path )
   end
   
+  def add_build_artifact( notation, path, pom = nil )
+    @resolver.addBuildArtifact(notation, path, pom )
+  end
+  
+  def build_artifacts=( artifacts )
+    @resolver.clearBuildArtifacts()
+    
+    unless artifacts.is_a? Array
+      artifacts = [artifacts]
+    end
+    
+    artifacts.each do |artifact|
+      # Hash of notation => path or notation => { :path =>, :pom => }
+      if artifact.is_a? Hash
+        
+        notation, opts = artifact.shift
+        
+        if opts.is_a? Hash
+          @resolver.add_build_artifact( notation, opts[:path], opts[:pom] )
+        else
+          @resolver.add_build_artifact( notation, opts )
+        end
+        
+      else
+        raise "invalid build_artifacts format" 
+      end
+    end
+  end
+  
+  def build_artifacts
+    Naether::Java.convert_to_ruby_array( @resolver.getBuildArtifacts() )
+  end
+  
   # Add a dependency in the notation: groupId:artifactId:type:version
   def add_notation_dependency( notation, scope='compile' )
     @resolver.addDependency( notation, scope )
@@ -328,4 +356,8 @@ class Naether
     @project_instance.writePom( file_path )
     
   end
+
+  def set_log_level( level )
+    Naether::Java.java_class('com.slackworks.naether.LogUtil').changeLevel( 'com.slackworks', level )
+  end
 end

data/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.slackworks</groupId>
     <artifactId>naether</artifactId>
-    <version>0.6.1</version>
+    <version>0.7.0</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.6.1
+  version: 0.7.0
 platform: java
 authors: 
   - Michael Guymon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 -04:00
+date: 2012-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ files:
   - lib/naether.rb
   - lib/naether/bootstrap.rb
   - lib/naether/java.rb
-  - naether-0.6.1.jar
+  - naether-0.7.0.jar
   - pom.xml
 has_rdoc: true
 homepage: http://github.com/mguymon/naether