audit fixes: C 04: cloog - cowsay

Closes Homebrew/homebrew#44965.

Signed-off-by: Andrew Janke <andrew@apjanke.net>

Formula/cloog.rb

@@ -34,7 +34,7 @@ class Cloog < Formula
       "--with-gmp=system",
       "--with-gmp-prefix=#{Formula["gmp"].opt_prefix}",
       "--with-isl=system",
-      "--with-isl-prefix=#{Formula["isl"].opt_prefix}"
+      "--with-isl-prefix=#{Formula["isl"].opt_prefix}",
     ]
 
     args << "--with-osl=bundled" if build.head?

Formula/cmigemo.rb

@@ -1,6 +1,7 @@
 class Cmigemo < Formula
   desc "Migemo is a tool that supports Japanese incremental search with Romaji"
   homepage "http://www.kaoriya.net/software/cmigemo"
+  head "https://github.com/koron/cmigemo.git"
 
   stable do
     url "https://cmigemo.googlecode.com/files/cmigemo-default-src-20110227.zip"
@@ -10,18 +11,16 @@ class Cmigemo < Formula
     patch :DATA
   end
 
-  head "https://github.com/koron/cmigemo.git"
-
   depends_on "nkf" => :build
 
   def install
-    system "chmod +x ./configure"
+    chmod 0755, "./configure"
     system "./configure", "--prefix=#{prefix}"
     system "make", "osx"
-    system "make osx-dict"
+    system "make", "osx-dict"
     system "make", "-C", "dict", "utf-8" if build.stable?
     ENV.j1 # Install can fail on multi-core machines unless serialized
-    system "make osx-install"
+    system "make", "osx-install"
   end
 
   def caveats; <<-EOS.undent

Formula/cmockery2.rb

@@ -1,9 +1,9 @@
 class Cmockery2 < Formula
   desc "Reviving cmockery unit test framework from Google"
   homepage "https://github.com/lpabon/cmockery2"
-  head "https://github.com/lpabon/cmockery2.git"
   url "https://github.com/lpabon/cmockery2/archive/v1.3.9.tar.gz"
   sha256 "c38054768712351102024afdff037143b4392e1e313bdabb9380cab554f9dbf2"
+  head "https://github.com/lpabon/cmockery2.git"
 
   bottle do
     cellar :any

Formula/collectd.rb

@@ -2,6 +2,17 @@ class Collectd < Formula
   desc "Statistics collection and monitoring daemon"
   homepage "https://collectd.org/"
 
+  stable do
+    url "https://collectd.org/files/collectd-5.5.0.tar.bz2"
+    mirror "http://pkgs.fedoraproject.org/repo/pkgs/collectd/collectd-5.5.0.tar.bz2/c39305ef5514b44238b0d31f77e29e6a/collectd-5.5.0.tar.bz2"
+    sha256 "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88"
+
+    patch do
+      url "https://github.com/collectd/collectd/commit/e0683047a42e217c352c2419532b8e029f9f3f0a.diff"
+      sha256 "7053170a072d27465b69eed269d32190ec810bcb0db59f139a1682e71a326fdd"
+    end
+  end
+
   bottle do
     revision 1
     sha256 "d07cd68645ca83f86ac0b06526a869a89d899fdd1d7211a9884f85e8d682e27a" => :el_capitan
@@ -18,17 +29,6 @@ class Collectd < Formula
     depends_on "autoconf" => :build
   end
 
-  stable do
-    url "https://collectd.org/files/collectd-5.5.0.tar.bz2"
-    mirror "http://pkgs.fedoraproject.org/repo/pkgs/collectd/collectd-5.5.0.tar.bz2/c39305ef5514b44238b0d31f77e29e6a/collectd-5.5.0.tar.bz2"
-    sha256 "847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88"
-
-    patch do
-      url "https://github.com/collectd/collectd/commit/e0683047a42e217c352c2419532b8e029f9f3f0a.diff"
-      sha256 "7053170a072d27465b69eed269d32190ec810bcb0db59f139a1682e71a326fdd"
-    end
-  end
-
   # Will fail against Java 1.7
   option "with-java", "Enable Java 1.6 support"
   option "with-debug", "Enable debug support"

Formula/convertlit.rb

@@ -2,8 +2,8 @@ class Convertlit < Formula
   desc "Convert Microsoft Reader format eBooks into open format"
   homepage "http://www.convertlit.com/"
   url "http://www.convertlit.com/clit18src.zip"
-  sha256 "d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba"
   version "1.8"
+  sha256 "d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba"
 
   depends_on "libtommath"
 

Formula/cowsay.rb

@@ -22,7 +22,7 @@ class Cowsay < Formula
 
   test do
     output = shell_output("#{bin}/cowsay moo")
-    assert output.include?("moo")  # bubble
-    assert output.include?("^__^") # cow
+    assert_match "moo", output  # bubble
+    assert_match "^__^", output # cow
   end
 end