buildr 1.3.5-x86-mswin32 → 1.4.0-x86-mswin32

data/spec/java/tests_spec.rb

@@ -39,23 +39,25 @@ describe Buildr::JUnit do
     project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
     project('foo').test.dependencies.should include(artifact("junit:junit:jar:#{JUnit.version}"))
   end
-  
+
   it 'should have REQUIRES up to version 1.5 since it was deprecated in 1.3.3' do
     Buildr::VERSION.should < '1.5'
     lambda { JUnit::REQUIRES }.should_not raise_error
   end
-  
+
   it 'should pick JUnit version from junit build settings' do
     Buildr::JUnit.instance_eval { @dependencies = nil }
     write 'build.yaml', 'junit: 1.2.3'
     define('foo') { test.using(:junit) }
     project('foo').test.compile.dependencies.should include(artifact("junit:junit:jar:1.2.3"))
   end
-  
+
   it 'should include JMock dependencies' do
     define('foo') { test.using(:junit) }
-    project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
-    project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+    two_or_later = JMock.version[0,1].to_i >= 2
+    group = two_or_later ? "org.jmock" : "jmock"
+    project('foo').test.compile.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
+    project('foo').test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
   end
 
   it 'should pick JUnit version from junit build settings' do
@@ -65,7 +67,7 @@ describe Buildr::JUnit do
     define('foo') { test.using(:junit) }
     project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:1.2.3"))
   end
-  
+
   it 'should include public classes extending junit.framework.TestCase' do
     write 'src/test/java/com/example/FirstTest.java', <<-JAVA
       package com.example;
@@ -287,7 +289,7 @@ describe Buildr::JUnit do
     fork_tests :each
     project('foo').test.failed_tests.should be_empty
   end
-  
+
   after do
     # Yes, this is ugly.  Better solution?
     Buildr::JUnit.instance_eval { @dependencies = nil }
@@ -374,8 +376,10 @@ describe Buildr::TestNG do
 
   it 'should include TestNG dependencies' do
     define('foo') { test.using :testng }
-    project('foo').test.compile.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
-    project('foo').test.dependencies.should include(artifact("jmock:jmock:jar:#{JMock.version}"))
+    two_or_later = JMock.version[0,1].to_i >= 2
+    group = two_or_later ? "org.jmock" : "jmock"
+    project('foo').test.compile.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
+    project('foo').test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
   end
 
   it 'should include classes using TestNG annotations' do

data/spec/packaging/archive_spec.rb

@@ -22,6 +22,8 @@ describe 'ArchiveTask', :shared=>true do
     @dir = File.expand_path('test')
     @files = %w{Test1.txt Text2.html}.map { |file| File.expand_path(file, @dir) }.
       each { |file| write file, content_for(file) }
+    @empty_dirs = %w{EmptyDir1 EmptyDir2}.map { |file| File.expand_path(file, @dir) }.
+      each { |file| mkdir file }
   end
 
   # Not too smart, we just create some content based on file name to make sure you read what you write.
@@ -59,6 +61,11 @@ describe 'ArchiveTask', :shared=>true do
     inspect_archive { |archive| archive.should be_empty }
   end
 
+  it 'should raise error when include() is called with nil values' do
+    lambda { archive(@archive).include(nil) }.should raise_error
+    lambda { archive(@archive).include([nil]) }.should raise_error
+  end
+
   it 'should create empty archive if called #clean method' do
     archive(@archive).include(@files).clean.invoke
     inspect_archive { |archive| archive.should be_empty }
@@ -83,6 +90,22 @@ describe 'ArchiveTask', :shared=>true do
     inspect_archive.keys.should include('included')
   end
 
+  it 'should archive artifacts' do
+    write 'library-1.0.txt', 'library-1.0'
+    artifact("org.example:library:txt:1.0").from 'library-1.0.txt'
+    archive(@archive).include("org.example:library:txt:1.0").invoke
+    inspect_archive.keys.should include('library-1.0.txt')
+  end
+
+  it 'should archive project artifacts' do
+    define 'p1' do
+      project.version = '1.0'
+      package(:zip)
+    end
+    archive(@archive).include(project('p1')).invoke
+    inspect_archive.keys.should include('p1-1.0.zip')
+  end
+
   it 'should include entry for directory' do
     archive(@archive).include(@dir).invoke
     inspect_archive { |archive| @files.each { |f| archive['test/' + File.basename(f)].should eql(content_for(f)) } }
@@ -112,12 +135,18 @@ describe 'ArchiveTask', :shared=>true do
     end
   end
 
+  it 'should raise error when using :from with nil value' do
+    lambda {
+      archive(@archive).include(:from=>nil)
+    }.should raise_error
+  end
+
   it 'should exclude entire directory and all its children' do
     mkpath "#{@dir}/sub"
     write "#{@dir}/sub/test"
     archive(@archive).include(@dir).exclude("#{@dir}/sub").invoke
     inspect_archive do |archive|
