BuildMaster 1.0.9 → 1.1.9

data/test/buildmaster/cotta/tc_cotta_zip_support.rb

@@ -6,12 +6,12 @@ require 'cotta'
 require 'cotta/in_memory_system'
 
 module BuildMaster
-context 'zip support in cotta' do
-  setup do
+describe Cotta, 'zip support' do
+  before do
     @cotta = Cotta.new(InMemorySystem.new)
   end
   
-  specify 'extract from a tar file' do
+  it 'extract from a tar file' do
     tar_file = Cotta.parent_of(__FILE__).file('tar_test.tar')
     dir = @cotta.dir('dir/extract')
     tar_file.extract(dir)
@@ -21,7 +21,7 @@ context 'zip support in cotta' do
     dir.file('three.txt').load.should == 'three'
   end
   
-  specify 'archive files in the directory to a file' do
+  it 'should archive files in the directory to a file' do
     source = @cotta.dir('dir/source')
     source.file('one.txt').save('one')
     source.file('two.txt').save('two')
@@ -31,13 +31,13 @@ context 'zip support in cotta' do
     
     target_dir = @cotta.dir('target')
     tar_file.extract(target_dir)
-    target_dir.should_have(3).list
     target_dir.file('one.txt').load.should == 'one'
     target_dir.file('two.txt').load.should == 'two'
     target_dir.file('three.txt').load.should == 'three'
+    target_dir.should have(3).list
   end
 
-  specify 'archive subdirectories' do
+  it 'archive subdirectories' do
       source = @cotta.dir('dir/source')
       sub = source.dir('sub')
       sub.file('one.txt').save('one')
@@ -47,9 +47,9 @@ context 'zip support in cotta' do
 
       target_dir = @cotta.dir('target')
       tar_file.extract(target_dir)
-      target_dir.should_have(1).list
-      target_dir.dir('sub').should_exists
-      target_dir.dir('sub').should_have(2).list
+      target_dir.should have(1).list
+      target_dir.dir('sub').should be_exists
+      target_dir.dir('sub').should have(2).list
       target_dir.file('sub/one.txt').load.should == 'one'
       target_dir.file('sub/two.txt').load.should == 'two'
   end

data/test/buildmaster/cotta/tc_in_memory_system.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'system_file_specifications'
+require 'file_system_behaviors'
   
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
 
@@ -9,19 +9,19 @@ require 'spec'
 
 module BuildMaster
 
-context 'In memory system' do
-  setup do
+describe InMemorySystem do
+  it_should_behave_like 'FileSystemBehaviors'
+
+  def create_system
     @system = InMemorySystem.new
     @ios = Array.new
   end
   
-  teardown do
+  after do
     @ios.each {|io| io.close unless io.closed?}
   end
   
-  register_system_file_specifications
-      
-  specify 'root directory always exists' do
+  it 'root directory always exists' do
     @system.dir_exists?(Pathname.new('/')).should == true
     @system.dir_exists?(Pathname.new('D:/')).should == true
   end

data/test/buildmaster/cotta/tc_io_chain.rb

@@ -10,13 +10,13 @@ require 'physical_system_stub'
 
 module BuildMaster
 module IoChain
-  context 'io chain' do
+  describe IoChain do
     include IoChain
-    setup do
+    before do
       @cotta = Cotta.new(PhysicalSystemStub.new)
     end
 
-    specify 'copy binary io' do
+    it 'copy binary io' do
       file = Cotta.parent_of(__FILE__).file('logo.gif')
       target = @cotta.file('target.gif')
       file.read_binary do |input|

data/test/buildmaster/cotta/tc_pathname.rb

@@ -3,18 +3,18 @@ require 'spec'
 
 require 'cotta'
 
-context 'pathname methods for cotta' do
-  specify 'parent check for unix path' do
+describe Pathname do
+  it 'parent check for unix path' do
     pathname = Pathname.new('/')
-    pathname.cotta_parent.should_be nil
+    pathname.cotta_parent.should be_nil
   end
   
-  specify 'parent check for windows path' do
+  it 'parent check for windows path' do
     pathname = Pathname.new('D:/')
-    pathname.cotta_parent.should_be nil
+    pathname.cotta_parent.should be_nil
   end
   
-  specify 'parent check for normal ppl' do
+  it 'parent check for normal ppl' do
     pathname = Pathname.new('/test')
     pathname.cotta_parent.should == Pathname.new('/')
   end

data/test/buildmaster/cotta/tc_physical_system.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-require 'system_file_specifications'
+require 'file_system_behaviors'
 require 'physical_system_stub'
   
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
@@ -10,25 +10,24 @@ require 'spec'
 
 module BuildMaster
 
