BuildMaster 0.6.0 → 0.7.0

data/lib/buildmaster.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.dirname(__FILE__))
 
+require 'buildmaster/java_manifest'
 require 'buildmaster/shell_command'
 require 'buildmaster/release_control'
-require 'buildmaster/ant_client'
-require 'buildmaster/cvs_client'
+require 'buildmaster/ant_driver'
+require 'buildmaster/cvs_driver'
 require 'buildmaster/svn_driver'
+require 'buildmaster/site_spec'
 require 'buildmaster/site'
 require 'buildmaster/xtemplate'

data/lib/buildmaster/{ant_client.rb → ant_driver.rb}

@@ -1,7 +1,11 @@
 module BuildMaster
 
-class Ant
+class AntDriver
   include Shell
+  def AntDriver.from_file(ant_file)
+    return AntDriver.new(ant_file)
+  end
+  
   def initialize(ant_file = nil, &command_runner)
     @ant_file = ant_file
     @ant_home = check_directory(get_environment('ANT_HOME'))
@@ -58,6 +62,10 @@ class Ant
     run_command(command_line)
   end
   
+  def method_missing(method, *args)
+    target(method)
+  end
+  
   private :get_java_command
 
 end

data/lib/buildmaster/{cvs_client.rb → cvs_driver.rb}

@@ -22,10 +22,10 @@ class CvsInfo
   
 end
 
-class CvsClient
+class CvsDriver
   include Shell
-  def CvsClient.load(working_directory)
-    return CvsClient.new(CvsInfo.load("#{working_directory}/CVS"), working_directory)
+  def CvsDriver.from_path(working_directory)
+    return CvsDriver.new(CvsInfo.load("#{working_directory}/CVS"), working_directory)
   end
   
   def initialize(cvs_info, working_directory, &command_runner)

data/lib/buildmaster/file_processor.rb

@@ -38,24 +38,10 @@ HTML
       return process_html_content(File.open(@content_path))
     end
     
-    private
     def process_html_content(source)
-      document_with_skin = @template.process(source) do |message|
-        begin
-          method = @evaluator.method(message)
-          if (method.arity == 0)
-            method.call
-          else
-            method.call(@content_path)
-          end
-        rescue NameError
-          raise TemplateException,
-            "unable to process message: #{message}: #{$!}" ,
-          caller
-      end
+      document_with_skin = @template.process(source) {|message| @evaluator.evaluate(message, @content_path)}
+      return document_with_skin
     end
-    return document_with_skin
-  end
   
 end
 

data/lib/buildmaster/java_manifest.rb

@@ -0,0 +1,72 @@
+module BuildMaster
+class JavaManifest
+  def initialize(manifest_file)
+    @manifest_file = manifest_file
+  end
+  
+  def version
+    number = nil
+    build = nil
+    IO.foreach(@manifest_file) do |line|
+      name_value = NameValue.parse(line)
+      if (name_value.name== "Implementation-Version")
+        number = name_value.value
+      elsif (name_value.name == "Implementation-Build")
+        build = name_value.value
+      end
+    end
+    return Version.new(number, build.to_i)
+  end
+  
+  def increase_build
+    content = ""
+    number = nil
+    build = nil
+    IO.foreach(@manifest_file) do |line|
+      name_value = NameValue.parse(line)
+      if (name_value.name== "Implementation-Version")
+        number = name_value.value
+        content = content + line
+      elsif (name_value.name == "Implementation-Build")
+        build = name_value.value.to_i + 1
+        content = content + "Implementation-Build: #{build}\n"
+      else
+        content = content + line
+      end
+    end
+    File.open(@manifest_file, "w") do |file|
+      file.printf(content)
+    end
+    return Version.new(number, build)
+  end
+end
+
+class NameValue
+  attr_reader :name, :value
+
+  def NameValue.parse(line)
+    name_value = NameValue.new(nil, nil)
+    index = line.index(':')
+    if (index)
+      name=line[0, index]
+      value=line[index+1, line.length].strip
+      name_value = NameValue.new(name, value)
+    end
+    return name_value
+  end
+  
+  def initialize(name, value)
+    @name = name
+    @value = value
+  end
+end
+
+class Version
+  attr_reader :number, :build
+  
+  def initialize(number, build) 
+    @number = number
+    @build = build
+  end
+end
+end

