BuildMaster 0.8.1 → 0.9.0

data/test/buildmaster/tc_build_number_file.rb

@@ -1,31 +1,36 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
 
-require 'test/unit'
+require 'spec'
 
 require 'buildmaster/build_number_file'
+require 'buildmaster/cotta'
+require 'buildmaster/cotta/in_memory_system'
 
 module BuildMaster
-class BuildNumberFileTest < Test::Unit::TestCase
-  def test_load_file
-    path = tmp_file(2)
+context 'BuildNumberFileTest' do
+  setup do
+    @cotta = Cotta.new(InMemorySystem.new)
+  end
+  
+  teardown do
+    @cotta = nil
+  end
+  
+  specify 'load_file' do
+    path = @cotta.file('tmp/buildnumber')
+    path.save(2)
     build_number = BuildNumberFile.new(path)
-    assert_equal(2, build_number.number)
+    build_number.number.should_equal 2
   end
   
-  def test_increase_build
-    path = tmp_file(3)
+  specify 'increase_build' do
+    path = @cotta.file('tmp/buildnumber')
+    path.save(3)
     build_number = BuildNumberFile.new(path)
     build_number.increase_build
-    assert_equal(4, build_number.number)
+    build_number.number.should_equal 4
     reloaded = BuildNumberFile.new(path)
-    assert_equal(4, reloaded.number)
-  end
-  
-  private
-  def tmp_file(build_number)
-    path = File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'buildnumber')
-    File.open(path, "w") {|file| file.puts build_number}
-    return path
+    reloaded.number.should_equal 4
   end
 end
 end

data/test/buildmaster/tc_cvs_driver.rb

@@ -1,64 +1,62 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 
-require 'test/unit'
+require 'spec'
 require 'buildmaster'
+require 'buildmaster/cotta'
+require 'buildmaster/cotta/in_memory_system'
 
 module BuildMaster
 
-class CvsDriverTest < Test::Unit::TestCase
-  protected
-  def setUp() 
-    super
+context 'CvsDriverTest' do
+
+  setup do
+    @system = InMemorySystem.new
+    @cotta = Cotta.new(@system)
+    @working = @cotta.dir('working')
   end
   
-  private 
-  def ensure_folder_exists(path)
-    if (not File.exists? path)
-      Dir.mkdir(path)      
-    end
+  teardown do
+    @system = nil
+    @cotta = nil
+    @working = nil
   end
-  
-  public
-  def test_load_CvsInfo
-    folder = 'tmp'
-    ensure_folder_exists(folder);
+
+  specify 'load_CvsInfo' do
+    folder = @cotta.dir('tmp')
+    folder.mkdirs
     root = ':ext:wolfdancer@cvsserver.com:/cvs/root'
     repository = 'xpe'
-    write("#{folder}/ROOT", root)
-    write("#{folder}/Repository", repository)
+    folder.file('ROOT').save(root)
+    folder.file('Repository').save(repository)
     cvs = CvsInfo.load(folder)
-    assert_equal(root, cvs.root)
-    assert_equal(repository, cvs.repository)
+    cvs.root.should_equal root
+    cvs.repository.should_equal repository
   end
   
-  def tes_checkout
-    log = ''
-    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+  specify 'checkout' do
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), @working)
     client.checkout
-    assert_equal('cvs -d root co -d working module', log)
+    @system.executed_commands.size.should_equal 1
+    @system.executed_commands[0].should_equal 'cvs -d root co -d working module'
   end
   
-  def test_update
+  specify 'update' do
     log = ''
-    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), @working)
     client.update
-    assert_equal('cvs -d root update working', log)
+    @system.executed_commands.size.should_equal 1
+    @system.executed_commands[0].should_equal 'cvs -d root update working'
     client.update('-PAd')
-    assert_equal('cvs -d root update -PAd working', log)
+    @system.executed_commands.size.should_equal 2
+    @system.executed_commands[1].should_equal 'cvs -d root update -PAd working'
   end
   
-  def test_command
+  specify 'command' do
     log = ''
-    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), @working)
     client.command('command -option argument')
-    assert_equal('cvs -d root command -option argument working', log)
-  end
-  
-  private 
-  def write(fileName, content)
-    File.open(fileName, "w") do |file|
-      file.puts content
-    end
+    @system.executed_commands.size.should_equal 1
+    @system.executed_commands[0].should_equal 'cvs -d root command -option argument working'
   end
 
 end

data/test/buildmaster/tc_file_processor.rb

@@ -1,76 +1,100 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 
-require 'test/unit'
+require 'spec'
 require 'rexml/document'
 require 'pathname'
 require 'buildmaster/file_processor'
 require 'buildmaster/xtemplate'
+require 'buildmaster/cotta'
+require 'buildmaster/cotta/in_memory_system'
+
 
 module BuildMaster
-class FileProcessorTest < Test::Unit::TestCase
-  def test_should_know_content_and_target
+
+context 'File Processor' do
+  setup do
+    @cotta = Cotta.new(InMemorySystem.new)
+    @cotta.file('content').save(<<CONTENT
+line one
+line two
+line three
+CONTENT
+)
+  end
+  
+  teardown do
+    @cotta = nil
+  end
+
+  specify 'should know content and target' do
       template = XTemplate.new(<<CONTENT
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
 </html>
 CONTENT
 )
