BuildMaster 0.8.1 → 0.9.0

data/lib/buildmaster/cotta/physical_system.rb

@@ -0,0 +1,64 @@
+$:.unshift File.dirname(__FILE__)
+
+require 'file_not_found_error'
+require 'command_error'
+require 'fileutils'
+
+module BuildMaster
+class PhysicalSystem
+  def initialize
+  end
+
+  def shell(command)
+    raise CommandError.new, command, caller unless system(command)
+  end
+  
+  def environment!(variable)
+    value = ENV[variable]
+    raise "#{variable} environment variable not found" unless value
+    return value
+  end
+  
+  def environment(variable, default)
+    value = ENV[variable]
+    value = default unless value
+    return value
+  end
+  
+  def dir_exists?(dir_path)
+    return FileTest.directory?(dir_path)
+  end
+  
+  def file_exists?(file_path)
+    return FileTest.file?(file_path)
+  end
+  
+  def list(dir_path)
+    Dir.entries(dir_path).find_all {|item| item != '.' && item != '..'}
+  end
+  
+  def mkdir(dir_path)
+    Dir.mkdir(dir_path)
+  end
+  
+  def io(file_path, argument)
+    return File.open(file_path, argument)
+  end
+  
+  def delete_file(file_path)
+    return File.delete(file_path)
+  end
+  
+  def delete_dir(dir_path)
+    return Dir.delete(dir_path)
+  end
+  
+  def copy(source, target)
+    FileUtils.copy(source, target)
+  end
+  
+  def move(source, target)
+    FileUtils.move(source, target)
+  end
+end
+end

data/lib/buildmaster/cvs_driver.rb

@@ -10,36 +10,28 @@ class CvsInfo
   end
   
   def CvsInfo.load(folder)
-    return CvsInfo.new(read("#{folder}/Root").strip!, read("#{folder}/Repository").strip!)
-  end
-  
-  private
-  def CvsInfo.read(file)
-    File.open(file) do |file|
-      return file.gets
-    end
+    return CvsInfo.new(folder.file('ROOT').load.strip,  folder.file('Repository').load.strip)
   end
   
 end
 
 class CvsDriver
-  include Shell
   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)
+  def initialize(cvs_info, working_directory)
     @cvs_info = cvs_info
     @working_directory = working_directory
-    @command_runner = command_runner
+    @cotta = @working_directory.cotta
   end
   
   def command(command)
-    run_command "cvs -d #{@cvs_info.root} #{command} #{@working_directory}"
+    @cotta.shell "cvs -d #{@cvs_info.root} #{command} #{@working_directory.path}"
   end
   
   def checkout()
-    run_command("cvs -d #{@cvs_info.root} co -d #{@working_directory} #{@cvs_info.repository}")
+    @cotta.shell("cvs -d #{@cvs_info.root} co -d #{@working_directory.path} #{@cvs_info.repository}")
   end
   
   def update(option='')

data/lib/buildmaster/file_processor.rb

@@ -18,13 +18,13 @@ class FileProcessor
     return result
   end
   
-  attr_reader :path_to_content_file, :path_to_target_file
+  attr_reader :content_file, :target_file
 
-  def initialize(template, path_to_content_file, sitespec)
+  def initialize(template, content_file, sitespec)
     @template = template
-    @path_to_content_file = path_to_content_file
+    @content_file = content_file
     @sitespec = sitespec
-    extension = File.extname(path_to_content_file)
+    extension = content_file.extname
     if (extension == '.html')
       @convert_method = 'process_html'
     elsif (extension == '.textile')
@@ -33,53 +33,54 @@ class FileProcessor
       @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)
+      basename = content_file.basename
+      @path = sitespec.relative_to_root(content_file).parent.join("#{basename}.html")
+      @target_file = sitespec.output_dir.file(@path)
     else