-      archive.keys.select { |file| file =~ /sub/ }.should be_empty 
+      archive.keys.select { |file| file =~ /sub/ }.should be_empty
     end
   end
 
@@ -171,6 +200,11 @@ describe 'ArchiveTask', :shared=>true do
     archive(@archive).include(@files.first, :as=>'test/sample').invoke
     inspect_archive { |archive| @files.each { |f| archive['test/sample'].should eql(content_for(@files.first)) } }
   end
+  
+  it 'should archive directory into specified alias, without using "."' do
+    archive(@archive).include(@dir, :as=>'.').invoke
+    inspect_archive { |archive| archive.keys.should_not include(".") }
+  end
 
   it 'should archive file into specified name/path' do
     archive(@archive).include(@files.first, :as=>'test/sample', :path=>'path').invoke
@@ -219,19 +253,19 @@ describe 'ArchiveTask', :shared=>true do
     create_for_merge do |src|
       archive(@archive).merge(src).include(File.basename(@files.first))
       archive(@archive).invoke
-      inspect_archive do |archive| 
+      inspect_archive do |archive|
         archive[File.basename(@files.first)].should eql(content_for(@files.first))
         archive[File.basename(@files.last)].should be_nil
       end
     end
   end
-  
+
   it 'should expand another archive file with exclude pattern' do
     create_for_merge do |src|
       archive(@archive).merge(src).exclude(File.basename(@files.first))
       archive(@archive).invoke
-      inspect_archive do |archive| 
-        @files[1..-1].each { |f| archive[File.basename(f)].should eql(content_for(f)) } 
+      inspect_archive do |archive|
+        @files[1..-1].each { |f| archive[File.basename(f)].should eql(content_for(f)) }
         archive[File.basename(@files.first)].should be_nil
       end
     end
@@ -285,7 +319,7 @@ describe 'ArchiveTask', :shared=>true do
     # all included files newer.
     File.utime Time.now - 100, Time.now - 100, @archive
     archive(@archive).include(@files).invoke
-    File.stat(@archive).mtime.should be_close(Time.now, 10) 
+    File.stat(@archive).mtime.should be_close(Time.now, 10)
   end
 
   it 'should do nothing if all files are uptodate' do
@@ -293,7 +327,7 @@ describe 'ArchiveTask', :shared=>true do
     # By touching all files in the past, there's nothing new to update.
     (@files + [@archive]).each { |f| File.utime Time.now - 100, Time.now - 100, f }
     archive(@archive).include(@files).invoke
-    File.stat(@archive).mtime.should be_close(Time.now - 100, 10) 
+    File.stat(@archive).mtime.should be_close(Time.now - 100, 10)
   end
 
   it 'should update if one of the files is recent' do
@@ -342,7 +376,7 @@ describe TarTask, ' gzipped' do
 
   def inspect_archive
     entries = {}
-    Zlib::GzipReader.open @archive do |gzip| 
+    Zlib::GzipReader.open @archive do |gzip|
       Archive::Tar::Minitar.open gzip, 'r' do |reader|
         reader.each { |entry| entries[entry.directory ? "#{entry.name}/" : entry.name] = entry.read }
       end
@@ -370,23 +404,50 @@ describe ZipTask do
     entries
   end
 
+  it 'should include empty dirs' do
+    archive(@archive).include(@dir)
+    archive(@archive).invoke
+    inspect_archive do |archive|
+      archive.keys.should include('test/EmptyDir1/')
+    end
+  end
+
+  it 'should include empty dirs from Dir' do
+    archive(@archive).include(Dir["#{@dir}/*"])
+    archive(@archive).invoke
+    inspect_archive do |archive|
+      archive.keys.should include('EmptyDir1/')
+    end
+  end
+
   it 'should work with path object' do
     archive(@archive).path('code').include(@files)
     archive(@archive).invoke
     inspect_archive { |archive| archive.keys.should include('code/') }
   end
+  
+  it 'should have path object that includes empty dirs' do
+    archive(@archive).path('code').include(Dir["#{@dir}/*"])
+    archive(@archive).invoke
+    inspect_archive do |archive|
+      archive.keys.should include('code/EmptyDir1/')
+    end
+  end
 
-  it 'should preserve file permissions' do
-    # with JRuby it's important to use absolute paths with File.chmod()
-    # http://jira.codehaus.org/browse/JRUBY-3300
-    hello = File.expand_path('src/main/bin/hello')
-    write hello, 'echo hi'
-    File.chmod(0777,  hello) || 
-    fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
+  # chmod is not reliable on Windows
+  unless Buildr::Util.win_os?
+    it 'should preserve file permissions' do
+      # with JRuby it's important to use absolute paths with File.chmod()
+      # http://jira.codehaus.org/browse/JRUBY-3300
+      hello = File.expand_path('src/main/bin/hello')
+      write hello, 'echo hi'
+      File.chmod(0777,  hello)
+      fail("Failed to set permission on #{hello}") unless (File.stat(hello).mode & 0777) == 0777
 
