buildr-resolver 0.3.0 → 0.3.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "naether", "0.3.0"
+gem "naether", "0.3.1"
 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.0)
+    naether (0.3.1)
       rjb (= 1.3.3)
-    naether (0.3.0-java)
+    naether (0.3.1-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.0)
+  naether (= 0.3.1)
   rspec (~> 1.3.1)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/buildr-resolver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-resolver}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = %q{2011-03-03}
+  s.date = %q{2011-03-08}
   s.description = %q{Java dependency resolver  for Buildr using Maven's Aether}
   s.email = %q{michael.guymon@gmail.com}
   s.extra_rdoc_files = [
@@ -25,36 +25,38 @@ Gem::Specification.new do |s|
     "VERSION",
     "buildr-resolver.gemspec",
     "lib/buildr/resolver.rb",
+    "lib/buildr/resolver/java.rb",
     "spec/resolver_spec.rb"
   ]
   s.homepage = %q{http://github.com/mguymon/buildr-resolver}
   s.licenses = ["Apache"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{buildr-resolver}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.7}
   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.0"])
+      s.add_runtime_dependency(%q<naether>, ["= 0.3.1"])
       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.0"])
+      s.add_dependency(%q<naether>, ["= 0.3.1"])
       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.0"])
+    s.add_dependency(%q<naether>, ["= 0.3.1"])
     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

@@ -1,20 +1,13 @@
 require 'rubygems'
 require 'naether'
+require "#{File.dirname(__FILE__)}/resolver/java"
 
 module Buildr
   module Resolver
     class << self
       
-      def resolver_dependencies
-        Naether.bootstrap_dependencies
-      end
-      
-      def resolve( dependencies )
-        # Load Naether jar dependencies
-        naether_jars = [Naether::Bootstrap.naether_jar]
-        naether_jars = naether_jars + Buildr.artifacts(resolver_dependencies).each(&:invoke).map(&:to_s)
-        
-        naether = Naether.create_from_jars( naether_jars )
+      def resolve( dependencies, excludes=[] )
+        naether = Naether.create_from_jars( Buildr::Resolver::Java.instance.jar_dependencies )
         if Buildr.repositories.remote.size > 0
           naether.clear_remote_repositories
           Buildr.repositories.remote.each do |repo|
@@ -27,7 +20,22 @@ module Buildr
         naether.dependencies = dependencies
         naether.resolve_dependencies( false )
         
-        naether.dependencies
+        dependences = naether.dependencies
+        
+        unless excludes.nil?
+          unless excludes.is_a? Array
+            excludes = [excludes]
+          end
+          
+          dependences.delete_if do |dep|
+            excludes.select { |exclude| dep =~ /^#{exclude}/ }.size > 0
+          end
+        end
+      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 )
       end
     end
   end

data/lib/buildr/resolver/java.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'naether'
+require 'singleton'
+
+module Buildr
+  module Resolver
+    class Java
+      include Singleton
+      
+      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)
+      end
+      
+      def jar_dependencies
+        @naether_jars
+      end
+    end
+  end
+end

data/spec/resolver_spec.rb

@@ -1,5 +1,6 @@
 require 'lib/buildr/resolver'
 require 'buildr'
+require 'fileutils'
 
 Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 
@@ -10,5 +11,25 @@ describe Buildr::Resolver do
       
       dependencies.should eql ["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.0"]
     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.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.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.should eql ["org.slf4j:slf4j-api:jar:1.6.0"]
+    end
+    
+    it "should deploy artifact" do
+      unless File.exists? 'tmp/test-repo'
+        FileUtils::mkdir_p 'tmp/test-repo'
+      end
+      
+      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
   end
 end

metadata

@@ -1,73 +1,103 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-resolver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.0
+  hash: 17
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
-  - Michael Guymon
+- Michael Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: naether
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.3.0
-    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
+- !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
 description: Java dependency resolver  for Buildr using Maven's Aether
 email: michael.guymon@gmail.com
 executables: []
@@ -75,48 +105,52 @@ 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
-  - 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: 2
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: buildr-resolver
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 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