buildr-resolver 0.3.3 → 0.3.4

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "naether", "0.3.2"
+gem "naether", "0.3.3"
 gem "buildr",  ">= 1.4.4"
 
 group :development do

data/README.rdoc

@@ -62,54 +62,6 @@ all the additional dependencies for it. If you added a <tt>puts dep</tt> after <
 	org.springframework.osgi:spring-osgi-io:jar:1.2.1
 
 
-You can also manually exclude dependencies as an optional parameter to <tt>Buildr::Resolver.resolve</tt>. The exclusions
-are regex matched, so you can pass in only a groupId or the full dependency notation.
-
-example +buildfile+ with exclusions
-
-    require 'buildr/resolver'
-    Java.load # must be called before Buildr::Resolver.resolve if using Ruby due to Rjb startup of JVM by Buildr
-    deps = ['org.apache.activemq:activemq-spring:jar:5.4.2']
-    excluded = ['commons-logging', 'log4j', 'logkit' ]
-    deps =  Buildr::Resolver.resolve( deps, excluded )
-    define 'example' do
-        project.version = '0.1.0'
-        compile.with deps
-        package :jar
-    end
-
-Will result in the following, excluding commons-logging:commons-logging-api:jar:1.1, commons-logging:commons-logging:jar:1.1
-log4j:log4j:jar:1.2.12, and logkit:logkit:jar:1.0.1
-
-    org.apache.activemq:activemq-spring:jar:5.4.2
-    org.apache.activemq:activemq-core:jar:5.4.2
-    org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
-    org.apache.activemq:activeio-core:jar:3.1.2
-    avalon-framework:avalon-framework:jar:4.1.3
-    javax.servlet:servlet-api:jar:2.3
-    org.apache.activemq:kahadb:jar:5.4.2
-    org.apache.activemq.protobuf:activemq-protobuf:jar:1.1
-    org.osgi:org.osgi.core:jar:4.1.0
-    org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar:1.0.1
-    org.springframework:spring-context:jar:3.0.3.RELEASE
-    org.springframework:spring-aop:jar:3.0.3.RELEASE
-    aopalliance:aopalliance:jar:1.0
-    org.springframework:spring-expression:jar:3.0.3.RELEASE
-    org.springframework:spring-asm:jar:3.0.3.RELEASE
-    commons-net:commons-net:jar:2.0
-    org.jasypt:jasypt:jar:1.6
-    commons-lang:commons-lang:jar:2.1
-    commons-codec:commons-codec:jar:1.1
-    com.ibm.icu:icu4j:jar:4.0.1
-    org.apache.activemq:activemq-pool:jar:5.4.2
-    org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0.1
-    commons-pool:commons-pool:jar:1.5.4
-    org.springframework:spring-beans:jar:3.0.3.RELEASE
-    org.springframework:spring-core:jar:3.0.3.RELEASE
-    org.springframework:spring-test:jar:3.0.3.RELEASE
-    org.springframework.osgi:spring-osgi-core:jar:1.2.1
-    org.springframework.osgi:spring-osgi-io:jar:1.2.1
-
 == License
 
 Licensed to the Apache Software Foundation (ASF) under one or more

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/buildr-resolver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-resolver}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-14}
   s.description = %q{Java dependency resolver  for Buildr using Maven's Aether}
   s.email = %q{michael.guymon@gmail.com}
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -42,20 +41,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<naether>, ["= 0.3.2"])
+      s.add_runtime_dependency(%q<naether>, ["= 0.3.3"])
       s.add_runtime_dependency(%q<buildr>, [">= 1.4.4"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
     else
-      s.add_dependency(%q<naether>, ["= 0.3.2"])
+      s.add_dependency(%q<naether>, ["= 0.3.3"])
       s.add_dependency(%q<buildr>, [">= 1.4.4"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     end
   else
-    s.add_dependency(%q<naether>, ["= 0.3.2"])
+    s.add_dependency(%q<naether>, ["= 0.3.3"])
     s.add_dependency(%q<buildr>, [">= 1.4.4"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/buildr/resolver.rb

@@ -10,19 +10,26 @@ module Buildr
         Buildr::Resolver::Java.instance.naether
       end
       
-      # Resolve dependencies for an array of dependencies
+      # Resolve dependencies for an array of dependencies in the format of 'groupId:artifactId:type:version'
+      # or as a hash to define the scope, 'groupId:artifactId:type:version' => 'compile'. Example:
       #
-      # excludes is an array of dependencies to exclude
-      # repos is an array of {:url => '', :username => '', :password => '' } of additional remote repos
-      # with authentication
-      def resolve( dependencies, excludes=[], repos = [] )
+      # [ 'ch.qos.logback:logback-classic:jar:0.9.24', {'junit:junit:jar:4.8.2' => 'test'} ] 
+      #
+      # Options
+      #   * :excludes - an array of dependencies to regex exclude
+      #   * :repos - an array of {:url => '', :username => '', :password => '' } of additional remote repos that require auth
+      def resolve( dependencies, opts = {} )
+        
+        options = opts
+        
         if Buildr.repositories.remote.size > 0
           naether.clear_remote_repositories
           Buildr.repositories.remote.each do |repo|
             naether.add_remote_repository( repo )
           end
           
-          unless repos.nil?
+          unless options[:repos].nil?
+            repos = options[:repos]
             unless repos.is_a? Array
               repos = [repos]
             end
@@ -38,17 +45,26 @@ module Buildr
         naether.dependencies = dependencies
         naether.resolve_dependencies( false )
         
-        dependences = naether.dependencies
-        
-        unless excludes.nil?
+        unless options[:excludes].nil?
+          
+          excludes = options[:excludes]
+          
           unless excludes.is_a? Array
             excludes = [excludes]
           end
           
-          dependences.delete_if do |dep|
-            excludes.select { |exclude| dep.to_s =~ /^#{exclude}/ }.size > 0
+          dependencies = naether.dependencies
+          dependencies.delete_if do |dep|
+            excludes.select do |exclude| 
+              dep.toString() =~ /^#{exclude}/
+            end.size > 0
           end
+          
+          naether.dependencies = dependencies
+          
         end
+        
+        naether.dependenciesNotation
       end
       
       def deploy_artifact( notation, file_path, url, opts = {} )

data/spec/resolver_spec.rb

@@ -13,13 +13,13 @@ describe Buildr::Resolver do
     end
     
     it "should resolve dependencies with exclusions" do
-      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], ['ch.qos.logback:logback-classic'] )
+      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], { :excludes => ['ch.qos.logback:logback-classic'] } )
       dependencies.should eql ["ch.qos.logback:logback-core:jar:0.9.24", "org.slf4j:slf4j-api:jar:1.6.0"]
       
-      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], ['org.slf4j'] )
+      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], { :excludes => ['org.slf4j'] } )
       dependencies.should eql ["ch.qos.logback:logback-classic:jar:0.9.24","ch.qos.logback:logback-core:jar:0.9.24"]
       