-    zip('foo.zip').include('src/main/bin/*').invoke
-    unzip('target' => 'foo.zip').extract
-    (File.stat('target/hello').mode & 0777).should == 0777
+      zip('foo.zip').include('src/main/bin/*').invoke
+      unzip('target' => 'foo.zip').extract
+      (File.stat('target/hello').mode & 0777).should == 0777
+    end
   end
 
 end
@@ -399,6 +460,8 @@ describe Unzip do
     @files = %w{Test1.txt Text2.html}.map { |file| File.join(@dir, file) }.
       each { |file| write file, content_for(file) }
     @target = File.expand_path('target')
+    @targz = File.expand_path('test.tar.gz')
+    @targz2 = File.expand_path('test.tgz')
   end
 
   # Not too smart, we just create some content based on file name to
@@ -407,11 +470,21 @@ describe Unzip do
     "Content for #{File.basename(file)}"
   end
 
+  def with_tar(*args)
+    tar(@targz).include(*args.empty? ? @files : args).invoke
+    yield
+  end
+
+  def with_tar_too(*args)
+    tar(@targz2).include(*args.empty? ? @files : args).invoke
+    yield
+  end
+
   def with_zip(*args)
     zip(@zip).include(*args.empty? ? @files : args).invoke
     yield
   end
-    
+
   it 'should touch target directory' do
     with_zip do
       mkdir @target
@@ -428,6 +501,20 @@ describe Unzip do
     end
   end
 
+  it 'should expand files from a tar.gz file' do
+    with_tar do
+      unzip(@target=>@targz).target.invoke
+      @files.each { |f| File.read(File.join(@target, File.basename(f))).should eql(content_for(f)) }
+    end
+  end
+
+  it 'should expand files from a .tgz file' do
+    with_tar_too do
+      unzip(@target=>@targz2).target.invoke
+      @files.each { |f| File.read(File.join(@target, File.basename(f))).should eql(content_for(f)) }
+    end
+  end
+
   it 'should expand all files' do
     with_zip do
       unzip(@target=>@zip).target.invoke
@@ -435,6 +522,13 @@ describe Unzip do
     end
   end
 
+  it 'should expand all files from a .tar.gz file' do
+    with_tar do
+      unzip(@target=>@targz).target.invoke
+      FileList[File.join(@target, '*')].size.should be(@files.size)
+    end
+  end
+
   it 'should expand only included files' do
     with_zip do
       only = File.basename(@files.first)
@@ -444,6 +538,15 @@ describe Unzip do
     end
   end
 
+  it 'should expand only included files from a .tar.gz file' do
+    with_tar do
+      only = File.basename(@files.first)
+      unzip(@target=>@targz).include(only).target.invoke
+      FileList[File.join(@target, '*')].should include(File.expand_path(only, @target))
+      FileList[File.join(@target, '*')].size.should be(1)
+    end
+  end
+
   it 'should expand all but excluded files' do
     with_zip do
       except = File.basename(@files.first)
@@ -453,6 +556,15 @@ describe Unzip do
     end
   end
 
+  it 'should expand all but excluded files with a .tar.gz file' do
+    with_tar do
+      except = File.basename(@files.first)
+      unzip(@target=>@targz).exclude(except).target.invoke
+      FileList[File.join(@target, '*')].should_not include(File.expand_path(except, @target))
+      FileList[File.join(@target, '*')].size.should be(@files.size - 1)
+    end
+  end
+
   it 'should include with nested path patterns' do
     with_zip @files, :path=>'test/path' do
       only = File.basename(@files.first)
@@ -469,6 +581,22 @@ describe Unzip do
     end
   end
 
+  it 'should include with nested path patterns with a .tar.gz file' do
+    with_tar @files, :path=>'test/path' do
+      only = File.basename(@files.first)
+      unzip(@target=>@targz).include(only).target.invoke
+      FileList[File.join(@target, '*')].should be_empty
+
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@targz).include('test/path/' + only).target.invoke
+      FileList[File.join(@target, 'test/path/*')].size.should be(1)
+
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@targz).include('test/**/*').target.invoke
+      FileList[File.join(@target, 'test/path/*')].size.should be(2)
+    end
+  end
+
   it 'should include with relative path' do
     with_zip @files, :path=>'test/path' do
       only = File.basename(@files.first)
@@ -488,7 +616,27 @@ describe Unzip do
       FileList[File.join(@target, 'path/*')].size.should be(2)
     end
   end
