BuildMaster 0.8.0 → 0.8.1

data/lib/buildmaster/buildnumber

@@ -1 +1 @@
-9
+15

data/lib/buildmaster/site/template_builder.rb

@@ -54,7 +54,6 @@ class Releases
   def initialize
     @pre_release_version = 'n/a'
     @snap_shot_version = 'n/a'
-    @download_link = 'download.html'
     @versioning_link = 'versioning.html'
   end
 end

data/lib/buildmaster/svn_driver.rb

@@ -12,22 +12,19 @@ class SvnInfo
   end
   
   def analyze_entry_file(path)
-    content = load_content(path)
-    xml = REXML::Document.new(content)
-    xml.root.each_element_with_attribute('name', '', 1) do |element|
-      @repository_root = element.attributes['repos']
+    File.open(path, 'r') do |file|
+      parse_xml_load_repository_root(file)
     end
   end
   
-  def load_content(path)
-    buffer = StringIO.new
-    File.open(path, 'r') do |file|
-      while (line = file.gets)
-        buffer.puts(line)
-      end
+  private
+  def parse_xml_load_repository_root(file)
+    xml = REXML::Document.new(file)
+    xml.root.each_element_with_attribute('name', '', 1) do |element|
+      @repository_root = element.attributes['repos']
     end
-    return buffer.string
   end
+  
 end
 
 class SvnDriver

data/lib/buildmaster/templatelets/href.rb

@@ -22,7 +22,11 @@ class Href
   def construct_href(url, current_path)
     href = url
     if (URI.parse(url).scheme.nil?)
-      href = Pathname.new(url).relative_path_from(current_path.parent)
+      path = Pathname.new(url)
+      if (not path.relative?)
+        path = path.relative_path_from(Pathname.new('/'))
+      end
+      href = path.relative_path_from(current_path.parent)
     end  
     return href
   end
@@ -36,4 +40,4 @@ class Href
     end
   end
 end
-end
+end

data/test/buildmaster/manifest.mf

@@ -1,5 +1,5 @@
 Implementation-Version: 2.3.3
-Implementation-Build: 1114
+Implementation-Build: 1132
 
 Implementation-Vendor: Vendor
 Implementation-Number: Number

data/test/buildmaster/site/tc_template_builder.rb

@@ -77,7 +77,15 @@ class TemplateBuilderTest < Test::Unit::TestCase
     releases.snap_shot_version = 'n/a'
     releases.download_link = 'download.html'
     releases.versioning_link = 'versioning.html'
-    builder.generate
+    document = builder.generate
+    assert_equal('Latest Versions', REXML::XPath.first(document, '/html/body/template:when/div[@class="right"]/div/h1').text)
+  end
+  
+  def test_should_have_no_release_info_if_not_assigned
+    builder = TemplateBuilder.new
+    builder.releases.download_link = nil
+    document = builder.generate
+    assert_equal(0, REXML::XPath.match(document, '/html/body/template:when/div/*').size)
   end
 
   def test_should_read_from_yaml

data/test/buildmaster/tc_source_file_handler.rb

@@ -11,7 +11,7 @@ class SourceFileHandlerTest < Test::Unit::TestCase
   attr_reader :path_info
 
   def test_should_be_able_to_find_source
-    server = WEBrick::HTTPServer.new
+    server = WEBrick::HTTPServer.new(:Port => 2000)
     dir = File.dirname(__FILE__)
     spec = SiteSpec.new
     spec.template =<<TEMPLATE

data/test/buildmaster/templatelets/tc_href.rb

@@ -43,6 +43,13 @@ class HrefTest < CommonTemplateletTest
     @href.process(@target_element, @template_element, source('download/download.html'))
     assert_equal('http://www.google.com', @target_element.attributes['src'])
   end
+
+  def test_should_handle_absolute_path
+    @template_element.attributes['url'] = '/doc.html'
+    @target_element = create_element('img')
+    @href.process(@target_element, @template_element, source('download/download.html'))
+    assert_equal('../doc.html', @target_element.attributes['src'])
+  end
   
 end
-end
+end

data/test/buildmaster/templatelets/tc_when.rb

@@ -45,15 +45,15 @@ CONTENT
   end
   
   def expression_for_true(path)
-    return true
+    return 'word two' =~ /word/
   end
   
   def expression_for_false(path)
-    return false
+    return 'one word two' =~ /nomatch/
   end
   
   def load_templatelets
     return Hash.new
   end
 end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: BuildMaster
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2006-08-08 00:00:00 -07:00
+  version: 0.8.1
+date: 2006-08-31 00:00:00 -06:00
 summary: A project that hosts a series of scripts to be used in project building, project releasing, and site building.
 require_paths: 
 - lib