Merge branch 'guard-clause' into confident

Conflicts: lib/cowsay.rb
avdi · Jan 11, 2010 · f5a78d8 · f5a78d8
2 parents 37503fe + add4ed3
commit f5a78d8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/cowsay.rb b/lib/cowsay.rb
@@ -20,6 +20,7 @@ def initialize(options={})
     end
 
     def say(message, options={})
+      return "" if message.nil?
       options[:cowfile] and assert(options[:cowfile].to_s !~ /^\s*$/)
       command = "cowsay"
       if options[:strings] && options[:strings][:eyes]
@@ -31,7 +32,6 @@ def say(message, options={})
       destination = WithPath.new(options[:out]).path
 
       messages = Array(message)
-      results = []
       results = messages.map { |message|
         checked_popen(command, "w+", lambda{message}) do |process|
           process.write(message)