-  
+
+  it 'should include with relative path with a .tar.gz file' do
+    with_tar @files, :path=>'test/path' do
+      only = File.basename(@files.first)
+      unzip(@target=>@targz).tap { |unzip| unzip.from_path('test').include(only) }.target.invoke
+      FileList[File.join(@target, '*')].should be_empty
+
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@targz).tap { |unzip| unzip.from_path('test').include('test/*') }.target.invoke
+      FileList[File.join(@target, 'path/*')].should be_empty
+
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@targz).tap { |unzip| unzip.from_path('test').include('path/*' + only) }.target.invoke
+      FileList[File.join(@target, 'path/*')].size.should be(1)
+
+      Rake::Task.clear ; rm_rf @target
+      unzip(@target=>@targz).tap { |unzip| unzip.from_path('test').include('path/*') }.target.invoke
+      FileList[File.join(@target, 'path/*')].size.should be(2)
+    end
+  end
+
   it 'should exclude with relative path' do
     with_zip @files, :path=>'test' do
       except = File.basename(@files.first)
@@ -498,6 +646,15 @@ describe Unzip do
     end
   end
 
+  it 'should exclude with relative path on a tar.gz file' do
+    with_tar @files, :path=>'test' do
+      except = File.basename(@files.first)
+      unzip(@target=>@targz).tap { |unzip| unzip.from_path('test').exclude(except) }.target.invoke
+      FileList[File.join(@target, '*')].should include(File.join(@target, File.basename(@files[1])))
+      FileList[File.join(@target, '*')].size.should be(@files.size - 1)
+    end
+  end
+
   it "should handle relative paths without any includes or excludes" do
     lib_files = %w{Test3.so Test4.rb}.
       map { |file| File.join(@dir, file) }.
@@ -508,6 +665,16 @@ describe Unzip do
     FileList[File.join(@target, '**/*')].should have(2).files
   end
 
+  it "should handle relative paths without any includes or excludes with a tar.gz file" do
+    lib_files = %w{Test3.so Test4.rb}.
+      map { |file| File.join(@dir, file) }.
+      each { |file| write file, content_for(file) }
+    tar(@targz).include(@files, :path => 'src').include(lib_files, :path => 'lib').invoke
+
+    unzip(@target=>@targz).tap { |unzip| unzip.from_path('lib') }.target.invoke
+    FileList[File.join(@target, '**/*')].should have(2).files
+  end
+
   it 'should return itself from root method' do
     task = unzip(@target=>@zip)
     task.root.should be(task)

data/spec/packaging/artifact_namespace_spec.rb

@@ -26,46 +26,58 @@ describe Buildr::ArtifactNamespace do
     Object.send :remove_const, :A
   end
 
-  describe '.root' do 
+  describe '.root' do
     it 'should return the top level namespace' do
       Buildr::ArtifactNamespace.root.should be_root
     end
-    
+
     it 'should yield the namespace if a block is given' do
-      Buildr::ArtifactNamespace.root { |ns| ns.should be_root }
+      flag = false
+      Buildr::ArtifactNamespace.root { |ns| flag = true; ns.should be_root }
+      flag.should == true
+    end
+
+    it 'should return the root when used outside of a project definition' do
+      artifact_ns.should be_root
+    end
+
+    it 'should yield to a block when used outside of a project definition' do
+      flag = false
+      artifact_ns {|ns| flag = true; ns.should be_root}
+      flag.should == true
     end
   end
 
-  describe '.instance' do 
+  describe '.instance' do
     it 'should return the top level namespace when invoked outside a project definition' do
       artifact_ns.should be_root
     end
 
-    it 'should return the namespace for the receiving project' do 
+    it 'should return the namespace for the receiving project' do
       define('foo') { }
       project('foo').artifact_ns.name.should == 'foo'
     end
-    
+
     it 'should return the current project namespace when invoked inside a project' do
       define 'foo' do
         artifact_ns.should_not be_root
         artifact_ns.name.should == 'foo'
-        task :doit do 
+        task :doit do
           artifact_ns.should_not be_root
           artifact_ns.name.should == 'foo'
         end.invoke
       end
     end
-  
+
     it 'should return the root namespace if given :root' do
       artifact_ns(:root).should be_root
     end
-    
-    it 'should return the namespace for the given name' do 
+
+    it 'should return the namespace for the given name' do
       artifact_ns(:foo).name.should == 'foo'
       artifact_ns('foo:bar').name.should == 'foo:bar'
       artifact_ns(['foo', 'bar', 'baz']).name.should == 'foo:bar:baz'
-      abc_module do 
+      abc_module do
         artifact_ns(A::B::C).name.should == 'A::B::C'
       end
       artifact_ns(:root).should be_root
@@ -79,12 +91,12 @@ describe Buildr::ArtifactNamespace do
     end
   end
 
-  describe '#parent' do 
-    it 'should be nil for root namespace' do 
+  describe '#parent' do
+    it 'should be nil for root namespace' do
       artifact_ns(:root).parent.should be_nil
     end
-    
-    it 'should be the parent namespace for nested modules' do 
+
+    it 'should be the parent namespace for nested modules' do
       abc_module do
         artifact_ns(A::B::C).parent.should == artifact_ns(A::B)
         artifact_ns(A::B).parent.should == artifact_ns(A)
