BuildMaster 0.7.0 → 0.8.0

data/README

@@ -23,3 +23,29 @@ and decrorating the content pages with a skin.
 The supported content sources are <a href="http://www.w3.org/TR/xhtml11/">XHTML</a> and <a href="http://hobix.com/textile/">Textile</a>.
 
 
+== Task List
+
+* Use RDoc engine (rdoc/template, TemplatePage) to generate template (page
+255)
+* Use RDoc format for content
+
+require 'rdoc/template'
+HTML = %{Hello, %name%.
+<p>
+The reasons you gave were:
+<ul>
+START:reasons
+<li>%reason_name% (%rank%)
+END:reasons
+</ul>
+}
+data = {
+'name' => 'Dave Thomas',
+'reasons' => [
+{ 'reason_name' => 'flexible', 'rank' => '87' },
+{ 'reason_name' => 'transparent', 'rank' => '76' },
+{ 'reason_name' => 'fun', 'rank' => '94' },
+]
+}
+t = TemplatePage.new(HTML)
+t.write_html_on(STDOUT, data)

data/lib/buildmaster.rb

@@ -1,5 +1,6 @@
 $:.unshift(File.dirname(__FILE__))
 
+require 'buildmaster/build_number_file'
 require 'buildmaster/java_manifest'
 require 'buildmaster/shell_command'
 require 'buildmaster/release_control'
@@ -7,5 +8,5 @@ require 'buildmaster/ant_driver'
 require 'buildmaster/cvs_driver'
 require 'buildmaster/svn_driver'
 require 'buildmaster/site_spec'
-require 'buildmaster/site'
+require 'buildmaster/site/site'
 require 'buildmaster/xtemplate'

data/lib/buildmaster/build_number_file.rb

@@ -0,0 +1,27 @@
+
+module BuildMaster
+class BuildNumberFile
+  attr_reader :number
+  
+  def initialize(path)
+    @path = path
+    @number = load_content().chomp!.to_i
+  end
+  
+  def increase_build
+    @number = @number + 1
+    save_content
+  end
+  
+  private
+  def load_content()
+    content = nil
+    File.open(@path, 'r') {|file| content = file.gets}
+    return content
+  end
+  
+  def save_content
+    File.open(@path, 'w') {|file| file.puts @number}
+  end
+end
+end

data/lib/buildmaster/buildnumber

@@ -0,0 +1 @@
+9

data/lib/buildmaster/file_processor.rb

@@ -1,26 +1,118 @@
 $:.unshift File.dirname(__FILE__)
 
+require 'site_spec'
+require 'source_content'
+require 'pathname'
+
 module BuildMaster
 
 class FileProcessor
-  def initialize(template, content_path, evaluator)
+#todo match only beginning of the file
+@@TEXTILE_REGX = /---(-)*\n(.*)\n(-)*---\n/
+
+  def FileProcessor::join(from, path)
+    result = from
+    path.each_filename do |name|
+      result = File.join(result, name)
+    end
+    return result
+  end
+  
+  attr_reader :path_to_content_file, :path_to_target_file
+
+  def initialize(template, path_to_content_file, sitespec)
     @template = template
-    @content_path = content_path
-    @evaluator = evaluator
+    @path_to_content_file = path_to_content_file
+    @sitespec = sitespec
+    extension = File.extname(path_to_content_file)
+    if (extension == '.html')
+      @convert_method = 'process_html'
+    elsif (extension == '.textile')
+      @convert_method = 'process_textile'
+    elsif (extension == '.markdown')
+      @convert_method = 'process_markdown'
+    end
+    if @convert_method
+      basename = File.basename(path_to_content_file, extension).to_s
+      @path = sitespec.relative_to_root(path_to_content_file).parent.join("#{basename}.html")
+      @path_to_target_file = FileProcessor.join(sitespec.output_dir, @path)
+    else
+      @path_to_target_file = FileProcessor.join(sitespec.output_dir, sitespec.relative_to_root(path_to_content_file))
+    end
+  end
+  
+  def FileProcessor::for_request_path(request_path, site_spec)
+    template = site_spec.load_template
+    relative_to_root = Pathname.new("#{request_path}")
+    dir = relative_to_root.parent
+    extension = relative_to_root.extname.to_s
+    result = nil
+    path_to_content = nil
+    if (extension == '.html')
+      basename = relative_to_root.basename(extension).to_s
+      source_directory = join(site_spec.content_dir, dir)
+      ['textile', 'markdown', 'html'].find do |extension_candidate|
+        filename = "#{basename}.#{extension_candidate}"
+        candidate = File.join(source_directory, filename)
+        if (FileTest.file? candidate)
+          path_to_content = candidate
+          true
+        else
+          false
+        end 
+      end
+    end
+    if (not path_to_content)
+      path_to_content = join(site_spec.content_dir, relative_to_root)
+    end
+    return FileProcessor.new(template, path_to_content, site_spec)
+  end
+  
+  def is_html?
+    return File.extname(path_to_target_file) == '.html'
+  end
+  
+  def write_to_target
+    document = generate_document
+    if (document)
+      File.open(path_to_target_file, 'w') do |file|
+        document.write(file, 0, false, true)
+      end
+    else
+      FileUtils.cp path_to_content_file, path_to_target_file
+    end
+  end
+  
+  def generate_document
+    send(@convert_method, load_content()) if (@convert_method)
+  end
+  
+  
+  def load_content
+    return IO.read(path_to_content_file)
+  end
+
+  def process_textile(textile_content)
+require 'redcloth'
+    return process_content_with_title(textile_content) {|content| RedCloth.new(content).to_html}
+  end
+  
+  def process_markdown(markdown_content)
+require 'bluecloth'
+    return process_content_with_title(markdown_content) {|content| BlueCloth.new(content).to_html}
   end
     