-      site_spec = SiteSpec.new
-      current_dir = File.dirname(__FILE__)
-      site_spec.content_dir = File.join(current_dir, "content")
-      site_spec.output_dir = File.join(current_dir, "output")
-      processor = FileProcessor.new(template, File.join(current_dir, 'content', 'index.html'), site_spec)
-      assert_equal(File.join(current_dir, 'content', 'index.html'), processor.path_to_content_file)
-      assert_equal(true, processor.is_html?)
+      site_spec = SiteSpec.new('file.txt', @cotta)
+      site_spec.content_dir = 'content'
+      site_spec.output_dir = 'output'
+      processor = FileProcessor.new(template, @cotta.file('content/index.html'), site_spec)
+      processor.content_file.path.should_equal(Pathname.new('content/index.html'))
+      processor.is_html?.should_equal(true)
   end
   
-  def test_should_know_html_target
+  specify 'should know HTML target file' do
       template = XTemplate.new(<<CONTENT
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
 </html>
 CONTENT
 )
-      site_spec = SiteSpec.new
-      current_dir = File.dirname(__FILE__)
-      site_spec.content_dir = File.join(current_dir, "content")
-      site_spec.output_dir = File.join(current_dir, "output")
-      processor = FileProcessor.new(template, File.join(current_dir, 'content', 'index.gif'), site_spec)
-      assert_equal(File.join(current_dir, 'content', 'index.gif'), processor.path_to_content_file)
-      assert_equal(false, processor.is_html?)
-      assert_equal(nil, processor.generate_document)
+      site_spec = SiteSpec.new(nil, @cotta)
+      current_dir = @cotta.dir('root')
+      site_spec.content_dir = 'root/content'
+      site_spec.output_dir = 'root/output'
+      processor = FileProcessor.new(template, current_dir.dir('content').file('index.gif'), site_spec)
+      processor.content_file.path.should_equal current_dir.dir('content').file('index.gif').path
+      processor.is_html?.should_equal false
+      processor.generate_document.should_equal nil
   end
   
-  def test_should_load_from_target
+  specify 'should load from target file' do
       template_content = <<CONTENT
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
 </html>
 CONTENT
-      site_spec = SiteSpec.new
-      current_dir = File.dirname(__FILE__)
+      site_spec = SiteSpec.new(__FILE__, @cotta)
+      current_dir = @cotta.dir(File.dirname(__FILE__))
+      current_dir.dir('site').dir('content').file('index.html').save
+      current_dir.dir('site').dir('content').file('index.gif').save
+      current_dir.dir('site').dir('content').file('textile.textile').save
+      current_dir.dir('site').dir('content').file('markdown.markdown').save
       site_spec.template = template_content
-      site_spec.content_dir = File.join(current_dir, 'site', 'content')
-      site_spec.output_dir = File.join(current_dir, "output")
+      site_spec.content_dir = 'site/content'
+      site_spec.output_dir = 'output'
       processor = FileProcessor.for_request_path('/index.html', site_spec)
-      assert_equal(File.join(site_spec.content_dir, 'index.html'), processor.path_to_content_file)
+      processor.content_file.should_equal site_spec.content_dir.file('index.html')
+      
       processor = FileProcessor.for_request_path('/index.gif', site_spec)
-      assert_equal(File.join(site_spec.content_dir, 'index.gif'), processor.path_to_content_file)
+      processor.content_file.should_equal site_spec.content_dir.file('index.gif')
+
       processor = FileProcessor.for_request_path('/textile.html', site_spec)
-      assert_equal(File.join(site_spec.content_dir, 'textile.textile'), processor.path_to_content_file)
+      processor.content_file.should_equal site_spec.content_dir.file('textile.textile')
+
       processor = FileProcessor.for_request_path('/markdown.html', site_spec)
-      assert_equal(File.join(site_spec.content_dir, 'markdown.markdown'), processor.path_to_content_file)
+      processor.content_file.should_equal site_spec.content_dir.file('markdown.markdown')
   end
   
   def output_dir
-    return 'tmp'
+    return @cotta.dir('tmp')
   end
   
   def relative_to_root(path)
     return Pathname.new('tmp')
   end
-  
-  def test_mark_down_support
+
+  specify 'should have support for markdown content' do
     template_content = <<CONTENT
 <html xmlns="http://www.w3.org/1999/xhtml"
         xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
@@ -83,7 +107,7 @@ CONTENT
     hash = {'include' => Include.new(self)}
     template = XTemplate.new(template_content, hash)
 
-    processor = FileProcessor.new(template, "content_path", self)
+    processor = FileProcessor.new(template, @cotta.file('content_path'), self)
     markdown_content = <<CONTENT
 --------------------------------------------
 Title Here
@@ -93,8 +117,8 @@ Header
 CONTENT
     document = processor.process_markdown(markdown_content)
     document = REXML::Document.new(document.to_s)
