From 23dacc752529bcba88248899cd5b67a66499dc40 Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Wed, 21 Sep 2016 09:21:27 +0200
Subject: Fix Style/Next.

---
 Library/Homebrew/dev-cmd/test-bot.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Library/Homebrew/dev-cmd/test-bot.rb')

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 7a5853c48..aa3a49610 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -563,11 +563,10 @@ module Homebrew
 
       (installed & dependencies).each do |installed_dependency|
         installed_dependency_formula = Formulary.factory(installed_dependency)
-        if installed_dependency_formula.installed? &&
-           !installed_dependency_formula.keg_only? &&
-           !installed_dependency_formula.linked_keg.exist?
-          test "brew", "link", installed_dependency
-        end
+        next unless installed_dependency_formula.installed?
+        next if installed_dependency_formula.keg_only?
+        next if installed_dependency_formula.linked_keg.exist?
+        test "brew", "link", installed_dependency
       end
 
       dependencies -= installed
-- 
cgit v1.2.3


From 9ce3c8d8a4059be6187dfcfd3daddfa7ef48c656 Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Wed, 21 Sep 2016 09:22:21 +0200
Subject: Fix Style/NumericLiterals.

---
 Library/Homebrew/dev-cmd/test-bot.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew/dev-cmd/test-bot.rb')

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index aa3a49610..d63f88a1c 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -185,8 +185,8 @@ module Homebrew
 
     def puts_result
       if ENV["TRAVIS"]
-        travis_start_time = @start_time.to_i*1000000000
-        travis_end_time = @end_time.to_i*1000000000
+        travis_start_time = @start_time.to_i * 1_000_000_000
+        travis_end_time = @end_time.to_i * 1_000_000_000
         travis_duration = travis_end_time - travis_start_time
         puts "#{Tty.white}==>#{Tty.green} PASSED#{Tty.reset}" if passed?
         puts "travis_time:end:#{@travis_timer_id},start=#{travis_start_time},finish=#{travis_end_time},duration=#{travis_duration}"
-- 
cgit v1.2.3


From fe2d51e0b9d4d9c138e512c245b1ed8d0f1dbf53 Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Fri, 23 Sep 2016 11:01:40 +0200
Subject: Fix Style/IfUnlessModifier.

---
 Library/Homebrew/dev-cmd/test-bot.rb | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'Library/Homebrew/dev-cmd/test-bot.rb')

diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index d63f88a1c..ba78cdb59 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -724,9 +724,7 @@ module Homebrew
         coverage_args = []
         if ARGV.include?("--coverage")
           if ENV["JENKINS_HOME"]
-            if OS.mac? && MacOS.version == :sierra
-              coverage_args << "--coverage"
-            end
+            coverage_args << "--coverage" if OS.mac? && MacOS.version == :sierra
           else
             coverage_args << "--coverage"
           end
@@ -741,9 +739,7 @@ module Homebrew
           test "brew", "cask-tests", *coverage_args
         end
       elsif @tap
-        if @tap.name == "homebrew/core"
-          test "brew", "style", @tap.name
-        end
+        test "brew", "style", @tap.name if @tap.name == "homebrew/core"
         test "brew", "readall", "--aliases", @tap.name
       end
     end
@@ -1054,9 +1050,7 @@ module Homebrew
       ARGV << "--junit" << "--local" << "--test-default-formula"
     end
 
-    if ARGV.include? "--ci-master"
-      ARGV << "--fast"
-    end
+    ARGV << "--fast" if ARGV.include?("--ci-master")
 
     if ARGV.include? "--local"
       ENV["HOMEBREW_CACHE"] = "#{ENV["HOME"]}/Library/Caches/Homebrew"
@@ -1080,9 +1074,7 @@ module Homebrew
       safe_system "brew", "tap", tap.name, "--full"
     end
 
-    if ARGV.include? "--ci-upload"
-      return test_ci_upload(tap)
-    end
+    return test_ci_upload(tap) if ARGV.include?("--ci-upload")
 
     tests = []
     any_errors = false
-- 
cgit v1.2.3