-  def process_textile()
-    textile_content = IO.read(@content_path)
-    match_result = TEXTILE_REGX.match(textile_content)
+  def process_content_with_title(full_content)
+    match_result = @@TEXTILE_REGX.match(full_content)
     title = ''
-      if match_result != nil
-        title = match_result[2]
-        textile_content = match_result.post_match
-      end
-      html_body = RedCloth.new(textile_content).to_html
-      html_content = <<HTML
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    body_content = full_content
+    if match_result != nil
+      title = match_result[2]
+      body_content = match_result.post_match
+    end
+    html_body = yield body_content
+    html_content = <<HTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -31,18 +123,15 @@ class FileProcessor
 </body>
 </html>
 HTML
-    return process_html_content(html_content)      
-    end
-    
-    def process_html()
-      return process_html_content(File.open(@content_path))
-    end
+    return process_html(html_content)      
+  end
+
+  def process_html(html_content)
+    source = SourceContent.new(@path, REXML::Document.new(html_content))
+    document_with_skin = @template.process(source)
+    return document_with_skin
+  end
     
-    def process_html_content(source)
-      document_with_skin = @template.process(source) {|message| @evaluator.evaluate(message, @content_path)}
-      return document_with_skin
-    end
-  
 end
 
 end

data/lib/buildmaster/java_manifest.rb

@@ -4,6 +4,10 @@ class JavaManifest
     @manifest_file = manifest_file
   end
   
+  def JavaManifest::from_file(manifest_file)
+    return JavaManifest.new(manifest_file)
+  end
+  
   def version
     number = nil
     build = nil

data/lib/buildmaster/{site.rb → site/site.rb}

@@ -1,15 +1,10 @@
-$:.unshift File.dirname(__FILE__)
+$:.unshift File.join(File.dirname(__FILE__), '..')
 
 require 'fileutils'
-require 'redcloth'
-require 'source_file_handler'
 require 'file_processor'
 require 'site_spec'
 
 module BuildMaster
-#todo match only beginning of the file
-TEXTILE_REGX = /---(-)*\n(.*)\n(-)*---/
-
   class NullLogger
     def << message
      puts "IGNORED: #{message}"
@@ -38,23 +33,10 @@ TEXTILE_REGX = /---(-)*\n(.*)\n(-)*---/
       puts "Generated file count: #{@count}"
     end
     
-    def server(port_number=2000, log_file=$stdout, level=WEBrick::Log::INFO, access_log=nil)
-require 'webrick'
-      mime_types = WEBrick::HTTPUtils::DefaultMimeTypes.update(
-        {"textile" => "text/plain"}
-      )
-      @server = WEBrick::HTTPServer.new(
-        :Port => port_number,
-        :Logger => WEBrick::Log.new(log_file, level),
-        :MimeTypes => mime_types,
-        :AccessLog => access_log
-      )
-      @server.mount('/', SourceFileHandler, @spec)
-      @server.mount('/source', WEBrick::HTTPServlet::FileHandler, @spec.content_dir, true)
-      ['INT', 'TERM'].each { |signal|
-         trap(signal){ @server.shutdown} 
-      }
-      @server.start
+    def server(*args)
+require 'site_server'
+      @server = SiteServer.new(*args)
+      @server.start(@spec)
     end
     
     def test(port_number=2000)
