formulae: various audit fixes

Closes Homebrew/homebrew#44758.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>

Formula/cdb.rb

@@ -21,6 +21,7 @@ class Cdb < Formula
     pipe_output("#{bin}/cdbmake db dbtmp", record, 0)
     assert File.exist? "db"
     assert_equal(record,
-                 pipe_output("#{bin}/cdbdump", (testpath/"db").binread, 0))
+                 pipe_output("#{bin}/cdbdump", (testpath/"db").binread, 0),
+                )
   end
 end

Formula/cdlabelgen.rb

@@ -10,7 +10,7 @@ class Cdlabelgen < Formula
   end
 
   test do
-    system "#{bin}/cdlabelgen -c TestTitle --output-file testout.eps"
+    system "#{bin}/cdlabelgen", "-c", "TestTitle", "--output-file", "testout.eps"
     File.file?("testout.eps")
   end
 end

Formula/cdpr.rb

@@ -6,7 +6,7 @@ class Cdpr < Formula
 
   def install
     # Makefile hardcodes gcc and other atrocities
-    system "#{ENV.cc} #{ENV.cflags} cdpr.c cdprs.c conffile.c #{ENV.ldflags} -lpcap -o cdpr"
+    system ENV.cc, ENV.cflags, "cdpr.c", "cdprs.c", "conffile.c", ENV.ldflags, "-lpcap", "-o", "cdpr"
     bin.install "cdpr"
   end
 

Formula/cfitsio.rb

@@ -3,8 +3,8 @@ class Cfitsio < Formula
   homepage "http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
   url "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3370.tar.gz"
   mirror "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz"
-  sha256 "092897c6dae4dfe42d91d35a738e45e8236aa3d8f9b3ffc7f0e6545b8319c63a"
   version "3.370"
+  sha256 "092897c6dae4dfe42d91d35a738e45e8236aa3d8f9b3ffc7f0e6545b8319c63a"
 
   option "with-examples", "Compile and install example programs"
 
@@ -20,7 +20,7 @@ class Cfitsio < Formula
     system "make", "install"
 
     if build.with? "examples"
-      system "make fpack funpack"
+      system "make", "fpack", "funpack"
       bin.install "fpack", "funpack"
 
       resource("examples").stage do

Formula/cgal.rb

@@ -13,7 +13,9 @@ class Cgal < Formula
 
   option :cxx11
 
-  option "imaging", "Build ImageIO and QT compoments of CGAL"
+  deprecated_option "imaging" => "with-imaging"
+
+  option "with-imaging", "Build ImageIO and QT compoments of CGAL"
   option "with-eigen3", "Build with Eigen3 support"
   option "with-lapack", "Build with LAPACK support"
 
@@ -27,7 +29,7 @@ class Cgal < Formula
   end
   depends_on "mpfr"
 
-  depends_on "qt" if build.include? "imaging"
+  depends_on "qt" if build.with? "imaging"
   depends_on "eigen" if build.with? "eigen3"
 
   # Allows to compile with clang 425: http://goo.gl/y9Dg2y
@@ -38,8 +40,9 @@ class Cgal < Formula
     args = ["-DCMAKE_INSTALL_PREFIX=#{prefix}",
             "-DCMAKE_BUILD_TYPE=Release",
             "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON",
-            "-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib"]
-    unless build.include? "imaging"
+            "-DCMAKE_INSTALL_NAME_DIR=#{HOMEBREW_PREFIX}/lib",
+           ]
+    if build.without? "imaging"
       args << "-DWITH_CGAL_Qt3=OFF" << "-DWITH_CGAL_Qt4=OFF" << "-DWITH_CGAL_ImageIO=OFF"
     end
     if build.with? "eigen3"

Formula/chadwick.rb

@@ -25,7 +25,7 @@ class Chadwick < Formula
   test do
     resource("event_files").stage testpath
     output = shell_output("#{bin}/cwbox -i ATL201404080 -y 2014 2014ATL.EVN")
-    assert output.include?("Game of 4/8/2014 -- New York at Atlanta")
+    assert_match "Game of 4/8/2014 -- New York at Atlanta", output
     assert_equal 0, $?.exitstatus
   end
 end

Formula/chibi-scheme.rb

@@ -1,14 +1,13 @@
 class ChibiScheme < Formula
   desc "Small footprint Scheme for use as a C Extension Language"
   homepage "http://synthcode.com/wiki/chibi-scheme"
+  head "https://github.com/ashinn/chibi-scheme.git"
 
   stable do
     url "http://synthcode.com/scheme/chibi/chibi-scheme-0.7.3.tgz"
     sha256 "21a0cf669d42a670a11c08f50dc5aedb7b438fae892260900da58f0ed545fc7d"
   end
 
-  head "https://github.com/ashinn/chibi-scheme.git"
-
   bottle do
     cellar :any
     sha256 "9fab20beb2d9afdd48d97434ca022f327f7b1eb3bec7d0a4d2ed6d44a091946a" => :yosemite
@@ -30,4 +29,3 @@ class ChibiScheme < Formula
     assert_equal 0, $?.exitstatus
   end
 end
-

Formula/chisel.rb

@@ -19,6 +19,6 @@ class Chisel < Formula
     xcode_path = `xcode-select --print-path`.strip
     lldb_rel_path = "Contents/SharedFrameworks/LLDB.framework/Resources/Python"
     ENV["PYTHONPATH"] = "#{xcode_path}/../../#{lldb_rel_path}"
-    system "python #{libexec}/fblldb.py"
+    system "python", "#{libexec}/fblldb.py"
   end
 end