Skip to content

Commit

Permalink
Prettier exception handler
Browse files Browse the repository at this point in the history
Build timing
No dmd caveats
  • Loading branch information
mxcl committed May 21, 2009
1 parent a2afb5a commit 5d13eee
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
16 changes: 13 additions & 3 deletions Cellar/homebrew/brewkit.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Copyright 2009 Max Howell <[email protected]>
# Licensed as per the GPL version 3
require 'find'
require 'fileutils'
require 'pathname'

$agent = "Homebrew 0.1 (Ruby; Mac OS X 10.5 Leopard)"
Expand All @@ -16,6 +14,9 @@ def h1 title


class Formula
require 'find'
require 'fileutils'

# if you reimplement, assign @name, @version, @url and @md5
def initialize(url, md5)
@name = File.basename $0, '.rb' #original script that the interpreter started
Expand All @@ -41,6 +42,8 @@ def brew
raise "@version.nil?" if @version.nil?
raise "@name does not validate to our regexp" unless /^\w+$/ =~ @name

beginning = Time.now

prefix=$cellar+@name+@version
raise "#{prefix} already exists!" if prefix.exist?

Expand Down Expand Up @@ -78,7 +81,7 @@ def brew
# stay in appsupport in case any odd files gets created etc.
`#{$cellar}/homebrew/brew ln #{prefix}` if prefix.exist?

puts "#{prefix}: "+`find #{prefix} -type f | wc -l`.strip+' files, '+`du -hd0 #{prefix} | cut -d"\t" -f1`.strip
puts "#{prefix}: "+`find #{prefix} -type f | wc -l`.strip+' files, '+`du -hd0 #{prefix} | cut -d"\t" -f1`.strip+", built in #{Time.now - beginning} seconds"
end
end

Expand Down Expand Up @@ -141,6 +144,13 @@ def system cmd
end
end

# force a prettier exception handler unless --verbose or HOMEBREW_DEBUG
Kernel.at_exit {
unless ARGV.include? '--verbose' or ENV['HOMEBREW_DEBUG']
puts "\033[1;31mError\033[0;0m: #{$!}" if $!
exit! 1
end
}

########################################################################script
if $0 == __FILE__
Expand Down
2 changes: 2 additions & 0 deletions Formula/dmd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@

FileUtils.cp_r Dir['html/d/*'], html unless ARGV.include? '--no-html'
FileUtils.cp_r Dir['samples/d/*'], samples unless ARGV.include? '--no-samples'

nil
end

0 comments on commit 5d13eee

Please sign in to comment.