@@ -71,6 +53,7 @@ require 'webrick'
 require 'buildmaster/site_tester'
       Thread.new() {server(port_number, NullLogger.new, 0, NullLogger.new)}
       begin
+        sleep(2)
         yield port_number
       ensure
         @server.stop
@@ -99,30 +82,12 @@ require 'buildmaster/site_tester'
       end
     end
     
-    def process_file(content_path, out_dir, content_dir, item)
-      print ">> #{content_path}"
-      extension = File.extname(content_path)
+    def process_file(path_to_content, out_dir, content_dir, item)
+      print ">> #{path_to_content}\n"
+      extension = File.extname(path_to_content)
       isIndex = @current_file_name =~ /^index/
-      file_processor = FileProcessor.new(@template, content_path, @spec)
-      if (extension.casecmp('.textile') == 0)
-        base_name = File.basename(item, extension)
-        output_file = File.join(out_dir, base_name + '.html')
-        write(output_file, file_processor.process_textile())
-      elsif (extension.casecmp('.html') == 0)
-        output_file = File.join(out_dir, item)
-        write(output_file, file_processor.process_html())
-      else
-        output_file = File.join(out_dir, item)
-        puts " ==> #{output_file}"
-        FileUtils.cp content_path, output_file
-      end
-    end
-    
-    def write(target_file, xhtml)
-      puts " ==> #{target_file}"
-      File.open(target_file, "w") do |file|
-        xhtml.write(file, 0, false, true)
-      end
+      file_processor = FileProcessor.new(@template, path_to_content, @spec)
+      file_processor.write_to_target
     end
     
   end

data/lib/buildmaster/site/template/buildmaster.css