@@ -93,8 +105,8 @@ describe Buildr::ArtifactNamespace do
     end
 
     it 'should be the parent namespace for nested projects' do
-      define 'a' do 
-        define 'b' do 
+      define 'a' do
+        define 'b' do
           define 'c' do
             artifact_ns.parent.should == artifact_ns(parent)
           end
@@ -104,9 +116,9 @@ describe Buildr::ArtifactNamespace do
       end
     end
   end
-  
+
   describe '#parent=' do
-    it 'should reject to set parent for root namespace' do 
+    it 'should reject to set parent for root namespace' do
       lambda { artifact_ns(:root).parent = :foo }.should raise_error(Exception, /cannot set parent/i)
     end
 
@@ -118,10 +130,10 @@ describe Buildr::ArtifactNamespace do
     end
 
     it 'should allow to set parent to :current' do
-      abc_module do 
+      abc_module do
         mod = A::B
         artifact_ns(mod).parent = :current
-        def mod.stuff 
+        def mod.stuff
           Buildr::artifact_ns(self)
         end
         define 'a' do
@@ -133,14 +145,14 @@ describe Buildr::ArtifactNamespace do
       end
     end
   end
-  
-  describe '#need' do 
+
+  describe '#need' do
     it 'should accept an artifact spec' do
       define 'one' do
         artifact_ns.need 'a:b:c:1'
         # referenced by spec
         artifact_ns['a:b:c'].should_not be_selected
-        
+
         # referenced by name
         artifact_ns[:b].should_not be_selected
         artifact_ns[:b].should be_satisfied_by('a:b:c:1')
@@ -155,7 +167,7 @@ describe Buildr::ArtifactNamespace do
         artifact_ns.need 'thing -> a:b:c:2.1 -> ~>2.0'
         # referenced by spec
         artifact_ns['a:b:c'].should_not be_selected
-        
+
         # referenced by name
         artifact_ns.key?(:b).should be_false
         artifact_ns[:thing].should_not be_selected
@@ -165,7 +177,7 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
-    it 'should accept a hash :name -> requirement_spec' do 
+    it 'should accept a hash :name -> requirement_spec' do
       define 'one' do
         artifact_ns.need :thing => 'a:b:c:2.1 -> ~>2.0'
         artifact_ns[:thing].should be_satisfied_by('a:b:c:2.5')
@@ -181,8 +193,8 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
-    it 'should take a hash :name -> specs_array' do 
-      define 'one' do 
+    it 'should take a hash :name -> specs_array' do
+      define 'one' do
         artifact_ns.need :things => ['foo:bar:jar:1.0',
                                      'foo:baz:jar:2.0',]
         artifact_ns['foo:bar:jar'].should_not be_selected
@@ -194,8 +206,8 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
-    it 'should select best matching version if defined' do 
-      define 'one' do 
+    it 'should select best matching version if defined' do
+      define 'one' do
         artifact_ns.use :a => 'foo:bar:jar:1.5'
         artifact_ns.use :b => 'foo:baz:jar:2.0'
         define 'two' do
@@ -205,7 +217,7 @@ describe Buildr::ArtifactNamespace do
           artifact_ns.need :c => 'foo:bat:jar:3.0'
           artifact_ns['foo:bat:jar'].should_not be_selected
           artifact_ns[:c].should_not be_selected
-          
+
           artifact_ns.need :one => 'foo:bar:jar:>=1.0'
           artifact_ns[:one].version.should == '1.5'
           artifact_ns[:one].should be_selected
@@ -220,7 +232,7 @@ describe Buildr::ArtifactNamespace do
     end
   end
 
-  describe '#use' do 
+  describe '#use' do
     it 'should register the artifact on namespace' do
       define 'one' do
         artifact_ns.use :thing => 'a:b:c:1'
@@ -232,7 +244,7 @@ describe Buildr::ArtifactNamespace do
           artifact_ns[:thing].requirement.should be_nil
           artifact_ns[:thing].version.should == '2'
           artifact_ns[:thing].id.should == 'd'
-          
+
           artifact_ns.use :copied => artifact_ns.parent[:thing]
           artifact_ns[:copied].should_not == artifact_ns.parent[:thing]
           artifact_ns[:copied].requirement.should be_nil
@@ -258,7 +270,7 @@ describe Buildr::ArtifactNamespace do
         artifact_ns['a:b:c'].version.should == '2'
       end
     end
-    
+
     it 'should complain if namespace requirement is not satisfied' do
       define 'one' do
         artifact_ns.need :bar => 'foo:bar:baz:~>1.5'
@@ -266,7 +278,7 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
-    it 'should be able to register a group' do 
+    it 'should be able to register a group' do
       specs = ['its:me:here:1', 'its:you:there:2']
       artifact_ns.use :them => specs
       artifact_ns[:them].map(&:to_spec).should == specs
@@ -274,7 +286,7 @@ describe Buildr::ArtifactNamespace do
       artifact_ns[:you].should be_nil
     end
 
