naether 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/jar_dependencies.yml

@@ -1,36 +1,36 @@
 --- 
 :dependencies: 
-- 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.apache.maven.wagon:wagon-file: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
+  - 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.apache.maven.wagon:wagon-file: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

@@ -85,19 +85,48 @@ class Naether
   end
   
   # Add a dependency in the notation: groupId:artifactId:type:version
-  def add_dependency( notation )
-    @resolver.addDependency( notation )
+  def add_notation_dependency( notation, scope='compile' )
+    @resolver.addDependency( notation, scope )
+  end
+  
+  # Add a dependency 
+  def add_dependency( dependency )
+    #@resolver.addDependency( dependency )
+    if Naether.platform == 'java'
+      @resolver.addDependency( dependency )
+    else
+      @resolver._invoke('addDependency', 'Lorg.sonatype.aether.graph.Dependency;', dependency)
+    end
   end
   
   # Set array of dependencies in the notation: groupId:artifactId:type:version
   def dependencies=(dependencies)
+    @resolver.clearDependencies()
     dependencies.each do |dependent|
-      add_dependency( 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
+      elsif dependent.is_a? String
+        add_notation_dependency( dependent, 'compile' )
+      else
+        add_dependency( dependent )
+      end
     end
   end
   
   # Get dependencies
   def dependencies()
+    if Naether.platform == 'java'
+      return @resolver.getDependencies().to_a
+    else
+      return @resolver.getDependencies().toArray()
+    end 
+  end
+  
+  def dependenciesNotation()
     if Naether.platform == 'java'
       return @resolver.getDependenciesNotation().to_a
     else
@@ -108,7 +137,7 @@ class Naether
   # Resolve dependencies, finding related additional dependencies
   def resolve_dependencies( download_artifacts = true )
     @resolver.resolveDependencies( download_artifacts );
-    dependencies
+    dependenciesNotation
   end
   
   def deploy_artifact( notation, file_path, url, opts = {} )
@@ -145,7 +174,7 @@ class Naether
       @project_instance = projectClass.new
     end
     
-    @project_instance.setNotation( notation )
+    @project_instance.setProjectNotation( notation )
     
     dependencies().each do |notation|
       @project_instance.addDependency( notation )

data/pom.xml

@@ -114,21 +114,6 @@
 		    <artifactId>wagon-file</artifactId>
 		    <version>${wagonVersion}</version>
 		</dependency>
-
-	
-		<!-- exclude commons logging -->
-	    <dependency>
-	        <groupId>commons-logging</groupId>
-	        <artifactId>commons-logging</artifactId>
-	        <version>1.1.1</version>
-	        <scope>provided</scope>
-	    </dependency>
-	    <dependency>
-	        <groupId>commons-logging</groupId>
-	        <artifactId>commons-logging-api</artifactId>
-	        <version>1.1</version>
-	        <scope>provided</scope>
-	    </dependency>
 	
 	  	<!-- Test Scope -->
 	    <dependency>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: naether
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Michael Guymon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency