BuildMaster 0.9.0 → 0.9.1

data/README

@@ -1,14 +1,19 @@
-= BuildMaster - Building and releasing project and site with Ruby
+= BuildMaster[http://buildmaster.rubyforge.org] - Building and releasing project and site with Ruby
 
 Homepage::  http://buildmaster.rubyforge.org
 Author::    Shane
 Copyright:: (c) 2006 BuildMaster on rubyforge
 License::   Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
-BuildMaster is a project that targets project building, releasing and site building.
+BuildMaster[http://buildmaster.rubyforge.org] is a project that targets project building, 
+releasing and site building.
 
-Please post your question at http://groups.google.com/group/buildmaster/ or
-send email to buildmaster@googlegroups.com
+This rDoc is intended for you the check out the available methods on the objects.  For a full 
+document of what BuildMaster[http://buildmaster.rubyforge.org] can do for you, please check out 
+BuildMaster[http://buildmaster.rubyforge.org]'s home page: 
+http://buildmaster.rubyforge.org
+
+Please post your question at mailing-list[http://groups.google.com/group/buildmaster/]
 
 == Project Building and Releasing
 
@@ -20,8 +25,8 @@ A ruby version of the project building and releasing script as described in
 A simple template engine that can build a website by producing the content pages based on the specified source
 and decrorating the content pages with a skin.
 
-The supported content sources are <a href="http://www.w3.org/TR/xhtml11/">XHTML</a>
-, <a href="http://hobix.com/textile/">Textile</a> and <a href="http://daringfireball.net/projects/markdown/">Markdown</a>.
+The supported content sources are XHTML[http://www.w3.org/TR/xhtml11/], Textile[http://hobix.com/textile/] and 
+Markdown[http://daringfireball.net/projects/markdown/].
 
 == Cotta
 

data/lib/buildmaster/ant_driver.rb

@@ -54,7 +54,7 @@ class AntDriver
     end
     all_arguments = Array.new()
     all_arguments.push(@ant_options)
-    all_arguments.push('-classpath', local_path)
+    all_arguments.push('-classpath', "\"#{local_path}\"")
     all_arguments.push("-Dant.home=#{@ant_home.path}")
     all_arguments.push('org.apache.tools.ant.launch.Launcher', @ant_arguments);
     all_arguments.push('-f', @ant_file.path) if @ant_file

data/lib/buildmaster/buildnumber

@@ -1 +1 @@
-22
+41

data/lib/buildmaster/cotta/cotta_dir.rb

@@ -51,6 +51,16 @@ class CottaDir
     @system.delete_dir(@path)
   end
   
+  def move_to(target)
+    target.parent.mkdirs
+    @system.move_dir(@path, target.path)
+  end
+  
+  def copy_to(target)
+    target.parent.mkdirs
+    @system.copy_dir(@path, target.path)
+  end
+  
   def list
     @system.list(@path).collect do |item|
       candidate = dir(item)

data/lib/buildmaster/cotta/cotta_file.rb

@@ -35,12 +35,12 @@ class CottaFile
   
   def copy_to(target_file)
     target_file.parent.mkdirs
-    @system.copy(path, target_file.path)
+    @system.copy_file(path, target_file.path)
   end
   
   def move_to(target_file)
     target_file.parent.mkdirs
-    @system.move(path, target_file.path)
+    @system.move_file(path, target_file.path)
   end
   
   def save(content = '')

data/lib/buildmaster/cotta/in_memory_system.rb

@@ -14,11 +14,22 @@ class InMemorySystem
     @file_system = Hash.new
     @file_system[Pathname.new('/')] = DirectoryContent.new('/')
     @file_system[Pathname.new('.')] = DirectoryContent.new('.')
+    @output_map = Hash.new
   end
   
   def shell(command)
     @executed_commands.push(command)
   end
+  
+  def shell_output(command)
+    result = @output_map[command]
+    raise "#{command} not found in expectation" unless result
+    return result
+  end
+  
+  def output_for_command(command, output)
+    @output_map[command] = output
+  end
 
   def dir_exists?(pathname)
     content = path_content(pathname)
@@ -45,15 +56,35 @@ class InMemorySystem
   end
   
   def copy(source, target)
+    copy_file(source, target)
+  end
+  
+  def copy_file(source, target)
     file_content = retrieve_file_content(source, 'r').content
     create_file(target).content = file_content.clone
   end
   
   def move(source, target)
+    move_file(source, target)
+  end
+  
+  def move_file(source, target)
     copy(source, target)
     delete_file(source)
   end
   
+  def copy_dir(source, target)
+    mkdir(target)
+    path_content(source).children.each do |item|
+      item.copy_to_dir(self, source, target)
+    end
+  end
+  
+  def move_dir(source, target)
+    copy_dir(source, target)
+    delete_dir(source)
+  end
+  
   def delete_file(pathname)
     raise Errno::ENOENT.new(pathname) unless file_exists? pathname
     delete_entry(pathname)
@@ -87,6 +118,8 @@ class InMemorySystem
   
   def create_file(pathname)
     content = FileContent.new(pathname.basename.to_s)
+    parent_dir = pathname.parent
+    path_content(parent_dir).add(content)
     @file_system[pathname] = content
     return content
   end
@@ -101,9 +134,7 @@ class InMemorySystem
       if (options =~ /r/)
         raise Errno::ENOENT.new(pathname)
       end
-      parent_dir = pathname.parent
       file_content = create_file(pathname)
-      path_content(parent_dir).add(file_content)
     end
     return file_content
   end
@@ -138,6 +169,12 @@ class DirectoryContent
   def delete(name)
     @children.delete_if {|file_content| file_content.name == name}
   end
+  
+  def copy_to_dir(system, parent_dir, target_dir)
+    source_path = parent_dir.join(name)
+    target_path = target_dir.join(name)
+    system.copy_dir(source_path, target_path)
+  end
 end
 
 class FileContent
@@ -156,5 +193,11 @@ class FileContent
   def directory?
     return false
   end
+  
+  def copy_to_dir(system, parent_dir, target_dir)
+    target_path = target_dir.join(name)
+    source_path = parent_dir.join(name)
+    system.copy_file(source_path, target_path)
+  end
 end  
 end

data/lib/buildmaster/cotta/physical_system.rb

@@ -10,9 +10,15 @@ class PhysicalSystem
   end
 
   def shell(command)
+    puts "$> #{command}"
     raise CommandError.new, command, caller unless system(command)
   end
   
+  def shell_output(command)
+    puts "$> #{command}"
+    `#{command}`
+  end
+  
   def environment!(variable)
     value = ENV[variable]
     raise "#{variable} environment variable not found" unless value
@@ -53,12 +59,20 @@ class PhysicalSystem
     return Dir.delete(dir_path)
   end
   
-  def copy(source, target)
+  def copy_file(source, target)
     FileUtils.copy(source, target)
   end
   
-  def move(source, target)
+  def move_file(source, target)
     FileUtils.move(source, target)
   end
+  
+  def copy_dir(source, target)
+    FileUtils.copy_entry(source, target)
+  end
+  
+  def move_dir(source, target)
+    FileUtils.mv(source, target)
+  end
 end
 end

data/lib/buildmaster/svn_driver.rb

@@ -3,39 +3,30 @@ require 'rexml/document'
 
 module BuildMaster
 
-class SvnInfo
-  attr_reader :work_dir, :repository_root
-  
-  def initialize(work_dir)
-    @work_dir = work_dir
-    entries = work_dir.dir('.svn').file('entries')
-    analyze_entry_file(entries)
-  end
-  
-  def analyze_entry_file(entry_file)
-    @repository_root = entry_file.read do |file|
-      parse_xml_load_repository_root(file)
-    end
-  end
-  
-  private
-  def parse_xml_load_repository_root(file)
-    xml = REXML::Document.new(file)
-    xml.root.each_element_with_attribute('name', '', 1) do |element|
-      return element.attributes['repos']
-    end
-  end
-  
-end
-
 class SvnDriver    
     def SvnDriver::from_path(directory)
-        return SvnDriver.new(SvnInfo.new(directory))
+        return SvnDriver.new(directory)
     end
     
-    def initialize(svn_info)
-        @svn_info = svn_info
-        @system = svn_info.work_dir.system
+    attr_reader :work_dir, :repository_url
+    
+    def initialize(work_dir, repository_root = nil, repository_url = nil)
+        @system = work_dir.system
+        @work_dir = work_dir
+        @repository_root = repository_root
+        @repository_url = repository_url
+    end
+    
+    def repository_root
+      load_svn_info unless @repository_root
+      return @repository_root
+    end
+    
+    def repository_url
+      if (not @repository_url)
+        @repository_url = "#{repository_root}/trunk"
+      end
+      return @repository_url
     end
     
     def status
@@ -51,11 +42,11 @@ class SvnDriver
     end
     
     def tag(tag_name)
-        @system.shell("svn copy #{@svn_info.repository_root}/trunk #{@svn_info.repository_root}/tags/#{tag_name} -m \"ruby buildmaster\"")
+        @system.shell("svn copy #{repository_url} #{repository_root}/tags/#{tag_name} -m \"ruby buildmaster\"")
     end
     
     def checkout(output)
-        @system.shell("svn checkout #{@svn_info.repository_root}/trunk #{output}")
+        @system.shell("svn checkout #{repository_root}/trunk #{output}")
     end
     
     def command(command)
@@ -63,8 +54,24 @@ class SvnDriver
     end
     
     private
+    def load_svn_info
+      info = @system.shell_output("svn info #{work_dir.path}")
+      StringIO.new(info).each_line do |line|
+        index = line.index(':')
+        if (index)
+          property = line[0, index].strip
+          value = line[index + 1, line.length - index - 1].strip
+          if (property == 'Repository Root')
+            @repository_root = value
+          elsif (property == 'URL')
+            @repository_url = value
+          end
+        end
+      end
+    end
+    
     def command_for_path(svn_command, argument='')
-        @system.shell("svn #{svn_command} #{@svn_info.work_dir.path}#{argument}")
+        @system.shell("svn #{svn_command} #{@work_dir.path}#{argument}")
     end
 end
 

data/test/buildmaster/cotta/cotta_specifications.rb

@@ -167,6 +167,31 @@ def register_cotta_dir_specifications
     actual_dir_list[1].name.should_equal 'one.txt'
     actual_dir_list[1].save
   end
+  
+  specify 'should move directory with its children' do
+    dir = BuildMaster::CottaDir.new(@system, Pathname.new('targetdir/child_dir'))
+    @dir.file('file.txt').save('file.txt')
+    @dir.dir('subdir').mkdirs
+    @dir.list.size.should_equal 2
+    @dir.move_to(dir)
+    @dir.exists?.should_equal false
+    dir.list.size.should_equal 2
+    dir.file('file.txt').load.should_equal 'file.txt'
+    dir.dir('subdir').exists?.should_equal true
+  end
+  
+  specify 'should copy directory with its children' do
+    dir = BuildMaster::CottaDir.new(@system, Pathname.new('targetdir/child_dir'))
+    @dir.file('file.txt').save('file.txt')
+    @dir.dir('subdir').mkdirs
+    @dir.list.size.should_equal 2
+    @dir.copy_to(dir)
+    @dir.exists?.should_equal true
+    dir.list.size.should_equal 2
+    dir.file('file.txt').load.should_equal 'file.txt'
+    dir.dir('subdir').exists?.should_equal true
+  end
+  
 end
 
 end

data/test/buildmaster/cotta/physical_system_stub.rb

@@ -47,12 +47,24 @@ class PhysicalSystemStub
     @system.io(relative_from_tmp(pathname), arguments)
   end
   
-  def copy(source, target)
-    @system.copy(relative_from_tmp(source), relative_from_tmp(target))
+  def copy_file(source, target)
+    @system.copy_file(relative_from_tmp(source), relative_from_tmp(target))
   end
   
-  def move(source, target)
-    @system.move(relative_from_tmp(source), relative_from_tmp(target))
+  def move_file(source, target)
+    @system.move_file(relative_from_tmp(source), relative_from_tmp(target))
+  end
+  
+  def copy_dir(source, target)
+    @system.copy_dir(relative_from_tmp(source), relative_from_tmp(target))
+  end
+  
+  def move_dir(source, target)
+    @system.move_dir(relative_from_tmp(source), relative_from_tmp(target))
+  end
+  
+  def copy_dir(source, target)
+    @system.copy_dir(relative_from_tmp(source), relative_from_tmp(target))
   end
   
   private

data/test/buildmaster/cotta/system_file_specifications.rb

@@ -98,7 +98,7 @@ require 'pathname'
         write_io.puts 'line'
         write_io.close
         target = Pathname.new('target')
-        @system.copy(pathname, target)
+        @system.copy_file(pathname, target)
         @system.file_exists?(target).should_equal true
         read_io = load_io(target, 'r')
         read_io.gets.should_equal "line\n"
@@ -107,11 +107,9 @@ require 'pathname'
       
       specify 'move file' do
         pathname = Pathname.new('file1')
-        write_io = load_io(pathname, 'w')
-        write_io.puts 'line'
-        write_io.close
+        write_content(pathname, 'line')
         target = Pathname.new('target')
-        @system.move(pathname, target)
+        @system.move_file(pathname, target)
         @system.file_exists?(target).should_equal true
         read_io = load_io(target, 'r')
         read_io.gets.should_equal "line\n"
@@ -119,6 +117,41 @@ require 'pathname'
         @system.file_exists?(pathname).should_equal false
       end
       
+      specify 'move dir' do
+        source = Pathname.new('source')
+        @system.mkdir source
+        source_file = Pathname.new('source/file.txt')
+        write_content(source_file, 'file.txt')
+        @system.mkdir source.join('subdir')
+        target = Pathname.new('target')
+        @system.move_dir(source, target)
+        @system.list(target).size.should_equal 2
+        @system.dir_exists?(source).should_equal false
+        @system.dir_exists?(target).should_equal true
+        @system.file_exists?(Pathname.new('target/file.txt')).should_equal true
+        @system.dir_exists?(Pathname.new('target/subdir')).should_equal true
+      end
+      
+      specify 'copy dir' do
+        source = Pathname.new('source')
+        @system.mkdir source
+        source_file = Pathname.new('source/file.txt')
+        write_content(source_file, 'file.txt')
+        @system.mkdir source.join('subdir')
+        target = Pathname.new('target')
+        @system.copy_dir(source, target)
+        @system.list(target).size.should_equal 2
+        @system.dir_exists?(source).should_equal true
+        @system.dir_exists?(target).should_equal true
+        @system.file_exists?(Pathname.new('target/file.txt')).should_equal true
+      end
+      
+      def write_content(pathname, content)
+        write_io = load_io(pathname, 'w')
+        write_io.puts content
+        write_io.close
+      end
+
   end    
   def load_io(*args)
     io = @system.io(*args)

data/test/buildmaster/tc_svn_driver.rb

@@ -12,74 +12,68 @@ context 'SVN drivers' do
         @system = InMemorySystem.new
         cotta = Cotta.new(@system)
         @work_dir_root = cotta.dir('/workdir')
-        @work_dir_root.dir('.svn').file('entries').save <<CONTENT
-<?xml version="1.0" encoding="utf-8"?>
-<wc-entries
-   xmlns="svn:">
-<entry
-   committed-rev="120"
-   name=""
-   committed-date="2006-09-05T06:50:07.932800Z"
-   url="svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster/trunk"
-   last-author="wolfdancer"
-   kind="dir"
-   uuid="ab7ff8c2-9713-0410-a269-a4b56b3120d2"
-   repos="svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster"
-   prop-time="2006-09-05T06:49:40.625000Z"
-   revision="120"/>
-</wc-entries>
+        @system.output_for_command("svn info #{@work_dir_root.path}", <<CONTENT
+Path: .
+URL: svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster/trunk
+Repository Root: svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster
+Repository UUID: ab7ff8c2-9713-0410-a269-a4b56b3120d2
+Revision: 153
+Node Kind: directory
+Schedule: normal
+Last Changed Author: wolfdancer
+Last Changed Rev: 153
+Last Changed Date: 2006-10-15 21:27:51 -0700 (Sun, 15 Oct 2006)
 CONTENT
-        @info = SvnInfo.new @work_dir_root
+)
+        @svn = SvnDriver.new @work_dir_root
     end
     
-    specify 'load svn info from the .svn directory' do
-        info = SvnInfo.new(@work_dir_root)
-        info.work_dir.should_equal @work_dir_root
-        info.repository_root.should_equal 'svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster'
+    specify 'load svn info from the info command' do
+        @svn.work_dir.should_equal @work_dir_root
+        @svn.repository_root.should_equal 'svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster'
     end
     
     specify 'load svn driver from the root directory' do
-        svn = SvnDriver.from_path(@work_dir_root)
-        svn.command('info')
+        @svn.command('info')
     end
     
     specify 'svn status command' do
         log = ''
-        svn = SvnDriver.new(@info)
-        svn.status
+        @svn.status
         @system.executed_commands[0].should_equal "svn status #{@work_dir_root.path}"
     end
     
     specify 'svn update command' do
         log = ''
-        svn = SvnDriver.new(@info)
-        svn.update
+        @svn.update
         @system.executed_commands[0].should_equal "svn update #{@work_dir_root.path}"
     end
     
     specify 'svn commit command' do
-        svn = SvnDriver.new(@info)
-        svn.commit('message')
+        @svn.commit('message')
         @system.executed_commands[0].should_equal "svn commit #{@work_dir_root.path} -m \"message\""
     end
     
     specify 'svn check out command' do
-        svn = SvnDriver.new(@info)
-        svn.checkout('output')
-        @system.executed_commands[0].should_equal "svn checkout #{@info.repository_root}/trunk output"
+        @svn.checkout('output')
+        @system.executed_commands[0].should_equal "svn checkout #{@svn.repository_root}/trunk output"
     end
     
     specify 'svn command' do
-        svn = SvnDriver.new(@info)
-        svn.command('info')
+        @svn.command('info')
         @system.executed_commands[0].should_equal "svn info #{@work_dir_root.path}"
     end
     
     specify 'svn tag' do
-        svn = SvnDriver.new(@info)
         tag = 'build_0.0.5_b3'
-        svn.tag(tag)
-        @system.executed_commands[0].should_equal "svn copy #{@info.repository_root}/trunk #{@info.repository_root}/tags/#{tag} -m \"ruby buildmaster\""
+        @svn.tag(tag)
+        @system.executed_commands[0].should_equal "svn copy #{@svn.repository_root}/trunk #{@svn.repository_root}/tags/#{tag} -m \"ruby buildmaster\""
+    end
+    
+    specify 'physical svn works' do
+      cotta = Cotta.new
+      svn = SvnDriver.new(cotta.file(__FILE__).parent)
+      svn.repository_root.should_equal 'svn+ssh://wolfdancer@rubyforge.org/var/svn/buildmaster'
     end
     
 end

metadata

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