naether 0.2.6-java → 0.3.0-java

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.0

data/jar_dependencies.yml

@@ -1,37 +1,35 @@
 --- 
 :dependencies: 
-- ch.qos.logback:logback-classic:jar:0.9.24
-- ch.qos.logback:logback-core:jar:0.9.24
-- org.slf4j:slf4j-api:jar:1.6.1
-- org.slf4j:jcl-over-slf4j:jar:1.6.1
-- org.slf4j:log4j-over-slf4j:jar:1.6.1
-- org.codehaus.plexus:plexus-utils:jar:1.5.8
-- org.apache.maven:maven-model-v3:jar:2.0
-- org.codehaus.plexus:plexus-container-default:jar:1.5.5
-- org.codehaus.plexus:plexus-classworlds:jar:2.2.2
-- org.apache.xbean:xbean-reflect:jar:3.4
-- com.google.collections:google-collections:jar:1.0
-- org.sonatype.aether:aether-api:jar:1.11
-- org.sonatype.aether:aether-util:jar:1.11
-- org.sonatype.aether:aether-impl:jar:1.11
-- org.sonatype.aether:aether-spi:jar:1.11
-- org.sonatype.aether:aether-connector-file:jar:1.11
-- org.sonatype.aether:aether-connector-asynchttpclient:jar:1.11
-- com.ning:async-http-client:jar:1.6.1
-- org.jboss.netty:netty:jar:3.2.4.Final
-- org.sonatype.aether:aether-connector-wagon:jar:1.11
-- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6
-- org.apache.maven:maven-aether-provider:jar:3.0.2
-- org.apache.maven:maven-model:jar:3.0.2
-- org.apache.maven:maven-model-builder:jar:3.0.2
-- org.codehaus.plexus:plexus-interpolation:jar:1.14
-- org.apache.maven:maven-repository-metadata:jar:3.0.2
-- org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
-- org.apache.maven.wagon:wagon-ssh:jar:1.0-beta-7
-- com.jcraft:jsch:jar:0.1.38
-- org.apache.maven.wagon:wagon-ssh-common:jar:1.0-beta-7
-- org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-6
-- org.apache.maven.wagon:wagon-http-lightweight:jar:1.0-beta-7
-- org.apache.maven.wagon:wagon-http-shared:jar:1.0-beta-7
-- nekohtml:xercesMinimal:jar:1.9.6.2
-- nekohtml:nekohtml:jar:1.9.6.2
+  - com.jcraft:jsch:jar:0.1.38
+  - com.ning:async-http-client:jar:1.6.1
+  - org.apache.xbean:xbean-reflect:jar:3.4
+  - org.jboss.netty:netty:jar:3.2.4.Final
+  - com.google.collections:google-collections:jar:1.0
+  - ch.qos.logback:logback-classic:jar:0.9.24
+  - ch.qos.logback:logback-core:jar:0.9.24
+  - org.slf4j:slf4j-api:jar:1.6.1
+  - org.slf4j:jcl-over-slf4j:jar:1.6.1
+  - org.slf4j:log4j-over-slf4j:jar:1.6.1
+  - org.sonatype.aether:aether-api:jar:1.11
+  - org.sonatype.aether:aether-util:jar:1.11
+  - org.sonatype.aether:aether-impl:jar:1.11
+  - org.sonatype.aether:aether-spi:jar:1.11
+  - org.sonatype.aether:aether-connector-file:jar:1.11
+  - org.sonatype.aether:aether-connector-asynchttpclient:jar:1.11
+  - org.sonatype.aether:aether-connector-wagon:jar:1.11
+  - org.apache.maven:maven-model-v3:jar:2.0
+  - org.apache.maven:maven-aether-provider:jar:3.0.2
+  - org.apache.maven:maven-model:jar:3.0.2
+  - org.apache.maven:maven-model-builder:jar:3.0.2
+  - org.apache.maven:maven-repository-metadata:jar:3.0.2
+  - org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-6
+  - org.apache.maven.wagon:wagon-ssh-common:jar:1.0-beta-7
+  - org.apache.maven.wagon:wagon-http-lightweight:jar:1.0-beta-7
+  - org.apache.maven.wagon:wagon-http-shared:jar:1.0-beta-7
+  - org.apache.maven.wagon:wagon-ssh:jar:1.0-beta-7
+  - org.codehaus.plexus:plexus-utils:jar:1.5.8
+  - org.codehaus.plexus:plexus-container-default:jar:1.5.5
+  - org.codehaus.plexus:plexus-classworlds:jar:2.2.2
+  - org.codehaus.plexus:plexus-component-annotations:jar:1.5.5
+  - org.codehaus.plexus:plexus-interpolation:jar:1.14
+  - org.codehaus.plexus:plexus-interactivity-api:jar:1.0-alpha-6

data/lib/naether.rb

@@ -14,6 +14,7 @@ class Naether
   JAR_LIB = "#{File.dirname(__FILE__)}/.."
   
   class << self
+    
     # Helper to determine the platform
     def platform
       $platform || RUBY_PLATFORM[/java/] || 'ruby'
