rbuilder 0.0.3 → 0.0.4

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 Gem::manage_gems
 require 'rake/gempackagetask'
-NEXT_VERSION = "0.0.3"
+NEXT_VERSION = "0.0.4"
 
 
  desc 'Running all unit tests'

data/bin/rbuilder

@@ -3,9 +3,8 @@ $: << File.join(File.expand_path(File.dirname(__FILE__)),'..','rbuilder')
 require 'libs'
 require 'gui'
 require 'optparse'
-
+VERSION = 0.0.4
 USAGE_MESSAGE = %Q{
-usage #{$0} <working_dir> <build_command>
 
 This program is an automatic builder for any build environment 
 (ant, make, rake... the lot). It accepts parameters for the 
@@ -24,23 +23,28 @@ or 'make' or 'ant' but can be anything.
 
 The build command is expected to have an exit value of 0 when 
 the build is successfull and anything else when the build is 
-not successfull.
+not successful.
+
+usage #{$0} [<working_dir> <build_command>]
+   or #{$0} [options]
+where options are:
 }
 
-def usage 
-    puts USAGE_MESSAGE
+def usage(parser) 
+    puts parser
     exit(1)
 end
     
 configuration_file = nil
 parser = OptionParser.new do |opts|
     opts.banner = USAGE_MESSAGE
-    opts.on("-h", '--help', "show this message") { usage }
-    opts.on("-c", '--configfile file', "use configuration file ") { |file| configuration_file = file }
+    opts.on("-h", '--help', "show this message") { usage(parser) }
+    opts.on("-v", '--version', "show version") { p VERSION }
+    opts.on("-c", '--configfile file', "use configuration file") { |file| configuration_file = file }
 end 
     
 rest = parser.parse ARGV
-usage unless configuration_file || (rest[0] && rest[1])
+usage(parser) unless configuration_file || (rest[0] && rest[1])
 
 builder = Builder.new
 build_configuration = BuildConfiguration.new(builder)

data/rbuilder/build.rb

@@ -33,14 +33,18 @@ class Build
         changed!
     end
     
-    def revision 
-        return reason.revision
+    def revision_number
+        return reason.revision_number
     end
     
     def committer 
         return reason.committer
     end
     
+    def timestamp
+        return reason.timestamp
+    end
+    
     def green?  
         status == BuildStatus.ok
     end

data/rbuilder/build_command.rb

@@ -17,10 +17,9 @@ class BuildCommand
     
     def run_command(build_result)
         orig_stderr = $stderr.dup
-        run_process commandline do |stdout,stderr|
-            while !(stdout.eof? && stderr.eof?)
+        run_process commandline do |stdout|
+            while !(stdout.eof?)
                 report(build_result, stdout)
-                report(build_result, stderr)
             end
         end 
         return $? == 0
@@ -35,36 +34,9 @@ class BuildCommand
         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
+    def run_process(*cmd, &block)
+        IO.popen("#{cmd} 2>&1", &block)
+        return $? == 0
     end
     
     attr_reader :commandline

data/rbuilder/gui/build_list_view_entry.rb

@@ -19,10 +19,11 @@ module Gui
         def update
             iterator[0] = self
             iterator[1] = build.archive
-            iterator[2] = build.revision.to_s
-            iterator[3] = build.committer.to_s
-            iterator[4] = build.status.to_s
-            iterator[5] = build.summary.to_s
+            iterator[2] = build.revision_number.to_s
+            iterator[3] = build.timestamp.to_s
+            iterator[4] = build.committer.to_s
+            iterator[5] = build.status.to_s
+            iterator[6] = build.summary.to_s
         end
         Colors = {BuildStatus.ok => 'green', BuildStatus.failed => 'red', BuildStatus.building => 'yellow'}
         def update_renderer_style(renderer)

data/rbuilder/gui/builder_list_view.rb

@@ -9,17 +9,17 @@ module Gui
         end
 
         def initialize_ui_elements
-            @tree_store = Gtk::TreeStore.new(BuildListViewEntry,String,String,String,String,String)
+            @tree_store = Gtk::TreeStore.new(BuildListViewEntry,String,String,String,String,String,String)
             @tree_view = Gtk::TreeView.new(tree_store)
             @gtk_container = Gtk::ScrolledWindow.new 
             gtk_container << tree_view
             
             renderer = Gtk::CellRendererText.new
-            %w{Archive Revision Committer Status Summary}.each_with_index do |column, index|
+            %w{Archive Revision Time Committer Status Summary}.each_with_index do |column, index|
                 col = Gtk::TreeViewColumn.new(column, renderer, :text => index+1)
                 col.resizable=true
                 col.set_cell_data_func(renderer) do |col, renderer, model, iter| 
-                    iter[0].update_renderer_style(renderer)
+                    iter[0].update_renderer_style(renderer) if iter[0]
                 end
                 
                 tree_view.append_column(col)

data/rbuilder/revision_committed.rb

@@ -1,21 +1,36 @@
 
 class RevisionCommitted
-    attr_reader :committer, :revision
-    def initialize(revision, committer)    
+    def initialize(revision)    
         @revision = revision
-        @committer = committer
     end
     
     def self.from_source_control_status(status)
-        self.new(status.revision, status.committer)
+        self.new(status)
+    end
+    
+    def committer
+        return @revision.committer
+    end
+    
+    def revision_number
+        return @revision.revision
+    end
+    
+    def timestamp
+        return @revision.timestamp
     end
     
     def ==(other)
         return false unless other.class == self.class 
-        self.revision == other.revision && self.committer == other.committer
+        self.revision == other.revision 
     end
     
     def to_s
-        "Revision #{revision} committed by #{committer}"
+        "Revision #{revision_number} committed by #{committer}"
     end
+
+    protected 
+    attr_reader :revision
+    
+        
 end

data/rbuilder/source_control/status.rb

@@ -1,9 +1,11 @@
 module SourceControl
     class Status
-        attr_reader :revision, :committer
-        def initialize(revision, committer)
+        attr_reader :revision, :committer, :timestamp, :comment
+        def initialize(revision, committer, timestamp = "", comment = "")
             @revision = revision
             @committer = committer
+            @timestamp = timestamp
+            @comment = comment
         end
         
         
@@ -14,7 +16,7 @@ module SourceControl
         end
         
         def to_s
-            "(#{revision},#{committer})"
+            "(#{revision},#{committer}, #{timestamp}, #{comment})"
         end
         def inspect
             "Status#{to_s}"

data/rbuilder/source_control/svn.rb

@@ -28,7 +28,7 @@ module SourceControl
         end
          
         def parse_archive(repo_info)
-            repo_info =~ /^(Repository Root: )(.*)$/
+            return 'unknown archive' unless repo_info =~ /^(Repository Root: )(.*)$/
             line = $2
             line = strip_server(line)
             return strip_trunk(line)            
@@ -36,8 +36,10 @@ module SourceControl
         
         def get_info
             info_output = run_info
-            revision = info_output[/^Revision:(.*)$/].split(':')[1]
-            committer = info_output[/^Last Changed Author:(.*)$/].split(':')[1].strip
+            revision_line = info_output[/^Revision:(.*)$/]
+            revision = revision_line && revision_line.split(':')[1] || 0
+            author_line = info_output[/^Last Changed Author:(.*)$/]
+            committer = author_line && author_line.split(':')[1].strip || 'unknown'
             Status.new(revision.to_i, committer)
         end
         

data/tests/gui/test_builder_list_view_entry.rb

@@ -25,21 +25,21 @@ module Gui
     class TestBuilderListViewEntry < Test::Unit::TestCase
         attr_reader :build, :entry, :tree_view_iterator
         def setup
-            @build = stub(:add_observer => nil, :archive => 'the_archive', :revision => 123, :status => BuildStatus.building, :summary => nil, :committer => 'westgeer')
+            @build = stub(:add_observer => nil, :archive => 'the_archive', :revision_number => 123, :timestamp => '10 o clock', :status => BuildStatus.building, :summary => nil, :committer => 'westgeer')
             @entry = BuildListViewEntry.new(build)
             @tree_view_iterator = []
         end
         
         def test_attach_to_tree_view_iterator_sets_revision_and_status_values
             entry.attach_to(tree_view_iterator)
-            assert_equal [entry, 'the_archive', '123', 'westgeer', 'building', ''], tree_view_iterator
+            assert_equal [entry, 'the_archive', '123', '10 o clock', 'westgeer', 'building', ''], tree_view_iterator
         end
         
         def test_update_updates_tree_view_iterator
             entry.attach_to(tree_view_iterator)
-            build.stubs(:archive => 'some_archive', :revision => 300, :status => BuildStatus.ok,:summary => 'done', :committer => 'westgeer')
+            build.stubs(:archive => 'some_archive', :revision_number => 300, :timestamp => '11 o clock', :status => BuildStatus.ok,:summary => 'done', :committer => 'westgeer')
             entry.update
-            assert_equal [entry, 'some_archive', '300', 'westgeer', 'ok', 'done'], tree_view_iterator
+            assert_equal [entry, 'some_archive', '300', '11 o clock', 'westgeer', 'ok', 'done'], tree_view_iterator
         end
     end
     

data/tests/source_control/test_source_control.rb

@@ -6,23 +6,22 @@ require 'rbuilder/source_control'
 
 
 class TestSourceControlCheck < Test::Unit::TestCase
-    attr_reader :svn, :source_control, :builder
+    attr_reader :svn, :source_control, :build_description
     
     def setup
         @svn = stub(:working_dir => 'the_working_dir', :archive => 'the_archive_name')
         @source_control = SourceControl.new(svn)
-        @builder = mock
+        @build_description = mock
     end
     
-    
-    def expect_new_revision_committed_on_builder(last_commit)
+    def expect_new_revision_committed_on_build_description(last_commit)
         svn.stubs(:get_info).returns(last_commit)
-        builder.expects(:new_revision_committed).with(last_commit)
+        build_description.expects(:new_revision_committed).with(last_commit)
     end
     
-    def expect_no_new_revision_committed_on_builder(last_commit)
+    def expect_no_new_revision_committed_on_build_description(last_commit)
         svn.stubs(:get_info).returns(last_commit)
-        builder.expects(:new_revision_committed).with(last_commit).never
+        build_description.expects(:new_revision_committed).with(last_commit).never
     end
     
     def test_working_dir
@@ -35,18 +34,18 @@ class TestSourceControlCheck < Test::Unit::TestCase
     end
     
     def test_generates_new_revision_committed_when_source_control_status_has_changed
-        expect_new_revision_committed_on_builder(SourceControl::Status.new(35, 'westgeest'))
-        source_control.report_change_to(builder)
+        expect_new_revision_committed_on_build_description(SourceControl::Status.new(35, 'westgeest'))
+        source_control.report_change_to(build_description)
 
-        expect_new_revision_committed_on_builder(SourceControl::Status.new(36, 'harry'))
-        source_control.report_change_to(builder)
+        expect_new_revision_committed_on_build_description(SourceControl::Status.new(36, 'harry'))
+        source_control.report_change_to(build_description)
     end
 
     def test_generates_nothing_when_source_control_revision_was_not_changed
-        expect_new_revision_committed_on_builder(SourceControl::Status.new(35, 'westgeest'))
-        source_control.report_change_to(builder)
+        expect_new_revision_committed_on_build_description(SourceControl::Status.new(35, 'westgeest'))
+        source_control.report_change_to(build_description)
         
-        expect_no_new_revision_committed_on_builder(SourceControl::Status.new(35, 'westgeest'))
-        source_control.report_change_to(builder)
+        expect_no_new_revision_committed_on_build_description(SourceControl::Status.new(35, 'westgeest'))
+        source_control.report_change_to(build_description)
     end    
 end

data/tests/source_control/test_svn.rb

@@ -42,15 +42,31 @@ module SourceControl
             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_archive_is_unknown_if_archive_line_not_in_svn_output
+            svn.stubs(:run_info).returns svn_output_without_author_for(:repo_root => 'file:///home/svn/rbuilder/trunk')
+            assert_equal 'unknown archive', 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')
+            svn.stubs(:run_log).with('repos').returns svn_log_output_for(:revision => '10', :comment => 'fix')
+            svn.stubs(:run_info).returns svn_output_for(:author => 'westgeest', :revision => '1', :repo_root => 'repos')
             assert_equal Status.new(1, 'westgeest'), svn.get_info  
-            svn.stubs(:run_info).returns svn_output_for(:author => 'harry', :revision => '2')
+            svn.stubs(:run_log).with('repos').returns svn_log_output_for(:revision => '10', :comment => 'fix')
+            svn.stubs(:run_info).returns svn_output_for(:author => 'harry', :revision => '2', :repo_root => 'repos')
             assert_equal Status.new(2, 'harry'), svn.get_info  
         end
         
+        def test_author_returns_unknown_when_author_not_in_svn_output
+            svn.stubs(:run_info).returns svn_output_without_author_for()
+            assert_equal Status.new(0, 'unknown'), svn.get_info  
+        end
+        
         private
+        def svn_log_output_for(args = {})
+            args = {:revision => '1', :comment => 'some comment'}.merge args 
+            
+        end
         def svn_output_for(args = {})
             args = {:repo_root => 'svn+ssh://yosemite/home/svn/rbuilder', :author => 'harry', :revision => '2'}.merge args 
             %Q{
@@ -66,5 +82,16 @@ module SourceControl
                 Last Changed Date: 2007-12-21 23:31:23 +0100 (Fri, 21 Dec 2007)
                 }.gsub(/^ +/,'')
         end
+        def svn_output_without_author_for(args = {})
+            args = {:repo_root => 'svn+ssh://yosemite/home/svn/rbuilder', :author => 'harry', :revision => '2'}.merge args 
+            %Q{
+                Path: .
+                URL: svn+ssh://yosemite/home/svn/rbuilder/trunk
+                Repository UUID: f125cab9-89fe-4a65-988d-b833e1c403a1
+                Node Kind: directory
+                Schedule: normal
+                Last Changed Date: 2007-12-21 23:31:23 +0100 (Fri, 21 Dec 2007)
+                }.gsub(/^ +/,'')
+        end
     end
 end

data/tests/test_build.rb

@@ -49,11 +49,25 @@ class TestBuildRevision < Test::Unit::TestCase
         @build = Build.new(nil,nil,stub_reason)
     end
     
-    def test_is_retreived_from_reason
-        stub_reason.stubs(:revision).returns 233
-        assert_equal 233, build.revision
-        stub_reason.stubs(:revision).returns 455
-        assert_equal 455, build.revision
+    def test_is_number_is_retreived_from_reason
+        stub_reason.stubs(:revision_number).returns 233
+        assert_equal 233, build.revision_number
+        stub_reason.stubs(:revision_number).returns 455
+        assert_equal 455, build.revision_number
+    end
+    
+    def test_is_committer_is_retreived_from_reason
+        stub_reason.stubs(:committer).returns 'rob'
+        assert_equal 'rob', build.committer
+        stub_reason.stubs(:committer).returns 'henk'
+        assert_equal 'henk', build.committer
+    end
+    
+    def test_is_timestamp_is_retreived_from_reason
+        stub_reason.stubs(:timestamp).returns '10 o clock'
+        assert_equal '10 o clock', build.timestamp
+        stub_reason.stubs(:timestamp).returns '11:30'
+        assert_equal '11:30', build.timestamp
     end
     
 end

data/tests/test_build_command.rb