data/lib/buildmaster/run_ant.rb

@@ -25,7 +25,7 @@ $debug = true
 #######################################################################
 require 'Ant'
 
-if not Ant.new().launch(ARGV)
-  raise 'Ant failed'
+if not AntDriver.new().launch(ARGV)
+  raise 'AntDriver failed'
 end
 

data/lib/buildmaster/shell_command.rb

@@ -1,6 +1,7 @@
 module Shell
   private
   def run(command)
+    puts "--> #{command}"
     if (!system(command))
       raise "error running command: #{command}"
     end

data/lib/buildmaster/site.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'redcloth'
 require 'source_file_handler'
 require 'file_processor'
+require 'site_spec'
 
 module BuildMaster
 #todo match only beginning of the file
@@ -15,51 +16,6 @@ TEXTILE_REGX = /---(-)*\n(.*)\n(-)*---/
     end
   end
 
-  class SiteSpec
-    def self.get_instance
-      self.new()
-    end
-
-    attr_accessor :output_dir, :content_dir, :template, :template_file
-    
-    def validate_inputs
-      validate_dir(@content_dir, :content_dir)
-    end
-    
-    def load_template
-      if (@template)
-        return XTemplate.new(@template)
-      else
-        return XTemplate.new(File.open(@template_file))
-      end
-    end
-    
-    private
-    def validate_dir(directory, symbol)
-      if not directory
-        raise "Directory for #{symbol.id2name} not specified"
-      end
-      if not File.exists? directory
-        raise "Directory for #{symbol.id2name} -- <#{directory}#> does not exist"
-      end
-      if not File.directory? directory
-        raise "<#{directory}> should be a directory for #{symbol.id2name}"
-      end
-    end
-    
-    def validate_file(file, symbol)
-      if not file
-        raise "File for #{symbol.id2name} not specified"
-      end
-      if (not File.exists? file)
-        raise "File for #{symbol.id2name} -- <#{file}> does not exist"
-      end
-      if not File.file? file
-        raise "#<{file} should be a file for #{symbol.id2name}"
-      end
-    end
-  end
-  
   class Site
     def initialize(spec)
       @spec = spec
@@ -73,7 +29,7 @@ TEXTILE_REGX = /---(-)*\n(.*)\n(-)*---/
       if arguments.size > 0
         action = arguments[0]
       end
-      method(action).call
+      send action
     end
     
     def build

data/lib/buildmaster/site_spec.rb

@@ -0,0 +1,84 @@
+require 'pathname'
+
+module BuildMaster
+  class SiteSpec
+    def self.get_instance
+      self.new()
+    end
+
+    attr_accessor :output_dir, :content_dir, :template, :template_file
+    
+    def properties
+      @properties = Hash.new unless @properties
+      return @properties
+    end
+    
+    def validate_inputs
+      validate_dir(@content_dir, :content_dir)
+    end
+    
+    def load_template
+      if (@template)
+        return XTemplate.new(@template)
+      else
+        return XTemplate.new(File.open(@template_file))
+      end
+    end
+
+    def relative_to_root(path)
+      to = path_name(path)
+      from = path_name(@content_dir)
+      return to.relative_path_from(from)
+    end
+    
+    def evaluate(expression, path)
+      value_from_properties = properties()[expression]
+      if (value_from_properties)
+        return value_from_properties
+      end
+      if (!respond_to?(expression, true))
+        raise "Neither property nor method found with name '#{expression}'"
+      end
+      relative_path = relative_to_root(path)
+      if (expression == 'relative_to_root')
+        return relative_path
+      else
+        send(expression, relative_to_root(path).to_s)
+      end
+    end
+    
+    def add_property(name, value)
+      properties()[name] = value
+    end
+    
+    private
+    def path_name(path)
+      return Pathname.new(path.gsub(/\\/, '/'))
+    end
+    
+    def validate_dir(directory, symbol)
+      if not directory
+        raise "Directory for #{symbol.id2name} not specified"
+      end
+      if not File.exists? directory
+        raise "Directory for #{symbol.id2name} -- <#{directory}> does not exist"
+      end
+      if not File.directory? directory
+        raise "<#{directory}> should be a directory for #{symbol.id2name}"
+      end
+    end
+    
+    def validate_file(file, symbol)
+      if not file
+        raise "File for #{symbol.id2name} not specified"
+      end
+      if (not File.exists? file)
+        raise "File for #{symbol.id2name} -- <#{file}> does not exist"
+      end
+      if not File.file? file
+        raise "#<{file} should be a file for #{symbol.id2name}"
+      end
+    end
+  end
+  
+end

data/lib/buildmaster/template_runner.rb

@@ -1,6 +1,6 @@
 module BuildMaster
   class TemplateRunner
-    NAMESPACE = "http://buildmaster.rubyforge.org/xtemplate/1.0"
+  BuildMaster::NAMESPACE = "http://buildmaster.rubyforge.org/xtemplate/1.0"
 
     def initialize(result, template, source, &evaluator)
       @result = result
@@ -39,14 +39,9 @@ module BuildMaster
     end
         
     def process_directive(target, template_element)
-      begin
-        action = method("process_#{template_element.name}_directive")
-        action.call(target, template_element)
-      rescue NameError
-        raise TemplateException,
-          "unable to process template:#{template_element.name}: #{$!}" ,
-          caller
-      end
+      message = "process_#{template_element.name}_directive"
+      raise TemplateException, "unable to process element template:#{template_element.name}" unless respond_to?(message, true)
+      send(message, target, template_element)
     end
 
     def clone_element( template_element )
@@ -103,6 +98,29 @@ module BuildMaster
       end
     end
     
+    def process_link_directive(target_element, template_element)
+      current_path = @evaluator.call('relative_to_root')
+      file_name = current_path.basename(current_path.extname).to_s + ".html"
+      current_html_path = current_path.parent().join(file_name)
+      href = Pathname.new(attribute!(template_element, 'href'))
+      if (href.absolute?)
+        href = href.relative_path_from(Pathname.new('/'))
+      end
+      anchor_or_div = nil
+      if (current_html_path == href)
+        anchor_or_div = REXML::Element.new('div')
+        anchor_or_div.attributes['class']='current'
+      else
+        anchor_or_div = REXML::Element.new('a')
+        anchor_or_div.attributes['href'] = href.relative_path_from(current_html_path.parent())
+      end
+      template_element.attributes.each do |name, value|
+        anchor_or_div.attributes[name] = value unless name == 'href'
+      end
+      process_children(anchor_or_div, template_element)
+      target_element.add(anchor_or_div)
+    end
+    
     def evaluate!(xml_element, attribute_name)
       value = evaluate(xml_element, attribute_name)
       message = xml_element.attributes[attribute_name]

data/test/buildmaster/manifest.mf

@@ -0,0 +1,5 @@
+Implementation-Version: 2.3.3
+Implementation-Build: 1000
+
+Implementation-Vendor: Vendor
+Implementation-Number: Number

data/test/buildmaster/{tc_ant_client.rb → tc_ant_driver.rb}

@@ -10,7 +10,7 @@ class AntTest < Test::Unit::TestCase
   def setup
     super
     build_file = File.join(File.dirname(__FILE__), "build.xml")
-    @ant = Ant.new(build_file)
+    @ant = AntDriver.from_file(build_file)
   end
 
   public
@@ -23,6 +23,10 @@ class AntTest < Test::Unit::TestCase
     @ant.target('passing')
   end
   
+  def test_dynamic_method
+    @ant.passing
+  end
+  
   def test_fail
     assert_raise(RuntimeError) {@ant.target('failing')}
   end

data/test/buildmaster/{tc_cvs_client.rb → tc_cvs_driver.rb}

@@ -5,7 +5,7 @@ require 'buildmaster'
 
 module BuildMaster
 
-class CvsClientTest < Test::Unit::TestCase
+class CvsDriverTest < Test::Unit::TestCase
   protected
   def setUp() 
     super
@@ -33,14 +33,14 @@ class CvsClientTest < Test::Unit::TestCase
   
   def tes_checkout
     log = ''
-    client = CvsClient.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
     client.checkout
     assert_equal('cvs -d root co -d working module', log)
   end
   
   def test_update
     log = ''
-    client = CvsClient.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
     client.update
     assert_equal('cvs -d root update working', log)
     client.update('-PAd')
@@ -49,7 +49,7 @@ class CvsClientTest < Test::Unit::TestCase
   
   def test_command
     log = ''
-    client = CvsClient.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
+    client = CvsDriver.new(CvsInfo.new('root', 'module'), 'working') {|command| log = command}
     client.command('command -option argument')
     assert_equal('cvs -d root command -option argument working', log)
   end

data/test/buildmaster/tc_file_processor.rb

@@ -0,0 +1,34 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+
+require 'test/unit'
+require 'rexml/document'
+require 'buildmaster/file_processor'
+require 'buildmaster/xtemplate'
+
+module BuildMaster
+class FileProcessorTest < Test::Unit::TestCase
+  def test_expression_evaluation
+    template = XTemplate.new(<<CONTENT
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
+<p>
+  <template:attribute name="class" eval="method_one"/>
+</p>      
+</html>
+CONTENT
+)
+    processor = FileProcessor.new(template, "content_path", self)
+    document = processor.process_html_content("<html></html>")
+    assert_equal('method one result', 
+      REXML::XPath.first(REXML::Document.new(document.to_s), '/html/p/@class').value.strip)
+    
+  end
+  
+  def evaluate(expression, path)
+    assert_equal('method_one', expression)
+    assert_equal('content_path', path)
+    return "method one result"
+  end
+  
+end
+end

data/test/buildmaster/tc_java_manifest.rb

@@ -0,0 +1,23 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+
+require 'test/unit'
+require 'buildmaster'
+
+module BuildMaster
+
+class JavaManifestTest < Test::Unit::TestCase
+  def test_loading_manifest
+    manifest = JavaManifest.new(File.join(File.dirname(__FILE__), "manifest.mf"))
+    version = manifest.version
+    assert_equal(version.number, "2.3.3")
+  end
+  
+  def test_increase_build
+    manifest = JavaManifest.new(File.join(File.dirname(__FILE__), "manifest.mf"))
+    build_number = manifest.version.build
+    version = manifest.increase_build
+    assert_equal(version.build, build_number + 1)
+    assert_equal(version.build, manifest.version.build)
+  end
+end
+end

data/test/buildmaster/tc_release_control.rb

@@ -8,7 +8,7 @@ module BuildMaster
 
 class ReleaseTest < Test::Unit::TestCase
   def testRelease
-    cvs_mock = Mock.new(CvsClient)
+    cvs_mock = Mock.new(CvsDriver)
     cvs_mock.expects(:checkout)
     cvs_mock.expects(:tag)
     cvs_mock.expects(:commit)

data/test/buildmaster/tc_site_spec.rb

@@ -0,0 +1,66 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "..", "lib")
+
+require 'test/unit'
+require 'buildmaster'
+
+module BuildMaster
+
+class SiteSpecTest < Test::Unit::TestCase
+  def test_should_get_relative_path
+    spec = SiteSpec.new
+    spec.content_dir = '/one/two/content'
+    assert_equal('images/logo.gif', spec.relative_to_root('/one/two/content/images/logo.gif').to_s)
+  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)
+  end
+  
+  def test_should_evaluate
+    spec = SampleSiteSpec.new
+    spec.content_dir = '/one/two/content'
+    result = spec.evaluate('expression', '/one/two/content/dir/file.txt')
+    assert_equal('dir/file.txt', result)
+  end
+  
+  def test_should_check_for_property
+    spec = SiteSpec.new
+    spec.content_dir = "/one"
+    spec.add_property('release', '0.6')
+    assert_equal('0.6', spec.evaluate('release', '/one'))
+  end
+  
+  def test_should_throw_error_with_proper_message_for_expression_problem
+    spec = SiteSpec.new
+    spec.content_dir = "/one"
+    begin
+      spec.evaluate('expression', '/one/two')
+      fail('exception should have been thrown')
+    rescue RuntimeError => boom
+      assert_equal("Neither property nor method found with name 'expression'", boom.message)
+    end
+  end
+  
+  def test_relative_to_root_expression
+    spec = SiteSpec.new
+    spec.content_dir = '/one'
+    actual = spec.evaluate('relative_to_root', '/one/two')
+    assert_equal(Pathname.new('two'), actual)
+  end
+  
+end
+
+class SampleSiteSpec < SiteSpec
+  private
+  def expression(path)
+    return path
+  end
+  
+  def expression2
+    return 'expected'
+  end
+end
+
+end

data/test/buildmaster/tc_template_runner.rb

@@ -32,14 +32,6 @@ END
       template_element = REXML::XPath.first(REXML::Document.new(template_content), "/html/p")
       source_xml = REXML::Document.new(source_content)
       source_element = REXML::XPath.first(source_xml, '/persons/person[@id="1"]')
-#      puts "========= TARGET ========="
-#      puts target_element
-#      puts "========== TEMPLATE =========="
-#      puts template_element
-#      puts "========== SOURCE ==========="
-#      puts source_element
-#      puts '=========== Source Match ============'
-#      puts REXML::XPath.first(source_element, './name')
       runner = TemplateRunner.new(target_element, template_element, source_element)
       runner.process
       assert_equal('Name One', REXML::XPath.first(REXML::Document.new(target_xml.to_s), '/html/h1/text()').value.strip)

data/test/buildmaster/tc_xtemplate.rb

@@ -167,7 +167,7 @@ INCLUDE_SOURCE
         xml_output = REXML::Document.new(xml_document.to_s())
         assert_equal('release 0.0.1 (build 235)', REXML::XPath.first(xml_output, '/html/body/h1').text)
       end
-      
+
       def test_should_process_each_with_children
         template_content = <<INCLUDE_CONTENT
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -247,10 +247,53 @@ INCLUDE_SOURCE
 NEWS
         end
         xml_output = REXML::Document.new(xml_document.to_s())
-#        puts xml_output
         assert_equal(3, REXML::XPath.match(xml_output, '/html/body/div/div').size)
         assert_equal('BuildMaster website created', 
                   REXML::XPath.first(xml_output, '/html/body/div/div[1]/p').text())
       end