-      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], ['ch.qos.logback:logback-classic:jar:0.9.24', 'ch.qos.logback:logback-core:jar:0.9.24'] )
+      dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'], { :excludes => ['ch.qos.logback:logback-classic:jar:0.9.24', 'ch.qos.logback:logback-core:jar:0.9.24'] } )
       dependencies.should eql ["org.slf4j:slf4j-api:jar:1.6.0"]
     end
     

metadata

@@ -2,7 +2,7 @@
 name: buildr-resolver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
   - Michael Guymon
@@ -10,7 +10,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 
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.3.2
+            version: 0.3.3
     requirement: *id001
     prerelease: false
     type: :runtime
@@ -79,7 +79,6 @@ extra_rdoc_files:
   - README.rdoc
 files: 
   - Gemfile
-  - Gemfile.lock
   - LICENSE
   - README.rdoc
   - Rakefile

data/Gemfile.lock

@@ -1,75 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    atoulme-Antwrap (0.7.1)
-      rjb (>= 1.0.3)
-    atoulme-Antwrap (0.7.1-java)
-    bouncy-castle-java (1.5.0145.2)
-    builder (2.1.2)
-    buildr (1.4.4)
-      atoulme-Antwrap (= 0.7.1)
-      builder (= 2.1.2)
-      highline (= 1.5.1)
-      hoe (= 2.3.3)
-      json_pure (= 1.4.3)
-      minitar (= 0.5.3)
-      net-sftp (= 2.0.4)
-      net-ssh (= 2.0.23)
-      rake (= 0.8.7)
-      rjb (= 1.3.3)
-      rspec (~> 1.3.1)
-      rubyforge (= 2.0.3)
-      rubyzip (= 0.9.1)
-      xml-simple (= 1.0.12)
-    buildr (1.4.4-java)
-      atoulme-Antwrap (= 0.7.1)
-      builder (= 2.1.2)
-      highline (= 1.5.1)
-      hoe (= 2.3.3)
-      jruby-openssl (>= 0.7)
-      json_pure (= 1.4.3)
-      minitar (= 0.5.3)
-      net-sftp (= 2.0.4)
-      net-ssh (= 2.0.23)
-      rake (= 0.8.7)
-      rspec (~> 1.3.1)
-      rubyforge (= 2.0.3)
-      rubyzip (= 0.9.1)
-      xml-simple (= 1.0.12)
-    git (1.2.5)
-    highline (1.5.1)
-    hoe (2.3.3)
-      rake (>= 0.8.7)
-      rubyforge (>= 1.0.4)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    jruby-openssl (0.7.3)
-      bouncy-castle-java
-    json_pure (1.4.3)
-    minitar (0.5.3)
-    naether (0.3.2)
-      rjb (= 1.3.3)
-    naether (0.3.2-java)
-    net-sftp (2.0.4)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.0.23)
-    rake (0.8.7)
-    rjb (1.3.3)
-    rspec (1.3.1)
-    rubyforge (2.0.3)
-      json_pure (>= 1.1.7)
-    rubyzip (0.9.1)
-    xml-simple (1.0.12)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  buildr (>= 1.4.4)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  naether (= 0.3.2)
-  rspec (~> 1.3.1)