-      @path_to_target_file = FileProcessor.join(sitespec.output_dir, sitespec.relative_to_root(path_to_content_file))
+      @target_file = sitespec.output_dir.file(sitespec.relative_to_root(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
+    if (request_path[0,1] == '/')
+      request_path = request_path[1, request_path.length - 1]
     end
-    if (not path_to_content)
-      path_to_content = join(site_spec.content_dir, relative_to_root)
+    file = site_spec.content_dir.file(request_path)
+    if (file.extname == '.html')
+      file = check_source(file)
     end
-    return FileProcessor.new(template, path_to_content, site_spec)
+    return FileProcessor.new(template, file, site_spec)
+  end
+  
+  def FileProcessor::check_source(file)
+    result = file
+    basename = file.basename
+    dir = file.parent
+    ['textile', 'markdown', 'html'].find do |extension|
+      candidate = dir.file("#{basename}.#{extension}")
+      if (candidate.exists?)
+        result = candidate
+        true
+      else
+        false
+      end
+    end
+    return result
   end
   
   def is_html?
-    return File.extname(path_to_target_file) == '.html'
+    return target_file.extname == '.html'
   end
   
   def write_to_target
     document = generate_document
     if (document)
-      File.open(path_to_target_file, 'w') do |file|
+      target_file.write do |file|
         document.write(file, 0, false, true)
       end
     else
-      FileUtils.cp path_to_content_file, path_to_target_file
+      content_file.copy_to(target_file)
     end
   end
   
@@ -89,7 +90,7 @@ class FileProcessor
   
   
   def load_content
-    return IO.read(path_to_content_file)
+    return content_file.load
   end
 
   def process_textile(textile_content)

data/lib/buildmaster/java_manifest.rb

@@ -11,7 +11,7 @@ class JavaManifest
   def version
     number = nil
     build = nil
-    IO.foreach(@manifest_file) do |line|
+    @manifest_file.foreach do |line|
       name_value = NameValue.parse(line)
       if (name_value.name== "Implementation-Version")
         number = name_value.value
@@ -26,7 +26,7 @@ class JavaManifest
     content = ""
     number = nil
     build = nil
-    IO.foreach(@manifest_file) do |line|
+    @manifest_file.foreach do |line|
       name_value = NameValue.parse(line)
       if (name_value.name== "Implementation-Version")
         number = name_value.value
@@ -38,7 +38,7 @@ class JavaManifest
         content = content + line
       end
     end
-    File.open(@manifest_file, "w") do |file|
+    @manifest_file.write do |file|
       file.printf(content)
     end
     return Version.new(number, build)

data/lib/buildmaster/site/site.rb

@@ -60,34 +60,23 @@ require 'buildmaster/site_tester'
       end 
     end
     
-    def ensure_directory_exists(dir_name)
-      if (not File.exist?(dir_name))
-        ensure_directory_exists(File.join(dir_name, '..'))
-        Dir.mkdir dir_name
-      end
-    end
-    
     def build_directory(out_dir, content_dir, template)
-      ensure_directory_exists(out_dir)
-      Dir.foreach(content_dir) do |item|
-        content_path = File.join(content_dir, item)
-        if (item == '.' || item == '..' || item == '.svn' || item == 'CVS')
-        elsif (File.directory? content_path)
-          build_directory(File.join(out_dir, item), content_path, template)
-        else
-          @current_file_name = content_path
-          process_file(content_path, out_dir, content_dir, item)
+      out_dir.mkdirs
+      content_dir.list.each do |item|
+        if (item.name == '.svn' || item.name == 'CVS' || item.name == '_svn')
+        elsif (item.respond_to? 'list')
+          build_directory(out_dir.dir(item.name), item, template)
+        elsif (item.respond_to? 'read')
+          @current_file_name = item
+          process_file(item, out_dir, content_dir, item)
           @count = @count + 1
         end
       end
     end
     
-    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, path_to_content, @spec)
-      file_processor.write_to_target
+    def process_file(content_file, out_dir, content_dir, item)
+      print ">> #{content_file.path.to_s}\n"
+      FileProcessor.new(@template, content_file, @spec).write_to_target
     end
     
   end

data/lib/buildmaster/site_spec.rb

@@ -4,6 +4,7 @@ require 'pathname'
 require 'templatelets'
 require 'tree_to_object'
 require 'site/template_builder'
+require 'cotta'
 
 module BuildMaster
 
@@ -11,8 +12,9 @@ module BuildMaster
     attr_reader :output_dir
     attr_accessor :content_dir, :template, :template_file
     
-    def initialize(file = nil)
-      @root = File.dirname(file) if file
+    def initialize(file = nil, cotta = Cotta.new())
+      @root = cotta.file(file).parent if file
+      @cotta = cotta
       if (block_given?)
         yield self
       end
@@ -20,17 +22,17 @@ module BuildMaster
     
     def output_dir=(path)
       if (@root)
-        @output_dir = File.join(@root, path)
+        @output_dir = @root.dir(path)
       else
-        @output_dir = path
+        @output_dir = @cotta.dir(path)
       end
     end
     
     def content_dir=(path)
       if (@root)
-        @content_dir = File.join(@root, path)
+        @content_dir = @root.dir(path)
       else
-        @content_dir = path
+        @content_dir = @cotta.dir(path)
       end
     end
     
@@ -44,7 +46,7 @@ module BuildMaster
     end
     
     def validate_inputs
-      validate_dir(@content_dir, :content_dir)
+      validate_dir(content_dir, :content_dir)
     end
     
     def load_template
@@ -69,17 +71,17 @@ module BuildMaster
       if (@template)
         return @template
       else
-        return File.open(@template_file)
+        return @template_file.load
       end
     end
     
     def load_document(path)
-      return REXML::Document.new(File.open(File.join(content_dir, path)))
+      content_dir.file(path).read {|file| REXML::Document.new(file)}
     end
 
     def relative_to_root(path)
-      to = path_name(path)
-      from = path_name(@content_dir)
+      to = path_name(path.path.to_s)
+      from = path_name(@content_dir.path.to_s)
       return to.relative_path_from(from)
     end
     
@@ -109,10 +111,10 @@ module BuildMaster
       if not directory
         raise "Directory for #{symbol.id2name} not specified"
       end
-      if not File.exists? directory
+      if not directory.exists?
         raise "Directory for #{symbol.id2name} -- <#{directory}> does not exist"
       end
-      if not File.directory? directory
+      if not directory.exists?
         raise "<#{directory}> should be a directory for #{symbol.id2name}"
       end
     end

data/lib/buildmaster/source_file_handler.rb

@@ -17,7 +17,7 @@ class SourceFileHandler < WEBrick::HTTPServlet::AbstractServlet
     @config = server.config
     @logger = @config[:Logger]
     @spec = spec
-    @delegate = WEBrick::HTTPServlet::FileHandler.new(server, spec.content_dir, true)
+    @delegate = WEBrick::HTTPServlet::FileHandler.new(server, spec.content_dir.path, true)
   end
   
   def service(req, res)

data/lib/buildmaster/svn_driver.rb

@@ -4,15 +4,16 @@ require 'rexml/document'
 module BuildMaster
 
 class SvnInfo
-  attr_reader :path, :repository_root
+  attr_reader :work_dir, :repository_root
   
-  def initialize(path)
-    @path = path
-    analyze_entry_file(File.join(path, ".svn", "entries"))
+  def initialize(work_dir)
+    @work_dir = work_dir
+    entries = work_dir.dir('.svn').file('entries')
+    analyze_entry_file(entries)
   end
   
-  def analyze_entry_file(path)
-    File.open(path, 'r') do |file|
+  def analyze_entry_file(entry_file)
+    @repository_root = entry_file.read do |file|
       parse_xml_load_repository_root(file)
     end
   end
@@ -21,26 +22,20 @@ class SvnInfo
   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']
+      return element.attributes['repos']
     end
   end
   
 end
 
-class SvnDriver
-    include Shell
-    
+class SvnDriver    
     def SvnDriver::from_path(directory)
         return SvnDriver.new(SvnInfo.new(directory))
     end
     
-    def initialize(svn_info, &command_runner)
+    def initialize(svn_info)
         @svn_info = svn_info
-        if (command_runner)
-            @command_runner = command_runner
-        else
-            @command_runner = Proc.new {|command| run(command)}
-        end
+        @system = svn_info.work_dir.system
     end
     
     def status
@@ -56,11 +51,11 @@ class SvnDriver
     end
     
     def tag(tag_name)
-        run_command("svn copy #{@svn_info.repository_root}/trunk #{@svn_info.repository_root}/tags/#{tag_name} -m \"ruby buildmaster\"")
+        @system.shell("svn copy #{@svn_info.repository_root}/trunk #{@svn_info.repository_root}/tags/#{tag_name} -m \"ruby buildmaster\"")
     end
     
     def checkout(output)
-        run_command("svn checkout #{@svn_info.repository_root}/trunk #{output}")
+        @system.shell("svn checkout #{@svn_info.repository_root}/trunk #{output}")
     end
     
     def command(command)
@@ -68,9 +63,8 @@ class SvnDriver
     end
     
     private
-    
     def command_for_path(svn_command, argument='')
-        run_command("svn #{svn_command} #{@svn_info.path}#{argument}")
+        @system.shell("svn #{svn_command} #{@svn_info.work_dir.path}#{argument}")
     end
 end