+
+      def test_should_process_link_element_to_anchor_with_relative_path_when_not_current_page
+        template_content = <<CONTENT
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
+    <head>
+      <title>BuildMaster</title>
+    </head>
+    <body><template:link href="/dir/file" class="value">File</template:link></body>
+</html>
+CONTENT
+        template = XTemplate.new(template_content)
+        xml_output = template.process('') do |expression|
+          assert_equal('relative_to_root', expression)
+          Pathname.new('hello.textile')
+        end
+        actual_element = REXML::XPath.first(xml_output, '/html/body/a')
+        assert_equal('dir/file', actual_element.attributes['href'])
+        assert_equal('value', actual_element.attributes['class'])
+        assert_equal('File', actual_element.text)
+      end
+      
+      def test_should_process_link_element_to_div_when_on_current_page
+        template_content = <<CONTENT
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:template="http://buildmaster.rubyforge.org/xtemplate/1.0">
+    <head>
+      <title>BuildMaster</title>
+    </head>
+    <body><template:link href="/dir/file.html" class="value">File</template:link></body>
+</html>
+CONTENT
+        template = XTemplate.new(template_content)
+        xml_output = template.process('') do |expression|
+          assert_equal('relative_to_root', expression)
+          Pathname.new('dir/file.textile')
+        end
+        actual_element = REXML::XPath.first(xml_output, '/html/body/div')
+        assert_equal(nil, actual_element.attributes['href'])
+        assert_equal('value', actual_element.attributes['class'])
+        assert_equal('File', actual_element.text)
+      end
+      
+
     end
 end

data/test/ts_buildmaster.rb

@@ -1,10 +1,12 @@
 $:.unshift(File.dirname(__FILE__))
 require 'test/unit'
 
-require 'buildmaster/tc_ant_client'
-require 'buildmaster/tc_cvs_client'
+require 'buildmaster/tc_ant_driver'
 require 'buildmaster/tc_release_control'
+require 'buildmaster/tc_site_spec'
 require 'buildmaster/tc_site'
+require 'buildmaster/tc_cvs_driver'
 require 'buildmaster/tc_svn_driver'
 require 'buildmaster/tc_template_runner'
 require 'buildmaster/tc_xtemplate'
+require 'buildmaster/tc_file_processor'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: BuildMaster
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2006-06-20
+  version: 0.7.0
+date: 2006-07-23
 summary: "A project that hosts a series of scripts to be used in project building, project
   releasing, and site building."
 require_paths: 
@@ -32,14 +32,16 @@ files:
   - lib/buildmaster.rb
   - lib/mock
   - lib/mock.rb
-  - lib/buildmaster/ant_client.rb
+  - lib/buildmaster/ant_driver.rb
   - lib/buildmaster/build_file.rb
-  - lib/buildmaster/cvs_client.rb
+  - lib/buildmaster/cvs_driver.rb
   - lib/buildmaster/file_processor.rb
+  - lib/buildmaster/java_manifest.rb
   - lib/buildmaster/release_control.rb
   - lib/buildmaster/run_ant.rb
   - lib/buildmaster/shell_command.rb
   - lib/buildmaster/site.rb
+  - lib/buildmaster/site_spec.rb
   - lib/buildmaster/site_tester.rb
   - lib/buildmaster/source_file_handler.rb
   - lib/buildmaster/svn_driver.rb
@@ -51,10 +53,14 @@ files:
   - test/ts_buildmaster.rb
   - test/buildmaster/build.xml
   - test/buildmaster/content
-  - test/buildmaster/tc_ant_client.rb
-  - test/buildmaster/tc_cvs_client.rb
+  - test/buildmaster/manifest.mf
+  - test/buildmaster/tc_ant_driver.rb
+  - test/buildmaster/tc_cvs_driver.rb
+  - test/buildmaster/tc_file_processor.rb
+  - test/buildmaster/tc_java_manifest.rb
   - test/buildmaster/tc_release_control.rb
   - test/buildmaster/tc_site.rb
+  - test/buildmaster/tc_site_spec.rb
   - test/buildmaster/tc_svn_driver.rb
   - test/buildmaster/tc_template_runner.rb
   - test/buildmaster/tc_xtemplate.rb
@@ -69,14 +75,4 @@ extra_rdoc_files:
 executables: []
 extensions: []
 requirements: []
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: RedCloth
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.0.4
-      version: 
+dependencies: []