buildr 1.3.1.1 → 1.3.2

data/spec/transport_spec.rb

@@ -391,7 +391,7 @@ end
 
 describe URI::SFTP, '#read' do
   before do
-    @uri = URI('sftp://john:secret@localhost/path/readme')
+    @uri = URI('sftp://john:secret@localhost/root/path/readme')
     @content = 'Readme. Please!'
 
     @ssh_session = mock('Net::SSH::Session')
@@ -413,21 +413,21 @@ describe URI::SFTP, '#read' do
   end
 
   it 'should open file for reading' do
-    @file_factory.should_receive(:open).with('/path/readme', 'r')
+    @file_factory.should_receive(:open).with('/root/path/readme', 'r')
     @uri.read
   end
 
   it 'should read contents of file and return it' do
     file = mock('Net::SFTP::Operations::File')
     file.should_receive(:read).with(an_instance_of(Numeric)).once.and_return(@content, nil)
-    @file_factory.should_receive(:open).with('/path/readme', 'r').and_yield(file)
+    @file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
     @uri.read.should eql(@content)
   end
 
   it 'should read contents of file and pass it to block' do
     file = mock('Net::SFTP::Operations::File')
     file.should_receive(:read).with(an_instance_of(Numeric)).once.and_return(@content, nil)
-    @file_factory.should_receive(:open).with('/path/readme', 'r').and_yield(file)
+    @file_factory.should_receive(:open).with('/root/path/readme', 'r').and_yield(file)
     content = ''
     @uri.read do |chunk|
       content << chunk
@@ -439,7 +439,7 @@ end
 
 describe URI::SFTP, '#write' do
   before do
-    @uri = URI('sftp://john:secret@localhost/path/readme')
+    @uri = URI('sftp://john:secret@localhost/root/path/readme')
     @content = 'Readme. Please!'
 
     @ssh_session = mock('Net::SSH::Session')
@@ -449,7 +449,9 @@ describe URI::SFTP, '#write' do
       Net::SFTP::Session.should_receive(:new).with(@ssh_session).and_yield(@sftp_session).and_return(@sftp_session)
       @sftp_session.should_receive(:connect!).and_return(@sftp_session)
       @sftp_session.should_receive(:loop)
-      @sftp_session.stub!(:mkdir)
+      @sftp_session.stub!(:opendir!).and_return { fail }
+      @sftp_session.stub!(:close)
+      @sftp_session.stub!(:mkdir!)
       @sftp_session.should_receive(:file).with.and_return(@file_factory)
       @file_factory.stub!(:open)
       @ssh_session.should_receive(:close)
@@ -461,27 +463,41 @@ describe URI::SFTP, '#write' do
     @uri.write @content
   end
 
-  it 'should create path recursively on SFTP server' do
-    @sftp_session.should_receive(:mkdir).ordered.with('', {})
-    @sftp_session.should_receive(:mkdir).ordered.with('/path', {})
+  it 'should check that path exists on server' do
+    paths = ['/root', '/root/path']
+    @sftp_session.should_receive(:opendir!).with(anything()).twice { |path| paths.shift.should == path }
     @uri.write @content
   end
 
-  it 'should only create paths that don\'t exist' do
-    @sftp_session.should_receive(:realpath).any_number_of_times
-    @sftp_session.should_not_receive(:mkdir)
+  it 'should close all opened directories' do
+    @sftp_session.should_receive(:opendir!).with(anything()).twice do |path| 
+      @sftp_session.should_receive(:close).with(handle = Object.new)
+      handle
+    end
+    @uri.write @content
+  end
+
+  it 'should create missing paths on server' do
+    @sftp_session.should_receive(:opendir!).twice { |path| fail unless path == '/root' }
+    @sftp_session.should_receive(:mkdir!).once.with('/root/path', {})
+    @uri.write @content
+  end
+
+  it 'should create missing directories recursively' do
+    paths = ['/root', '/root/path']
+    @sftp_session.should_receive(:mkdir!).with(anything(), {}).twice { |path, options| paths.shift.should == path }
     @uri.write @content
   end
 
   it 'should open file for writing' do
-    @file_factory.should_receive(:open).with('/path/readme', 'w')
+    @file_factory.should_receive(:open).with('/root/path/readme', 'w')
     @uri.write @content
   end
 
   it 'should write contents to file' do
     file = mock('Net::SFTP::Operations::File')
     file.should_receive(:write).with(@content)
-    @file_factory.should_receive(:open).with('/path/readme', 'w').and_yield(file)
+    @file_factory.should_receive(:open).with('/root/path/readme', 'w').and_yield(file)
     @uri.write @content
   end
 

data/spec/version_requirement_spec.rb

@@ -36,7 +36,11 @@ describe Buildr::VersionRequirement, '.create' do
   end
 
   it 'should create a single version requirement' do 
-    create('1.0').should_not have_alternatives
+    create('1.0').should_not be_composed
+  end
+
+  it 'should create a composed version requirement' do 
+    create('1.0 | 2.1').should be_composed
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: buildr
 version: !ruby/object:Gem::Version 
-  version: 1.3.1.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Apache Buildr
@@ -9,23 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-05 00:00:00 -07:00
+date: 2008-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rjb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    - - <=
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -35,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -44,24 +44,27 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 2.0.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyzip
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -71,6 +74,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -80,24 +84,27 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.5
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 1.6.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: Antwrap
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -107,15 +114,17 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.3
+        version: 1.1.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: xml-simple
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -125,6 +134,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: archive-tar-minitar
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -202,7 +212,6 @@ files:
 - lib/buildr/packaging/zip.rb
 - lib/buildr/packaging.rb
 - lib/buildr.rb
-- lib/core
 - addon/buildr
 - addon/buildr/antlr.rb
 - addon/buildr/cobertura.rb
@@ -258,6 +267,7 @@ files:
 - spec/project_spec.rb
 - spec/sandbox.rb
 - spec/scala_compilers_spec.rb
+- spec/scala_test_frameworks_spec.rb
 - spec/spec.opts
 - spec/spec_helpers.rb
 - spec/test_spec.rb
@@ -331,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: buildr
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A build system that doesn't suck