@@ -24,6 +25,7 @@ class Naether
       Naether::Bootstrap.dependencies( dep_file )
     end
     
+    # Loads all jars from paths and creates a new instance of Naether
     def create_from_paths( deps_jar_dir, naether_jar_dir = nil )
       naether_jar_dir = naether_jar_dir || JAR_LIB
       Naether::Java.load_jars_dir( [deps_jar_dir, naether_jar_dir] )
@@ -31,6 +33,7 @@ class Naether
       Naether.new
     end
     
+    # Loads all jars creates a new instance of Naether
     def create_from_jars( jars )
       Naether::Java.load_jars( jars )
       
@@ -38,19 +41,19 @@ class Naether
     end
   end
   
-  #
-  # Create new instance
-  #
+  # Create new instance. Naether.create_from_paths and Naether.create_from_jars should be
+  # used instead of Naether.new
   def initialize()
     
     if Naether.platform == 'java'
-      @resolver = com.slackworks.Naether.new 
+      @resolver = com.slackworks.naether.Naether.new 
     else
-      naetherClass = Rjb::import('com.slackworks.Naether') 
+      naetherClass = Rjb::import('com.slackworks.naether.Naether') 
       @resolver = naetherClass.new
     end
   end
   
+  # Clear all remote repositories
   def clear_remote_repositories
     @resolver.clearRemoteRepositories()
   end
@@ -60,8 +63,21 @@ class Naether
     @resolver.addRemoteRepository( url )
   end
   
+  # Array of remote repositories
   def remote_repositories
-    @resolver.getRemoteRepositories()
+    if Naether.platform == 'java'
+      return @resolver.getRemoteRepositories()
+    else
+      return @resolver.getRemoteRepositories().toArray()
+    end 
+  end
+  
+  def local_repo_path
+    @resolver.getLocalRepoPath()
+  end
+  
+  def local_repo_path=( path )
+    @resolver.setLocalRepoPath( path )
   end
   
   # Add a dependency in the notation: groupId:artifactId:type:version
@@ -77,18 +93,17 @@ class Naether
   end
   
   # Get dependencies
-  def dependencies
+  def dependencies()
     if Naether.platform == 'java'
       return @resolver.getDependenciesNotation().to_a
     else
-      bootstrap = Rjb::import('com.slackworks.Bootstrap')
       return @resolver.getDependenciesNotation().toArray().map{ |dep| dep.toString() }
     end 
   end
   
   # Resolve dependencies, finding related additional dependencies
-  def resolve_dependencies
-    @resolver.resolveDependencies();
+  def resolve_dependencies( download_artifacts = true )
+    @resolver.resolveDependencies( download_artifacts );
     dependencies
   end
 end

data/lib/naether/bootstrap.rb

@@ -25,9 +25,9 @@ class Naether
         Naether::Java.load_jars_dir( jar_path || Naether::JAR_LIB )
         deps = {};
         if Naether.platform == 'java'
-          deps[:dependencies] = com.slackworks.Bootstrap.dependencies.to_a
+          deps[:dependencies] = com.slackworks.naether.Bootstrap.dependencies.to_a
         else
-          bootstrap = Rjb::import('com.slackworks.Bootstrap')
+          bootstrap = Rjb::import('com.slackworks.naether.Bootstrap')
           deps[:dependencies] = bootstrap.dependencies.toArray().map{ |dep| dep.toString() }
         end  
         

data/lib/naether/java.rb

@@ -20,9 +20,8 @@ class Naether
       end
     end
     
-    #
-    #
-    #
+  
+    # Loads all jars from the array of paths
     def self.load_jars_dir(paths)
       unless paths.is_a? Array
         paths = [paths]
@@ -30,16 +29,14 @@ class Naether
       
       jars = []
       paths.each do |path|
-        jars = jars + Dir.glob( "#{File.expand_path(path)}/*.jar")
+        jars = jars + Dir.glob( "#{File.expand_path(path)}/*.jar", File::FNM_CASEFOLD)
       end
       
       Naether::Java.load_jars(jars)
       
     end
     
-    #
-    # Load jars
-    #
+    # Load jars for the runtime platform
     def self.load_jars(jars)
       if Naether.platform == 'java'
         Naether::Java::JRuby.instance.load_jars(jars)
@@ -49,7 +46,7 @@ class Naether
     end
     
     #
-    # Handle loading for JRuby
+    # Handle loading jars for JRuby
     #
     class JRuby
       include Singleton

data/pom.xml

@@ -8,16 +8,8 @@
     <packaging>jar</packaging>
 
     <name>naether</name>
-    <url>http://maven.apache.org</url>
-
-    <repositories>
-        <repository>
-            <id>people.apache.org</id>
-            <name>Apache Snapshots</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-	</repositories>
-
+    <url>https://github.com/mguymon/naether</url>
+	
     <properties>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<aetherVersion>1.11</aetherVersion>

metadata

@@ -2,7 +2,7 @@
 name: naether
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.6
+  version: 0.3.0
 platform: java
 authors: 
   - Michael Guymon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency