rbuilder 0.0.1 → 0.0.3

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 Gem::manage_gems
 require 'rake/gempackagetask'
+NEXT_VERSION = "0.0.3"
+
 
  desc 'Running all unit tests'
  task :default => :test
@@ -25,7 +27,7 @@ require 'rake/gempackagetask'
  
  spec = Gem::Specification.new do |s| 
   s.name = "rbuilder"
-  s.version = "0.0.1"
+  s.version = NEXT_VERSION
   s.author = "Rob Westgeest"
   s.email = "rob.westgeest@gmail.com"
   s.homepage = "http://notaresource.blogspot.com/rbuilder"

data/conf/example.conf

@@ -1,2 +1,4 @@
-build '../../integration_tests/some_project', 'rake'
-build '../../integration_tests/rbuilder', 'rake'
+# simple configuration
+build '/some/dir/integration_tests/some_project', 'rake'
+# configuration with aliased name
+build '/some/dir/integration_tests/some_other_project', 'rake', 'archive name'

data/rbuilder/build.rb

@@ -44,7 +44,15 @@ class Build
     def green?  
         status == BuildStatus.ok
     end
+   
+    def ==(other)
+        other.is_a?(Build) &&
+        self.reason == other.reason &&
+        self.archive == other.archive && 
+        self.build_command == other.build_command &&
+        self.working_dir == other.working_dir
+    end
     
-    private
+    protected
     attr_reader :build_command, :working_dir, :building
 end

data/rbuilder/build_command.rb

@@ -16,18 +16,57 @@ class BuildCommand
     end
     
     def run_command(build_result)
-        puts "running '#{commandline}' in working dir '#{`pwd`.strip}'"
-        IO.popen commandline do |stdout|
-            while !stdout.eof?
-                line = stdout.readline
-                build_result.info(line)
-                puts line
+        orig_stderr = $stderr.dup
+        run_process commandline do |stdout,stderr|
+            while !(stdout.eof? && stderr.eof?)
+                report(build_result, stdout)
+                report(build_result, stderr)
             end
-        end
+        end 
         return $? == 0
     end
         
     private 
+    def report(build_result,io)
+        unless io.eof?
+            line = io.readline
+            build_result.info(line)
+            puts line
+        end
+    end
+    
+    def run_process(*cmd)
+        outpipe = IO::pipe
+        errorpipe = IO::pipe
+
+        pid = fork{
+          # child
+            outpipe.first.close
+            STDOUT.reopen(outpipe.last)
+            outpipe.last.close
+
+            errorpipe.first.close
+            STDERR.reopen(errorpipe.last)
+            errorpipe.last.close
+
+            exec(*cmd)
+          exit!($?)
+        }
+
+        outpipe.last.close
+        errorpipe.last.close
+        Process.waitpid(pid)
+        pi = [outpipe.first, errorpipe.first]
+        if defined? yield
+          begin
+            return yield(*pi)
+          ensure
+            pi.each{|p| p.close unless p.closed?}
+          end
+        end
+        pi
+    end
+    
     attr_reader :commandline
     
 end

data/rbuilder/build_configuration.rb

@@ -7,8 +7,8 @@ class BuildConfiguration
         @builder = builder
     end
     
-    def build(dir, command)
-        @builder.add_description BuildDescription.new(BuildCommand.new(command), SourceControl.svn(dir))
+    def build(dir, command, logical_name = nil)
+        @builder.add_description BuildDescription.new(BuildCommand.new(command), SourceControl.svn(dir), logical_name)
     end
     
     def from_text(text) 

data/rbuilder/build_description.rb

@@ -5,10 +5,11 @@ class BuildDescription
     include Observable
     attr_reader :builds
     
-    def initialize(build_command, source_control)
+    def initialize(build_command, source_control, archive_name = nil)
         @build_command = build_command
         @builds = []
         @source_control = source_control
+        @archive_name = archive_name
     end
     
     def status
@@ -28,13 +29,18 @@ class BuildDescription
     end
     
     def create_build(reason)
-        Build.new(build_command, working_dir, reason, source_control.archive)
+        Build.new(build_command, working_dir, reason, archive_name)
     end
     
     def iterate
         source_control.report_change_to(self)
     end
     
+    def archive_name
+        @archive_name || source_control.archive
+    end
+    
+
     private
     
     def working_dir

data/rbuilder/source_control/svn.rb

@@ -42,8 +42,9 @@ module SourceControl
         end
         
         def strip_server(line)
-            return line unless line =~ /(svn.*:\/\/[^\/]*\/)(.*)/ 
-            return $2
+            return $2 if line =~ /(svn.*:\/\/[^\/]*\/)(.*)/ 
+            return $2 if line =~ /(file.*:\/\/[^\/]*\/)(.*)/ 
+            return line
         end
         
         def strip_trunk(line)

data/tests/source_control/test_svn.rb

@@ -28,11 +28,21 @@ module SourceControl
             assert_equal 'the_repo_root', svn.archive 
         end
         
-        def test_archive_strips_server_and_trunk_if_possible
+        def test_archive_strips_server_and_trunk_if_protocol_is_svnssh
             svn.stubs(:run_info).returns svn_output_for(:repo_root => 'svn+ssh://yosemite/home/svn/rbuilder/trunk')
             assert_equal 'home/svn/rbuilder', svn.archive 
         end
         
+        def test_archive_strips_server_and_trunk_if_protocol_is_svn
+            svn.stubs(:run_info).returns svn_output_for(:repo_root => 'svn://yosemite/home/svn/rbuilder/trunk')
+            assert_equal 'home/svn/rbuilder', svn.archive 
+        end
+        
+        def test_archive_strips_server_and_trunk_if_protocol_is_file
+            svn.stubs(:run_info).returns svn_output_for(:repo_root => 'file:///home/svn/rbuilder/trunk')
+            assert_equal 'home/svn/rbuilder', svn.archive 
+        end
+
         def test_info_returns_info_struct_with_revision_and_committer
             svn.stubs(:run_info).returns svn_output_for(:author => 'westgeest', :revision => '1')
             assert_equal Status.new(1, 'westgeest'), svn.get_info  

data/tests/test_build_command.rb

@@ -35,7 +35,7 @@ class TestBuilderExecution < Test::Unit::TestCase
 
 end
 
-class TestBuildCommandWithRealCommand < Test::Unit::TestCase
+class TestBuildCommandWithRealCommandPrintingOnStdout < Test::Unit::TestCase
     attr_reader :expected_output_lines, :build_command, :build_report
     def setup
         @expected_output_lines = ["line_1\n","line_2\n"]
@@ -54,4 +54,25 @@ class TestBuildCommandWithRealCommand < Test::Unit::TestCase
         build_command.execute(".", build_report)
     end
     
-end
+end
+
+class TestBuildCommandWithRealCommandPrintingOnStdErr < Test::Unit::TestCase
+    attr_reader :expected_output_lines, :build_command, :build_report
+    def setup
+        @expected_output_lines = ["line_1\n","line_2\n"]
+        @build_command = BuildCommand.new( %Q{ruby -e '$stderr.puts "line_1";$stderr.puts "line_2"; exit(1)'} )
+        @build_report = stub_everything
+    end
+    
+    def test_output_is_send_to_build_report
+        build_report.expects(:info).with("line_1\n")
+        build_report.expects(:info).with("line_2\n")
+        build_command.execute(".", build_report)
+    end
+    
+    def test_real_abnormal_normal_command_should_be_red
+        build_report.expects :red
+        build_command.execute(".", build_report)
+    end
+end    
+

data/tests/test_build_configuration.rb

@@ -15,6 +15,14 @@ class TestBuildConfiguration < Test::Unit::TestCase
         assert_equal 1, builder.descriptions.size
     end
 
+    def test_build_creates_build_description_with_logical_name_if_passed
+        builder = Builder.new
+        config = BuildConfiguration.new(builder)
+        config.from_text("build '.', 'some_command', 'nice_name'")
+        assert_equal 'nice_name', builder.descriptions.first.archive_name
+    end
+
+
     def test_build_fails_if_directory_does_not_exist
         builder = Builder.new
         config = BuildConfiguration.new(builder)

data/tests/test_build_description.rb

@@ -16,7 +16,7 @@ class TestBuildDescriptionIterate < Test::Unit::TestCase
     end
 end
 
-class TestBuildDescriptionRunABuild < Test::Unit::TestCase
+class TestBuildDescription_RunABuild < Test::Unit::TestCase
     attr_reader :working_dir, :build_command, :build_description, :build
     def setup
         @working_dir = "some_dir"
@@ -64,17 +64,31 @@ end
 
 
 class TestBuildCreation < Test::Unit::TestCase
-    def test_creates_a_build_with_a_build_descrition_reason_working_dir_and_build_report
-        working_dir = "working_dir"
-        source_control = stub(:working_dir => working_dir, :archive => 'the_archive')
+    attr_reader :working_dir, :source_control, :build_command, :build_reason
+    def setup
+        @working_dir = "working_dir"
+        @source_control = stub(:working_dir => working_dir, :archive => 'the_archive')
+        @build_command = Object.new
+        @build_reason = Object.new
+        
+    end
+    
+    def test_creates_a_build_with_a_build_descrition_reason_working_dir_and_build_report_and_source_control_archive
+        build_description = BuildDescription.new(build_command, source_control)
+        
+        build = build_description.create_build(build_reason)
+        
+        expected_build = Build.new(build_command, working_dir, build_reason, source_control.archive)
+        assert_equal expected_build, build
+    end
+    
+    def test_creates_a_build_with_a_build_descrition_reason_working_dir_and_build_report_and_logical_name
+        build_description = BuildDescription.new(build_command, source_control, 'the_logical_name' )
         
-        build_description = Object
-        build_reason = Object
-        build_description = BuildDescription.new(build_description, source_control)
         build = build_description.create_build(build_reason)
         
-        assert_same build_reason, build.reason
-        assert_equal 'the_archive', build.archive
+        expected_build = Build.new(build_command, working_dir, build_reason, 'the_logical_name')
+        assert_equal expected_build, build
     end
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rbuilder
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2008-01-18 00:00:00 +01:00
+  version: 0.0.3
+date: 2008-02-15 00:00:00 +01:00
 summary: A Ruby auto build tool like build-o-matic for running on a desktop pc
 require_paths: 
 - rbuilder