-    it 'should be able to assign sub namespaces' do 
+    it 'should be able to assign sub namespaces' do
       artifact_ns(:foo).bar = "foo:bar:baz:0"
       artifact_ns(:moo).foo = artifact_ns(:foo)
       artifact_ns(:moo).foo.should == artifact_ns(:foo)
@@ -289,15 +301,22 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
+    it 'should handle version string' do
+      foo = artifact_ns do |ns|
+        ns.bar = 'a:b:c:1'
+      end
+      foo.use :bar => '2.0'
+      foo.bar.version.should == '2.0'
+    end
   end
 
-  describe '#values' do 
-    it 'returns the artifacts defined on namespace' do 
+  describe '#values' do
+    it 'returns the artifacts defined on namespace' do
       define 'foo' do
         artifact_ns.use 'foo:one:baz:1.0'
         define 'bar' do
           artifact_ns.use 'foo:two:baz:1.0'
-          
+
           specs = artifact_ns.values.map(&:to_spec)
           specs.should include('foo:two:baz:1.0')
           specs.should_not include('foo:one:baz:1.0')
@@ -309,13 +328,13 @@ describe Buildr::ArtifactNamespace do
     end
   end
 
-  describe '#values_at' do 
-    it 'returns the named artifacts' do 
+  describe '#values_at' do
+    it 'returns the named artifacts' do
       define 'foo' do
         artifact_ns.use 'foo:one:baz:1.0'
         define 'bar' do
           artifact_ns.use :foo_baz => 'foo:two:baz:1.0'
-          
+
           specs = artifact_ns.values_at('one').map(&:to_spec)
           specs.should include('foo:one:baz:1.0')
           specs.should_not include('foo:two:baz:1.0')
@@ -332,7 +351,7 @@ describe Buildr::ArtifactNamespace do
         artifact_ns.use 'foo:one:baz:2.0'
         define 'bar' do
           artifact_ns.use :older => 'foo:one:baz:1.0'
-          
+
           specs = artifact_ns.values_at('foo:one:baz').map(&:to_spec)
           specs.should include('foo:one:baz:1.0')
           specs.should_not include('foo:one:baz:2.0')
@@ -348,7 +367,7 @@ describe Buildr::ArtifactNamespace do
         artifact_ns.use 'foo:one:baz:2.0'
         define 'bar' do
           artifact_ns.use :older => 'foo:one:baz:1.0'
-          
+
           specs = artifact_ns.values_at('foo:one:baz:>1.0').map(&:to_spec)
           specs.should include('foo:one:baz:2.0')
           specs.should_not include('foo:one:baz:1.0')
@@ -356,14 +375,57 @@ describe Buildr::ArtifactNamespace do
       end
     end
   end
-  
-  describe '#method_missing' do 
-    it 'should use cool_aid! to create a requirement' do 
+
+  describe '#artifacts' do
+    it 'returns artifacts in namespace' do
+      define 'one' do
+        artifact_ns[:foo] = 'group:foo:jar:1'
+        artifact_ns[:bar] = 'group:bar:jar:1'
+        artifact_ns.artifacts.map{|a| a.to_spec}.should include('group:foo:jar:1', 'group:bar:jar:1')
+      end
+    end
+  end
+
+  describe '#keys' do
+    it 'returns names in namespace' do
+      define 'one' do
+        artifact_ns[:foo] = 'group:foo:jar:1'
+        artifact_ns[:bar] = 'group:bar:jar:1'
+        artifact_ns.keys.should include('foo', 'bar')
+      end
+    end
+  end
+
+  describe '#delete' do
+    it 'deletes corresponding artifact requirement' do
+      define 'one' do
+        artifact_ns[:foo] = 'group:foo:jar:1'
+        artifact_ns[:bar] = 'group:bar:jar:1'
+        artifact_ns.delete :bar
+        artifact_ns.artifacts.map{|a| a.to_spec}.should include('group:foo:jar:1')
+        artifact_ns[:foo].to_spec.should eql('group:foo:jar:1')
+      end
+    end
+  end
+
+  describe '#clear' do
+    it 'clears all artifact requirements in namespace' do
+      define 'one' do
+        artifact_ns[:foo] = 'group:foo:jar:1'
+        artifact_ns[:bar] = 'group:bar:jar:1'
+        artifact_ns.clear
+        artifact_ns.artifacts.should be_empty
+      end
+    end
+  end
+
+  describe '#method_missing' do
+    it 'should use cool_aid! to create a requirement' do
       define 'foo' do
         artifact_ns.cool_aid!('cool:aid:jar:2').should be_kind_of(ArtifactNamespace::ArtifactRequirement)
         artifact_ns[:cool_aid].version.should == '2'
         artifact_ns[:cool_aid].should_not be_selected
-        define 'bar' do 
+        define 'bar' do
           artifact_ns.cool_aid! 'cool:aid:man:3', '>2'
           artifact_ns[:cool_aid].version.should == '3'
           artifact_ns[:cool_aid].requirement.should be_satisfied_by('2.5')