-context 'Physical System' do
-  setup do
+describe PhysicalSystem do
+  it_should_behave_like "FileSystemBehaviors"
+  def create_system
     @system = PhysicalSystemStub.new
     @ios = Array.new
   end
   
-  teardown do
+  after do
     @ios.each {|io| io.close unless io.closed?}
   end
 
-  register_system_file_specifications
-
-  specify 'root directory always exists' do
+  it 'root directory always exists' do
     @system = PhysicalSystem.new
     @system.dir_exists?(Pathname.new('/')).should == true
     @system.dir_exists?(Pathname.new('D:/')).should == true
   end
   
-  specify 'shell command should return output' do
+  it 'shell command should return output' do
     @system = PhysicalSystem.new
     @system.shell('ruby --version')[0..3].should == 'ruby'
   end

data/test/buildmaster/project/tc_ant_driver.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib", "buildmaster")
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", '..', "lib", "buildmaster")
 
 require 'spec'
 require 'project'
@@ -6,27 +6,27 @@ require 'cotta'
 
 module BuildMaster
 
-context 'AntTest' do
-  setup do
+describe AntDriver do
+  before do
     cotta = Cotta.new()
     build_file = cotta.file(__FILE__).parent.file('build.xml')
     @ant = AntDriver.from_file(build_file)
   end
 
-  specify 'run' do
+  it 'run' do
     @ant.project_help
   end
   
-  specify 'pass' do
+  it 'pass' do
     @ant.target('passing')
   end
   
-  specify 'dynamic_method' do
+  it 'dynamic_method' do
     @ant.passing
   end
   
-  specify 'fail' do
-    lambda {@ant.target('failing')}.should_raise CommandError
+  it 'fail' do
+    lambda {@ant.target('failing')}.should raise_error(CommandError)
   end
 end
 

data/test/buildmaster/project/tc_build_number_file.rb

@@ -7,23 +7,23 @@ require 'cotta'
 require 'cotta/in_memory_system'
 
 module BuildMaster
-context 'BuildNumberFileTest' do
-  setup do
+describe BuildNumberFile do
+  before do
     @cotta = Cotta.new(InMemorySystem.new)
   end
   
-  teardown do
+  after do
     @cotta = nil
   end
   
-  specify 'load_file' do
+  it 'load_file' do
     path = @cotta.file('tmp/buildnumber')
     path.save(2)
     build_number = BuildNumberFile.new(path)
     build_number.number.should == 2
   end
   
-  specify 'increase_build' do
+  it 'increase_build' do
     path = @cotta.file('tmp/buildnumber')
     path.save(3)
     build_number = BuildNumberFile.new(path)

data/test/buildmaster/project/tc_cvs_driver.rb

@@ -1,27 +1,27 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib", 'buildmaster')
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", '..', "lib", 'buildmaster')
 
 require 'spec'
 require 'cotta'
 require 'cotta/in_memory_system'
-require 'cvs_driver'
+require 'project/cvs_driver'
 
 module BuildMaster
 
-context 'CvsDriverTest' do
+describe CvsDriver do
 
-  setup do
+  before do
     @system = InMemorySystem.new
     @cotta = Cotta.new(@system)
     @working = @cotta.dir('working')
   end
   
-  teardown do
+  after do
     @system = nil
     @cotta = nil
     @working = nil
   end
 
-  specify 'load_CvsInfo' do
+  it 'load_CvsInfo' do
     folder = @cotta.dir('tmp')
     folder.mkdirs
     root = ':ext:wolfdancer@cvsserver.com:/cvs/root'
@@ -33,14 +33,14 @@ context 'CvsDriverTest' do
     cvs.repository.should == repository
   end
   
-  specify 'checkout' do
+  it 'checkout' do
     @system.output_for_command 'cvs -d root co -d working module', ''
     client = CvsDriver.new(CvsInfo.new('root', 'module'), @working)
     client.checkout
     @system.executed_commands.size.should == 1
   end
   
-  specify 'update' do
+  it 'update' do
     @system.output_for_command 'cvs -d root update working', ''
     @system.output_for_command 'cvs -d root update -PAd working', ''
     log = ''
@@ -51,7 +51,7 @@ context 'CvsDriverTest' do
     @system.executed_commands.size.should == 2
   end
   
-  specify 'command' do
+  it 'command' do
     @system.output_for_command 'cvs -d root command -option argument working', ''
     log = ''
     client = CvsDriver.new(CvsInfo.new('root', 'module'), @working)

data/test/buildmaster/project/tc_java_manifest.rb

@@ -1,46 +1,44 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib", 'buildmaster')
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", '..', "lib", 'buildmaster')
 
 require 'spec'
 require 'cotta'
 require 'cotta/in_memory_system'