@@ -39,7 +39,7 @@ 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"]
-        @build_command = BuildCommand.new("echo line_1;echo line_2")
+        @build_command = BuildCommand.new(%Q{ruby -e 'puts "line_1";puts "line_2"; exit(0)'})
         @build_report = stub_everything
     end
     

data/tests/test_build_description.rb

@@ -51,13 +51,16 @@ class TestBuildDescription_RunABuild < Test::Unit::TestCase
         assert_equal [build,build2], build_description.builds
     end
     
-    def test_receiving_a_commit_runs_a_build_with_reason_receiving_a_commit
+    def test_receiving_a_new_revision_comitted_runs_a_build_with_reason_receiving_a_commit
         revision = 234
         committer = 'westgeer'
-        expected_reason = RevisionCommitted.new(revision,committer)
+        timestamp = "timestamp"
+        comments = "comments"
+        status = SourceControl::Status.new(revision,committer, timestamp, comments)
+        expected_reason = RevisionCommitted.from_source_control_status(status)
         build.expects :run
         build_description.expects(:create_build).with(expected_reason).returns build
-        build_description.new_revision_committed(SourceControl::Status.new(revision,committer))
+        build_description.new_revision_committed(status)
     end
     
 end

data/tests/test_builder.rb

@@ -41,6 +41,7 @@ class TestBuilder < Test::Unit::TestCase
     end
     
 end
+
 class TestBuildViewUpdates < Test::Unit::TestCase
     
     def test_updates_views_afer_each_iteration

data/tests/test_revision_comitted.rb

@@ -3,28 +3,30 @@ require 'rubygems'
 require 'mocha'
 require File.join(File.dirname(__FILE__), 'builder_test_env')
 require 'revision_committed'
+require 'source_control'
 
 class TestRevisionCommitted < Test::Unit::TestCase
+    attr_reader :status, :event, :revision, :committer, :timestamp
+    def setup
+        @revision = 123
+        @committer = 'westgeer'
+        @timestamp = "ten o clock"
+        @status = SourceControl::Status.new(revision, committer, timestamp)
+        @event = RevisionCommitted.new(status)
+    end
+        
     def test_has_revision_and_committer
-        revision = 123
-        committer = 'westgeer'
-        event = RevisionCommitted.new(revision, committer)
-        assert_equal revision, event.revision
+        assert_equal revision, event.revision_number
         assert_equal committer, event.committer
+        assert_equal timestamp, event.timestamp
     end
     
     def test_equals
-        assert_equal RevisionCommitted.new(1,'westgeest'), RevisionCommitted.new(1,'westgeest')
-        assert_equal RevisionCommitted.new(2,'westgeest'), RevisionCommitted.new(2,'westgeest')
-        assert_equal RevisionCommitted.new(1,'blah'), RevisionCommitted.new(1,'blah')
-        
-        assert_not_equal RevisionCommitted.new(1,'blah'), RevisionCommitted.new(1,'westgeest')
-        assert_not_equal RevisionCommitted.new(1,'westgeest'), RevisionCommitted.new(1,'blah')
-        assert_not_equal RevisionCommitted.new(2,'westgeest'), RevisionCommitted.new(1,'westgeest')
-        assert_not_equal RevisionCommitted.new(1,'westgeest'), RevisionCommitted.new(2,'westgeest')
+        assert_equal RevisionCommitted.new(status), RevisionCommitted.new(status)
+        assert_not_equal RevisionCommitted.new(status), RevisionCommitted.new(SourceControl::Status.new('',''))
     end
     
     def test_equals_with_other_type_of_object_returns_false
-        assert_not_equal RevisionCommitted.new(1,'westgeest'), Object.new
+        assert_not_equal RevisionCommitted.new(status), Object.new
     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.3
-date: 2008-02-15 00:00:00 +01:00
+  version: 0.0.4
+date: 2008-04-03 00:00:00 +02:00
 summary: A Ruby auto build tool like build-o-matic for running on a desktop pc
 require_paths: 
 - rbuilder