@@ -372,11 +434,11 @@ describe Buildr::ArtifactNamespace do
       end
     end
 
-    it 'should use cool_aid= as shorhand for [:cool_aid]=' do 
+    it 'should use cool_aid= as shorhand for [:cool_aid]=' do
       artifact_ns.cool_aid = 'cool:aid:jar:1'
       artifact_ns[:cool_aid].should be_selected
     end
-    
+
     it 'should use cool_aid as shorthand for [:cool_aid]' do
       artifact_ns.need :cool_aid => 'cool:aid:jar:1'
       artifact_ns.cool_aid.should_not be_selected
@@ -391,25 +453,25 @@ describe Buildr::ArtifactNamespace do
     end
   end
 
-  describe '#ns' do 
+  describe '#ns' do
     it 'should create a sub namespace' do
       artifact_ns.ns :foo
       artifact_ns[:foo].should be_kind_of(ArtifactNamespace)
       artifact_ns(:foo).should_not === artifact_ns.foo
       artifact_ns.foo.parent.should == artifact_ns
     end
-    
+
     it 'should take any use arguments' do
       artifact_ns.ns :foo, :bar => 'foo:bar:jar:0', :baz => 'foo:baz:jar:0'
       artifact_ns.foo.bar.should be_selected
       artifact_ns.foo[:baz].should be_selected
     end
-    
-    it 'should access sub artifacts using with foo_bar like syntax' do 
+
+    it 'should access sub artifacts using with foo_bar like syntax' do
       artifact_ns.ns :foo, :bar => 'foo:bar:jar:0', :baz => 'foo:baz:jar:0'
       artifact_ns[:foo_baz].should be_selected
       artifact_ns.foo_bar.should be_selected
-      
+
       artifact_ns.foo.ns :bat, 'bat:man:jar:>1'
       batman = artifact_ns.foo.bat.man
       batman.should be_selected
@@ -418,7 +480,7 @@ describe Buildr::ArtifactNamespace do
       artifact_ns[:foo_bat_man].version.should == '3'
     end
 
-    it 'should include sub artifacts when calling #values' do 
+    it 'should include sub artifacts when calling #values' do
       artifact_ns.ns :bat, 'bat:man:jar:>1'
       artifact_ns.values.should_not be_empty
       artifact_ns.values.first.unversioned_spec.should == 'bat:man:jar'
@@ -435,13 +497,13 @@ describe Buildr::ArtifactNamespace do
       lambda { artifact_ns.ns(:foo) }.should raise_error(TypeError, /not a sub/i)
     end
 
-    it 'should clone artifacts when assigned' do 
+    it 'should clone artifacts when assigned' do
       artifact_ns(:foo).bar = "foo:bar:jar:0"
       artifact_ns(:moo).ns :muu, :miu => artifact_ns(:foo).bar
       artifact_ns(:moo).muu.miu.should_not == artifact_ns(:foo).bar
       artifact_ns(:moo).muu.miu.to_spec.should == artifact_ns(:foo).bar.to_spec
     end
-    
+
     it 'should clone parent artifacts by name' do
       define 'foo' do
         artifact_ns.bar = "foo:bar:jar:0"
@@ -462,12 +524,39 @@ describe Buildr::ArtifactNamespace do
 
 end # ArtifactNamespace
 
+describe Buildr::ArtifactNamespace::ArtifactRequirement do
+  before(:each) { Buildr::ArtifactNamespace.clear }
+  it 'should be created from artifact_ns' do
+    foo = artifact_ns do |ns|
+      ns.bar = 'a:b:c:1.0'
+    end
+    foo.bar.should be_kind_of(ArtifactNamespace::ArtifactRequirement)
+  end
+
+  it 'should handle version as string' do
+    foo = artifact_ns do |ns|
+      ns.bar = 'a:b:c:1.0'
+    end
+    foo.bar.version = '2.0'
+    foo.bar.version.should == '2.0'
+  end
+
+  it 'should handle version string directly' do
+    foo = artifact_ns do |ns|
+      ns.bar = 'a:b:c:1.0'
+    end
+    foo.bar = '2.0'
+    foo.bar.version.should == '2.0'
+  end
+
+end # ArtifactRequirement
+
 describe Buildr do
   before(:each) { Buildr::ArtifactNamespace.clear }
 
-  describe '.artifacts' do 
+  describe '.artifacts' do
     it 'should take ruby symbols and ask the current namespace for them' do
-      define 'foo' do 
+      define 'foo' do
         artifact_ns.cool = 'cool:aid:jar:1.0'
         artifact_ns.use 'some:other:jar:1.0'
         artifact_ns.use 'bat:man:jar:1.0'
@@ -475,8 +564,8 @@ describe Buildr do
         compile.dependencies.map(&:to_spec).should include('cool:aid:jar:1.0', 'some:other:jar:1.0', 'bat:man:jar:1.0')
       end
     end
