buildr-resolver 0.3.4 → 0.3.5

data/Gemfile

@@ -1,10 +1,9 @@
 source "http://rubygems.org"
 
-gem "naether", "0.3.3"
-gem "buildr",  ">= 1.4.4"
+gem "naether", "0.3.4"
+gem "buildr",  "= 1.4.5"
 
 group :development do
-  gem "rspec",   "~> 1.3.1"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
 end

data/Rakefile

@@ -9,11 +9,9 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec) 
 
 task :test => :spec
 

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/buildr-resolver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{buildr-resolver}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = %q{2011-03-14}
+  s.date = %q{2011-03-30}
   s.description = %q{Java dependency resolver  for Buildr using Maven's Aether}
   s.email = %q{michael.guymon@gmail.com}
   s.extra_rdoc_files = [
@@ -23,40 +23,43 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "buildr-resolver.gemspec",
+    "lib/buildr/override/core/transports.rb",
+    "lib/buildr/override/packaging/artifact.rb",
+    "lib/buildr/packaging/repository_array.rb",
     "lib/buildr/resolver.rb",
     "lib/buildr/resolver/java.rb",
+    "spec/repository_array_spec.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/repository_array_spec.rb",
     "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.3"])
-      s.add_runtime_dependency(%q<buildr>, [">= 1.4.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_runtime_dependency(%q<naether>, ["= 0.3.4"])
+      s.add_runtime_dependency(%q<buildr>, ["= 1.4.5"])
       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.3"])
-      s.add_dependency(%q<buildr>, [">= 1.4.4"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<naether>, ["= 0.3.4"])
+      s.add_dependency(%q<buildr>, ["= 1.4.5"])
       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.3"])
-    s.add_dependency(%q<buildr>, [">= 1.4.4"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<naether>, ["= 0.3.4"])
+    s.add_dependency(%q<buildr>, ["= 1.4.5"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
   end

data/lib/buildr/override/core/transports.rb

@@ -0,0 +1,103 @@
+require 'buildr'
+
+module URI
+  class HTTP #:nodoc:
+    
+    def read(options = nil, &block)
+      options ||= {}
+      
+      user = self.user || options[:username]
+      password = self.password || options[:password]
+      
+      connect do |http|
+        trace "Requesting #{self}"
+        headers = { 'If-Modified-Since' => CGI.rfc1123_date(options[:modified].utc) } if options[:modified]
+        request = Net::HTTP::Get.new(request_uri.empty? ? '/' : request_uri, headers)
+        request.basic_auth user, password if user
+        
+        http.request request do |response|
+          case response
+            when Net::HTTPNotModified
+            # No modification, nothing to do.
+            trace 'Not modified since last download'
+            return nil
+            when Net::HTTPRedirection
+            # Try to download from the new URI, handle relative redirects.
+            trace "Redirected to #{response['Location']}"
+            rself = self + URI.parse(response['Location'])
+            rself.user, rself.password = user, password
+            return rself.read(options, &block)
+            when Net::HTTPOK
+            info "Downloading #{self}"
+            result = nil
+            with_progress_bar options[:progress], path.split('/').last, response.content_length do |progress|
+              if block
+                response.read_body do |chunk|
+                  block.call chunk
+                  progress << chunk
+                end
+              else
+                result = ''
+                response.read_body do |chunk|
+                  result << chunk
+                  progress << chunk
+                end
+              end
+            end
+            return result
+            when Net::HTTPNotFound
+            raise NotFoundError, "Looking for #{self} and all I got was a 404!"
+          else
+            raise RuntimeError, "Failed to download #{self}: #{response.message}"
+          end
+        end
+      end
+    end
+  end
+  
+  private
+  
+  def write_internal(options, &block) #:nodoc:
+    options ||= {}
+    user = self.user || options[:username]
+    password = self.password || options[:password]  
+    
+    connect do |http|
+      trace "Uploading to #{path}"
+      content = StringIO.new
+      while chunk = yield(RW_CHUNK_SIZE)
+        content << chunk
+      end
+      headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream' }
+      request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
+      
+      request.basic_auth user, password if user
+      
+      response = nil
+      with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
+        request.content_length = content.size
+        content.rewind
+        stream = Object.new
+        class << stream ; self ;end.send :define_method, :read do |count|
+            bytes = content.read(count)
+            progress << bytes if bytes
+            bytes
+          end
+          request.body_stream = stream
+          response = http.request(request)
+        end
+        
+        case response
+          when Net::HTTPRedirection
+          # Try to download from the new URI, handle relative redirects.
+          trace "Redirected to #{response['Location']}"
+          content.rewind
+          return (self + URI.parse(response['location'])).write_internal(options) { |bytes| content.read(bytes) }
+          when Net::HTTPSuccess
+        else
+          raise RuntimeError, "Failed to upload #{self}: #{response.message}"
+        end
+      end
+    end
+    
+  end

data/lib/buildr/override/packaging/artifact.rb

@@ -0,0 +1,175 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'buildr'
+require 'buildr/packaging/repository_array'
+
+
+module Buildr
+
+  # A file task referencing an artifact in the local repository.
+  #
+  # This task includes all the artifact attributes (group, id, version, etc). It points
+  # to the artifact's path in the local repository. When invoked, it will download the
+  # artifact into the local repository if the artifact does not already exist.
+  #
+  # Note: You can enhance this task to create the artifact yourself, e.g. download it from
+  # a site that doesn't have a remote repository structure, copy it from a different disk, etc.
+  class Artifact 
+
+  protected
+
+    # :call-seq:
+    #   download
+    #
+    # Downloads an artifact from one of the remote repositories, and stores it in the local
+    # repository. Raises an exception if the artifact is not found.
+    #
+    # This method attempts to download the artifact from each repository in the order in
+    # which they are returned from #remote, until successful.
+    def download
+      trace "Downloading #{to_spec}"
+      remote = Buildr.repositories.remote
+      remote = remote.each { |repo| repo[:url].path += '/' unless repo[:url].path[-1] == '/' }
+      fail "Unable to download #{to_spec}. No remote repositories defined." if remote.empty?
+      exact_success = remote.find do |repo|        
+        begin
+          path = "#{group_path}/#{id}/#{version}/#{File.basename(name)}"          
+          download_artifact(repo[:url] + path, repo)
+          true
+        rescue URI::NotFoundError
+          false
+        rescue Exception=>error
+          info error
+          trace error.backtrace.join("\n")
+          false
+        end
+      end
+
+      if exact_success
+        return
+      elsif snapshot?
+        download_m2_snapshot(remote)
+      else
+        fail_download(remote)
+      end
+    end
+
+    def download_m2_snapshot(repos)
+      repos.find do |repo|
+        snapshot_url = current_snapshot_repo_url(repo)
+        if snapshot_url
+          begin
+            download_artifact snapshot_url
+            true
+          rescue URI::NotFoundError
+            false
+          end
+        else
+          false
+        end
+      end or fail_download(repos)
+    end
+
+    def current_snapshot_repo_url(repo)
+      begin
+        metadata_path = "#{group_path}/#{id}/#{version}/maven-metadata.xml"
+        metadata_xml = StringIO.new
+        URI.download repo[:url] + metadata_path, metadata_xml
+        metadata = REXML::Document.new(metadata_xml.string).root
+        timestamp = REXML::XPath.first(metadata, '//timestamp')
+        build_number = REXML::XPath.first(metadata, '//buildNumber')
+        error "No timestamp provided for the snapshot #{to_spec}" if timestamp.nil?
+        error "No build number provided for the snapshot #{to_spec}" if build_number.nil?
+        return nil if timestamp.nil? || build_number.nil?
+        snapshot_of = version[0, version.size - 9]
+        repo[:url] + "#{group_path}/#{id}/#{version}/#{id}-#{snapshot_of}-#{timestamp.text}-#{build_number.text}.#{type}"
+      rescue URI::NotFoundError
+        nil
+      end
+    end
+
+    def fail_download(repos)
+      fail "Failed to download #{to_spec}, tried the following repositories:\n#{repos.map{ |repo| "#{repo[:url].to_s}#{' as ' + repo[:username] if repo[:username]}" }.join("\n")}"
+    end
+
+  private
+
+    # :call-seq:
+    #   download_artifact
+    #
+    # Downloads artifact from given repository,
+    # supports downloading snapshot artifact with relocation on succeed to local repository
+    def download_artifact(path, opts = {})
+      download_file = "#{name}.#{Time.new.to_i}"
+      begin
+        URI.download path, download_file, opts
+        if File.exist?(download_file)
+          FileUtils.mkdir_p(File.dirname(name))
+          FileUtils.mv(download_file, name)
+        end
+      ensure
+        File.delete(download_file) if File.exist?(download_file)
+      end
+    end
+
+    # :call-seq:
+    #   :download_needed?
+    #
+    # Validates whether artifact is required to be downloaded from repository
+    def download_needed?(task)
+      return true if !File.exist?(name)
+
+      if snapshot?
+        return false if offline? && File.exist?(name)
+        return true if update_snapshot? || old?
+      end
+
+      return false
+    end
+
+
+  end
+
+  # Holds the path to the local repository, URLs for remote repositories, and settings for release server.
+  #
+  # You can access this object from the #repositories method. For example:
+  #   puts repositories.local
+  #   repositories.remote << 'http://example.com/repo'
+  #   repositories.release_to = 'sftp://example.com/var/www/public/repo'
+  class Repositories
+    include Singleton
+
+
+    # :call-seq:
+    #   remote = Array
+    #   remote = url
+    #   remote = nil
+    #
+    # With a String argument, clears the array and set it to that single URL.
+    #
+    # With an Array argument, clears the array and set it to these specific URLs.
+    #
+    # With nil, clears the array.
+    def remote=(urls)
+      case urls
+      when nil then @remote = nil
+      when Array then @remote = RepositoryArray.new(urls.dup)
+      else @remote =  RepositoryArray.new([urls])
+      end
+    end
+
+  end
+end

data/lib/buildr/packaging/repository_array.rb

@@ -0,0 +1,108 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  # Extention of Array to standardize URLs into { :url => 'url', :username => 'username', :password => 'password' }.
+  #   :url = url of remote repository
+  #   :username = optional username for authentication
+  #   :password = optional password for authentication
+  class RepositoryArray < Array
+    
+    def initialize( *args )
+      if !args.nil? && args.is_a?(Array) && args.size == 1
+        args = args[0]
+        converted = args.map {|url| convert_remote_url(url) }
+        super(converted)
+      else
+        super(args)
+      end
+    end
+    
+    # Concatenation—Returns a new array built by concatenating the two arrays together to produce a third array of standardized URL Hashes.  
+    def +(urls)
+      concat(urls)      
+    end
+    
+    # Append—Pushes the given object on to the end of this array, as a standardize URL Hash. This expression returns the array itself, so several appends may be chained together. 
+    def <<(url)
+      converted = convert_remote_url( url )
+      super( converted )
+    end
+    
+    # Appends the elements in other_array to self, as standardized URL Hashes    
+    def concat(urls)
+      if !urls.nil?
+        converted = urls.map { |url| convert_remote_url( url ) }
+        super(converted)
+      else
+        super(nil)
+      end 
+    end
+    
+    # :call-seq:
+    #   url = url => hash
+    #   url = Hash => hash
+    #
+    # With a String url, returns a standardize URL Hash. 
+    #
+    # With a Hash argument { :url => 'url', :username => 'username', :password => 'password' }, returns a standardize URL Hash.    
+    #
+    def convert_remote_url(url)
+      if url.is_a? String
+        return {:url =>  URI.parse(url)}
+      elsif url.is_a? Hash
+        hash = { :url =>  URI.parse((url[:url] || url['url'])) }
+        username = url[:username] || url['username']
+        hash[:username] = username if username
+        
+        password = (url[:password] || url['password'])
+        hash[:password] = password if password
+        
+        return hash
+      elsif url.is_a? URI
+        return { :url => url }
+      else
+        raise ArgumentError, "Unsupported :url, must be String, Hash, or URI: #{url.inspect}"
+      end
+    end
+    
+    # Inserts the given values before the element with the given index (which may be negative), as standardized URL Hashes
+    def insert( index, *args)
+      if !args.nil?
+        pos = index
+        args.each do |url| 
+          convert = convert_remote_url( url )
+          super( pos, convert )
+          if index >= 0
+            pos = pos + 1          
+          end
+        end
+      else
+        super( index, nil )  
+      end
+    end
+    
+    # Replaces the contents of self with the contents of other_array, truncating or expanding if necessary. The contents of other_array
+    # is converted standardized URL Hashes.
+    def replace( other_array )
+      if !other_array.nil?
+        converted = other_array.map { |url| convert_remote_url( url ) }
+        super( converted )
+      else
+        super( nil )  
+      end
+    end
+  end
+end

data/lib/buildr/resolver.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'naether'
-require "#{File.dirname(__FILE__)}/resolver/java"
+require "buildr/resolver/java"
+require "buildr/packaging/repository_array"
+require "buildr/override/core/transports"
+require "buildr/override/packaging/artifact"
 
 module Buildr
   module Resolver
@@ -17,7 +20,7 @@ module Buildr
       #
       # Options
       #   * :excludes - an array of dependencies to regex exclude
-      #   * :repos - an array of {:url => '', :username => '', :password => '' } of additional remote repos that require auth
+      #   * :download - have Buildr::Resolver download artifacts instead of Buildr
       def resolve( dependencies, opts = {} )
         
         options = opts
@@ -25,25 +28,14 @@ module Buildr
         if Buildr.repositories.remote.size > 0
           naether.clear_remote_repositories
           Buildr.repositories.remote.each do |repo|
-            naether.add_remote_repository( repo )
-          end
-          
-          unless options[:repos].nil?
-            repos = options[:repos]
-            unless repos.is_a? Array
-              repos = [repos]
-            end
-            
-            repos.each do |repo|
-              naether.add_remote_repository( repo[:url], repo[:username], repo[:password] )
-            end
-          end
+            naether.add_remote_repository( repo[:url].to_s, repo[:username], repo[:password] )           
+          end          
         end
         
         naether.local_repo_path = Repositories.instance.local
         
         naether.dependencies = dependencies
-        naether.resolve_dependencies( false )
+        naether.resolve_dependencies( opts[:download] == true )
         
         unless options[:excludes].nil?
           
@@ -71,6 +63,10 @@ module Buildr
         naether.deploy_artifact( notation, file_path, url, opts )
       end
       
+      def install_artifact( notation, file_path, opts = {} )
+        naether.install_artifact( notation, file_path, opts )
+      end
+      
       def write_pom( notation, file_path )
         naether.write_pom( notation, file_path )
       end

data/spec/repository_array_spec.rb

@@ -0,0 +1,107 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+require 'buildr/packaging/repository_array'
+
+describe Buildr::RepositoryArray do
+  it 'should create a new instance' do
+    repo_array = Buildr::RepositoryArray.new
+    repo_array.should_not be_nil
+  end
+  
+  it 'should create a new instance from an array' do
+    repo_array = Buildr::RepositoryArray.new( ['url1', {:url => 'url2'}] )
+    repo_array[0].should eql( { :url =>  URI.parse('url1') } )
+    repo_array[1].should eql( { :url =>  URI.parse('url2') } )
+  end
+  
+  context "instance" do
+    before(:each) do
+      @array = Buildr::RepositoryArray.new
+    end
+    
+    it 'should << and convert to standardize Hash' do
+      @array << 'url1' << { 'url' => 'url2' }
+      @array[0].should eql( {:url => URI.parse('url1')} )
+      @array[1].should eql( {:url => URI.parse('url2')} )
+    end
+    
+    it 'should + and convert to standardize Hash' do
+      @array + ['url1', { :url => 'url2'}]
+      @array[0].should eql( {:url => URI.parse('url1')} )
+      @array[1].should eql( {:url => URI.parse('url2')} )
+      
+      @array + ['url3', { :url => 'url4'}]
+      @array[0].should eql( {:url => URI.parse('url1')} )
+      @array[1].should eql( {:url => URI.parse('url2')} )
+      @array[2].should eql( {:url => URI.parse('url3')} )
+      @array[3].should eql( {:url => URI.parse('url4')} )
+    end
+    
+     it 'should concat and convert to standardize Hash' do
+      @array + ['url1', { :url => 'url2'}]
+      @array[0].should eql( {:url => URI.parse('url1')} )
+      @array[1].should eql( {:url => URI.parse('url2')} )
+      
+      @array + ['url3', { :url => 'url4'}]
+      @array[0].should eql( {:url => URI.parse('url1')} )
+      @array[1].should eql( {:url => URI.parse('url2')} )
+      @array[2].should eql( {:url => URI.parse('url3')} )
+      @array[3].should eql( {:url => URI.parse('url4')} )
+    end            
+    
+    it 'should convert a String into a standardize Hash' do
+      @array.convert_remote_url( 'url' ).should eql( {:url => URI.parse('url') } )
+    end
+    
+    it 'should convert a Hash into a standardize Hash' do
+      @array.convert_remote_url({ :username => 'username', :blah => 7, 'password' => 'password', 'foo' => 'bot', 'url' => 'url' }).should eql( {:url => URI.parse('url'), :username => 'username', :password => 'password' } )
+    end
+    
+    it 'should convert a URI into a standardize Hash' do
+      @array.convert_remote_url( URI.parse('test')).should eql( {:url => URI.parse('test') } )
+    end
+    
+    it 'Unsupported :url, must be String, Hash, or URI: 7' do
+      lambda { @array.convert_remote_url( 7 ) }.should raise_error(ArgumentError, /Unsupported :url, must be String, Hash, or URI: 7/)
+    end
+    
+    it "should insert as standardized Hash" do
+      @array << 'url1' << 'url3'
+      @array.insert( 1, 'url2', 'url2.5' )
+      
+      @array[0].should eql( {:url =>  URI.parse('url1')} )
+      @array[1].should eql( {:url =>  URI.parse('url2')} )
+      @array[2].should eql( {:url =>  URI.parse('url2.5')} )
+      @array[3].should eql( {:url =>  URI.parse('url3')} )
+      
+      @array.insert( -3, 'url2.2', 'url2.3' )
+      
+      @array[0].should eql( {:url =>  URI.parse('url1')} )
+      @array[1].should eql( {:url =>  URI.parse('url2')} )
+      @array[2].should eql( {:url =>  URI.parse('url2.2')} )
+      @array[3].should eql( {:url =>  URI.parse('url2.3')} )
+      @array[4].should eql( {:url =>  URI.parse('url2.5')} )
+      @array[5].should eql( {:url =>  URI.parse('url3')} )
+    end
+    
+    it "should replace as standardized Hash" do
+      @array << 'test'
+      @array.replace( ['url1', 'url2'] )
+      
+      @array[0].should eql( {:url =>  URI.parse('url1')} )
+      @array[1].should eql( {:url =>  URI.parse('url2')} )
+    end
+  end
+end

data/spec/resolver_spec.rb

@@ -1,11 +1,31 @@
-require 'lib/buildr/resolver'
 require 'buildr'
+require 'lib/buildr/resolver'
+require 'uri'
 require 'fileutils'
 
 Buildr.application.instance_eval { @rakefile = File.expand_path('buildfile') }
 
 describe Buildr::Resolver do
   context "Module" do
+    
+    before(:all) do
+      unless File.exists? 'tmp/test-repo'
+        FileUtils::mkdir_p 'tmp/test-repo'
+      end
+      
+      Buildr.repositories.remote = 'http://repo1.maven.org/maven2/'
+      Buildr::Resolver.naether.local_repo_path = 'tmp/test-repo'
+      Buildr.repositories.local = 'tmp/test-repo'
+    end
+    
+      
+    context "overrides for Buildr" do
+      it "should support hash repositories" do
+        Buildr.repositories.remote << { :url => 'http://test.com' }
+        Buildr.repositories.remote.last.should eql( { :url => URI.parse('http://test.com') } )
+      end
+    end
+    
     it "should resolve dependencies" do
       dependencies = Buildr::Resolver.resolve( ['ch.qos.logback:logback-classic:jar:0.9.24'] )
       
@@ -24,18 +44,11 @@ describe Buildr::Resolver do
     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
     
     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
@@ -45,5 +58,17 @@ describe Buildr::Resolver do
       xml.should match /.+org.slf4j<\/groupId>\s+<artifactId>slf4j-api<\/artifactId>\s+<version>1.6.0.+/
       
     end
+    
+    it "should install a pom" do
+      if File.exists?( "#{Buildr::Resolver.naether.local_repo_path}buildr-resolver/11.11/buildr-resolver-11.11.jar" )
+        File.delete("#{Buildr::Resolver.naether.local_repo_path}buildr-resolver/11.11/buildr-resolver-11.11.jar")
+      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" )
+      Buildr::Resolver.install_artifact( "buildr-resolver:buildr-resolver:jar:11.11", Naether::Bootstrap.naether_jar, {:pom_path => "tmp/pom.xml"} )
+      File.exists?( "#{Buildr::Resolver.naether.local_repo_path}/buildr-resolver/11.11/buildr-resolver-11.11.jar" )
+    end
   end
+  
 end

metadata

@@ -1,73 +1,87 @@
 --- !ruby/object:Gem::Specification 
 name: buildr-resolver
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.4
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
-  - Michael Guymon
+- Michael Guymon
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -04:00
+date: 2011-03-30 00:00:00 -04: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.3
-    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: 27
+        segments: 
+        - 0
+        - 3
+        - 4
+        version: 0.3.4
+  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: 13
+        segments: 
+        - 1
+        - 4
+        - 5
+        version: 1.4.5
+  requirement: *id002
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  requirement: *id004
+  type: :development
 description: Java dependency resolver  for Buildr using Maven's Aether
 email: michael.guymon@gmail.com
 executables: []
@@ -75,48 +89,56 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
+- LICENSE
+- README.rdoc
 files: 
-  - Gemfile
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION
-  - buildr-resolver.gemspec
-  - lib/buildr/resolver.rb
-  - lib/buildr/resolver/java.rb
-  - spec/resolver_spec.rb
+- Gemfile
+- LICENSE
+- README.rdoc
+- Rakefile
+- VERSION
+- buildr-resolver.gemspec
+- lib/buildr/override/core/transports.rb
+- lib/buildr/override/packaging/artifact.rb
+- lib/buildr/packaging/repository_array.rb
+- lib/buildr/resolver.rb
+- lib/buildr/resolver/java.rb
+- spec/repository_array_spec.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/repository_array_spec.rb
+- spec/resolver_spec.rb