buildr-resolver 0.3.2 → 0.3.3

data/Gemfile

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

data/Gemfile.lock

@@ -49,9 +49,9 @@ GEM
       bouncy-castle-java
     json_pure (1.4.3)
     minitar (0.5.3)
-    naether (0.3.1)
+    naether (0.3.2)
       rjb (= 1.3.3)
-    naether (0.3.1-java)
+    naether (0.3.2-java)
     net-sftp (2.0.4)
       net-ssh (>= 2.0.9)
     net-ssh (2.0.23)
@@ -71,5 +71,5 @@ DEPENDENCIES
   buildr (>= 1.4.4)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
-  naether (= 0.3.1)
+  naether (= 0.3.2)
   rspec (~> 1.3.1)

data/README.rdoc

@@ -1,6 +1,6 @@
 = Buildr Resolver
 
-A Java Dependency Resolver for {Buildr}[https://github.com/apache/buildr] using Maven's {Aether}[https://github.com/sonatype/sonatype-aether] via the wrapper {Naether}[https://github.com/mguymon/naether].
+A Java dependency resolver for {Buildr}[https://github.com/apache/buildr] using Maven's {Aether}[https://github.com/sonatype/sonatype-aether] via the wrapper {Naether}[https://github.com/mguymon/naether].
 
 
 https://github.com/mguymon/buildr-resolver
@@ -16,7 +16,7 @@ gem install buildr-resolver
 example +buildfile+ 
 
 	require 'buildr/resolver'
-	Java.load # must be called before Buildr::Resolver.resolve if using Ruby due to Rjb startup of JVM by Buildr
+	Java.load # must be called before Buildr::Resolver.resolve if not using JRuby due to Rjb startup of JVM by Buildr
 	deps = ['org.apache.activemq:activemq-spring:jar:5.4.2']
 	deps =  Buildr::Resolver.resolve( deps )
 	define 'example' do
@@ -25,8 +25,8 @@ example +buildfile+
 		package :jar
 	end
 	
-The Buildr::Resolver.resolve( deps ) is what takes the activemq dependency and resolves 
-all the additional dependencies for it. If you added a +puts+ +dep+ after Buildr::Resolver.resolve, it would output:
+The <tt>Buildr::Resolver.resolve(deps)</tt> is what takes the activemq dependency and resolves 
+all the additional dependencies for it. If you added a <tt>puts dep</tt> after <tt>Buildr::Resolver.resolve</tt>, it would output:
 
 	org.apache.activemq:activemq-spring:jar:5.4.2
 	commons-logging:commons-logging-api:jar:1.1
@@ -62,6 +62,54 @@ all the additional dependencies for it. If you added a +puts+ +dep+ after Buildr
 	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.2
+0.3.3

data/buildr-resolver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-resolver}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = %q{2011-03-08}
+  s.date = %q{2011-03-10}
   s.description = %q{Java dependency resolver  for Buildr using Maven's Aether}
   s.email = %q{michael.guymon@gmail.com}
   s.extra_rdoc_files = [
@@ -32,31 +32,30 @@ Gem::Specification.new do |s|
   s.licenses = ["Apache"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{buildr-resolver}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Java dependency resolver for Buildr using Maven's Aether}
   s.test_files = [
     "spec/resolver_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     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.1"])
+      s.add_runtime_dependency(%q<naether>, ["= 0.3.2"])
       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.1"])
+      s.add_dependency(%q<naether>, ["= 0.3.2"])
       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.1"])
+    s.add_dependency(%q<naether>, ["= 0.3.2"])
     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/java.rb

@@ -7,10 +7,15 @@ module Buildr
     class Java
       include Singleton
       
+      attr_reader :naether
+      
       def initialize
+        
         # Load Naether jar dependencies
         @naether_jars = [Naether::Bootstrap.naether_jar]
         @naether_jars = @naether_jars + Buildr.artifacts(Naether.bootstrap_dependencies).each(&:invoke).map(&:to_s)
+        
+        @naether = Naether.create_from_jars( @naether_jars )
       end
       
       def jar_dependencies

data/lib/buildr/resolver.rb

@@ -6,13 +6,31 @@ module Buildr
   module Resolver
     class << self
       
-      def resolve( dependencies, excludes=[] )
-        naether = Naether.create_from_jars( Buildr::Resolver::Java.instance.jar_dependencies )
+      def naether
+        Buildr::Resolver::Java.instance.naether
+      end
+      
+      # Resolve dependencies for an array of dependencies
+      #
+      # 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 = [] )
         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 repos.is_a? Array
+              repos = [repos]
+            end
+            
+            repos.each do |repo|
+              naether.add_remote_repository( repo[:url], repo[:username], repo[:password] )
+            end
+          end
         end
         
         naether.local_repo_path = Repositories.instance.local
@@ -34,8 +52,11 @@ module Buildr
       end
       
       def deploy_artifact( notation, file_path, url, opts = {} )
-        naether = Naether.create_from_jars( Buildr::Resolver::Java.instance.jar_dependencies )
-        naether.deploy_artifact( notation, file_path, url )
+        naether.deploy_artifact( notation, file_path, url, opts )
+      end
+      
+      def write_pom( notation, file_path )
+        naether.write_pom( notation, file_path )
       end
     end
   end

data/spec/resolver_spec.rb

@@ -31,5 +31,19 @@ describe Buildr::Resolver do
       Buildr::Resolver.deploy_artifact( "test:test:jar:1.12", Naether::Bootstrap.naether_jar, 'file:tmp/test-repo' )
       File.exists?('tmp/test-repo/test/test/1.12/test-1.12.jar').should be_true
     end
+    
+    it "should write a pom" do
+      unless File.exists? 'tmp'
+        FileUtils::mkdir 'tmp'
+      end
+      Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'] )
+      Buildr::Resolver.write_pom( "buildr-resolver:buildr-resolver:jar:45.45", "tmp/pom.xml" )
+      File.exists?( 'tmp/pom.xml' ).should be_true
+      
+      xml = IO.read( 'tmp/pom.xml' ) 
+      xml.should match /.+ch.qos.logback<\/groupId>\s+<artifactId>logback-core<\/artifactId>\s+<version>0.9.24.+/
+      xml.should match /.+org.slf4j<\/groupId>\s+<artifactId>slf4j-api<\/artifactId>\s+<version>1.6.0.+/
+      
+    end
   end
 end

metadata

@@ -1,103 +1,73 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-resolver
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors: 
-- Michael Guymon
+  - Michael Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: naether
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  requirement: *id001
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: buildr
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
-  requirement: *id002
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
-  requirement: *id003
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id004
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id005
-  type: :development
+  - !ruby/object:Gem::Dependency 
+    name: naether
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.3.2
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: buildr
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.4.4
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.3.1
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
+    requirement: *id004
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: jeweler
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.5.2
+    requirement: *id005
+    prerelease: false
+    type: :development
 description: Java dependency resolver  for Buildr using Maven's Aether
 email: michael.guymon@gmail.com
 executables: []
@@ -105,52 +75,49 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- buildr-resolver.gemspec
-- lib/buildr/resolver.rb
-- lib/buildr/resolver/java.rb
-- spec/resolver_spec.rb
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - buildr-resolver.gemspec
+  - lib/buildr/resolver.rb
+  - lib/buildr/resolver/java.rb
+  - spec/resolver_spec.rb
 has_rdoc: true
 homepage: http://github.com/mguymon/buildr-resolver
 licenses: 
-- Apache
+  - Apache
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: buildr-resolver
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Java dependency resolver for Buildr using Maven's Aether
 test_files: 
-- spec/resolver_spec.rb
+  - spec/resolver_spec.rb