-    
-    it 'should take a namespace' do 
+
+    it 'should take a namespace' do
       artifact_ns(:moo).muu = 'moo:muu:jar:1.0'
       define 'foo' do
         compile.with artifact_ns(:moo)
@@ -484,28 +573,28 @@ describe Buildr do
       end
     end
   end
-  
+
   describe '.artifact' do
-    it 'should search current namespace if given a symbol' do 
-      define 'foo' do 
+    it 'should search current namespace if given a symbol' do
+      define 'foo' do
         artifact_ns.use :cool => 'cool:aid:jar:1.0'
         define 'bar' do
           artifact(:cool).should == artifact_ns[:cool].artifact
         end
       end
     end
-    
-    it 'should search current namespace if given a symbol spec' do 
-      define 'foo' do 
+
+    it 'should search current namespace if given a symbol spec' do
+      define 'foo' do
         artifact_ns.use 'cool:aid:jar:1.0'
         define 'bar' do
           artifact(:'cool:aid:jar').should == artifact_ns[:aid].artifact
         end
       end
     end
-    
+
     it 'should fail when no artifact by that name is found' do
-      define 'foo' do 
+      define 'foo' do
         artifact_ns.use 'cool:aid:jar:1.0'
         define 'bar' do
           lambda { artifact(:cool) }.should raise_error(IndexError, /artifact/)
@@ -524,12 +613,12 @@ describe "Extension using ArtifactNamespace" do
   ensure
     Object.send :remove_const, :A
   end
-  
+
   it 'can register namespace listeners' do
     abc_module do
       # An example extension to illustrate namespace listeners and method forwarding
       class A::Example
-        
+
         module Ext
           include Buildr::Extension
           def example; @example ||= A::Example.new; end
@@ -537,22 +626,22 @@ describe "Extension using ArtifactNamespace" do
             Rake::Task.define_task('example') { p.example.doit }
           end
         end
-        
+
         REQUIRES = ArtifactNamespace.for(self) do |ns|
           ns.xmlbeans! 'org.apache.xmlbeans:xmlbeans:jar:2.3.0', '>2'
           ns.stax_api! 'stax:stax-api:jar:>=1.0.1'
         end
 
         attr_reader :options, :requires
-        
+
         def initialize
           # We could actually use the REQUIRES namespace, but to make things
-          # a bit more interesting, suppose each Example instance can have its 
+          # a bit more interesting, suppose each Example instance can have its
           # own artifact requirements in adition to those specified on REQUIRES.
           # To achieve this we create an anonymous namespace.
           @requires = ArtifactNamespace.new # a namespace per instance
           REQUIRES.each { |requirement| @requires.need requirement }
-          
+
           # For user convenience, we make the options object respond to
           #    :xmlbeans, :xmlbeans=, :xmlbeans?
           # forwarding them to the namespace.
@@ -573,7 +662,7 @@ describe "Extension using ArtifactNamespace" do
         end
 
         include Spec::Matchers # for assertions
-        
+
         # Called with the ArtifactRequirement that has just been selected
         # by a user. This allows extension author to selectively perform
         # some action by inspecting the requirement state.
@@ -591,20 +680,20 @@ describe "Extension using ArtifactNamespace" do
           # Now call ant task with our selected artifact and options
           classpath = requires.map(&:artifact).map(&:to_s).join(File::PATH_SEPARATOR)
           lambda { ant('thing') { |ant| ant.classpath classpath, :math => options[:math] } }
-          
+
           # We are not a Project instance, hence we have no artifact_ns
           lambda { artifact_ns }.should raise_error(NameError)
 
           # Extension authors may NOT rely project's namespaces.
-          # However the ruby-way gives you power and at the same time 
+          # However the ruby-way gives you power and at the same time
           # makes you dangerous, (think open-modules, monkey-patching)
           # Given that buildr is pure ruby, consider it a sharp-edged sword.
-          # Having said that, you may actually inspect a project's 
+          # Having said that, you may actually inspect a project's
           # namespace, but don't write on it without letting your users
           # know you will.
           # This example obtains the current project namespace to make
           # some assertions.
-          
+
           # To obtain a project's namespace we need either
           # 1) a reference to the project, and call artifact_ns on it
           #      project.artifact_ns  # the namespace for project
@@ -627,7 +716,7 @@ describe "Extension using ArtifactNamespace" do
           end
         end
       end
-      
+
       define 'foo' do
         define 'bar' do
           extend A::Example::Ext
@@ -643,7 +732,7 @@ describe "Extension using ArtifactNamespace" do
 
       project('foo:bar').example.requires.should_not == project('foo:baz').example.requires
       project('foo:bar').example.requires.xmlbeans.should_not == project('foo:baz').example.requires.xmlbeans
-      
+
       # current namespace outside a project is :root, see the stax callback
       project('foo:baz').example.options.stax_api = '1.6180'
       # we call the task outside the project, see #doit