-require 'java_manifest'
+require 'project/java_manifest'
 
 module BuildMaster
 
-context 'JavaManifestTest' do
-  setup do
+describe JavaManifest do
+  before do
     @cotta = Cotta.new(InMemorySystem.new)
   end
   
-  teardown do
+  after do
     @cotta = nil
   end
 
-  specify 'loading_manifest' do
+  it 'loading_manifest' do
     file = @cotta.file('dir/manifest.mf')
-    file.save(<<CONTENT
+    file.save <<CONTENT
 Implementation-Version: 2.3.3
 Implementation-Build: 1139
 
 Implementation-Vendor: Vendor
 Implementation-Number: Number
 CONTENT
-)
     manifest = JavaManifest.new(file)
     version = manifest.version
     "2.3.3".should == version.number
   end
   
-  specify 'increase_build' do
+  it 'increase_build' do
     file = @cotta.file('dir/manifest.mf')
-    file.save(<<CONTENT
+    file.save <<CONTENT
 Implementation-Version: 2.3.3
 Implementation-Build: 1139
 
 Implementation-Vendor: Vendor
 Implementation-Number: Number
 CONTENT
-)    
     manifest = JavaManifest.new(file)
     build_number = manifest.version.build
     version = manifest.increase_build

data/test/buildmaster/project/tc_release.rb

@@ -1,12 +1,12 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster', 'build')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
 
-require 'release'
+require 'project/release'
 require 'spec'
 
 module BuildMaster
 
-context 'release management' do
-  specify 'run tasks in order' do
+describe Release do
+  it 'run tasks in order' do
     mock = mock('tasks')
     mock.should_receive(:one).once.ordered
     mock.should_receive(:two).once.ordered
@@ -16,7 +16,7 @@ context 'release management' do
     release.execute
   end
   
-  specify 'run task from specified step in order' do
+  it 'run task from specified step in order' do
     mock = mock('tasks')
     mock.should_receive(:two).once.ordered
     mock.should_receive(:three).once.ordered
@@ -27,7 +27,7 @@ context 'release management' do
     release.execute('two')
   end
   
-  specify 'run tasks between two' do
+  it 'run tasks between two' do
     mock = mock('tasks')
     mock.should_receive(:two).once.ordered
     mock.should_receive(:three).once.ordered
@@ -39,21 +39,21 @@ context 'release management' do
     release.execute('two', 'three')
   end
   
-  specify 'don\'t allow duplicate tasks' do
+  it 'don\'t allow duplicate tasks' do
     release = Release.new
     release.task('one') {}
-    Proc.new {release.task('one')}.should_raise RuntimeError
+    Proc.new {release.task('one')}.should raise_error(RuntimeError)
   end
   
-  specify 'raise error for task not found' do
+  it 'raise error for task not found' do
     release = Release.new
     release.task('two') {}
-    Proc.new {release.execute('one')}.should_raise RuntimeError
+    Proc.new {release.execute('one')}.should raise_error(RuntimeError)
   end
   
-  specify 'raise error for empty task' do
+  it 'raise error for empty task' do
     release = Release.new
-    Proc.new {release.execute}.should_raise RuntimeError
+    Proc.new {release.execute}.should raise_error(RuntimeError)
   end
   
 end

data/test/buildmaster/project/tc_server_manager.rb

@@ -1,8 +1,8 @@
-require 'spec'
-
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib', 'buildmaster')
 
 require 'project/server_manager'
+require 'spec'
+
 
 module BuildMaster
 class StubServer
@@ -26,12 +26,12 @@ class StubServer
   end
 end
 
-context 'server manager' do
-  specify 'server manager default to stopped status' do
+describe ServerManager do
+  it 'server manager default to stopped status' do
     ServerManager.new(mock('server')).status.should == 'stopped'
   end
   
-  specify 'launch server' do
+  it 'launch server' do
     server = mock('server')
     server.should_receive(:start)
     server.should_receive(:running?).and_return(true)
@@ -40,20 +40,20 @@ context 'server manager' do
     manager.status.should == 'started'
   end
   
-  specify 'keep checking server to see if it is running' do
+  it 'keep checking server to see if it is running' do
     manager = ServerManager.new(StubServer.new)
     manager.start
     manager.status.should == 'started'
   end
   
-  specify 'stop and wait until it is not runnig anymore' do
+  it 'stop and wait until it is not runnig anymore' do
     manager = ServerManager.new(StubServer.new)
     manager.start
     manager.stop
     manager.status.should == 'stopped'
   end
   
-  specify 'raise error if start failed' do
+  it 'raise error if start failed' do
     server = mock('server that fails on start')
     server.should_receive(:start).and_raise 'error'
     server.should_receive(:running?).any_number_of_times.and_return(false)