Merge branch 'master' into filter_all_env_vars_932

Author: MikeMcQuaid

Library/.rubocop.yml

@@ -6,6 +6,11 @@ AllCops:
     - '**/Casks/**/*'
     - '**/vendor/**/*'
 
+require: ./Homebrew/rubocops.rb
+
+Homebrew/CorrectBottleBlock:
+  Enabled: true
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -41,7 +46,7 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
@@ -63,7 +68,7 @@ Style/BlockDelimiters:
   EnforcedStyle: line_count_based
 
 Style/CaseIndentation:
-  IndentWhenRelativeTo: end
+  EnforcedStyle: end
 
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
@@ -163,6 +168,8 @@ Style/TernaryParentheses:
 # makes diffs nicer
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
 
 Style/VariableNumber:
   Enabled: false

Library/Homebrew/.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
 Style/BlockDelimiters:
   Exclude:
     - '**/cask/spec/**/*'
-    - '**/cask/test/**/*'
+    - '**/*_spec.rb'
 
 # so many of these in formulae but none in here
 Lint/AmbiguousRegexpLiteral:

Library/Homebrew/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 100`
-# on 2016-12-31 22:41:53 +0000 using RuboCop version 0.45.0.
+# on 2017-01-27 21:44:55 +0000 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 16
+# Offense count: 17
 Lint/HandleExceptions:
   Exclude:
     - 'cmd/install.rb'
@@ -60,19 +60,26 @@ Lint/ShadowedException:
     - 'utils/fork.rb'
 
 # Offense count: 13
+# Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 19
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 363
+  Max: 400
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
+# Offense count: 2
+Security/MarshalLoad:
+  Exclude:
+    - 'dependency.rb'
+    - 'utils/fork.rb'
+
 # Offense count: 1
 Style/AccessorMethodName:
   Exclude:
@@ -85,6 +92,18 @@ Style/ClassVars:
     - 'formula_installer.rb'
     - 'test/support/helper/fs_leak_logger.rb'
 
+# Offense count: 13
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
+  Exclude:
+    - 'debrew/irb.rb'
+    - 'download_strategy.rb'
+    - 'extend/ENV/super.rb'
+    - 'formula.rb'
+    - 'patch.rb'
+
 # Offense count: 13
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:

Library/Homebrew/.simplecov

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "english"
+require "English"
 
 SimpleCov.start do
   coverage_dir File.expand_path("../test/coverage", File.realpath(__FILE__))

Library/Homebrew/brew.sh

@@ -207,6 +207,7 @@ case "$HOMEBREW_COMMAND" in
   up)          HOMEBREW_COMMAND="update" ;;
   ln)          HOMEBREW_COMMAND="link" ;;
   instal)      HOMEBREW_COMMAND="install" ;; # gem does the same
+  uninstal)    HOMEBREW_COMMAND="uninstall" ;;
   rm)          HOMEBREW_COMMAND="uninstall" ;;
   remove)      HOMEBREW_COMMAND="uninstall" ;;
   configure)   HOMEBREW_COMMAND="diy" ;;

Library/Homebrew/build.rb

@@ -48,7 +48,7 @@ def expand_reqs
         Requirement.prune
       elsif req.build? && dependent != formula
         Requirement.prune
-      elsif req.satisfied? && req.default_formula? && (dep = req.to_dependency).installed?
+      elsif req.satisfied? && (dep = req.to_dependency) && dep.installed?
         deps << dep
         Requirement.prune
       end

Library/Homebrew/cask/.gitattributes

@@ -1,29 +1,13 @@
 source "https://rubygems.org"
 
-gem "rake"
-
-group :debug do
-  gem "pry"
-  gem "pry-byebug", platforms: :mri
-end
-
 group :test do
-  # This is SimpleCov v0.12.0 with two fixes merged on top, that finally resolve
-  # all issues with parallel tests, uncovered files, and tracked files. Switch
-  # back to stable as soon as v0.12.1 or v0.13.0 is released. For details, see:
-  #  - https://github.com/colszowka/simplecov/pull/513
-  #  - https://github.com/colszowka/simplecov/pull/520
-  gem "simplecov", "0.12.0",
-    git: "https://github.com/colszowka/simplecov.git",
-    branch: "master",
-    ref: "83d8031ddde0927f87ef9327200a98583ca18d77",
-    require: false
+  gem "simplecov", require: false
   gem "codecov", require: false
-  gem "minitest", "~> 5.9"
+  gem "minitest"
   gem "minitest-reporters"
-  gem "mocha", "~> 1.1", require: false
+  gem "mocha", require: false
   gem "parallel_tests"
-  gem "rspec", "~> 3.5"
+  gem "rspec"
   gem "rspec-its", require: false
   gem "rspec-wait", require: false
 end

Library/Homebrew/cask/Gemfile

@@ -1,49 +1,27 @@
-GIT
-  remote: https://github.com/colszowka/simplecov.git
-  revision: 83d8031ddde0927f87ef9327200a98583ca18d77
-  ref: 83d8031ddde0927f87ef9327200a98583ca18d77
-  branch: master
-  specs:
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    builder (3.2.2)
-    byebug (9.0.6)
-    codecov (0.1.6)
+    builder (3.2.3)
+    codecov (0.1.9)
       json
       simplecov
       url
-    coderay (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (2.0.2)
+    json (2.0.3)
     metaclass (0.0.4)
-    method_source (0.8.2)
-    minitest (5.9.1)
-    minitest-reporters (1.1.12)
+    minitest (5.10.1)
+    minitest-reporters (1.1.14)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    parallel (1.9.0)
-    parallel_tests (2.10.0)
+    parallel (1.10.0)
+    parallel_tests (2.13.0)
       parallel
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rake (11.3.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -63,26 +41,26 @@ GEM
     rspec-wait (0.0.9)
       rspec (>= 3, < 4)
     ruby-progressbar (1.8.1)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slop (3.6.0)
     url (0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   codecov
-  minitest (~> 5.9)
+  minitest
   minitest-reporters
-  mocha (~> 1.1)
+  mocha
   parallel_tests
-  pry
-  pry-byebug
-  rake
-  rspec (~> 3.5)
+  rspec
   rspec-its
   rspec-wait
-  simplecov (= 0.12.0)!
+  simplecov
 
 BUNDLED WITH
-   1.13.6
+   1.13.7