@@ -0,0 +1,340 @@
+body {
+    padding: 0px;
+    margin: 0px;
+    border: 0px;
+    font-family: helvetica, arial, sans-serif;
+    background-color: white;
+    color: black;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    margin: 0px;
+    border: 0px;
+    padding: 0px;
+    font-weight: normal;
+}
+
+a:link { color: #00a; }
+a:active { color: red; }
+a:hover { color: darkred; }
+a:visited { color: black; }
+
+img {
+    border: 0px;
+    padding: 0px;
+    margin: 0px;
+}
+
+p {
+    border: 0px;
+    padding: 0px;
+    margin: 0px;
+    margin-bottom: 10px;
+}
+
+blockquote {
+    margin-bottom: 10px;
+}
+
+td {
+    padding: 2px;
+}
+
+th {
+    font-weight: bold;
+    white-space: nowrap;
+    padding: 2px;
+}
+
+th.Row {
+    text-align: left;
+    vertical-align: top;
+}
+
+ul, ol {
+    border: 0px;
+    padding: 0px;
+    margin-top: 0px;
+    margin-bottom: 12px;
+    margin-left: 20px;
+}
+
+div.header {
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	width: 100%;
+	height: 86px;
+	margin: 0px;
+	border: 0px;
+	background-color: #e0e0f0;
+	border-bottom: 1px solid #aaf;
+	padding-left,padding-right,padding-top: 0px;
+	padding-bottom: 4px;
+}
+
+h1.header {
+  padding:0;
+  margin:0;
+}
+
+a.header { border: 0px; text-decoration: none;}
+a.header:visited { color: #00a; }
+a.header:hover { color: red; }
+a.header:active { color: red; }
+
+div.left {
+  float:left;
+  width:180px;
+	background-color: white;
+	padding: 8px;
+	font-size: small;
+	font-style: normal;
+	margin-top: 16px;
+}
+
+div.left h1{
+    margin: 0px;
+    border: 0px;
+    padding: 4px;
+    color: #006;
+    font-size: small;
+    font-weight: bold;
+}
+
+div.MenuGroup a { text-decoration: none; }
+div.MenuGroup a:link { color: #006; }
+div.MenuGroup a:visited { color: #006; }
+div.MenuGroup a:active { color: red; }
+div.MenuGroup a:hover { color: white; background-color:#006;width:160px;}
+div.current {background-color:#006;width=160px;color:white;}
+/*---------------------------------------------------------------------------
+ *  Menus
+ */
+.MenuGroup {
+    border-left: 1px solid #aaf;
+    border-top: 1px solid #aaf;
+    border-bottom: 1px solid white; /* IE work-around */
+    
+    margin-bottom: 8px;
+    background-color: white;
+    color: #006;
+}
+
+.MenuGroup ul {
+    margin: 0px;
+    padding-left: 4px;
+    list-style-type: none;
+}
+
+.MenuGroup li {
+    padding: 2px;
+}
+
+.More {
+		width: 100%;
+		text-align: right;
+}
+/*------------------------------------------------------------------------------*/
+
+/*-------------------------------------------------
+ * Right Panel
+ */
+div.right {
+  float:right;
+  width:184px;
+  margin:0;
+	background-color: white;
+	padding: 8px;
+	font-size: small;
+	font-style: normal;
+	margin-top: 16px;
+}
+
+div.right h1{
+    margin: 0px;
+    border: 0px;
+    padding: 4px;
+    color: #006;
+    font-size: small;
+    font-weight: bold;
+}
+
+div.right a { text-decoration: none; }
+div.right a:link { color: #006; }
+div.right a:visited { color: #006; }
+div.right a:active { color: red; }
+div.right a:hover { color: red; }
+
+
+/*---------------------------------------------------------------------------
+ *  News panel
+ */
+.NewsGroup {
+    border-left: 1px solid #aaf;
+    border-top: 1px solid #aaf;
+    border-bottom: 1px solid white; /* IE workaround */
+    margin-bottom: 8px;
+    
+    color: #006;
+}
+.NewsItem {
+    margin: 4px;
+}
+.NewsTitle {
+    font-weight: bold;
+    margin: 0px;
+    padding: 0px;
+}
+.NewsDate {
+    margin: 0px;
+    padding: 0px;
+    font-size: smaller;
+}
+.NewsText {
+    padding: 0px;
+    margin: 0px;
+    margin-bottom: 8px;
+}
+.NewsText a { text-decoration: underline; }
+.NewsText a:link { color: #006; }
+.NewsText a:visited { color: #006; }
+.NewsText a:active { color: red; }
+.NewsText a:hover { color: red; }
+.NewsMore {
+		font-size: small;
+		margin: 4px;
+		margin-top: 12px;
+		text-align: left;
+}
+.NewsGroup td {
+    font-size: 12px;
+}
+
+/*-------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------
+ *  Document meta-information
+ */
+
+.Meta {
+    margin-top: 64px;
+    font-size: smaller;
+    color: #C0C0C0;
+    text-align: right;
+}
+
+.Meta a { text-decoration: underline; }
+.Meta a:link { color: #C0C0C0; }
+.Meta a:visited { color: #C0C0C0; }
+.Meta a:active { color: red; }
+.Meta a:hover { color: red; }
+/*--------------------------------------------------------------------------*/
+
+div.Content3Column {
+  margin-left:200px;
+  margin-right:216px;
+}
+
+div.Content2Column {
+  margin-left:200px;
+  margin-right:16px;
+}
+
+div.content h1 {
+    width: 100%;
+    font-size: Larger;
+    background-color: #006;
+    color: white;
+    padding: 2px;
+    padding-left: 6px;
+    margin-top: 24px;
+    margin-bottom: 12px;
+}
+
+div.content a { text-decoration: underline; }
+div.content a:link { color: #006; }
+div.content a:visited { color: #006; }
+div.content a:active { color: green; }
+div.content a:hover { color: red; }
+div.content h2 {
+    margin-top: 24px;
+    margin-bottom: 16px;    
+    font-weight: bold;
+    font-size: Larger;
+}
+
+div.content li {
+    margin-bottom: 6px;
+}
+div.content th {
+    background-color: #aaf;
+}
+div.content td {
+    background-color: #ddf;
+}
+
+div.Shaded pre {
+    padding: 4px;
+    font-family: courier new, monospace;
+    font-size: smaller;
+    border: 1px solid #008;
+    background-color: #ccf;
+    color: black;
+		width: 100%;
+}
+
+div.Shaded:before {
+    margin: 0px;
+    padding: 0px;
+    border: 0px;
+    font-size: inherit;
+    line-spacing: 100%;
+}
+
+div.footer {
+  color: #006;
+  padding:0.5em;
+  clear:both;
+  text-align:center;
+  font-size:75%;
+}
+
+div.footer a {
+  color:#006;
+  font-size:inherit;
+}
+
+div.bottomshadow {
+  width=100%;
+  height: 12px;
+  background-image: url("border_bottom.gif");
+  background-repeat: repeat-x;
+  padding: 12px;
+}
+
+div#content .Float {
+    float: right;
+    margin-left: 8px;
+    margin-right: 0px;
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+
+div#content .Diagram {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+
+div#content .Inline {
+    display: inline;
+}
+
+.source {
+		width: 100%;
+		text-align: right;
+		font-size: 90%;
+}