commit d85ebd6d10c88292be1721d1a02b108080216d0a
parent e75905acec7a38575959b41557f69f1e6b0cd4b3
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Wed, 3 Mar 2010 23:23:03 -0800
Merge branch 'master' into next
Diffstat:
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
@@ -48,7 +48,7 @@ spec = Gem::Specification.new do |s|
s.executables = SUP_EXECUTABLES
s.add_dependency "xapian-full", ">= 1.1.3.1"
- s.add_dependency "ncursesw"
+ s.add_dependency "ncurses"
s.add_dependency "rmail", ">= 0.17"
s.add_dependency "highline"
s.add_dependency "net-ssh"
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
@@ -132,6 +132,10 @@ class Object
## "k combinator"
def returning x; yield x; x; end
+ unless method_defined? :tap
+ def tap; yield self; self; end
+ end
+
## clone of java-style whole-method synchronization
## assumes a @mutex variable
## TODO: clean up, try harder to avoid namespace collisions