Add rspec coverage for cowsay. Achievement unlocked

Author: jhart-r7

lib/rex/text.rb

@@ -1148,12 +1148,12 @@ def self.cowsay(text, width=39)
     # text in the cowsay banner, so just do it by hand.  This big mess wraps
     # the provided text in an ASCII-cloud and then makes it look like the cloud
     # is a thought/word coming from the ASCII-cow.  Each line in the
-    # ASCII-cloud is no more than the specified number-characters long, and the cloud corners are
-    # made to look rounded
-    text_lines = text.scan(Regexp.new(".{1,#{width}}"))
+    # ASCII-cloud is no more than the specified number-characters long, and the
+    # cloud corners are made to look rounded
+    text_lines = text.scan(Regexp.new(".{1,#{width-4}}"))
     max_length = text_lines.map(&:size).sort.last
     cloud_parts = []
-    cloud_parts << " #{'_' * (max_length + 2)} "
+    cloud_parts << " #{'_' * (max_length + 2)}"
     if text_lines.size == 1
       cloud_parts << "< #{text} >"
     else
@@ -1165,7 +1165,7 @@ def self.cowsay(text, width=39)
       end
       cloud_parts << "\\ #{text_lines.last.ljust(max_length, ' ')} /"
     end
-    cloud_parts << " #{'-' * (max_length + 2)} "
+    cloud_parts << " #{'-' * (max_length + 2)}"
     cloud_parts << <<EOS
        \\   ,__,
         \\  (oo)____

spec/lib/rex/text_spec.rb

@@ -167,6 +167,61 @@
       end
     end
 
+    context ".cowsay" do
+
+      def moo(num)
+        (%w(moo) * num).join(' ')
+      end
+
+      it "should cowsay single lines correctly" do
+        cowsaid = <<EOCOW
+ _____________________
+< moo moo moo moo moo >
+ ---------------------
+       \\   ,__,
+        \\  (oo)____
+           (__)    )\\
+              ||--|| *
+EOCOW
+        described_class.cowsay(moo(5)).should eq(cowsaid)
+      end
+
+      it "should cowsay two lines correctly" do
+        cowsaid = <<EOCOW
+ _____________________________________
+/ moo moo moo moo moo moo moo moo moo \\
+\\  moo moo moo moo moo moo            /
+ -------------------------------------
+       \\   ,__,
+        \\  (oo)____
+           (__)    )\\
+              ||--|| *
+EOCOW
+        described_class.cowsay(moo(15)).should eq(cowsaid)
+      end
+
+      it "should cowsay three+ lines correctly" do
+        cowsaid = <<EOCOW
+ _____________________________________
+/ moo moo moo moo moo moo moo moo moo \\
+|  moo moo moo moo moo moo moo moo mo |
+| o moo moo moo moo moo moo moo moo m |
+\\ oo moo moo moo                      /
+ -------------------------------------
+       \\   ,__,
+        \\  (oo)____
+           (__)    )\\
+              ||--|| *
+EOCOW
+        described_class.cowsay(moo(30)).should eq(cowsaid)
+      end
+
+      it "should respect the wrap" do
+        wrap = 40 + rand(100)
+        cowsaid = described_class.cowsay(moo(1000), wrap)
+        max_len = cowsaid.split(/\n/).map(&:length).sort.last
+        max_len.should eq(wrap)
+      end
+    end
   end
 end
-