From e882ce1919997ac9c5ba9b17be9b806f9007540f Mon Sep 17 00:00:00 2001
From: JCount
Date: Sun, 8 Oct 2017 21:33:23 -0400
Subject: lines_cop: add ENV.universal_binary audit exemption for wine

---
 Library/Homebrew/rubocops/lines_cop.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Library')

diff --git a/Library/Homebrew/rubocops/lines_cop.rb b/Library/Homebrew/rubocops/lines_cop.rb
index 01b13585c..a45f673c6 100644
--- a/Library/Homebrew/rubocops/lines_cop.rb
+++ b/Library/Homebrew/rubocops/lines_cop.rb
@@ -121,6 +121,7 @@ module RuboCop
           end
 
           find_instance_method_call(body_node, "ENV", :universal_binary) do
+            next if @formula_name == "wine"
             problem "macOS has been 64-bit only since 10.6 so ENV.universal_binary is deprecated."
           end
 
-- 
cgit v1.2.3


From ca52eee2adbdf272b6f08953e5fe111667df7686 Mon Sep 17 00:00:00 2001
From: JCount
Date: Sun, 8 Oct 2017 21:46:32 -0400
Subject: lines_cop_spec: add test for ENV.universal_binary audit exemption for
 wine

---
 Library/Homebrew/test/rubocops/lines_cop_spec.rb | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index 753439c8e..e798db9e3 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -419,7 +419,22 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       end
     end
 
-    it "with ENV.universal_binary" do
+    it "with ENV.universal_binary exempted formula" do
+      source = <<-EOS.undent
+        class Wine < Formula
+          desc "foo"
+          url 'http://example.com/foo-1.0.tgz'
+          if build?
+             ENV.universal_binary
+          end
+        end
+      EOS
+
+      inspect_source(source, "/homebrew-core/Formula/wine.rb")
+      expect(cop.offenses).to eq([])
+    end
+
+    it "with ENV.x11" do
       source = <<-EOS.undent
         class Foo < Formula
           desc "foo"
-- 
cgit v1.2.3


From 85fa79b5cf6f1430d67ea5af7c10571caa1db5d7 Mon Sep 17 00:00:00 2001
From: JCount
Date: Mon, 9 Oct 2017 14:20:08 -0400
Subject: lines_cop_spec: improve language in universal_binary and build tests

---
 Library/Homebrew/test/rubocops/lines_cop_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index e798db9e3..af816a5a9 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -82,7 +82,7 @@ end
 describe RuboCop::Cop::FormulaAudit::Comments do
   subject(:cop) { described_class.new }
 
-  context "When auditing formula" do
+  context "When auditing formulae" do
     it "with commented cmake call" do
       source = <<-EOS.undent
         class Foo < Formula
@@ -154,7 +154,7 @@ end
 describe RuboCop::Cop::FormulaAudit::Miscellaneous do
   subject(:cop) { described_class.new }
 
-  context "When auditing formula" do
+  context "When auditing formulae" do
     it "with FileUtils" do
       source = <<-EOS.undent
         class Foo < Formula
@@ -380,7 +380,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       end
     end
 
-    it "with build.universal? exempted formula" do
+    it "with a build.universal? exemption reports no offenses" do
       source = <<-EOS.undent
         class Wine < Formula
           desc "foo"
@@ -392,7 +392,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       EOS
 
       inspect_source(source, "/homebrew-core/Formula/wine.rb")
-      expect(cop.offenses).to eq([])
+      expect(cop.offenses).to be_empty
     end
 
     it "with ENV.universal_binary" do
@@ -419,7 +419,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       end
     end
 
-    it "with ENV.universal_binary exempted formula" do
+    it "with an ENV.universal_binary exemption reports no offenses" do
       source = <<-EOS.undent
         class Wine < Formula
           desc "foo"
@@ -431,7 +431,7 @@ describe RuboCop::Cop::FormulaAudit::Miscellaneous do
       EOS
 
       inspect_source(source, "/homebrew-core/Formula/wine.rb")
-      expect(cop.offenses).to eq([])
+      expect(cop.offenses).to be_empty
     end
 
     it "with ENV.x11" do
-- 
cgit v1.2.3