-    assert_equal('Title Here', REXML::XPath.first(document, '/html/head/title').text)
-    assert_equal('Header', REXML::XPath.first(document, '/html/body/h1').text)
+    REXML::XPath.first(document, '/html/head/title').text.should_equal 'Title Here'
+    REXML::XPath.first(document, '/html/body/h1').text.should_equal 'Header'
   end
   
 end

data/test/buildmaster/tc_java_manifest.rb

@@ -1,23 +1,51 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 
-require 'test/unit'
+require 'spec'
 require 'buildmaster'
+require 'buildmaster/cotta'
+require 'buildmaster/cotta/in_memory_system'
 
 module BuildMaster
 
-class JavaManifestTest < Test::Unit::TestCase
-  def test_loading_manifest
-    manifest = JavaManifest.new(File.join(File.dirname(__FILE__), "manifest.mf"))
+context 'JavaManifestTest' do
+  setup do
+    @cotta = Cotta.new(InMemorySystem.new)
+  end
+  
+  teardown do
+    @cotta = nil
+  end
+
+  specify 'loading_manifest' do
+    file = @cotta.file('dir/manifest.mf')
+    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
-    assert_equal(version.number, "2.3.3")
+    "2.3.3".should_equal version.number
   end
   
-  def test_increase_build
-    manifest = JavaManifest.new(File.join(File.dirname(__FILE__), "manifest.mf"))
+  specify 'increase_build' do
+    file = @cotta.file('dir/manifest.mf')
+    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
-    assert_equal(version.build, build_number + 1)
-    assert_equal(version.build, manifest.version.build)
+    (build_number + 1).should_equal version.build
+    manifest.version.build.should_equal version.build
   end
 end
 end

data/test/buildmaster/tc_site_spec.rb

@@ -1,26 +1,31 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 
-require 'test/unit'
+require 'spec'
 require 'buildmaster'
+require 'buildmaster/cotta'
+require 'buildmaster/cotta/in_memory_system'
 
 module BuildMaster
 
-class SiteSpecTest < Test::Unit::TestCase
+context 'Site Specification' do
+  setup do
+    @cotta = Cotta.new(InMemorySystem.new)
+  end
 
-  def test_should_get_relative_path
-    spec = SiteSpec.new()
+  specify 'get relative path' do
+    spec = SiteSpec.new(nil, @cotta)
     spec.content_dir = '/one/two/content'
-    assert_equal('images/logo.gif', spec.relative_to_root('/one/two/content/images/logo.gif').to_s)
+    spec.relative_to_root(@cotta.file('/one/two/content/images/logo.gif')).to_s.should_equal('images/logo.gif')
   end
   
-  def test_should_support_windows_path
-    spec = SiteSpec.new()
-    spec.content_dir = "C:\\Work\\project\\content"
-    assert_equal('images/logo.gif', spec.relative_to_root('C:\\Work\\project\\content\\images\\logo.gif').to_s)
+  specify 'supports windows path' do
+    spec = SiteSpec.new(nil, @cotta)
+    spec.content_dir = 'C:\Work\project\content'
+    spec.relative_to_root(@cotta.file('C:\Work\project\content\images\logo.gif')).to_s.should_equal('images/logo.gif')
   end
   
-  def test_initialize_with_block
-    spec = SiteSpec.new(__FILE__) do |sitespec|
+  specify 'initialization with block' do
+    spec = SiteSpec.new(__FILE__, @cotta) do |sitespec|
       sitespec.content_dir = 'content'
       sitespec.output_dir = 'output'
       sitespec.page_layout = <<CONTENT
@@ -39,10 +44,10 @@ menu_groups:
 - title: second menu group
 CONTENT
     end
-    root = File.dirname(__FILE__)
-    assert_equal(File.join(root, 'content'), spec.content_dir)
-    assert_equal(File.join(root, 'output'), spec.output_dir)
-    assert_equal(true, spec.load_template_source.to_s.include?('first menu group'))
+    root = @cotta.dir(__FILE__).parent
+    spec.content_dir.should_equal(root.dir('content'))
+    spec.output_dir.should_equal(root.dir('output'))
+    spec.load_template_source.to_s.include?('first menu group').should_equal true
   end
   
 end

data/test/buildmaster/tc_source_file_handler.rb

@@ -1,16 +1,16 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
 
-require 'test/unit'
+require 'spec'
 require 'buildmaster'
 require 'webrick'
 require 'source_file_handler'
 
 module BuildMaster
 
-class SourceFileHandlerTest < Test::Unit::TestCase
+context 'SourceFileHandler' do
   attr_reader :path_info
 
-  def test_should_be_able_to_find_source
+  specify 'should_be_able_to_find_source' do
     server = WEBrick::HTTPServer.new(:Port => 2000)
     dir = File.dirname(__FILE__)
     spec = SiteSpec.new
@@ -30,7 +30,7 @@ TEMPLATE
     @path_info = '/markdown.html'
     file_handler.service(self, self)
     document = REXML::Document.new(self['body'])
-    assert_equal('Title', REXML::XPath.first(document, '/html/head/title').text)
+    REXML::XPath.first(document, '/html/head/title').text.should_equal 'Title'
   end
   
   def []=(name, value)