@@ -11,6 +11,7 @@ require "dm-validations" require "dm-types" require "dm-timestamps" require "dm-aggregates" +require "open4" require "yaml" require "logger" lib/integrity.rb @@ -1,4 +1,4 @@ -module Integrity +module Integrity class Build include DataMapper::Resource @@ -16,7 +16,7 @@ module Integrity has 1, :commit before :destroy do commit.destroy! end - after :save, :run_onsuccess + before :save, :run_onsuccess def self.pending all(:started_at => nil) @@ -55,14 +55,13 @@ module Integrity private def run_onsuccess - if successful? and !project.onsuccess.nil? and !project.onsuccess.empty? + if successful? and project.onsuccess pid, stdin, stdout, stderr = Open4::popen4 "#{project.onsuccess}" - if stderr.empty? - self.onsuccess_output = stdout + if stderr.read.strip.empty? + onsuccess_output = stdout.read.strip else - self.onsuccess_output = stderr + onsuccess_output = stderr.read.strip end - self.save end end end lib/integrity/build.rb @@ -27,4 +27,4 @@ %h2 Success Output: %pre.output :preserve - #{bash_color_codes h(build.onsuccess_output)} \ No newline at end of file + #{bash_color_codes h(build.onsuccess_output)} views/_build_info.haml 67f9aff5cb831c36e8b5153404d8f15b29ebd638 Michael Erb michael@erbmicha.com http://github.com/erbmicha/integrity/commit/416c05498efe421e24dcc724d3efe89007f3203e 416c05498efe421e24dcc724d3efe89007f3203e 2009-11-05T09:39:16-08:00 2009-11-05T09:39:16-08:00 added require for open4 to integrity.rb (what a dummy...) running :run_onsuccess before save now to avoid that nice infinite loop (moron) added blank newline at the end of build info partial just in case... 8bb4e6c823cda38688f1678e6236dc6b9debf747 Michael Erb michael@erbmicha.com