diff --git a/.editorconfig b/.editorconfig index ee94686ecf..a3f724a365 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ insert_final_newline = true [{Library/Homebrew/**.rb,.simplecov}] trim_trailing_whitespace = true -[Library/Taps/homebrew/**.rb] +[Library/Taps/**.rb] # trailing whitespace is crucial for patches trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index 3a4d0f5a61..d283d3a994 100644 --- a/.gitignore +++ b/.gitignore @@ -22,105 +22,132 @@ # Ignore Bundler files **/.bundle/bin **/.bundle/cache -**/vendor/bundle -**/vendor/ruby -**/vendor/bundle-standalone/ruby/*/bin -**/vendor/bundle-standalone/ruby/*/build_info/ -**/vendor/bundle-standalone/ruby/*/cache -**/vendor/bundle-standalone/ruby/*/extensions -**/vendor/bundle-standalone/ruby/*/gems/*/* -**/vendor/bundle-standalone/ruby/*/specifications +**/vendor/bundle/ruby/*/bin +**/vendor/bundle/ruby/*/build_info/ +**/vendor/bundle/ruby/*/cache +**/vendor/bundle/ruby/*/extensions +**/vendor/bundle/ruby/*/gems/*/* +**/vendor/bundle/ruby/*/specifications # Unignore vendored gems -!**/vendor/bundle-standalone/ruby/*/gems/*/lib -!**/vendor/bundle-standalone/ruby/*/gems/rubocop-rspec-*/config +!**/vendor/bundle/ruby/*/gems/*/lib +!**/vendor/bundle/ruby/*/gems/rubocop-rspec-*/config # Ignore partially included gems where we don't need all files -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/all.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/concurrency/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/duration/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/json.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/json/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/messages/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/multibyte/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper.rb -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper/ -**/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-*/lib/active_support/testing/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/latest.rb -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/rails.rb -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/version.rb -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/1.* -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.0* -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.1* -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.2* -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.3* -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/2.*.rb -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/force/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/rails/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/random/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/array/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/comparable/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/dir/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/enumerable/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/false_class/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/fixnum/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/float/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/hash/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/integer/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/kernel/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/module/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/nil_class/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/regexp/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/struct/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/struct/ -**/vendor/bundle-standalone/ruby/*/gems/backports-*/lib/backports/*/true_class/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/atomic/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/atomic_reference/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/collection/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/concern/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/executor/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/synchronization/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/thread_safe/ -**/vendor/bundle-standalone/ruby/*/gems/concurrent-ruby-*/lib/utility/ -**/vendor/bundle-standalone/ruby/*/gems/i18n-*/lib/i18n/tests* -**/vendor/bundle-standalone/ruby/*/gems/thread_safe-*/lib/thread_safe/util +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/all.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/cache/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/concurrency/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/dependencies/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/duration/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/json.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/json/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/log_subscriber/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/messages/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/multibyte/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper.rb +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/number_helper/ +**/vendor/bundle/ruby/2.3.0/gems/activesupport-*/lib/active_support/testing/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/latest.rb +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/rails.rb +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/version.rb +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/1.* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.0* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.1* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.2* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.3* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.6* +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/2.*.rb +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/force/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/rails/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/random/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/array/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/comparable/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/dir/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/enumerable/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/false_class/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/fixnum/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/float/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/hash/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/integer/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/kernel/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/module/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/nil_class/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/regexp/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/struct/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/struct/ +**/vendor/bundle/ruby/*/gems/backports-*/lib/backports/*/true_class/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/atomic/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/atomic_reference/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/collection/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/concern/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/executor/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/synchronization/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/thread_safe/ +**/vendor/bundle/ruby/*/gems/concurrent-ruby-*/lib/utility/ +**/vendor/bundle/ruby/*/gems/i18n-*/lib/i18n/tests* +**/vendor/bundle/ruby/*/gems/thread_safe-*/lib/thread_safe/util -# Ignore rubocop's (and other) dependencies we don't wish to vendor -**/vendor/bundle-standalone/ruby/*/gems/ast-*/ -**/vendor/bundle-standalone/ruby/*/gems/connection_pool-*/lib -**/vendor/bundle-standalone/ruby/*/gems/domain_name-*/lib -**/vendor/bundle-standalone/ruby/*/gems/http-cookie-*/lib -**/vendor/bundle-standalone/ruby/*/gems/jaro_winkler-*/ -**/vendor/bundle-standalone/ruby/*/gems/mime-types-data-*/lib -**/vendor/bundle-standalone/ruby/*/gems/mime-types-*/lib -**/vendor/bundle-standalone/ruby/*/gems/mini_portile2-*/lib -**/vendor/bundle-standalone/ruby/*/gems/minitest-*/lib -**/vendor/bundle-standalone/ruby/*/gems/net-http-digest_auth-*/lib -**/vendor/bundle-standalone/ruby/*/gems/net-http-persistent-*/lib -**/vendor/bundle-standalone/ruby/*/gems/nokogiri-*/lib -**/vendor/bundle-standalone/ruby/*/gems/ntlm-http-*/lib -**/vendor/bundle-standalone/ruby/*/gems/parallel-*/ -**/vendor/bundle-standalone/ruby/*/gems/parser-*/ -**/vendor/bundle-standalone/ruby/*/gems/powerpack-*/ -**/vendor/bundle-standalone/ruby/*/gems/rainbow-*/ -**/vendor/bundle-standalone/ruby/*/gems/rubocop-0*/ -**/vendor/bundle-standalone/ruby/*/gems/ruby-progressbar-*/ -**/vendor/bundle-standalone/ruby/*/gems/unf_ext-*/lib -**/vendor/bundle-standalone/ruby/*/gems/unf-*/lib -**/vendor/bundle-standalone/ruby/*/gems/unicode-display_width-*/ -**/vendor/bundle-standalone/ruby/*/gems/webrobots-*/lib +# Ignore dependencies we don't wish to vendor +**/vendor/bundle/ruby/*/gems/ast-*/ +**/vendor/bundle/ruby/*/gems/bundler-*/ +**/vendor/bundle/ruby/*/gems/coderay-*/ +**/vendor/bundle/ruby/*/gems/connection_pool-*/ +**/vendor/bundle/ruby/*/gems/coveralls-*/ +**/vendor/bundle/ruby/*/gems/diff-lcs-*/ +**/vendor/bundle/ruby/*/gems/docile-*/ +**/vendor/bundle/ruby/*/gems/domain_name-*/ +**/vendor/bundle/ruby/*/gems/http-cookie-*/ +**/vendor/bundle/ruby/*/gems/hpricot-*/ +**/vendor/bundle/ruby/*/gems/jaro_winkler-*/ +**/vendor/bundle/ruby/*/gems/json-*/ +**/vendor/bundle/ruby/*/gems/method_source-*/ +**/vendor/bundle/ruby/*/gems/mime-types-data-*/ +**/vendor/bundle/ruby/*/gems/mime-types-*/ +**/vendor/bundle/ruby/*/gems/mini_portile2-*/ +**/vendor/bundle/ruby/*/gems/minitest-*/ +**/vendor/bundle/ruby/*/gems/mustache-*/ +**/vendor/bundle/ruby/*/gems/net-http-digest_auth-*/ +**/vendor/bundle/ruby/*/gems/net-http-persistent-*/ +**/vendor/bundle/ruby/*/gems/nokogiri-*/ +**/vendor/bundle/ruby/*/gems/ntlm-http-*/ +**/vendor/bundle/ruby/*/gems/parallel-*/ +**/vendor/bundle/ruby/*/gems/parallel_tests-*/ +**/vendor/bundle/ruby/*/gems/parser-*/ +**/vendor/bundle/ruby/*/gems/powerpack-*/ +**/vendor/bundle/ruby/*/gems/psych-*/ +**/vendor/bundle/ruby/*/gems/pry-*/ +**/vendor/bundle/ruby/*/gems/rainbow-*/ +**/vendor/bundle/ruby/*/gems/rdiscount-*/ +**/vendor/bundle/ruby/*/gems/ronn-*/ +**/vendor/bundle/ruby/*/gems/rspec-*/ +**/vendor/bundle/ruby/*/gems/rspec-core-*/ +**/vendor/bundle/ruby/*/gems/rspec-expectations-*/ +**/vendor/bundle/ruby/*/gems/rspec-its-*/ +**/vendor/bundle/ruby/*/gems/rspec-mocks-*/ +**/vendor/bundle/ruby/*/gems/rspec-retry-*/ +**/vendor/bundle/ruby/*/gems/rspec-support-*/ +**/vendor/bundle/ruby/*/gems/rspec-wait-*/ +**/vendor/bundle/ruby/*/gems/rubocop-0*/ +**/vendor/bundle/ruby/*/gems/ruby-progressbar-*/ +**/vendor/bundle/ruby/*/gems/simplecov-*/ +**/vendor/bundle/ruby/*/gems/simplecov-cobertura-*/ +**/vendor/bundle/ruby/*/gems/simplecov-html-*/ +**/vendor/bundle/ruby/*/gems/term-ansicolor-*/ +**/vendor/bundle/ruby/*/gems/thor-*/ +**/vendor/bundle/ruby/*/gems/tins-*/ +**/vendor/bundle/ruby/*/gems/unf_ext-*/ +**/vendor/bundle/ruby/*/gems/unf-*/ +**/vendor/bundle/ruby/*/gems/unicode-display_width-*/ +**/vendor/bundle/ruby/*/gems/webrobots-*/ # Only include the `Mechanize::HTTP::ContentDispositionParser`. -**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib -!**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib/mechanize/http/content_disposition_parser.rb -!**/vendor/bundle-standalone/ruby/*/gems/mechanize-*/lib/mechanize/version.rb +**/vendor/bundle/ruby/*/gems/mechanize-*/lib +!**/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/http/content_disposition_parser.rb +!**/vendor/bundle/ruby/*/gems/mechanize-*/lib/mechanize/version.rb # Ignore `bin` contents (again). /bin diff --git a/Dockerfile b/Dockerfile index 25c13b6a3d..d210a61626 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update \ fonts-dejavu-core \ g++ \ git \ + libz-dev \ locales \ make \ openssh-client \ diff --git a/Dockerfile.test.yml b/Dockerfile.test.yml index c7aa56974c..e672123b73 100644 --- a/Dockerfile.test.yml +++ b/Dockerfile.test.yml @@ -1,3 +1,19 @@ sut: build: . - command: "sudo -i -u linuxbrew /home/linuxbrew/.linuxbrew/bin/brew test-bot" + command: + - sh + - -xc + - | + sudo -E -u linuxbrew /home/linuxbrew/.linuxbrew/bin/brew test-bot + status=$$? + cp brew-test-bot.xml /tmp/test-bot/ + exit $$status + environment: + - HOME=/home/linuxbrew + - BUILD_REASON + - BUILD_REPOSITORY_URI + - BUILD_SOURCEVERSION + - HOMEBREW_GITHUB_API_TOKEN + - SYSTEM_PULLREQUEST_PULLREQUESTNUMBER + - SYSTEM_PULLREQUEST_TARGETBRANCH + - TF_BUILD diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index 351a9f71b7..48b7093d10 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -37,10 +37,6 @@ Layout/EndAlignment: Layout/SpaceAroundOperators: Enabled: false -# Auto-correct is broken (https://github.com/rubocop-hq/rubocop/issues/6300). -Layout/EmptyLineAfterGuardClause: - Enabled: false - # Auto-correct is broken (https://github.com/rubocop-hq/rubocop/issues/6258) # and layout is not configurable (https://github.com/rubocop-hq/rubocop/issues/6254). Layout/RescueEnsureAlignment: diff --git a/Library/.rubocop_shared.yml b/Library/.rubocop_shared.yml index 5c2922e020..32d122760f 100644 --- a/Library/.rubocop_shared.yml +++ b/Library/.rubocop_shared.yml @@ -49,8 +49,7 @@ Style/CollectionMethods: Style/FormatStringToken: EnforcedStyle: template -# This often leads to lines longer than the maximum line length. -# https://github.com/rubocop-hq/rubocop/issues/6149 +# This shouldn't be enabled until LineLength is lower. Style/IfUnlessModifier: Enabled: false diff --git a/Library/Homebrew/vendor/.bundle/config b/Library/Homebrew/.bundle/config similarity index 55% rename from Library/Homebrew/vendor/.bundle/config rename to Library/Homebrew/.bundle/config index d43d1a4c41..24c48a4c9d 100644 --- a/Library/Homebrew/vendor/.bundle/config +++ b/Library/Homebrew/.bundle/config @@ -1,5 +1,7 @@ --- -BUNDLE_PATH: "bundle-standalone" -BUNDLE_DISABLE_SHARED_GEMS: "true" BUNDLE_BIN: "false" BUNDLE_CLEAN: "true" +BUNDLE_DISABLE_SHARED_GEMS: "true" +BUNDLE_JOBS: "4" +BUNDLE_PATH: "vendor/bundle" +BUNDLE_RETRY: "3" diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml index 317c6ffd63..625c9a8fcb 100644 --- a/Library/Homebrew/.rubocop.yml +++ b/Library/Homebrew/.rubocop.yml @@ -125,6 +125,10 @@ Style/GuardClause: Style/HashSyntax: EnforcedStyle: ruby19_no_mixed_keys +# LineLength is low enough here to re-enable it. +Style/IfUnlessModifier: + Enabled: true + # so many of these in formulae but none in here Style/TrailingBodyOnMethodDefinition: Enabled: true diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile new file mode 100644 index 0000000000..8fc84b9e5e --- /dev/null +++ b/Library/Homebrew/Gemfile @@ -0,0 +1,22 @@ +source "https://rubygems.org" + +# installed gems +gem "coveralls", require: false +gem "parallel_tests" +gem "ronn", require: false +gem "rspec" +gem "rspec-its", require: false +gem "rspec-retry", require: false +gem "rspec-wait", require: false +gem "rubocop" +gem "simplecov", require: false +gem "simplecov-cobertura", require: false + +# vendored gems +gem "activesupport" +gem "backports" +gem "concurrent-ruby" +gem "mechanize" +gem "plist" +gem "rubocop-rspec" +gem "ruby-macho" diff --git a/Library/Homebrew/test/Gemfile.lock b/Library/Homebrew/Gemfile.lock similarity index 56% rename from Library/Homebrew/test/Gemfile.lock rename to Library/Homebrew/Gemfile.lock index 79b210d897..d6a2cc26ee 100644 --- a/Library/Homebrew/test/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -1,7 +1,15 @@ GEM remote: https://rubygems.org/ specs: + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) ast (2.4.0) + backports (3.12.0) + concurrent-ruby (1.1.4) + connection_pool (2.2.2) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -10,16 +18,44 @@ GEM tins (~> 1.6) diff-lcs (1.3) docile (1.3.1) + domain_name (0.5.20180417) + unf (>= 0.0.5, < 1.0.0) hpricot (0.8.6) + http-cookie (1.0.3) + domain_name (~> 0.5) + i18n (1.6.0) + concurrent-ruby (~> 1.0) jaro_winkler (1.5.2) - json (2.1.0) + json (2.2.0) + mechanize (2.7.6) + domain_name (~> 0.5, >= 0.5.1) + http-cookie (~> 1.0) + mime-types (>= 1.17.2) + net-http-digest_auth (~> 1.1, >= 1.1.1) + net-http-persistent (>= 2.5.2) + nokogiri (~> 1.6) + ntlm-http (~> 0.1, >= 0.1.1) + webrobots (>= 0.0.9, < 0.2) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mini_portile2 (2.4.0) + minitest (5.11.3) mustache (1.1.0) - parallel (1.13.0) + net-http-digest_auth (1.4.1) + net-http-persistent (3.0.0) + connection_pool (~> 2.2) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + ntlm-http (0.1.1) + parallel (1.14.0) parallel_tests (2.28.0) parallel parser (2.6.0.0) ast (~> 2.4.0) + plist (3.5.0) powerpack (0.1.2) + psych (3.1.0) rainbow (3.0.0) rdiscount (2.2.0.1) ronn (0.7.3) @@ -46,14 +82,18 @@ GEM rspec-support (3.8.0) rspec-wait (0.0.9) rspec (>= 3, < 4) - rubocop (0.64.0) + rubocop (0.65.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.4.0) + rubocop-rspec (1.32.0) + rubocop (>= 0.60.0) + ruby-macho (2.2.0) ruby-progressbar (1.10.0) simplecov (0.16.1) docile (~> 1.1) @@ -65,23 +105,37 @@ GEM term-ansicolor (1.7.1) tins (~> 1.0) thor (0.19.4) + thread_safe (0.3.6) tins (1.20.2) + tzinfo (1.2.5) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) unicode-display_width (1.4.1) + webrobots (0.1.2) PLATFORMS ruby DEPENDENCIES + activesupport + backports + concurrent-ruby coveralls + mechanize parallel_tests + plist ronn rspec rspec-its rspec-retry rspec-wait rubocop + rubocop-rspec + ruby-macho simplecov simplecov-cobertura BUNDLED WITH - 1.16.6 + 2.0.1 diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index ad8734b629..a80ca67e5c 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -1,6 +1,4 @@ -unless ENV["HOMEBREW_BREW_FILE"] - raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" -end +raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" unless ENV["HOMEBREW_BREW_FILE"] std_trap = trap("INT") { exit! 130 } # no backtrace thanks @@ -10,6 +8,12 @@ if RUBY_X < 2 || (RUBY_X == 2 && RUBY_Y < 3) raise "Homebrew must be run under Ruby 2.3! You're running #{RUBY_VERSION}." end +# Load Bundler first of all if it's needed to avoid Gem version conflicts. +if ENV["HOMEBREW_INSTALL_BUNDLER_GEMS_FIRST"] + require_relative "utils/gems" + Homebrew.install_bundler_gems! +end + # Also define here so we can rescue regardless of location. class MissingEnvironmentVariables < RuntimeError; end @@ -92,9 +96,7 @@ begin # `Homebrew.help` never returns, except for external/unknown commands. end - if ENV["HOMEBREW_BUILD_FROM_SOURCE"] - odisabled("HOMEBREW_BUILD_FROM_SOURCE", "--build-from-source") - end + odisabled("HOMEBREW_BUILD_FROM_SOURCE", "--build-from-source") if ENV["HOMEBREW_BUILD_FROM_SOURCE"] if internal_cmd Homebrew.send cmd.to_s.tr("-", "_").downcase @@ -113,9 +115,7 @@ begin brew_uid = HOMEBREW_BREW_FILE.stat.uid tap_commands = [] - if Process.uid.zero? && !brew_uid.zero? - tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] - end + tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero? # Unset HOMEBREW_HELP to avoid confusing the tap ENV.delete("HOMEBREW_HELP") if help_flag tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}] diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 0a73e3b7b6..2cd1677a0e 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -309,6 +309,11 @@ then esac fi +if [[ "$HOMEBREW_COMMAND" = "audit" || "$HOMEBREW_COMMAND" = "style" ]] +then + export HOMEBREW_INSTALL_BUNDLER_GEMS_FIRST="1" +fi + # Set HOMEBREW_DEV_CMD_RUN for users who have run a development command. # This makes them behave like HOMEBREW_DEVELOPERs for brew update. if [[ -z "$HOMEBREW_DEVELOPER" ]] diff --git a/Library/Homebrew/cache_store.rb b/Library/Homebrew/cache_store.rb index aaaeb8604c..9aeac80ee4 100644 --- a/Library/Homebrew/cache_store.rb +++ b/Library/Homebrew/cache_store.rb @@ -39,6 +39,7 @@ class CacheStoreDatabase # Closes the underlying database (if it is created and open). def close_if_open! return unless @db + cache_path.dirname.mkpath cache_path.atomic_write(JSON.dump(@db)) end @@ -55,6 +56,7 @@ class CacheStoreDatabase # @return [Time] def mtime return unless created? + cache_path.mtime end diff --git a/Library/Homebrew/cask/artifact/abstract_artifact.rb b/Library/Homebrew/cask/artifact/abstract_artifact.rb index 66dea2b617..452c854e95 100644 --- a/Library/Homebrew/cask/artifact/abstract_artifact.rb +++ b/Library/Homebrew/cask/artifact/abstract_artifact.rb @@ -20,6 +20,24 @@ module Cask @dirmethod ||= "#{dsl_key}dir".to_sym end + def staged_path_join_executable(path) + path = Pathname(path) + + absolute_path = if path.absolute? + path + else + cask.staged_path.join(path) + end + + FileUtils.chmod "+x", absolute_path if absolute_path.exist? && !absolute_path.executable? + + if absolute_path.exist? + absolute_path + else + path + end + end + def <=>(other) return unless other.class < AbstractArtifact return 0 if self.class == other.class diff --git a/Library/Homebrew/cask/artifact/abstract_uninstall.rb b/Library/Homebrew/cask/artifact/abstract_uninstall.rb index 531e20c653..9cca7f11b9 100644 --- a/Library/Homebrew/cask/artifact/abstract_uninstall.rb +++ b/Library/Homebrew/cask/artifact/abstract_uninstall.rb @@ -136,6 +136,7 @@ module Cask Timeout.timeout(10) do Kernel.loop do next unless quit(bundle_id).success? + if running_processes(bundle_id).empty? puts "Application '#{bundle_id}' quit successfully." break @@ -179,9 +180,7 @@ module Cask # :signal should come after :quit so it can be used as a backup when :quit fails def uninstall_signal(*signals, command: nil, **_) signals.each do |pair| - unless pair.size == 2 - raise CaskInvalidError.new(cask, "Each #{stanza} :signal must consist of 2 elements.") - end + raise CaskInvalidError.new(cask, "Each #{stanza} :signal must consist of 2 elements.") unless pair.size == 2 signal, bundle_id = pair ohai "Signalling '#{signal}' to application ID '#{bundle_id}'" @@ -244,9 +243,10 @@ module Cask ohai "Running uninstall script #{executable}" raise CaskInvalidError.new(cask, "#{stanza} :#{directive_name} without :executable.") if executable.nil? - executable_path = cask.staged_path.join(executable) + executable_path = staged_path_join_executable(executable) - unless executable_path.exist? + if (executable_path.absolute? && !executable_path.exist?) || + (!executable_path.absolute? && (which executable_path).nil?) message = "uninstall script #{executable} does not exist" raise CaskError, "#{message}." unless force @@ -254,7 +254,6 @@ module Cask return end - command.run("/bin/chmod", args: ["--", "+x", executable_path]) command.run(executable_path, script_arguments) sleep 1 end diff --git a/Library/Homebrew/cask/artifact/artifact.rb b/Library/Homebrew/cask/artifact/artifact.rb index 28907292d5..39c7511305 100644 --- a/Library/Homebrew/cask/artifact/artifact.rb +++ b/Library/Homebrew/cask/artifact/artifact.rb @@ -13,9 +13,7 @@ module Cask def self.from_args(cask, *args) source_string, target_hash = args - if source_string.nil? - raise CaskInvalidError.new(cask.token, "no source given for #{english_name}") - end + raise CaskInvalidError.new(cask.token, "no source given for #{english_name}") if source_string.nil? unless target_hash.is_a?(Hash) raise CaskInvalidError.new(cask.token, "target required for #{english_name} '#{source_string}'") diff --git a/Library/Homebrew/cask/artifact/installer.rb b/Library/Homebrew/cask/artifact/installer.rb index 05811ec122..51733f9a92 100644 --- a/Library/Homebrew/cask/artifact/installer.rb +++ b/Library/Homebrew/cask/artifact/installer.rb @@ -26,24 +26,10 @@ module Cask def install_phase(command: nil, **_) ohai "Running #{self.class.dsl_key} script '#{path}'" - absolute_path = if path.absolute? - path - else - cask.staged_path.join(path) - end - - if absolute_path.exist? && !absolute_path.executable? - FileUtils.chmod "+x", absolute_path - end - - executable = if absolute_path.exist? - absolute_path - else - path - end + executable_path = staged_path_join_executable(path) command.run!( - executable, + executable_path, **args, env: { "PATH" => PATH.new( HOMEBREW_PREFIX/"bin", HOMEBREW_PREFIX/"sbin", ENV["PATH"] diff --git a/Library/Homebrew/cask/artifact/pkg.rb b/Library/Homebrew/cask/artifact/pkg.rb index add64dbebf..505bbbb95a 100644 --- a/Library/Homebrew/cask/artifact/pkg.rb +++ b/Library/Homebrew/cask/artifact/pkg.rb @@ -46,9 +46,7 @@ module Cask "-target", "/" ] args << "-verboseR" if verbose - if stanza_options.fetch(:allow_untrusted, false) - args << "-allowUntrusted" - end + args << "-allowUntrusted" if stanza_options.fetch(:allow_untrusted, false) with_choices_file do |choices_path| args << "-applyChoiceChangesXML" << choices_path if choices_path env = { diff --git a/Library/Homebrew/cask/artifact/stage_only.rb b/Library/Homebrew/cask/artifact/stage_only.rb index 3d45dc057f..add6ba3dab 100644 --- a/Library/Homebrew/cask/artifact/stage_only.rb +++ b/Library/Homebrew/cask/artifact/stage_only.rb @@ -4,9 +4,7 @@ module Cask module Artifact class StageOnly < AbstractArtifact def self.from_args(cask, *args) - if args != [true] - raise CaskInvalidError.new(cask.token, "'stage_only' takes only a single argument: true") - end + raise CaskInvalidError.new(cask.token, "'stage_only' takes only a single argument: true") if args != [true] new(cask) end diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb index 1c6f5d8540..6e73ccf16f 100644 --- a/Library/Homebrew/cask/audit.rb +++ b/Library/Homebrew/cask/audit.rb @@ -106,18 +106,14 @@ module Cask k.directives.key?(:uninstall_preflight) end - if count > 1 - add_warning "only a single uninstall_preflight stanza is allowed" - end + add_warning "only a single uninstall_preflight stanza is allowed" if count > 1 count = cask.artifacts.count do |k| k.is_a?(Artifact::PostflightBlock) && k.directives.key?(:uninstall_postflight) end - if count > 1 - add_warning "only a single uninstall_postflight stanza is allowed" - end + add_warning "only a single uninstall_postflight stanza is allowed" if count > 1 return unless cask.artifacts.count { |k| k.is_a?(Artifact::Zap) } > 1 @@ -296,6 +292,7 @@ module Cask def check_https_availability return unless download + if !cask.url.blank? && !cask.url.using check_url_for_https_availability(cask.url, user_agents: [cask.url.user_agent]) end diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb index 70ccf15d25..1416442b84 100644 --- a/Library/Homebrew/cask/cask_loader.rb +++ b/Library/Homebrew/cask/cask_loader.rb @@ -58,9 +58,7 @@ module Cask begin instance_eval(content, path).tap do |cask| - unless cask.is_a?(Cask) - raise CaskUnreadableError.new(token, "'#{path}' does not contain a cask.") - end + raise CaskUnreadableError.new(token, "'#{path}' does not contain a cask.") unless cask.is_a?(Cask) end rescue NameError, ArgumentError, ScriptError => e raise CaskUnreadableError.new(token, e.message) @@ -70,9 +68,7 @@ module Cask private def cask(header_token, **options, &block) - if token != header_token - raise CaskTokenMismatchError.new(token, header_token) - end + raise CaskTokenMismatchError.new(token, header_token) if token != header_token super(header_token, **options, sourcefile_path: path, &block) end @@ -192,9 +188,7 @@ module Cask return loader_class.new(ref) if loader_class.can_load?(ref) end - if FromTapPathLoader.can_load?(default_path(ref)) - return FromTapPathLoader.new(default_path(ref)) - end + return FromTapPathLoader.new(default_path(ref)) if FromTapPathLoader.can_load?(default_path(ref)) case (possible_tap_casks = tap_paths(ref)).count when 1 @@ -209,9 +203,7 @@ module Cask end possible_installed_cask = Cask.new(ref) - if possible_installed_cask.installed? - return FromPathLoader.new(possible_installed_cask.installed_caskfile) - end + return FromPathLoader.new(possible_installed_cask.installed_caskfile) if possible_installed_cask.installed? NullLoader.new(ref) end diff --git a/Library/Homebrew/cask/cmd/automerge.rb b/Library/Homebrew/cask/cmd/automerge.rb index b71083bac6..c830744ff1 100755 --- a/Library/Homebrew/cask/cmd/automerge.rb +++ b/Library/Homebrew/cask/cmd/automerge.rb @@ -63,6 +63,7 @@ module Cask end return if failed.empty? + $stderr.puts raise CaskError, "Failed merging the following PRs:\n#{failed.join("\n")}" end @@ -90,8 +91,10 @@ module Cask def diff_is_single_cask(diff) return false unless diff.files.count == 1 + file = diff.files.first return false unless file.a_path == file.b_path + file.a_path.match?(%r{\ACasks/[^/]+\.rb\Z}) end diff --git a/Library/Homebrew/cask/dsl.rb b/Library/Homebrew/cask/dsl.rb index 5a9b540a6b..57ff905511 100644 --- a/Library/Homebrew/cask/dsl.rb +++ b/Library/Homebrew/cask/dsl.rb @@ -131,9 +131,7 @@ module Cask return @language = nil if @language_blocks.nil? || @language_blocks.empty? - if @language_blocks.default.nil? - raise CaskInvalidError.new(cask, "No default language specified.") - end + raise CaskInvalidError.new(cask, "No default language specified.") if @language_blocks.default.nil? locales = MacOS.languages .map do |language| diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb index df1f747878..1f138d79e6 100644 --- a/Library/Homebrew/cask/installer.rb +++ b/Library/Homebrew/cask/installer.rb @@ -84,9 +84,7 @@ module Cask old_config = @cask.config - if @cask.installed? && !force? && !reinstall? && !upgrade? - raise CaskAlreadyInstalledError, @cask - end + raise CaskAlreadyInstalledError, @cask if @cask.installed? && !force? && !reinstall? && !upgrade? check_conflicts @@ -102,9 +100,7 @@ module Cask install_artifacts - unless @cask.tap&.private? - ::Utils::Analytics.report_event("cask_install", @cask.token) - end + ::Utils::Analytics.report_event("cask_install", @cask.token) unless @cask.tap&.private? puts summary end @@ -115,9 +111,7 @@ module Cask @cask.conflicts_with[:cask].each do |conflicting_cask| begin conflicting_cask = CaskLoader.load(conflicting_cask) - if conflicting_cask.installed? - raise CaskConflictError.new(@cask, conflicting_cask) - end + raise CaskConflictError.new(@cask, conflicting_cask) if conflicting_cask.installed? rescue CaskUnavailableError next # Ignore conflicting Casks that do not exist. end diff --git a/Library/Homebrew/cask/metadata.rb b/Library/Homebrew/cask/metadata.rb index 8335232dee..276554b354 100644 --- a/Library/Homebrew/cask/metadata.rb +++ b/Library/Homebrew/cask/metadata.rb @@ -9,17 +9,13 @@ module Cask def metadata_versioned_path(version: self.version) cask_version = (version || :unknown).to_s - if cask_version.empty? - raise CaskError, "Cannot create metadata path with empty version." - end + raise CaskError, "Cannot create metadata path with empty version." if cask_version.empty? metadata_master_container_path.join(cask_version) end def metadata_timestamped_path(version: self.version, timestamp: :latest, create: false) - if create && timestamp == :latest - raise CaskError, "Cannot create metadata path when timestamp is :latest." - end + raise CaskError, "Cannot create metadata path when timestamp is :latest." if create && timestamp == :latest path = if timestamp == :latest Pathname.glob(metadata_versioned_path(version: version).join("*")).max @@ -37,9 +33,7 @@ module Cask end def metadata_subdir(leaf, version: self.version, timestamp: :latest, create: false) - if create && timestamp == :latest - raise CaskError, "Cannot create metadata subdir when timestamp is :latest." - end + raise CaskError, "Cannot create metadata subdir when timestamp is :latest." if create && timestamp == :latest unless leaf.respond_to?(:empty?) && !leaf.empty? raise CaskError, "Cannot create metadata subdir for empty leaf." diff --git a/Library/Homebrew/caveats.rb b/Library/Homebrew/caveats.rb index 0c4f56bd1b..7a85c71897 100644 --- a/Library/Homebrew/caveats.rb +++ b/Library/Homebrew/caveats.rb @@ -47,12 +47,8 @@ class Caveats If you need to have #{f.name} first in your PATH run: EOS - if f.bin.directory? - s << " #{Utils::Shell.prepend_path_in_profile(f.opt_bin.to_s)}\n" - end - if f.sbin.directory? - s << " #{Utils::Shell.prepend_path_in_profile(f.opt_sbin.to_s)}\n" - end + s << " #{Utils::Shell.prepend_path_in_profile(f.opt_bin.to_s)}\n" if f.bin.directory? + s << " #{Utils::Shell.prepend_path_in_profile(f.opt_sbin.to_s)}\n" if f.sbin.directory? end if f.lib.directory? || f.include.directory? @@ -61,13 +57,9 @@ class Caveats For compilers to find #{f.name} you may need to set: EOS - if f.lib.directory? - s << " #{Utils::Shell.export_value("LDFLAGS", "-L#{f.opt_lib}")}\n" - end + s << " #{Utils::Shell.export_value("LDFLAGS", "-L#{f.opt_lib}")}\n" if f.lib.directory? - if f.include.directory? - s << " #{Utils::Shell.export_value("CPPFLAGS", "-I#{f.opt_include}")}\n" - end + s << " #{Utils::Shell.export_value("CPPFLAGS", "-I#{f.opt_include}")}\n" if f.include.directory? if which("pkg-config", ENV["HOMEBREW_PATH"]) && ((f.lib/"pkgconfig").directory? || (f.share/"pkgconfig").directory?) diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb index 6fc4ef0774..d6c7e7f33c 100644 --- a/Library/Homebrew/cleaner.rb +++ b/Library/Homebrew/cleaner.rb @@ -25,9 +25,7 @@ class Cleaner # Get rid of any info 'dir' files, so they don't conflict at the link stage info_dir_file = @f.info + "dir" - if info_dir_file.file? && !@f.skip_clean?(info_dir_file) - observe_file_removal info_dir_file - end + observe_file_removal info_dir_file if info_dir_file.file? && !@f.skip_clean?(info_dir_file) prune end @@ -111,9 +109,7 @@ class Cleaner end if ARGV.debug? old_perms = path.stat.mode & 0777 - if perms != old_perms - puts "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}" - end + puts "Fixing #{path} permissions from #{old_perms.to_s(8)} to #{perms.to_s(8)}" if perms != old_perms end path.chmod perms end diff --git a/Library/Homebrew/cleanup.rb b/Library/Homebrew/cleanup.rb index 4b102b39d5..5a9e870ef3 100644 --- a/Library/Homebrew/cleanup.rb +++ b/Library/Homebrew/cleanup.rb @@ -1,4 +1,5 @@ require "utils/bottles" +require "utils/gems" require "formula" require "cask/cask_loader" require "set" @@ -58,7 +59,11 @@ module CleanupRefinement def stale?(scrub = false) return false unless resolved_path.file? - stale_formula?(scrub) || stale_cask?(scrub) + if dirname.basename.to_s == "Cask" + stale_cask?(scrub) + else + stale_formula?(scrub) + end end private @@ -112,17 +117,13 @@ module CleanupRefinement def stale_cask?(scrub) return false unless name = basename.to_s[/\A(.*?)\-\-/, 1] - return if dirname.basename.to_s != "Cask" - cask = begin Cask::CaskLoader.load(name) rescue Cask::CaskUnavailableError return false end - unless basename.to_s.match?(/\A#{Regexp.escape(name)}\-\-#{Regexp.escape(cask.version)}\b/) - return true - end + return true unless basename.to_s.match?(/\A#{Regexp.escape(name)}\-\-#{Regexp.escape(cask.version)}\b/) return true if scrub && !cask.versions.include?(cask.version) @@ -205,6 +206,7 @@ module Homebrew # avoid having to try to do a `brew install` when we've just deleted # the running Ruby process... return if periodic + cleanup_portable_ruby else args.each do |arg| @@ -253,6 +255,7 @@ module Homebrew def cleanup_logs return unless HOMEBREW_LOGS.directory? + logs_days = if days > CLEANUP_DEFAULT_DAYS CLEANUP_DEFAULT_DAYS else @@ -334,9 +337,7 @@ module Homebrew def cleanup_lockfiles(*lockfiles) return if dry_run? - if lockfiles.empty? && HOMEBREW_LOCKS.directory? - lockfiles = HOMEBREW_LOCKS.children.select(&:file?) - end + lockfiles = HOMEBREW_LOCKS.children.select(&:file?) if lockfiles.empty? && HOMEBREW_LOCKS.directory? lockfiles.each do |file| next unless file.readable? @@ -368,6 +369,7 @@ module Homebrew portable_ruby_glob = "#{portable_ruby_path}/*.*" Pathname.glob(portable_ruby_glob).each do |path| next if !use_system_ruby && portable_ruby_version == path.basename.to_s + if dry_run? puts "Would remove: #{path} (#{path.abv})" else diff --git a/Library/Homebrew/cli_parser.rb b/Library/Homebrew/cli_parser.rb index d8440aed6e..a42c88d757 100644 --- a/Library/Homebrew/cli_parser.rb +++ b/Library/Homebrew/cli_parser.rb @@ -154,6 +154,7 @@ module Homebrew def formula_options ARGV.formulae.each do |f| next if f.options.empty? + f.options.each do |o| name = o.flag description = "`#{f.name}`: #{o.description}" @@ -220,9 +221,7 @@ module Homebrew if :mandatory.equal?(constraint_type) && primary_passed && !secondary_passed raise OptionConstraintError.new(primary, secondary) end - if secondary_passed && !primary_passed - raise OptionConstraintError.new(primary, secondary, missing: true) - end + raise OptionConstraintError.new(primary, secondary, missing: true) if secondary_passed && !primary_passed end end @@ -235,11 +234,12 @@ module Homebrew next if violations.count < 2 env_var_options = violations.select do |option| - @switch_sources[option_to_name(option)] == :env_var + @switch_sources[option_to_name(option)] == :env end select_cli_arg = violations.count - env_var_options.count == 1 raise OptionConflictError, violations.map(&method(:name_to_option)) unless select_cli_arg + env_var_options.each(&method(:disable_switch)) end end diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb index 492a6d47a8..e687aa281c 100644 --- a/Library/Homebrew/cmd/config.rb +++ b/Library/Homebrew/cmd/config.rb @@ -21,6 +21,7 @@ module Homebrew def config config_args.parse raise UsageError unless args.remaining.empty? + SystemConfig.dump_verbose_config end end diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb index 239e300d47..3effcedb02 100644 --- a/Library/Homebrew/cmd/deps.rb +++ b/Library/Homebrew/cmd/deps.rb @@ -200,9 +200,7 @@ module Homebrew "│ " end - if dep.is_a? Dependency - recursive_deps_tree(Formulary.factory(dep.name), prefix + prefix_addition, true) - end + recursive_deps_tree(Formulary.factory(dep.name), prefix + prefix_addition, true) if dep.is_a? Dependency end @dep_stack.pop diff --git a/Library/Homebrew/cmd/gist-logs.rb b/Library/Homebrew/cmd/gist-logs.rb index 66cb1dffe6..dbe0ad1810 100644 --- a/Library/Homebrew/cmd/gist-logs.rb +++ b/Library/Homebrew/cmd/gist-logs.rb @@ -73,9 +73,7 @@ module Homebrew end url = create_gist(files, descr) - if args.new_issue? - url = create_issue(f.tap, "#{f.name} failed to build on #{MacOS.full_version}", url) - end + url = create_issue(f.tap, "#{f.name} failed to build on #{MacOS.full_version}", url) if args.new_issue? puts url if url end diff --git a/Library/Homebrew/cmd/info.rb b/Library/Homebrew/cmd/info.rb index c13b62f8db..b2cd428977 100644 --- a/Library/Homebrew/cmd/info.rb +++ b/Library/Homebrew/cmd/info.rb @@ -51,6 +51,7 @@ module Homebrew info_args.parse if args.json raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json + print_json elsif args.github? exec_browser(*ARGV.formulae.map { |f| github_info(f) }) @@ -310,9 +311,7 @@ module Homebrew def output_analytics(filter: nil) days = args.days || "30" valid_days = %w[30 90 365] - unless valid_days.include?(days) - raise ArgumentError("Days must be one of #{valid_days.join(", ")}!") - end + raise ArgumentError("Days must be one of #{valid_days.join(", ")}!") unless valid_days.include?(days) category = args.category || "install" valid_categories = %w[install install-on-request build-error os-version] diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 0369d1d8ef..ada9aef850 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -94,9 +94,7 @@ module Homebrew unless args.force? ARGV.named.each do |name| next if File.exist?(name) - if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX - next - end + next if name !~ HOMEBREW_TAP_FORMULA_REGEX && name !~ HOMEBREW_CASK_TAP_CASK_REGEX tap = Tap.fetch(Regexp.last_match(1), Regexp.last_match(2)) tap.install unless tap.installed? @@ -143,14 +141,10 @@ module Homebrew end # --HEAD, fail with no head defined - if args.head? && f.head.nil? - raise "No head is defined for #{f.full_name}" - end + raise "No head is defined for #{f.full_name}" if args.head? && f.head.nil? # --devel, fail with no devel defined - if args.devel? && f.devel.nil? - raise "No devel block is defined for #{f.full_name}" - end + raise "No devel block is defined for #{f.full_name}" if args.devel? && f.devel.nil? installed_head_version = f.latest_head_version if installed_head_version && diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 15ceae6a86..03ad69e7a3 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -133,9 +133,7 @@ module Homebrew pinned_versions = {} names.sort.each do |d| keg_pin = (HOMEBREW_PINNED_KEGS/d.basename.to_s) - if keg_pin.exist? || keg_pin.symlink? - pinned_versions[d] = keg_pin.readlink.basename.to_s - end + pinned_versions[d] = keg_pin.readlink.basename.to_s if keg_pin.exist? || keg_pin.symlink? end pinned_versions.each do |d, version| puts d.basename.to_s.concat(args.versions? ? " #{version}" : "") diff --git a/Library/Homebrew/cmd/outdated.rb b/Library/Homebrew/cmd/outdated.rb index 0858eec572..dd469eb4ce 100644 --- a/Library/Homebrew/cmd/outdated.rb +++ b/Library/Homebrew/cmd/outdated.rb @@ -19,15 +19,16 @@ module Homebrew description: "List only the names of outdated brews (takes precedence over `--verbose`)." switch :verbose, description: "Display detailed version information." - flag "--json=", - description: "Show output in JSON format for provided . Currently the only "\ - "accepted value of is `v1`." + flag "--json", + description: "Print output in JSON format. Currently the default and only accepted "\ + "value for is `v1`. See the docs for examples of using the JSON "\ + "output: " switch "--fetch-HEAD", description: "Fetch the upstream repository to detect if the HEAD installation of the "\ "formula is outdated. Otherwise, the repository's HEAD will be checked for "\ "updates when a new stable or development version has been released." switch :debug - conflicts "--quiet", "--verbose", "--json=" + conflicts "--quiet", "--verbose", "--json" end end @@ -39,7 +40,9 @@ module Homebrew else ARGV.resolved_formulae end - if args.json == "v1" + if args.json + raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json + outdated = print_outdated_json(formulae) else outdated = print_outdated(formulae) diff --git a/Library/Homebrew/cmd/shellenv.sh b/Library/Homebrew/cmd/shellenv.sh index e0aa7d4260..cd2b141d67 100644 --- a/Library/Homebrew/cmd/shellenv.sh +++ b/Library/Homebrew/cmd/shellenv.sh @@ -7,10 +7,30 @@ #: Consider adding evaluating the output in your dotfiles (e.g. `~/.profile`) with `eval $(brew shellenv)` homebrew-shellenv() { - echo "export HOMEBREW_PREFIX=\"$HOMEBREW_PREFIX\"" - echo "export HOMEBREW_CELLAR=\"$HOMEBREW_CELLAR\"" - echo "export HOMEBREW_REPOSITORY=\"$HOMEBREW_REPOSITORY\"" - echo "export PATH=\"$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:\$PATH\"" - echo "export MANPATH=\"$HOMEBREW_PREFIX/share/man:\$MANPATH\"" - echo "export INFOPATH=\"$HOMEBREW_PREFIX/share/info:\$INFOPATH\"" + case "$SHELL" in + */fish) + echo "set -gx HOMEBREW_PREFIX \"$HOMEBREW_PREFIX\";" + echo "set -gx HOMEBREW_CELLAR \"$HOMEBREW_CELLAR\";" + echo "set -gx HOMEBREW_REPOSITORY \"$HOMEBREW_REPOSITORY\";" + echo "set -g fish_user_paths \"$HOMEBREW_PREFIX/bin\" \"$HOMEBREW_PREFIX/sbin\" \$fish_user_paths;" + echo "set -q MANPATH; or set MANPATH ''; set -gx MANPATH \"$HOMEBREW_PREFIX/share/man\" \$MANPATH;" + echo "set -q INFOPATH; or set INFOPATH ''; set -gx INFOPATH \"$HOMEBREW_PREFIX/share/info\" \$INFOPATH;" + ;; + */csh|*/tcsh) + echo "setenv HOMEBREW_PREFIX $HOMEBREW_PREFIX;" + echo "setenv HOMEBREW_CELLAR $HOMEBREW_CELLAR;" + echo "setenv HOMEBREW_REPOSITORY $HOMEBREW_REPOSITORY;" + echo "setenv PATH $HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:\$PATH;" + echo "setenv MANPATH $HOMEBREW_PREFIX/share/man:\$MANPATH;" + echo "setenv INFOPATH $HOMEBREW_PREFIX/share/info:\$INFOPATH;" + ;; + *) + echo "export HOMEBREW_PREFIX=\"$HOMEBREW_PREFIX\"" + echo "export HOMEBREW_CELLAR=\"$HOMEBREW_CELLAR\"" + echo "export HOMEBREW_REPOSITORY=\"$HOMEBREW_REPOSITORY\"" + echo "export PATH=\"$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:\$PATH\"" + echo "export MANPATH=\"$HOMEBREW_PREFIX/share/man:\$MANPATH\"" + echo "export INFOPATH=\"$HOMEBREW_PREFIX/share/info:\$INFOPATH\"" + ;; + esac } diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb index 6db14fcea0..b359c31581 100644 --- a/Library/Homebrew/cmd/tap-info.rb +++ b/Library/Homebrew/cmd/tap-info.rb @@ -13,10 +13,10 @@ module Homebrew EOS switch "--installed", description: "Display information on all installed taps." - flag "--json=", - description: "Print a JSON representation of . Currently the only accepted value for "\ - " is `v1`. See the docs for examples of using the JSON output: "\ - "" + flag "--json", + description: "Print a JSON representation of . Currently the default and only accepted "\ + "value for is `v1`. See the docs for examples of using the JSON "\ + "output: " switch :debug end end @@ -32,7 +32,9 @@ module Homebrew end end - if args.json == "v1" + if args.json + raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json + print_tap_json(taps.sort_by(&:to_s)) else print_tap_info(taps.sort_by(&:to_s)) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index fc27295bd6..0de8847cd9 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -75,9 +75,7 @@ module Homebrew puts " #{Formatter.url("https://github.com/Homebrew/brew#donations")}\n" # Consider the message possibly missed if not a TTY. - if $stdout.tty? - safe_system "git", "config", "--local", "--replace-all", "homebrew.donationmessage", "true" - end + safe_system "git", "config", "--local", "--replace-all", "homebrew.donationmessage", "true" if $stdout.tty? end end @@ -88,9 +86,7 @@ module Homebrew initial_revision = ENV["HOMEBREW_UPDATE_BEFORE"].to_s current_revision = ENV["HOMEBREW_UPDATE_AFTER"].to_s - if initial_revision.empty? || current_revision.empty? - odie "update-report should not be called directly!" - end + odie "update-report should not be called directly!" if initial_revision.empty? || current_revision.empty? if initial_revision != current_revision update_preinstall_header @@ -121,9 +117,7 @@ module Homebrew end if !updated - if !ARGV.include?("--preinstall") && !ENV["HOMEBREW_UPDATE_FAILED"] - puts "Already up-to-date." - end + puts "Already up-to-date." if !ARGV.include?("--preinstall") && !ENV["HOMEBREW_UPDATE_FAILED"] else if hub.empty? puts "No changes to formulae." diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index b584e826c4..dee3b8d0d3 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -25,7 +25,7 @@ git_init_if_necessary() { then CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core" else - CORE_OFFICIAL_REMOTE="https://github.com/Linuxbrew/homebrew-core" + CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/linuxbrew-core" fi safe_cd "$HOMEBREW_REPOSITORY" diff --git a/Library/Homebrew/cmd/vendor-install.sh b/Library/Homebrew/cmd/vendor-install.sh index afff156f6a..54499b8f8f 100644 --- a/Library/Homebrew/cmd/vendor-install.sh +++ b/Library/Homebrew/cmd/vendor-install.sh @@ -29,6 +29,11 @@ then ruby_URL2="https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.3.7/portable-ruby-2.3.7.x86_64_linux.bottle.tar.gz" ruby_SHA="9df214085a0e566a580eea3dd9eab14a2a94930ff74fbf97fb1284e905c8921d" ;; + aarch64) + ruby_URL="$HOMEBREW_BOTTLE_DOMAIN/bottles-portable-ruby/portable-ruby-2.3.7.aarch64_linux.bottle.tar.gz" + ruby_URL2="https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.3.7/portable-ruby-2.3.7.aarch64_linux.bottle.tar.gz" + ruby_SHA="e5a72a9deabe500d5d2eaed29e2eb84868ade962eda3ddc68ea169adbb7ac5a2" + ;; armv[67]*) ruby_URL="$HOMEBREW_BOTTLE_DOMAIN/bottles-portable-ruby/portable-ruby-2.3.7.armv6_linux.bottle.tar.gz" ruby_URL2="https://github.com/Homebrew/homebrew-portable-ruby/releases/download/2.3.7/portable-ruby-2.3.7.armv6_linux.bottle.tar.gz" diff --git a/Library/Homebrew/compilers.rb b/Library/Homebrew/compilers.rb index 5f79d32dce..a6afa499f3 100644 --- a/Library/Homebrew/compilers.rb +++ b/Library/Homebrew/compilers.rb @@ -18,9 +18,7 @@ class CompilerFailure def version(val = nil) if val @version = Version.parse(val.to_s) - if name.to_s == "clang" && val.to_i < 600 - odisabled "'fails_with :clang' with 'build' < 600" - end + odisabled "'fails_with :clang' with 'build' < 600" if name.to_s == "clang" && val.to_i < 600 end @version end diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb index 36b44eb803..0e4642c953 100644 --- a/Library/Homebrew/config.rb +++ b/Library/Homebrew/config.rb @@ -1,6 +1,4 @@ -unless ENV["HOMEBREW_BREW_FILE"] - raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" -end +raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" unless ENV["HOMEBREW_BREW_FILE"] # Path to `bin/brew` main executable in `HOMEBREW_PREFIX` HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"]) @@ -8,9 +6,8 @@ HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"]) class MissingEnvironmentVariables < RuntimeError; end def get_env_or_raise(env) - unless ENV[env] - raise MissingEnvironmentVariables, "#{env} was not exported!" - end + raise MissingEnvironmentVariables, "#{env} was not exported!" unless ENV[env] + ENV[env] end diff --git a/Library/Homebrew/cxxstdlib.rb b/Library/Homebrew/cxxstdlib.rb index b89c8b8a2c..82f4c76058 100644 --- a/Library/Homebrew/cxxstdlib.rb +++ b/Library/Homebrew/cxxstdlib.rb @@ -13,9 +13,7 @@ class CxxStdlib end def self.create(type, compiler) - if type && ![:libstdcxx, :libcxx].include?(type) - raise ArgumentError, "Invalid C++ stdlib type: #{type}" - end + raise ArgumentError, "Invalid C++ stdlib type: #{type}" if type && ![:libstdcxx, :libcxx].include?(type) klass = (compiler.to_s =~ GNU_GCC_REGEXP) ? GnuStdlib : AppleStdlib klass.new(type, compiler) @@ -60,9 +58,7 @@ class CxxStdlib next if dep.build? dep_stdlib = Tab.for_formula(dep.to_formula).cxxstdlib - unless compatible_with? dep_stdlib - raise CompatibilityError.new(formula, dep, dep_stdlib) - end + raise CompatibilityError.new(formula, dep, dep_stdlib) unless compatible_with? dep_stdlib end end diff --git a/Library/Homebrew/dependencies.rb b/Library/Homebrew/dependencies.rb index 0ca5d9ea88..386890c80a 100644 --- a/Library/Homebrew/dependencies.rb +++ b/Library/Homebrew/dependencies.rb @@ -95,21 +95,15 @@ module Homebrew formula.send("recursive_#{type}") do |dependent, dep| if dep.recommended? - if ignores.include?("recommended?") || dependent.build.without?(dep) - klass.prune - end + klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep) elsif dep.test? if includes.include?("test?") - if type == :dependencies - Dependency.keep_but_prune_recursive_deps - end + Dependency.keep_but_prune_recursive_deps if type == :dependencies else klass.prune end elsif dep.optional? - if !includes.include?("optional?") && !dependent.build.with?(dep) - klass.prune - end + klass.prune if !includes.include?("optional?") && !dependent.build.with?(dep) elsif dep.build? klass.prune unless includes.include?("build?") end diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index fc74049f10..8ad82f9ce9 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -134,9 +134,7 @@ class DependencyCollector end def parse_class_spec(spec, tags) - unless spec < Requirement - raise TypeError, "#{spec.inspect} is not a Requirement subclass" - end + raise TypeError, "#{spec.inspect} is not a Requirement subclass" unless spec < Requirement spec.new(tags) end diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index b742fb80da..3e6798e5cf 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -136,9 +136,7 @@ module Homebrew created_pr_comment = false if new_formula && !new_formula_problem_lines.empty? begin - if GitHub.create_issue_comment(new_formula_problem_lines.join("\n")) - created_pr_comment = true - end + created_pr_comment = true if GitHub.create_issue_comment(new_formula_problem_lines.join("\n")) rescue *GitHub.api_errors => e opoo "Unable to create issue comment: #{e.message}" end @@ -154,9 +152,7 @@ module Homebrew formula_plural = "#{formula_count} #{"formula".pluralize(formula_count)}" corrected_problem_plural = "#{corrected_problem_count} #{"problem".pluralize(corrected_problem_count)}" errors_summary = "#{problem_plural} in #{formula_plural} detected" - if corrected_problem_count.positive? - errors_summary += ", #{corrected_problem_plural} corrected" - end + errors_summary += ", #{corrected_problem_plural} corrected" if corrected_problem_count.positive? if problem_count.positive? || (new_formula_problem_count.positive? && !created_pr_comment) @@ -263,9 +259,7 @@ module Homebrew problem "'DATA' was found, but no '__END__'" if text.data? && !text.end? - if text.end? && !text.data? - problem "'__END__' was found, but 'DATA' is not used" - end + problem "'__END__' was found, but 'DATA' is not used" if text.end? && !text.data? if text =~ /inreplace [^\n]* do [^\n]*\n[^\n]*\.gsub![^\n]*\n\ *end/m problem "'inreplace ... do' was used for a single substitution (use the non-block form instead)." @@ -344,9 +338,7 @@ module Homebrew name = formula.name - if MissingFormula.blacklisted_reason(name) - problem "'#{name}' is blacklisted." - end + problem "'#{name}' is blacklisted." if MissingFormula.blacklisted_reason(name) if Formula.aliases.include? name problem "Formula name conflicts with existing aliases." @@ -394,10 +386,10 @@ module Homebrew problem "Dependency '#{dep.name}' is an alias; use the canonical name '#{dep.to_formula.full_name}'." end - if @new_formula && dep_f.keg_only_reason && - !["openssl", "apr", "apr-util"].include?(dep.name) && - !["openblas"].include?(dep.name) && - dep_f.keg_only_reason.reason == :provided_by_macos + if @new_formula && + dep_f.keg_only_reason&.reason == :provided_by_macos && + dep_f.keg_only_reason.valid? && + !["apr", "apr-util", "openblas", "openssl"].include?(dep.name) new_formula_problem( "Dependency '#{dep.name}' may be unnecessary as it is provided " \ "by macOS; try to build this formula without it.", @@ -418,13 +410,9 @@ module Homebrew problem "Dependency #{dep} does not define option #{opt.name.inspect}" end - if dep.name == "git" - problem "Don't use git as a dependency (it's always available)" - end + problem "Don't use git as a dependency (it's always available)" if dep.name == "git" - if dep.tags.include?(:run) - problem "Dependency '#{dep.name}' is marked as :run. Remove :run; it is a no-op." - end + problem "Dependency '#{dep.name}' is marked as :run. Remove :run; it is a no-op." if dep.tags.include?(:run) next unless @core_tap @@ -565,11 +553,10 @@ module Homebrew return unless formula.bottle_disabled? return if formula.bottle_unneeded? - unless formula.bottle_disable_reason.valid? - problem "Unrecognized bottle modifier" - end + problem "Unrecognized bottle modifier" unless formula.bottle_disable_reason.valid? return unless @core_tap + problem "Formulae should not use `bottle :disabled`" end @@ -635,9 +622,7 @@ module Homebrew next unless spec = formula.send(name.downcase) version = spec.version - if version.to_s !~ /\d/ - problem "#{name}: version (#{version}) is set to a string without a digit" - end + problem "#{name}: version (#{version}) is set to a string without a digit" if version.to_s !~ /\d/ if version.to_s.start_with?("HEAD") problem "#{name}: non-HEAD version name (#{version}) should not begin with HEAD" end @@ -655,18 +640,14 @@ module Homebrew problem "Formulae should not have a `devel` spec" if formula.devel - if formula.head + if formula.head && @versioned_formula head_spec_message = "Formulae should not have a `HEAD` spec" - if @new_formula - new_formula_problem head_spec_message - elsif @versioned_formula - versioned_head_spec = %w[ - bash-completion@2 - imagemagick@6 - python@2 - ] - problem head_spec_message unless versioned_head_spec.include?(formula.name) - end + versioned_head_spec = %w[ + bash-completion@2 + imagemagick@6 + python@2 + ] + problem head_spec_message unless versioned_head_spec.include?(formula.name) end throttled = %w[ @@ -733,9 +714,7 @@ module Homebrew version = Version.parse(stable.url) if version >= Version.create("1.0") _, minor_version, = version.to_s.split(".", 3).map(&:to_i) - if minor_version.odd? - problem "#{stable.version} is a development release" - end + problem "#{stable.version} is a development release" if minor_version.odd? end end end @@ -875,9 +854,7 @@ module Homebrew return unless @strict - if line.include?("env :userpaths") - problem "`env :userpaths` in formulae is deprecated" - end + problem "`env :userpaths` in formulae is deprecated" if line.include?("env :userpaths") if line =~ /system ((["'])[^"' ]*(?:\s[^"' ]*)+\2)/ bad_system = Regexp.last_match(1) @@ -904,6 +881,7 @@ module Homebrew return unless @core_tap return unless line.include?("env :std") + problem "`env :std` in `core` formulae is deprecated" end @@ -954,9 +932,7 @@ module Homebrew def audit only_audits = @only except_audits = @except - if only_audits && except_audits - odie "--only and --except cannot be used simultaneously!" - end + odie "--only and --except cannot be used simultaneously!" if only_audits && except_audits methods.map(&:to_s).grep(/^audit_/).each do |audit_method_name| name = audit_method_name.gsub(/^audit_/, "") @@ -1027,9 +1003,7 @@ module Homebrew end end - if version.to_s.start_with?("v") - problem "version #{version} should not have a leading 'v'" - end + problem "version #{version} should not have a leading 'v'" if version.to_s.start_with?("v") return unless version.to_s =~ /_\d+$/ @@ -1044,9 +1018,7 @@ module Homebrew url_strategy = DownloadStrategyDetector.detect(url) if using == :git || url_strategy == GitDownloadStrategy - if specs[:tag] && !specs[:revision] - problem "Git should specify :revision when a :tag is specified." - end + problem "Git should specify :revision when a :tag is specified." if specs[:tag] && !specs[:revision] end return unless using @@ -1101,16 +1073,12 @@ module Homebrew problem http_content_problem end elsif strategy <= GitDownloadStrategy - unless Utils.git_remote_exists? url - problem "The URL #{url} is not a valid git URL" - end + problem "The URL #{url} is not a valid git URL" unless Utils.git_remote_exists? url elsif strategy <= SubversionDownloadStrategy next unless DevelopmentTools.subversion_handles_most_https_certificates? next unless Utils.svn_available? - unless Utils.svn_remote_exists? url - problem "The URL #{url} is not a valid svn URL" - end + problem "The URL #{url} is not a valid svn URL" unless Utils.svn_remote_exists? url end end end diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 356241fe83..52bb5ec6d6 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -205,14 +205,10 @@ module Homebrew end def bottle_formula(f) - unless f.installed? - return ofail "Formula not installed or up-to-date: #{f.full_name}" - end + return ofail "Formula not installed or up-to-date: #{f.full_name}" unless f.installed? unless tap = f.tap - unless args.force_core_tap? - return ofail "Formula not from core or any installed taps: #{f.full_name}" - end + return ofail "Formula not from core or any installed taps: #{f.full_name}" unless args.force_core_tap? tap = CoreTap.instance end @@ -223,9 +219,7 @@ module Homebrew return end - unless Utils::Bottles.built_as? f - return ofail "Formula not installed with '--build-bottle': #{f.full_name}" - end + return ofail "Formula not installed with '--build-bottle': #{f.full_name}" unless Utils::Bottles.built_as? f return ofail "Formula has no stable version: #{f.full_name}" unless f.stable @@ -265,9 +259,7 @@ module Homebrew begin keg.delete_pyc_files! - unless args.skip_relocation? - changed_files = keg.replace_locations_with_placeholders - end + changed_files = keg.replace_locations_with_placeholders unless args.skip_relocation? Tab.clear_cache tab = Tab.for_keg(keg) @@ -300,9 +292,7 @@ module Homebrew mv "#{relocatable_tar_path}.gz", bottle_path end - if bottle_path.size > 1 * 1024 * 1024 - ohai "Detecting if #{filename} is relocatable..." - end + ohai "Detecting if #{filename} is relocatable..." if bottle_path.size > 1 * 1024 * 1024 if Homebrew.default_prefix?(prefix) prefix_check = File.join(prefix, "opt") @@ -344,9 +334,7 @@ module Homebrew ensure ignore_interrupts do original_tab&.write - unless args.skip_relocation? - keg.replace_placeholders_with_locations changed_files - end + keg.replace_placeholders_with_locations changed_files unless args.skip_relocation? end end end @@ -510,9 +498,7 @@ module Homebrew string = s.sub!(/ bottle do.+?end\n/m, output) odie "Bottle block update failed!" unless string else - if args.keep_old? - odie "--keep-old was passed but there was no existing bottle block!" - end + odie "--keep-old was passed but there was no existing bottle block!" if args.keep_old? puts output update_or_add = "add" if s.include? "stable do" diff --git a/Library/Homebrew/dev-cmd/bump-formula-pr.rb b/Library/Homebrew/dev-cmd/bump-formula-pr.rb index 820106b3fe..36c177897f 100644 --- a/Library/Homebrew/dev-cmd/bump-formula-pr.rb +++ b/Library/Homebrew/dev-cmd/bump-formula-pr.rb @@ -331,6 +331,7 @@ module Homebrew username = response.fetch("owner").fetch("login") rescue GitHub::AuthenticationFailedError => e raise unless e.github_message =~ /forking is disabled/ + # If the repository is private, forking might be disabled. # Create branches in the repository itself instead. remote_url = Utils.popen_read("git remote get-url --push origin").chomp @@ -380,30 +381,20 @@ module Homebrew contents = path.open("r") { |f| Formulary.ensure_utf8_encoding(f).read } contents.extend(StringInreplaceExtension) replacement_pairs.each do |old, new| - unless Homebrew.args.quiet? - ohai "replace #{old.inspect} with #{new.inspect}" - end - unless old - raise "No old value for new value #{new}! Did you pass the wrong arguments?" - end + ohai "replace #{old.inspect} with #{new.inspect}" unless Homebrew.args.quiet? + raise "No old value for new value #{new}! Did you pass the wrong arguments?" unless old contents.gsub!(old, new) end - unless contents.errors.empty? - raise Utils::InreplaceError, path => contents.errors - end + raise Utils::InreplaceError, path => contents.errors unless contents.errors.empty? path.atomic_write(contents) if args.write? contents else Utils::Inreplace.inreplace(path) do |s| replacement_pairs.each do |old, new| - unless Homebrew.args.quiet? - ohai "replace #{old.inspect} with #{new.inspect}" - end - unless old - raise "No old value for new value #{new}! Did you pass the wrong arguments?" - end + ohai "replace #{old.inspect} with #{new.inspect}" unless Homebrew.args.quiet? + raise "No old value for new value #{new}! Did you pass the wrong arguments?" unless old s.gsub!(old, new) end diff --git a/Library/Homebrew/dev-cmd/extract.rb b/Library/Homebrew/dev-cmd/extract.rb index 3360ab196c..0fecd1502d 100644 --- a/Library/Homebrew/dev-cmd/extract.rb +++ b/Library/Homebrew/dev-cmd/extract.rb @@ -5,38 +5,28 @@ require "tap" def with_monkey_patch BottleSpecification.class_eval do - if method_defined?(:method_missing) - alias_method :old_method_missing, :method_missing - end + alias_method :old_method_missing, :method_missing if method_defined?(:method_missing) define_method(:method_missing) { |*| } end Module.class_eval do - if method_defined?(:method_missing) - alias_method :old_method_missing, :method_missing - end + alias_method :old_method_missing, :method_missing if method_defined?(:method_missing) define_method(:method_missing) { |*| } end Resource.class_eval do - if method_defined?(:method_missing) - alias_method :old_method_missing, :method_missing - end + alias_method :old_method_missing, :method_missing if method_defined?(:method_missing) define_method(:method_missing) { |*| } end DependencyCollector.class_eval do - if method_defined?(:parse_symbol_spec) - alias_method :old_parse_symbol_spec, :parse_symbol_spec - end + alias_method :old_parse_symbol_spec, :parse_symbol_spec if method_defined?(:parse_symbol_spec) define_method(:parse_symbol_spec) { |*| } end if defined?(DependencyCollector::Compat) DependencyCollector::Compat.class_eval do - if method_defined?(:parse_string_spec) - alias_method :old_parse_string_spec, :parse_string_spec - end + alias_method :old_parse_string_spec, :parse_string_spec if method_defined?(:parse_string_spec) define_method(:parse_string_spec) { |*| } end end diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb index c08461e7d2..cd95002ea7 100644 --- a/Library/Homebrew/dev-cmd/man.rb +++ b/Library/Homebrew/dev-cmd/man.rb @@ -34,9 +34,7 @@ module Homebrew raise UsageError unless ARGV.named.empty? - if args.link? - odie "`brew man --link` is now done automatically by `brew update`." - end + odie "`brew man --link` is now done automatically by `brew update`." if args.link? regenerate_man_pages @@ -68,16 +66,16 @@ module Homebrew readme = HOMEBREW_REPOSITORY/"README.md" variables[:lead] = - readme.read[/(Homebrew's project lead .*\.)/, 1] + readme.read[/(Homebrew's \[Project Leader.*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:plc] = - readme.read[/(Homebrew's project leadership committee .*\.)/, 1] + readme.read[/(Homebrew's \[Project Leadership Committee.*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:tsc] = - readme.read[/(Homebrew's technical steering committee .*\.)/, 1] + readme.read[/(Homebrew's \[Technical Steering Committee.*\.)/, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:linux] = - readme.read[%r{(Homebrew/brew's Linux support \(and Linuxbrew\) maintainers are .*\.)}, 1] + readme.read[%r{(Homebrew/brew's Linux support \(and Linuxbrew\) maintainers .*\.)}, 1] .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1') variables[:maintainers] = readme.read[/(Homebrew's other current maintainers .*\.)/, 1] @@ -157,9 +155,11 @@ module Homebrew cmd_man_page_lines = begin cmd_parser = Homebrew.send(cmd_args_method_name) next if cmd_parser.hide_from_man_page + cmd_parser_manpage_lines(cmd_parser).join rescue NoMethodError => e raise if e.name != cmd_args_method_name + nil end cmd_man_page_lines ||= cmd_comment_manpage_lines(cmd_path) @@ -178,6 +178,7 @@ module Homebrew lines = [format_usage_banner(cmd_parser.usage_banner_text)] lines += cmd_parser.processed_options.map do |short, long, _, desc| next if !long.nil? && cmd_parser.global_option?(cmd_parser.option_to_name(long)) + generate_option_doc(short, long, desc) end.reject(&:blank?) lines @@ -187,11 +188,13 @@ module Homebrew comment_lines = cmd_path.read.lines.grep(/^#:/) return if comment_lines.empty? return if comment_lines.first.include?("@hide_from_man_page") + lines = [format_usage_banner(comment_lines.first).chomp] comment_lines.slice(1..-1) .each do |line| line = line.slice(4..-1) next unless line + lines << line.gsub(/^ +(-+[a-z-]+) */, "* `\\1`:\n ") end lines diff --git a/Library/Homebrew/dev-cmd/mirror.rb b/Library/Homebrew/dev-cmd/mirror.rb index e7deeb8b35..1b1365315d 100644 --- a/Library/Homebrew/dev-cmd/mirror.rb +++ b/Library/Homebrew/dev-cmd/mirror.rb @@ -23,9 +23,7 @@ module Homebrew bintray_user = ENV["HOMEBREW_BINTRAY_USER"] bintray_key = ENV["HOMEBREW_BINTRAY_KEY"] - if !bintray_user || !bintray_key - raise "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" - end + raise "Missing HOMEBREW_BINTRAY_USER or HOMEBREW_BINTRAY_KEY variables!" if !bintray_user || !bintray_key ARGV.formulae.each do |f| bintray_package = Utils::Bottles::Bintray.package f.name diff --git a/Library/Homebrew/dev-cmd/pull.rb b/Library/Homebrew/dev-cmd/pull.rb index fd1cc476dc..e2ea383132 100644 --- a/Library/Homebrew/dev-cmd/pull.rb +++ b/Library/Homebrew/dev-cmd/pull.rb @@ -66,17 +66,11 @@ module Homebrew pull_args.parse - if ARGV.named.empty? - odie "This command requires at least one argument containing a URL or pull request number" - end + odie "This command requires at least one argument containing a URL or pull request number" if ARGV.named.empty? # Passthrough Git environment variables for e.g. git am - if ENV["HOMEBREW_GIT_NAME"] - ENV["GIT_COMMITTER_NAME"] = ENV["HOMEBREW_GIT_NAME"] - end - if ENV["HOMEBREW_GIT_EMAIL"] - ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"] - end + ENV["GIT_COMMITTER_NAME"] = ENV["HOMEBREW_GIT_NAME"] if ENV["HOMEBREW_GIT_NAME"] + ENV["GIT_COMMITTER_EMAIL"] = ENV["HOMEBREW_GIT_EMAIL"] if ENV["HOMEBREW_GIT_EMAIL"] # Depending on user configuration, git may try to invoke gpg. if Utils.popen_read("git config --get --bool commit.gpgsign").chomp == "true" @@ -115,17 +109,15 @@ module Homebrew elsif (api_match = arg.match HOMEBREW_PULL_API_REGEX) _, user, repo, issue = *api_match url = "https://github.com/#{user}/#{repo}/pull/#{issue}" - tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") + tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) elsif (url_match = arg.match HOMEBREW_PULL_OR_COMMIT_URL_REGEX) url, user, repo, issue = *url_match - tap = Tap.fetch(user, repo) if repo.start_with?("homebrew-") + tap = Tap.fetch(user, repo) if repo.match?(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX) else odie "Not a GitHub pull request or commit: #{arg}" end - if !testing_job && args.bottle? && issue.nil? - odie "No pull request detected!" - end + odie "No pull request detected!" if !testing_job && args.bottle? && issue.nil? if tap tap.install unless tap.installed? @@ -157,9 +149,7 @@ module Homebrew end odie "Can not bump if non-formula files are changed" unless patch_changes[:others].empty? end - if is_bumpable - old_versions = current_versions_from_info_external(patch_changes[:formulae].first) - end + old_versions = current_versions_from_info_external(patch_changes[:formulae].first) if is_bumpable patch_puller.apply_patch changed_formulae_names = [] @@ -288,9 +278,7 @@ module Homebrew end def publish_changed_formula_bottles(tap, changed_formulae_names) - if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] - raise "Need to load formulae to publish them!" - end + raise "Need to load formulae to publish them!" if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] published = [] bintray_creds = { user: ENV["HOMEBREW_BINTRAY_USER"], key: ENV["HOMEBREW_BINTRAY_KEY"] } @@ -458,9 +446,7 @@ module Homebrew repo = Utils::Bottles::Bintray.repository(f.tap) package = Utils::Bottles::Bintray.package(f.name) info = FormulaInfoFromJson.lookup(f.full_name) - if info.nil? - raise "Failed publishing bottle: failed reading formula info for #{f.full_name}" - end + raise "Failed publishing bottle: failed reading formula info for #{f.full_name}" if info.nil? unless info.bottle_info_any opoo "No bottle defined in formula #{package}" @@ -562,9 +548,7 @@ module Homebrew def verify_bintray_published(formulae_names) return if formulae_names.empty? - if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] - raise "Need to load formulae to verify their publication!" - end + raise "Need to load formulae to verify their publication!" if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] ohai "Verifying bottles published on Bintray" formulae = formulae_names.map { |n| Formula[n] } @@ -605,9 +589,7 @@ module Homebrew raise "Failed to find published #{f} bottle at #{url} (#{res.code} #{res.message})!" end - if retry_count >= max_retries - raise "Failed to find published #{f} bottle at #{url}!" - end + raise "Failed to find published #{f} bottle at #{url}!" if retry_count >= max_retries print(wrote_dots ? "." : "Waiting on Bintray.") wrote_dots = true @@ -630,9 +612,7 @@ module Homebrew curl_download url, to: filename break rescue - if retry_count >= max_curl_retries - raise "Failed to download #{f} bottle from #{url}!" - end + raise "Failed to download #{f} bottle from #{url}!" if retry_count >= max_curl_retries puts "curl download failed; retrying in #{curl_retry_delay_seconds} sec" sleep curl_retry_delay_seconds diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index bab63de71b..34b63ae73f 100644 --- a/Library/Homebrew/dev-cmd/tests.rb +++ b/Library/Homebrew/dev-cmd/tests.rb @@ -33,6 +33,9 @@ module Homebrew def tests tests_args.parse + Homebrew.install_bundler_gems! + gem_user_dir = Gem.user_dir + HOMEBREW_LIBRARY_PATH.cd do ENV.delete("HOMEBREW_COLOR") ENV.delete("HOMEBREW_NO_COLOR") @@ -44,11 +47,14 @@ module Homebrew ENV.delete("HOMEBREW_NO_GITHUB_API") ENV.delete("HOMEBREW_NO_EMOJI") ENV.delete("HOMEBREW_DEVELOPER") + ENV.delete("HOMEBREW_PRY") ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? ENV["HOMEBREW_TEST_ONLINE"] = "1" if args.online? + ENV["USER"] ||= system_command!("id", args: ["-nu"]).stdout.chomp + # Avoid local configuration messing with tests e.g. git being configured # to use GPG to sign by default ENV["HOME"] = "#{HOMEBREW_LIBRARY_PATH}/test" @@ -66,8 +72,6 @@ module Homebrew ENV["GIT_#{role}_DATE"] = "Sun Jan 22 19:59:13 2017 +0000" end - Homebrew.install_bundler_gems! - parallel = true files = if args.only @@ -80,10 +84,10 @@ module Homebrew ["test/#{test_name}_spec.rb:#{line}"] end else - Dir.glob("test/**/*_spec.rb").reject { |p| p =~ %r{^test/vendor/bundle/} } + Dir.glob("test/**/*_spec.rb") end - opts = if ENV["CI"] + parallel_args = if ENV["CI"] %w[ --combine-stderr --serialize-stdout @@ -120,8 +124,11 @@ module Homebrew puts "Randomized with seed #{seed}" + # Let `bundle` in PATH find its gem. + ENV["GEM_PATH"] = "#{ENV["GEM_PATH"]}:#{gem_user_dir}" + if parallel - system "bundle", "exec", "parallel_rspec", *opts, "--", *bundle_args, "--", *files + system "bundle", "exec", "parallel_rspec", *parallel_args, "--", *bundle_args, "--", *files else system "bundle", "exec", "rspec", *bundle_args, "--", *files end diff --git a/Library/Homebrew/dev-cmd/vendor-gems.rb b/Library/Homebrew/dev-cmd/vendor-gems.rb index 6687e482f6..a40522a7a2 100644 --- a/Library/Homebrew/dev-cmd/vendor-gems.rb +++ b/Library/Homebrew/dev-cmd/vendor-gems.rb @@ -20,13 +20,16 @@ module Homebrew Homebrew.install_bundler! - ohai "cd #{HOMEBREW_LIBRARY_PATH}/vendor" - (HOMEBREW_LIBRARY_PATH/"vendor").cd do + ohai "cd #{HOMEBREW_LIBRARY_PATH}" + HOMEBREW_LIBRARY_PATH.cd do + ohai "bundle pristine" + safe_system "bundle", "pristine" + ohai "bundle install --standalone" safe_system "bundle", "install", "--standalone" - ohai "git add bundle-standalone" - system "git", "add", "bundle-standalone" + ohai "git add vendor/bundle" + system "git", "add", "vendor/bundle" if Formula["gpg"].installed? ENV["PATH"] = PATH.new(ENV["PATH"]) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index 7253e9bc2a..dc967d623d 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -106,6 +106,32 @@ module Homebrew EOS end + def examine_git_origin(repository_path, desired_origin) + return if !Utils.git_available? || !repository_path.git? + + current_origin = repository_path.git_origin + + if current_origin.nil? + <<~EOS + Missing #{desired_origin} git origin remote. + + Without a correctly configured origin, Homebrew won't update + properly. You can solve this by adding the remote: + git -C "#{repository_path}" remote add origin #{Formatter.url("https://github.com/#{desired_origin}.git")} + EOS + elsif current_origin !~ %r{#{desired_origin}(\.git|/)?$}i + <<~EOS + Suspicious #{desired_origin} git origin remote found. + The current git origin is: + #{current_origin} + + With a non-standard origin, Homebrew won't update properly. + You can solve this by setting the origin remote: + git -C "#{repository_path}" remote set-url origin #{Formatter.url("https://github.com/#{desired_origin}.git")} + EOS + end + end + def check_for_installed_developer_tools return if DevelopmentTools.installed? @@ -278,9 +304,7 @@ module Homebrew next unless d.directory? d.find do |path| - if path.symlink? && !path.resolved_path_exists? - broken_symlinks << path - end + broken_symlinks << path if path.symlink? && !path.resolved_path_exists? end end return if broken_symlinks.empty? @@ -531,60 +555,16 @@ module Homebrew end def check_brew_git_origin - return if !Utils.git_available? || !(HOMEBREW_REPOSITORY/".git").exist? - - origin = HOMEBREW_REPOSITORY.git_origin - - if origin.nil? - <<~EOS - Missing Homebrew/brew git origin remote. - - Without a correctly configured origin, Homebrew won't update - properly. You can solve this by adding the Homebrew remote: - git -C "#{HOMEBREW_REPOSITORY}" remote add origin #{Formatter.url("https://github.com/Homebrew/brew.git")} - EOS - elsif origin !~ %r{Homebrew/brew(\.git|/)?$} - <<~EOS - Suspicious Homebrew/brew git origin remote found. - - With a non-standard origin, Homebrew won't pull updates from - the main repository. The current git origin is: - #{origin} - - Unless you have compelling reasons, consider setting the - origin remote to point at the main repository by running: - git -C "#{HOMEBREW_REPOSITORY}" remote set-url origin #{Formatter.url("https://github.com/Homebrew/brew.git")} - EOS - end + examine_git_origin(HOMEBREW_REPOSITORY, "Homebrew/brew") end def check_coretap_git_origin - coretap_path = CoreTap.instance.path - return if !Utils.git_available? || !(coretap_path/".git").exist? + examine_git_origin(CoreTap.instance.path, CoreTap.instance.full_name) + end - origin = coretap_path.git_origin - - if origin.nil? - <<~EOS - Missing #{CoreTap.instance} git origin remote. - - Without a correctly configured origin, Homebrew won't update - properly. You can solve this by adding the Homebrew remote: - git -C "#{coretap_path}" remote add origin #{Formatter.url(CoreTap.instance.default_remote)} - EOS - elsif origin !~ %r{#{CoreTap.instance.full_name}(\.git|/)?$}i - <<~EOS - Suspicious #{CoreTap.instance} git origin remote found. - - With a non-standard origin, Homebrew won't pull updates from - the main repository. The current git origin is: - #{origin} - - Unless you have compelling reasons, consider setting the - origin remote to point at the main repository by running: - git -C "#{coretap_path}" remote set-url origin #{Formatter.url(CoreTap.instance.default_remote)} - EOS - end + def check_casktap_git_origin + cask = Tap.default_cask_tap + examine_git_origin(cask.path, cask.full_name) if cask.installed? end def check_coretap_git_branch @@ -611,7 +591,7 @@ module Homebrew <<~EOS You have the following deprecated, official taps tapped: - Homebrew/homebrew-#{tapped_deprecated_taps.join("\n ")} + Homebrew/homebrew-#{tapped_deprecated_taps.join("\n Homebrew/homebrew-")} Untap them with `brew untap`. EOS end diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 8481378f93..a6af403b3a 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -375,9 +375,7 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy if filename_with_encoding = content_disposition.parameters["filename*"] encoding, encoded_filename = filename_with_encoding.split("''", 2) - if encoding && encoded_filename - filename = URI.decode_www_form_component(encoded_filename).encode(encoding) - end + filename = URI.decode_www_form_component(encoded_filename).encode(encoding) if encoding && encoded_filename end filename || content_disposition.filename diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 0b5cb41eaf..403144a3c4 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -110,9 +110,7 @@ module Superenv path.append("/usr/bin", "/bin", "/usr/sbin", "/sbin") begin - if homebrew_cc =~ GNU_GCC_REGEXP - path.append(gcc_version_formula($&).opt_bin) - end + path.append(gcc_version_formula($&).opt_bin) if homebrew_cc =~ GNU_GCC_REGEXP rescue FormulaUnavailableError # Don't fail and don't add these formulae to the path if they don't exist. nil diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb index a983b3cb4a..1949002cc3 100644 --- a/Library/Homebrew/extend/os/linux/dependency_collector.rb +++ b/Library/Homebrew/extend/os/linux/dependency_collector.rb @@ -5,6 +5,7 @@ class DependencyCollector dep = Dependency.new("openjdk", tags) return dep if dep.installed? return req if req.satisfied? + dep rescue FormulaUnavailableError req diff --git a/Library/Homebrew/extend/os/linux/diagnostic.rb b/Library/Homebrew/extend/os/linux/diagnostic.rb index 061fe64bfb..68d90a9df4 100644 --- a/Library/Homebrew/extend/os/linux/diagnostic.rb +++ b/Library/Homebrew/extend/os/linux/diagnostic.rb @@ -54,7 +54,7 @@ module Homebrew this variable set to include other locations. Some programs like `vapigen` may not work correctly. Consider adding Homebrew's share directory to XDG_DATA_DIRS like so: - #{Utils::Shell.prepend_variable_in_profile("XDG_DATA_DIRS", HOMEBREW_PREFIX/"share")} + echo 'export XDG_DATA_DIRS="#{HOMEBREW_PREFIX}/share:$XDG_DATA_DIRS"' >> #{shell_profile} EOS end diff --git a/Library/Homebrew/extend/os/linux/tap.rb b/Library/Homebrew/extend/os/linux/tap.rb index 1ae251b9cc..4242ef099b 100644 --- a/Library/Homebrew/extend/os/linux/tap.rb +++ b/Library/Homebrew/extend/os/linux/tap.rb @@ -2,6 +2,6 @@ class CoreTap < Tap # @private def initialize super "Homebrew", "core" - @full_name = "Linuxbrew/homebrew-core" unless ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] + @full_name = "Homebrew/linuxbrew-core" unless ENV["HOMEBREW_FORCE_HOMEBREW_ON_LINUX"] end end diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index 601db6e05f..32ad1ffd54 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -106,6 +106,7 @@ module Homebrew def check_xcode_minimum_version return unless MacOS::Xcode.below_minimum_version? + xcode = MacOS::Xcode.version.to_s xcode += " => #{MacOS::Xcode.prefix}" unless MacOS::Xcode.default_prefix? diff --git a/Library/Homebrew/extend/os/mac/system_config.rb b/Library/Homebrew/extend/os/mac/system_config.rb index a773128f37..ec017bdc26 100644 --- a/Library/Homebrew/extend/os/mac/system_config.rb +++ b/Library/Homebrew/extend/os/mac/system_config.rb @@ -36,21 +36,15 @@ class SystemConfig end def clt - @clt ||= if MacOS::CLT.installed? - MacOS::CLT.version - end + @clt ||= MacOS::CLT.version if MacOS::CLT.installed? end def clt_headers - @clt_headers ||= if MacOS::CLT.headers_installed? - MacOS::CLT.headers_version - end + @clt_headers ||= MacOS::CLT.headers_version if MacOS::CLT.headers_installed? end def xquartz - @xquartz ||= if MacOS::XQuartz.installed? - "#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}" - end + @xquartz ||= "#{MacOS::XQuartz.version} => #{describe_path(MacOS::XQuartz.prefix)}" if MacOS::XQuartz.installed? end def dump_verbose_config(f = $stdout) diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 78b3a460a7..8398726fe9 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -345,9 +345,7 @@ class Pathname # Writes an exec script that invokes a Java jar def write_jar_script(target_jar, script_name, java_opts = "", java_version: nil) mkpath - java_home = if java_version - "JAVA_HOME=\"#{Language::Java.java_home_shell(java_version)}\" " - end + java_home = ("JAVA_HOME=\"#{Language::Java.java_home_shell(java_version)}\" " if java_version) join(script_name).write <<~SH #!/bin/bash #{java_home}exec java #{java_opts} -jar #{target_jar} "$@" diff --git a/Library/Homebrew/extend/string.rb b/Library/Homebrew/extend/string.rb index 0b2fa3e379..71f08c453b 100644 --- a/Library/Homebrew/extend/string.rb +++ b/Library/Homebrew/extend/string.rb @@ -28,18 +28,14 @@ module StringInreplaceExtension def sub!(before, after) result = super - unless result - errors << "expected replacement of #{before.inspect} with #{after.inspect}" - end + errors << "expected replacement of #{before.inspect} with #{after.inspect}" unless result result end # Warn if nothing was replaced def gsub!(before, after, audit_result = true) result = super(before, after) - if audit_result && result.nil? - errors << "expected replacement of #{before.inspect} with #{after.inspect}" - end + errors << "expected replacement of #{before.inspect} with #{after.inspect}" if audit_result && result.nil? result end @@ -55,9 +51,7 @@ module StringInreplaceExtension def remove_make_var!(flags) Array(flags).each do |flag| # Also remove trailing \n, if present. - unless gsub!(/^#{Regexp.escape(flag)}[ \t]*=.*$\n?/, "", false) - errors << "expected to remove #{flag.inspect}" - end + errors << "expected to remove #{flag.inspect}" unless gsub!(/^#{Regexp.escape(flag)}[ \t]*=.*$\n?/, "", false) end end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 01b6e6b837..ea2387e6ee 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -176,9 +176,7 @@ class Formula @name = name @path = path @alias_path = alias_path - @alias_name = if alias_path - File.basename(alias_path) - end + @alias_name = (File.basename(alias_path) if alias_path) @revision = self.class.revision || 0 @version_scheme = self.class.version_scheme || 0 @@ -248,14 +246,10 @@ class Formula end def validate_attributes! - if name.nil? || name.empty? || name =~ /\s/ - raise FormulaValidationError.new(full_name, :name, name) - end + raise FormulaValidationError.new(full_name, :name, name) if name.nil? || name.empty? || name =~ /\s/ url = active_spec.url - if url.nil? || url.empty? || url =~ /\s/ - raise FormulaValidationError.new(full_name, :url, url) - end + raise FormulaValidationError.new(full_name, :url, url) if url.nil? || url.empty? || url =~ /\s/ val = version.respond_to?(:to_str) ? version.to_str : version return unless val.nil? || val.empty? || val =~ /\s/ @@ -1338,9 +1332,7 @@ class Formula # Avoid false positives for clock_gettime support on 10.11. # CMake cache entries for other weak symbols may be added here as needed. - if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0" - args << "-DHAVE_CLOCK_GETTIME:INTERNAL=0" - end + args << "-DHAVE_CLOCK_GETTIME:INTERNAL=0" if MacOS.version == "10.11" && MacOS::Xcode.version >= "8.0" args end @@ -1430,7 +1422,7 @@ class Formula @installed ||= racks.flat_map do |rack| begin Formulary.from_rack(rack) - rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError + rescue [] end end.uniq(&:name) @@ -1842,9 +1834,7 @@ class Formula pretty_args.delete "--disable-debug" end pretty_args.each_index do |i| - if pretty_args[i].to_s.start_with? "import setuptools" - pretty_args[i] = "import setuptools..." - end + pretty_args[i] = "import setuptools..." if pretty_args[i].to_s.start_with? "import setuptools" end ohai "#{cmd} #{pretty_args * " "}".strip @@ -1957,9 +1947,7 @@ class Formula # If the cellar only has one version installed, don't complain # that we can't tell which one to keep. Don't complain at all if the # only installed version is a pinned formula. - unless quiet - opoo "Skipping #{full_name}: most recent version #{pkg_version} not installed" - end + opoo "Skipping #{full_name}: most recent version #{pkg_version} not installed" unless quiet end eligible_for_cleanup end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 45f2f08499..bce23f8bff 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -244,9 +244,7 @@ class FormulaInstaller check_conflicts - if !pour_bottle? && !formula.bottle_unneeded? && !DevelopmentTools.installed? - raise BuildToolsError, [formula] - end + raise BuildToolsError, [formula] if !pour_bottle? && !formula.bottle_unneeded? && !DevelopmentTools.installed? unless ignore_deps? deps = compute_dependencies @@ -267,17 +265,13 @@ class FormulaInstaller end options = display_options(formula) - if show_header? - oh1 "Installing #{Formatter.identifier(formula.full_name)} #{options}".strip - end + oh1 "Installing #{Formatter.identifier(formula.full_name)} #{options}".strip if show_header? unless formula.tap&.private? action = "#{formula.full_name} #{options}".strip Utils::Analytics.report_event("install", action) - if installed_on_request - Utils::Analytics.report_event("install_on_request", action) - end + Utils::Analytics.report_event("install_on_request", action) if installed_on_request end self.class.attempted << formula @@ -624,9 +618,7 @@ class FormulaInstaller keg = Keg.new(formula.prefix) link(keg) - unless @poured_bottle && formula.bottle_specification.skip_relocation? - fix_dynamic_linkage(keg) - end + fix_dynamic_linkage(keg) unless @poured_bottle && formula.bottle_specification.skip_relocation? if build_bottle? ohai "Not running post_install as we're building a bottle" @@ -757,9 +749,7 @@ class FormulaInstaller formula.update_head_version - if !formula.prefix.directory? || Keg.new(formula.prefix).empty_installation? - raise "Empty installation" - end + raise "Empty installation" if !formula.prefix.directory? || Keg.new(formula.prefix).empty_installation? rescue Exception => e # rubocop:disable Lint/RescueException if e.is_a? BuildError e.formula = formula diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 44f40685fa..8b40c7376f 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -16,9 +16,7 @@ module Formulary end def self.load_formula(name, path, contents, namespace) - if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] - raise "Formula loading disabled by HOMEBREW_DISABLE_LOAD_FORMULA!" - end + raise "Formula loading disabled by HOMEBREW_DISABLE_LOAD_FORMULA!" if ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] mod = Module.new const_set(namespace, mod) @@ -244,9 +242,7 @@ module Formulary new_name = new_tap.core_tap? ? name : new_tapped_name end - if warn && old_name && new_name - opoo "Use #{new_name} instead of deprecated #{old_name}" - end + opoo "Use #{new_name} instead of deprecated #{old_name}" if warn && old_name && new_name end [name, path] @@ -397,22 +393,16 @@ module Formulary return TapLoader.new(ref, from: from) end - if File.extname(ref) == ".rb" && Pathname.new(ref).expand_path.exist? - return FromPathLoader.new(ref) - end + return FromPathLoader.new(ref) if File.extname(ref) == ".rb" && Pathname.new(ref).expand_path.exist? formula_with_that_name = core_path(ref) - if formula_with_that_name.file? - return FormulaLoader.new(ref, formula_with_that_name) - end + return FormulaLoader.new(ref, formula_with_that_name) if formula_with_that_name.file? possible_alias = CoreTap.instance.alias_dir/ref return AliasLoader.new(possible_alias) if possible_alias.file? possible_tap_formulae = tap_paths(ref) - if possible_tap_formulae.size > 1 - raise TapFormulaAmbiguityError.new(ref, possible_tap_formulae) - end + raise TapFormulaAmbiguityError.new(ref, possible_tap_formulae) if possible_tap_formulae.size > 1 if possible_tap_formulae.size == 1 path = possible_tap_formulae.first.resolved_path @@ -422,9 +412,7 @@ module Formulary if newref = CoreTap.instance.formula_renames[ref] formula_with_that_oldname = core_path(newref) - if formula_with_that_oldname.file? - return FormulaLoader.new(newref, formula_with_that_oldname) - end + return FormulaLoader.new(newref, formula_with_that_oldname) if formula_with_that_oldname.file? end possible_tap_newname_formulae = [] @@ -438,19 +426,13 @@ module Formulary raise TapFormulaWithOldnameAmbiguityError.new(ref, possible_tap_newname_formulae) end - unless possible_tap_newname_formulae.empty? - return TapLoader.new(possible_tap_newname_formulae.first, from: from) - end + return TapLoader.new(possible_tap_newname_formulae.first, from: from) unless possible_tap_newname_formulae.empty? possible_keg_formula = Pathname.new("#{HOMEBREW_PREFIX}/opt/#{ref}/.brew/#{ref}.rb") - if possible_keg_formula.file? - return FormulaLoader.new(ref, possible_keg_formula) - end + return FormulaLoader.new(ref, possible_keg_formula) if possible_keg_formula.file? possible_cached_formula = Pathname.new("#{HOMEBREW_CACHE_FORMULA}/#{ref}.rb") - if possible_cached_formula.file? - return FormulaLoader.new(ref, possible_cached_formula) - end + return FormulaLoader.new(ref, possible_cached_formula) if possible_cached_formula.file? NullLoader.new(ref) end @@ -473,9 +455,7 @@ module Formulary def self.find_with_priority(ref, spec = :stable) possible_pinned_tap_formulae = tap_paths(ref, Dir["#{HOMEBREW_LIBRARY}/PinnedTaps/*/*/"]).map(&:realpath) - if possible_pinned_tap_formulae.size > 1 - raise TapFormulaAmbiguityError.new(ref, possible_pinned_tap_formulae) - end + raise TapFormulaAmbiguityError.new(ref, possible_pinned_tap_formulae) if possible_pinned_tap_formulae.size > 1 if possible_pinned_tap_formulae.size == 1 selected_formula = factory(possible_pinned_tap_formulae.first, spec) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 7657f74c36..9232ce808c 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -148,6 +148,4 @@ require "official_taps" require "tap" require "tap_constants" -if !ARGV.include?("--no-compat") && !ENV["HOMEBREW_NO_COMPAT"] - require "compat" -end +require "compat" if !ARGV.include?("--no-compat") && !ENV["HOMEBREW_NO_COMPAT"] diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb index 9f48c4b971..cda94a4913 100644 --- a/Library/Homebrew/hardware.rb +++ b/Library/Homebrew/hardware.rb @@ -61,7 +61,7 @@ module Hardware def type case RUBY_PLATFORM when /x86_64/, /i\d86/ then :intel - when /arm/ then :arm + when /arm/, /aarch64/ then :arm when /ppc\d+/ then :ppc else :dunno end diff --git a/Library/Homebrew/help.rb b/Library/Homebrew/help.rb index 6b734c3b70..9a7ecd9020 100644 --- a/Library/Homebrew/help.rb +++ b/Library/Homebrew/help.rb @@ -83,6 +83,7 @@ module Homebrew .generate_help_text rescue NoMethodError => e raise if e.name != cmd_args_method_name + nil end diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index aa62e8594f..4c12e22bfa 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -263,9 +263,7 @@ class Keg if tap bad_tap_opt = opt/tap.user - if !bad_tap_opt.symlink? && bad_tap_opt.directory? - FileUtils.rm_rf bad_tap_opt - end + FileUtils.rm_rf bad_tap_opt if !bad_tap_opt.symlink? && bad_tap_opt.directory? end aliases.each do |a| @@ -569,9 +567,7 @@ class Keg begin keg = Keg.for(src) rescue NotAKegError - if ARGV.verbose? - puts "Won't resolve conflicts for symlink #{dst} as it doesn't resolve into the Cellar" - end + puts "Won't resolve conflicts for symlink #{dst} as it doesn't resolve into the Cellar" if ARGV.verbose? return end @@ -636,9 +632,7 @@ class Keg # Don't link pyc or pyo files because Python overwrites these # cached object files and next time brew wants to link, the # file is in the way. - if %w[.pyc .pyo].include?(src.extname) && src.to_s.include?("/site-packages/") - Find.prune - end + Find.prune if %w[.pyc .pyo].include?(src.extname) && src.to_s.include?("/site-packages/") case yield src.relative_path_from(root) when :skip_file, nil diff --git a/Library/Homebrew/language/java.rb b/Library/Homebrew/language/java.rb index 3dc8d18d23..01ff28d9eb 100644 --- a/Library/Homebrew/language/java.rb +++ b/Library/Homebrew/language/java.rb @@ -8,6 +8,7 @@ module Language def self.java_home(version = nil) req = JavaRequirement.new [*version] raise UnsatisfiedRequirements, req.message unless req.satisfied? + req.java_home end diff --git a/Library/Homebrew/language/node.rb b/Library/Homebrew/language/node.rb index e7958e7d95..28d9ee4b83 100644 --- a/Library/Homebrew/language/node.rb +++ b/Library/Homebrew/language/node.rb @@ -11,9 +11,7 @@ module Language # directory, consequently breaking that assumption. We require a tarball # because npm install creates a "real" installation when fed a tarball. output = Utils.popen_read("npm pack --ignore-scripts") - if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty? - raise "npm failed to pack #{Dir.pwd}" - end + raise "npm failed to pack #{Dir.pwd}" if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty? output.lines.last.chomp end diff --git a/Library/Homebrew/language/python_virtualenv_constants.rb b/Library/Homebrew/language/python_virtualenv_constants.rb index 3b7eec5aa3..f39dd4ff27 100644 --- a/Library/Homebrew/language/python_virtualenv_constants.rb +++ b/Library/Homebrew/language/python_virtualenv_constants.rb @@ -1,6 +1,6 @@ PYTHON_VIRTUALENV_URL = - "https://files.pythonhosted.org/packages/51/aa" \ - "/c395a6e6eaaedfa5a04723b6446a1df783b16cca6fec66e671cede514688" \ - "/virtualenv-16.4.0.tar.gz".freeze + "https://files.pythonhosted.org/packages/37/db" \ + "/89d6b043b22052109da35416abc3c397655e4bd3cff031446ba02b9654fa" \ + "/virtualenv-16.4.3.tar.gz".freeze PYTHON_VIRTUALENV_SHA256 = - "cceab52aa7d4df1e1871a70236eb2b89fcfe29b6b43510d9738689787c513261".freeze + "984d7e607b0a5d1329425dd8845bd971b957424b5ba664729fab51ab8c11bc39".freeze diff --git a/Library/Homebrew/load_path.rb b/Library/Homebrew/load_path.rb index 678263d322..b25aefa83d 100644 --- a/Library/Homebrew/load_path.rb +++ b/Library/Homebrew/load_path.rb @@ -2,8 +2,6 @@ require "pathname" HOMEBREW_LIBRARY_PATH = Pathname(__dir__).realpath -unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) - $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) -end +$LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) -require "vendor/bundle-standalone/bundler/setup" +require "vendor/bundle/bundler/setup" diff --git a/Library/Homebrew/locale.rb b/Library/Homebrew/locale.rb index 79f863c047..4c05be5be8 100644 --- a/Library/Homebrew/locale.rb +++ b/Library/Homebrew/locale.rb @@ -11,9 +11,7 @@ class Locale def self.parse(string) string = string.to_s - if string !~ LOCALE_REGEX - raise ParserError, "'#{string}' cannot be parsed to a #{self}" - end + raise ParserError, "'#{string}' cannot be parsed to a #{self}" if string !~ LOCALE_REGEX scan = proc do |regex| string.scan(/(?:\-|^)(#{regex})(?:\-|$)/).flatten.first @@ -29,9 +27,7 @@ class Locale attr_reader :language, :region, :script def initialize(language, region, script) - if language.nil? && region.nil? && script.nil? - raise ArgumentError, "#{self.class} cannot be empty" - end + raise ArgumentError, "#{self.class} cannot be empty" if language.nil? && region.nil? && script.nil? { language: language, diff --git a/Library/Homebrew/migrator.rb b/Library/Homebrew/migrator.rb index b98d908d2b..b863e82371 100644 --- a/Library/Homebrew/migrator.rb +++ b/Library/Homebrew/migrator.rb @@ -118,9 +118,7 @@ class Migrator @old_tabs = old_cellar.subdirs.map { |d| Tab.for_keg(Keg.new(d)) } @old_tap = old_tabs.first.tap - if !force && !from_same_tap_user? - raise MigratorDifferentTapsError.new(formula, old_tap) - end + raise MigratorDifferentTapsError.new(formula, old_tap) if !force && !from_same_tap_user? @new_cellar = HOMEBREW_CELLAR/formula.name @new_cellar_existed = @new_cellar.exist? @@ -233,9 +231,7 @@ class Migrator end end - if conflicted - odie "Remove #{new_cellar} manually and run brew migrate #{oldname}." - end + odie "Remove #{new_cellar} manually and run brew migrate #{oldname}." if conflicted end oh1 "Moving #{Formatter.identifier(oldname)} versions to #{new_cellar}" diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index 7d1742e3ce..97a448b84e 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -310,6 +310,7 @@ module OS version = nil [EXECUTABLE_PKG_ID, MAVERICKS_NEW_PKG_ID].each do |id| next unless File.exist?("#{PKG_PATH}/usr/bin/clang") + version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1] break if version end diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb index 393512b439..dc03fcb11f 100644 --- a/Library/Homebrew/os/mac/xquartz.rb +++ b/Library/Homebrew/os/mac/xquartz.rb @@ -87,9 +87,7 @@ module OS # remain public. New code should use `MacOS::X11.bin`, `MacOS::X11.lib` and # `MacOS::X11.include` instead, as that accounts for Xcode-only systems. def prefix - @prefix ||= if Pathname.new("/opt/X11/lib/libpng.dylib").exist? - Pathname.new("/opt/X11") - end + @prefix ||= Pathname.new("/opt/X11") if Pathname.new("/opt/X11/lib/libpng.dylib").exist? end def installed? diff --git a/Library/Homebrew/requirements/codesign_requirement.rb b/Library/Homebrew/requirements/codesign_requirement.rb index ed6c6988e8..aaf4f650fa 100644 --- a/Library/Homebrew/requirements/codesign_requirement.rb +++ b/Library/Homebrew/requirements/codesign_requirement.rb @@ -3,12 +3,8 @@ class CodesignRequirement < Requirement def initialize(tags) options = tags.shift - unless options.is_a?(Hash) - raise ArgumentError("CodesignRequirement requires an options Hash!") - end - unless options.key?(:identity) - raise ArgumentError("CodesignRequirement requires an identity key!") - end + raise ArgumentError("CodesignRequirement requires an options Hash!") unless options.is_a?(Hash) + raise ArgumentError("CodesignRequirement requires an identity key!") unless options.key?(:identity) @identity = options.fetch(:identity) @with = options.fetch(:with, "code signing") diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb index 9cd6bd5d57..c71ee2bcf2 100644 --- a/Library/Homebrew/resource.rb +++ b/Library/Homebrew/resource.rb @@ -66,9 +66,7 @@ class Resource # directory. Subclasses that override stage should implement the tmp # dir using {Mktemp} so that works with all subtypes. def stage(target = nil, &block) - unless target || block - raise ArgumentError, "target directory or block is required" - end + raise ArgumentError, "target directory or block is required" unless target || block verify_download_integrity(fetch) prepare_patches diff --git a/Library/Homebrew/rubocops/checksum.rb b/Library/Homebrew/rubocops/checksum.rb index d00bd6740d..3d48cad941 100644 --- a/Library/Homebrew/rubocops/checksum.rb +++ b/Library/Homebrew/rubocops/checksum.rb @@ -7,13 +7,9 @@ module RuboCop def audit_formula(_node, _class_node, _parent_class_node, body_node) return if body_node.nil? - if method_called_ever?(body_node, :md5) - problem "MD5 checksums are deprecated, please use SHA256" - end + problem "MD5 checksums are deprecated, please use SHA256" if method_called_ever?(body_node, :md5) - if method_called_ever?(body_node, :sha1) - problem "SHA1 checksums are deprecated, please use SHA256" - end + problem "SHA1 checksums are deprecated, please use SHA256" if method_called_ever?(body_node, :sha1) sha256_calls = find_every_method_call_by_name(body_node, :sha256) sha256_calls.each do |sha256_call| diff --git a/Library/Homebrew/rubocops/extend/formula.rb b/Library/Homebrew/rubocops/extend/formula.rb index 59b71d0156..00d26ccf8f 100644 --- a/Library/Homebrew/rubocops/extend/formula.rb +++ b/Library/Homebrew/rubocops/extend/formula.rb @@ -367,9 +367,7 @@ module RuboCop def check_precedence(first_nodes, next_nodes) next_nodes.each do |each_next_node| first_nodes.each do |each_first_node| - if component_precedes?(each_first_node, each_next_node) - return [each_first_node, each_next_node] - end + return [each_first_node, each_next_node] if component_precedes?(each_first_node, each_next_node) end end nil diff --git a/Library/Homebrew/rubocops/formula_desc.rb b/Library/Homebrew/rubocops/formula_desc.rb index 94fde418fa..9ff6c75049 100644 --- a/Library/Homebrew/rubocops/formula_desc.rb +++ b/Library/Homebrew/rubocops/formula_desc.rb @@ -65,14 +65,10 @@ module RuboCop desc = parameters(desc_call).first # Check for leading whitespace. - if regex_match_group(desc, /^\s+/) - problem "Description shouldn't have a leading space" - end + problem "Description shouldn't have a leading space" if regex_match_group(desc, /^\s+/) # Check for trailing whitespace. - if regex_match_group(desc, /\s+$/) - problem "Description shouldn't have a trailing space" - end + problem "Description shouldn't have a trailing space" if regex_match_group(desc, /\s+$/) # Check if command-line is wrongly used in formula's desc if match = regex_match_group(desc, /(command ?line)/i) diff --git a/Library/Homebrew/rubocops/lines.rb b/Library/Homebrew/rubocops/lines.rb index 55cd1f5c59..718f5f8061 100644 --- a/Library/Homebrew/rubocops/lines.rb +++ b/Library/Homebrew/rubocops/lines.rb @@ -89,9 +89,7 @@ module RuboCop class OptionDeclarations < FormulaCop def audit_formula(_node, _class_node, _parent_class_node, body_node) - if find_method_def(body_node, :options) - problem "Use new-style option definitions" - end + problem "Use new-style option definitions" if find_method_def(body_node, :options) find_instance_method_call(body_node, :build, :without?) do |method| next unless unless_modifier?(method.parent) @@ -327,9 +325,7 @@ module RuboCop problem "Use Language::Node for npm install args" unless languageNodeModule?(method_node) end - if find_method_def(body_node, :test) - problem "Use new-style test definitions (test do)" - end + problem "Use new-style test definitions (test do)" if find_method_def(body_node, :test) find_method_with_args(body_node, :skip_clean, :all) do problem "`skip_clean :all` is deprecated; brew no longer strips symbols. " \ diff --git a/Library/Homebrew/rubocops/urls.rb b/Library/Homebrew/rubocops/urls.rb index c4ac19b220..83fb8798f0 100644 --- a/Library/Homebrew/rubocops/urls.rb +++ b/Library/Homebrew/rubocops/urls.rb @@ -97,9 +97,7 @@ module RuboCop problem "Don't use #{Regexp.last_match(1)}use_mirror in SourceForge urls (url is #{url})." end - if url.end_with?("/download") - problem "Don't use /download in SourceForge urls (url is #{url})." - end + problem "Don't use /download in SourceForge urls (url is #{url})." if url.end_with?("/download") if url =~ %r{^https?://sourceforge\.} problem "Use https://downloads.sourceforge.net to get geolocation (url is #{url})." diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 329d2b8fc6..d49b87d22c 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -55,9 +55,7 @@ class SoftwareSpec resources.each_value do |r| r.owner = self r.version ||= begin - if version.nil? - raise "#{full_name}: version missing for \"#{r.name}\" resource!" - end + raise "#{full_name}: version missing for \"#{r.name}\" resource!" if version.nil? if version.head? Version.create("HEAD") diff --git a/Library/Homebrew/style.rb b/Library/Homebrew/style.rb index c4886c6211..f2ce76b0ee 100644 --- a/Library/Homebrew/style.rb +++ b/Library/Homebrew/style.rb @@ -30,9 +30,7 @@ module Homebrew args << "--parallel" end - if ARGV.verbose? - args += ["--extra-details", "--display-cop-names"] - end + args += ["--extra-details", "--display-cop-names"] if ARGV.verbose? if options[:except_cops] options[:except_cops].map! { |cop| RuboCop::Cop::Cop.registry.qualified_cop_name(cop.to_s, "") } @@ -49,9 +47,7 @@ module Homebrew RuboCop::Cop::Cop.registry.departments.include?(cop.to_sym) end - if cops_to_include.empty? - odie "RuboCops #{options[:only_cops].join(",")} were not found" - end + odie "RuboCops #{options[:only_cops].join(",")} were not found" if cops_to_include.empty? args << "--only" << cops_to_include.join(",") end diff --git a/Library/Homebrew/system_command.rb b/Library/Homebrew/system_command.rb index 2b1c222fe8..fe2ca7dc46 100644 --- a/Library/Homebrew/system_command.rb +++ b/Library/Homebrew/system_command.rb @@ -197,6 +197,7 @@ class SystemCommand def success? return false if @exit_status.nil? + @exit_status.zero? end diff --git a/Library/Homebrew/system_config.rb b/Library/Homebrew/system_config.rb index dba2e8fb55..06641d0e14 100644 --- a/Library/Homebrew/system_config.rb +++ b/Library/Homebrew/system_config.rb @@ -157,15 +157,9 @@ class SystemConfig if defaults_hash[:HOMEBREW_REPOSITORY] != HOMEBREW_REPOSITORY.to_s f.puts "HOMEBREW_REPOSITORY: #{HOMEBREW_REPOSITORY}" end - if defaults_hash[:HOMEBREW_CELLAR] != HOMEBREW_CELLAR.to_s - f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" - end - if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s - f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}" - end - if defaults_hash[:HOMEBREW_TEMP] != HOMEBREW_TEMP.to_s - f.puts "HOMEBREW_TEMP: #{HOMEBREW_TEMP}" - end + f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if defaults_hash[:HOMEBREW_CELLAR] != HOMEBREW_CELLAR.to_s + f.puts "HOMEBREW_CACHE: #{HOMEBREW_CACHE}" if defaults_hash[:HOMEBREW_CACHE] != HOMEBREW_CACHE.to_s + f.puts "HOMEBREW_TEMP: #{HOMEBREW_TEMP}" if defaults_hash[:HOMEBREW_TEMP] != HOMEBREW_TEMP.to_s if defaults_hash[:HOMEBREW_RUBY_WARNINGS] != ENV["HOMEBREW_RUBY_WARNINGS"].to_s f.puts "HOMEBREW_RUBY_WARNINGS: #{ENV["HOMEBREW_RUBY_WARNINGS"]}" end diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index 72bccb077d..7a58ed6e2c 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -133,13 +133,9 @@ class Tab < OpenStruct def self.for_formula(f) paths = [] - if f.opt_prefix.symlink? && f.opt_prefix.directory? - paths << f.opt_prefix.resolved_path - end + paths << f.opt_prefix.resolved_path if f.opt_prefix.symlink? && f.opt_prefix.directory? - if f.linked_keg.symlink? && f.linked_keg.directory? - paths << f.linked_keg.resolved_path - end + paths << f.linked_keg.resolved_path if f.linked_keg.symlink? && f.linked_keg.directory? if (dirs = f.installed_prefixes).length == 1 paths << dirs.first diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb index de323aa858..c28b9775eb 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -22,17 +22,13 @@ class Tap repo = args.second end - if [user, repo].any? { |part| part.nil? || part.include?("/") } - raise "Invalid tap name '#{args.join("/")}'" - end + raise "Invalid tap name '#{args.join("/")}'" if [user, repo].any? { |part| part.nil? || part.include?("/") } # We special case homebrew and linuxbrew so that users don't have to shift in a terminal. user = user.capitalize if ["homebrew", "linuxbrew"].include? user - repo = repo.delete_prefix "homebrew-" + repo = repo.sub(HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX, "") - if ["Homebrew", "Linuxbrew"].include?(user) && ["core", "homebrew"].include?(repo) - return CoreTap.instance - end + return CoreTap.instance if ["Homebrew", "Linuxbrew"].include?(user) && ["core", "homebrew"].include?(repo) cache_key = "#{user}/#{repo}".downcase cache.fetch(cache_key) { |key| cache[key] = Tap.new(user, repo) } @@ -280,9 +276,7 @@ class Tap begin safe_system "git", *args unless Readall.valid_tap?(self, aliases: true) - unless ARGV.homebrew_developer? - raise "Cannot tap #{name}: invalid syntax in tap!" - end + raise "Cannot tap #{name}: invalid syntax in tap!" unless ARGV.homebrew_developer? end rescue Interrupt, RuntimeError ignore_interrupts do diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb index 749f36ca7a..764c547705 100644 --- a/Library/Homebrew/tap_constants.rb +++ b/Library/Homebrew/tap_constants.rb @@ -8,3 +8,4 @@ HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY)}/Taps/(?[\w- HOMEBREW_TAP_PATH_REGEX = Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{(?:/.*)?$}.source) # match official taps' casks, e.g. homebrew/cask/somecask or homebrew/cask-versions/somecask HOMEBREW_CASK_TAP_CASK_REGEX = %r{^(?:([Cc]askroom)/(cask|versions)|(homebrew)/(cask|cask-[\w-]+))/([\w+-.]+)$}.freeze +HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX = /^(home|linux)brew-/.freeze diff --git a/Library/Homebrew/test/.bundle/config b/Library/Homebrew/test/.bundle/config deleted file mode 100644 index 065e005f2b..0000000000 --- a/Library/Homebrew/test/.bundle/config +++ /dev/null @@ -1,6 +0,0 @@ ---- -BUNDLE_BIN: "../bin" -BUNDLE_PATH: "../vendor/bundle" -BUNDLE_DISABLE_SHARED_GEMS: "true" -BUNDLE_JOBS: "4" -BUNDLE_RETRY: "3" diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile deleted file mode 100644 index 16cc49d415..0000000000 --- a/Library/Homebrew/test/Gemfile +++ /dev/null @@ -1,18 +0,0 @@ -source "https://rubygems.org" - -gem "parallel_tests" -gem "rspec" -gem "rspec-its", require: false -gem "rspec-retry", require: false -gem "rspec-wait", require: false -gem "rubocop" - -group :development do - gem "ronn", require: false -end - -group :coverage do - gem "coveralls", require: false - gem "simplecov", require: false - gem "simplecov-cobertura", require: false -end diff --git a/Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb b/Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb index 4b6f1bca27..c89c572d56 100644 --- a/Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb +++ b/Library/Homebrew/test/cask/artifact/shared_examples/uninstall_zap.rb @@ -228,11 +228,6 @@ shared_examples "#uninstall_phase or #zap_phase" do it "is supported" do allow(fake_system_command).to receive(:run).with(any_args).and_call_original - expect(fake_system_command).to receive(:run).with( - "/bin/chmod", - args: ["--", "+x", script_pathname], - ) - expect(fake_system_command).to receive(:run).with( cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool"), args: ["--please"], diff --git a/Library/Homebrew/test/cask/cmd/style_spec.rb b/Library/Homebrew/test/cask/cmd/style_spec.rb index 64c5a68bcb..336fa1140d 100644 --- a/Library/Homebrew/test/cask/cmd/style_spec.rb +++ b/Library/Homebrew/test/cask/cmd/style_spec.rb @@ -42,7 +42,7 @@ describe Cask::Cmd::Style, :cask do context "when installation succeeds" do before do - allow(Homebrew).to receive(:install_gem_setup_path!) + allow(Homebrew).to receive(:install_bundler_gems!) end it "exits successfully" do @@ -52,7 +52,7 @@ describe Cask::Cmd::Style, :cask do context "when installation fails" do before do - allow(Homebrew).to receive(:install_gem_setup_path!).and_raise(SystemExit) + allow(Homebrew).to receive(:install_bundler_gems!).and_raise(SystemExit) end it "raises an error" do diff --git a/Library/Homebrew/test/cli_parser_spec.rb b/Library/Homebrew/test/cli_parser_spec.rb index c5c1f25764..c4b1dfe033 100644 --- a/Library/Homebrew/test/cli_parser_spec.rb +++ b/Library/Homebrew/test/cli_parser_spec.rb @@ -179,19 +179,19 @@ describe Homebrew::CLI::Parser do end it "prioritizes cli arguments over env vars when they conflict" do - allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_A").and_return("1") - allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_B").and_return("0") allow(ENV).to receive(:[]) + allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_A").and_return("1") + allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_B").and_return(nil) parser.parse(["--switch-b"]) expect(Homebrew.args.switch_a).to be_falsy expect(Homebrew.args).to be_switch_b end it "raises an exception on constraint violation when both are env vars" do + allow(ENV).to receive(:[]) allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_A").and_return("1") allow(ENV).to receive(:[]).with("HOMEBREW_SWITCH_B").and_return("1") - allow(ENV).to receive(:[]) - expect { parser.parse(["--switch-a", "--switch-b"]) }.to raise_error(Homebrew::CLI::OptionConflictError) + expect { parser.parse([]) }.to raise_error(Homebrew::CLI::OptionConflictError) end end diff --git a/Library/Homebrew/test/cmd/style_spec.rb b/Library/Homebrew/test/cmd/style_spec.rb index c9e1ac2afc..f105e7d208 100644 --- a/Library/Homebrew/test/cmd/style_spec.rb +++ b/Library/Homebrew/test/cmd/style_spec.rb @@ -15,6 +15,10 @@ describe "brew style" do end end + before do + allow(Homebrew).to receive(:install_bundler_gems!) + end + describe "Homebrew::check_style_json" do let(:dir) { mktmpdir } diff --git a/Library/Homebrew/test/dev-cmd/audit_spec.rb b/Library/Homebrew/test/dev-cmd/audit_spec.rb index 548a6c4316..daf5cf6d0e 100644 --- a/Library/Homebrew/test/dev-cmd/audit_spec.rb +++ b/Library/Homebrew/test/dev-cmd/audit_spec.rb @@ -252,7 +252,7 @@ module Homebrew its(:problems) { are_expected.to be_empty } end - describe "which is not whitelisted" do + describe "which is not whitelisted", :needs_macos do subject { fa } let(:fa) do diff --git a/Library/Homebrew/test/cmd/irb_spec.rb b/Library/Homebrew/test/dev-cmd/irb_spec.rb similarity index 100% rename from Library/Homebrew/test/cmd/irb_spec.rb rename to Library/Homebrew/test/dev-cmd/irb_spec.rb diff --git a/Library/Homebrew/test/dev-cmd/pull_spec.rb b/Library/Homebrew/test/dev-cmd/pull_spec.rb index d07bf57bb4..89c468486b 100644 --- a/Library/Homebrew/test/dev-cmd/pull_spec.rb +++ b/Library/Homebrew/test/dev-cmd/pull_spec.rb @@ -10,10 +10,13 @@ describe "brew pull", :integration_test do .and not_to_output.to_stdout .and be_a_failure - expect { brew "pull", "1" } - .to output(/Fetching patch/).to_stdout - .and output(/Current branch is new\-branch/).to_stderr - .and be_a_failure + # Needs Homebrew/homebrew-core + if OS.mac? + expect { brew "pull", "1" } + .to output(/Fetching patch/).to_stdout + .and output(/Current branch is new\-branch/).to_stderr + .and be_a_failure + end expect { brew "pull", "--bump", "https://api.github.com/repos/Homebrew/homebrew-core/pulls/122" } .to output(/Fetching patch/).to_stdout diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 67e6f6cb87..b5a601ffa3 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -5,9 +5,7 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] if ENV["HOMEBREW_COVERALLS_REPO_TOKEN"] require "coveralls" - if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?) - Coveralls::Output.no_color - end + Coveralls::Output.no_color if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?) formatters << Coveralls::SimpleCov::Formatter @@ -74,11 +72,9 @@ RSpec.configure do |config| config.silence_filter_announcements = true if ENV["TEST_ENV_NUMBER"] - # TODO: when https://github.com/rspec/rspec-expectations/pull/1056 - # makes it into a stable release: - # config.expect_with :rspec do |c| - # c.max_formatted_output_length = 200 - # end + config.expect_with :rspec do |c| + c.max_formatted_output_length = 200 + end # Never truncate output objects. RSpec::Support::ObjectFormatter.default_instance.max_formatted_output_length = nil @@ -128,9 +124,7 @@ RSpec.configure do |config| config.before(:each, :needs_svn) do homebrew_bin = File.dirname HOMEBREW_BREW_FILE - unless %W[/usr/bin/svn #{homebrew_bin}/svn].map { |x| File.executable?(x) }.any? - skip "subversion not installed." - end + skip "subversion not installed." unless %W[/usr/bin/svn #{homebrew_bin}/svn].map { |x| File.executable?(x) }.any? end config.before(:each, :needs_unzip) do diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb index aceb130b14..cf8c939d55 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb @@ -176,6 +176,7 @@ RSpec.shared_context "integration test" do def setup_remote_tap(name) Tap.fetch(name).tap do |tap| next if tap.installed? + full_name = Tap.fetch(name).full_name # Check to see if the original Homebrew process has taps we can use. system_tap_path = Pathname("#{ENV["HOMEBREW_LIBRARY"]}/Taps/#{full_name}") diff --git a/Library/Homebrew/test/support/lib/config.rb b/Library/Homebrew/test/support/lib/config.rb index 6d6de3368e..28387c2694 100644 --- a/Library/Homebrew/test/support/lib/config.rb +++ b/Library/Homebrew/test/support/lib/config.rb @@ -1,6 +1,4 @@ -unless ENV["HOMEBREW_BREW_FILE"] - raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" -end +raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" unless ENV["HOMEBREW_BREW_FILE"] require "pathname" diff --git a/Library/Homebrew/unpack_strategy/tar.rb b/Library/Homebrew/unpack_strategy/tar.rb index 390acfba77..3ef8fe7b92 100644 --- a/Library/Homebrew/unpack_strategy/tar.rb +++ b/Library/Homebrew/unpack_strategy/tar.rb @@ -17,9 +17,7 @@ module UnpackStrategy def self.can_extract?(path) return true if path.magic_number.match?(/\A.{257}ustar/n) - unless [Bzip2, Gzip, Lzip, Xz].any? { |s| s.can_extract?(path) } - return false - end + return false unless [Bzip2, Gzip, Lzip, Xz].any? { |s| s.can_extract?(path) } # Check if `tar` can list the contents, then it can also extract it. IO.popen(["tar", "tf", path], err: File::NULL) do |stdout| @@ -40,7 +38,7 @@ module UnpackStrategy end system_command! "tar", - args: ["xf", tar_path, "-C", unpack_dir], + args: ["xof", tar_path, "-C", unpack_dir], verbose: verbose end end diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 61e741c5b9..05962a3365 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -3,6 +3,7 @@ require "utils/analytics" require "utils/curl" require "utils/fork" require "utils/formatter" +require "utils/gems" require "utils/git" require "utils/github" require "utils/inreplace" @@ -41,9 +42,7 @@ def odebug(title, *sput) end def oh1(title, options = {}) - if $stdout.tty? && !ARGV.verbose? && options.fetch(:truncate, :auto) == :auto - title = Tty.truncate(title) - end + title = Tty.truncate(title) if $stdout.tty? && !ARGV.verbose? && options.fetch(:truncate, :auto) == :auto puts Formatter.headline(title, color: :green) end @@ -207,68 +206,6 @@ module Homebrew _system(cmd, *args, **options) end - def setup_gem_environment! - # Match where our bundler gems are. - ENV["GEM_HOME"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}" - ENV["GEM_PATH"] = ENV["GEM_HOME"] - - # Make rubygems notice env changes. - Gem.clear_paths - Gem::Specification.reset - - # Add Gem binary directory and (if missing) Ruby binary directory to PATH. - path = PATH.new(ENV["PATH"]) - path.prepend(RUBY_BIN) if which("ruby") != RUBY_PATH - path.prepend(Gem.bindir) - ENV["PATH"] = path - end - - # TODO: version can be removed when compat/download_strategy is deleted in 2.0 - def install_gem!(name, version = nil) - setup_gem_environment! - - return unless Gem::Specification.find_all_by_name(name, version).empty? - - ohai "Installing or updating '#{name}' gem" - install_args = %W[--no-document #{name}] - install_args << "--version" << version if version - - # Do `gem install [...]` without having to spawn a separate process or - # having to find the right `gem` binary for the running Ruby interpreter. - require "rubygems/commands/install_command" - install_cmd = Gem::Commands::InstallCommand.new - install_cmd.handle_options(install_args) - exit_code = 1 # Should not matter as `install_cmd.execute` always throws. - begin - install_cmd.execute - rescue Gem::SystemExitException => e - exit_code = e.exit_code - end - odie "Failed to install/update the '#{name}' gem." if exit_code.nonzero? - end - - def install_gem_setup_path!(name, executable: name) - install_gem!(name) - - return if which(executable) - - odie <<~EOS - The '#{name}' gem is installed but couldn't find '#{executable}' in the PATH: - #{ENV["PATH"]} - EOS - end - - def install_bundler! - install_gem_setup_path! "bundler", executable: "bundle" - end - - def install_bundler_gems! - install_bundler! - ENV["BUNDLE_GEMFILE"] = "#{HOMEBREW_LIBRARY_PATH}/test/Gemfile" - system "bundle", "install" unless quiet_system("bundle", "check") - setup_gem_environment! - end - # rubocop:disable Style/GlobalVars def inject_dump_stats!(the_module, pattern) @injected_dump_stat_modules ||= {} @@ -495,9 +432,7 @@ end # shortfall or overrun may vary. def truncate_text_to_approximate_size(s, max_bytes, options = {}) front_weight = options.fetch(:front_weight, 0.5) - if front_weight < 0.0 || front_weight > 1.0 - raise "opts[:front_weight] must be between 0.0 and 1.0" - end + raise "opts[:front_weight] must be between 0.0 and 1.0" if front_weight < 0.0 || front_weight > 1.0 return s if s.bytesize <= max_bytes glue = "\n[...snip...]\n" diff --git a/Library/Homebrew/utils/gems.rb b/Library/Homebrew/utils/gems.rb new file mode 100644 index 0000000000..d8d4e4b2ec --- /dev/null +++ b/Library/Homebrew/utils/gems.rb @@ -0,0 +1,106 @@ +# Never `require` anything in this file (except English). It needs to be able to +# work as the first item in `brew.rb` so we can load gems with Bundler when +# needed before anything else is loaded (e.g. `json`). + +require "English" + +module Homebrew + module_function + + def ruby_bindir + "#{RbConfig::CONFIG["prefix"]}/bin".freeze + end + + def gem_user_bindir + "#{Gem.user_dir}/bin".freeze + end + + def ohai_if_defined(message) + if defined?(ohai) + ohai message + else + puts "==> #{message}" + end + end + + def odie_if_defined(message) + if defined?(odie) + odie message + else + $stderr.puts "Error: #{message}" + exit 1 + end + end + + def setup_gem_environment!(gem_home: nil, gem_bindir: nil) + # Match where our bundler gems are. + gem_home ||= "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}" + ENV["GEM_HOME"] = gem_home + ENV["GEM_PATH"] = ENV["GEM_HOME"] + + # Make RubyGems notice environment changes. + Gem.clear_paths + Gem::Specification.reset + + # Add necessary Ruby and Gem binary directories to PATH. + gem_bindir ||= Gem.bindir + paths = ENV["PATH"].split(":") + paths.unshift(ruby_bindir) unless paths.include?(ruby_bindir) + paths.unshift(gem_bindir) unless paths.include?(gem_bindir) + ENV["PATH"] = paths.compact.join(":") + end + + def install_gem!(name, version: nil, setup_gem_environment: true) + setup_gem_environment! if setup_gem_environment + return unless Gem::Specification.find_all_by_name(name, version).empty? + + # Shell out to `gem` to avoid RubyGems requires e.g. loading JSON. + ohai_if_defined "Installing '#{name}' gem" + install_args = %W[--no-document #{name}] + install_args << "--version" << version if version + return if system "#{ruby_bindir}/gem", "install", *install_args + + odie_if_defined "failed to install the '#{name}' gem." + end + + def install_gem_setup_path!(name, version: nil, executable: name, setup_gem_environment: true) + install_gem!(name, version: version, setup_gem_environment: setup_gem_environment) + return if ENV["PATH"].split(":").any? do |path| + File.executable?("#{path}/#{executable}") + end + + odie_if_defined <<~EOS + the '#{name}' gem is installed but couldn't find '#{executable}' in the PATH: + #{ENV["PATH"]} + EOS + end + + def install_bundler! + setup_gem_environment!(gem_home: Gem.user_dir, gem_bindir: gem_user_bindir) + install_gem_setup_path!("bundler", version: ">=2", executable: "bundle", setup_gem_environment: false) + end + + def install_bundler_gems! + install_bundler! + + ENV["BUNDLE_GEMFILE"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/Gemfile" + @bundle_installed ||= begin + bundle = "#{gem_user_bindir}/bundle".freeze + bundle_check_output = `#{bundle} check 2>&1` + bundle_check_failed = !$CHILD_STATUS.exitstatus.zero? + + # for some reason sometimes the exit code lies so check the output too. + if bundle_check_failed || bundle_check_output.include?("Install missing gems") + unless system bundle, "install" + odie_if_defined <<~EOS + failed to run `#{bundle} install`! + EOS + end + else + true + end + end + + setup_gem_environment! + end +end diff --git a/Library/Homebrew/utils/github.rb b/Library/Homebrew/utils/github.rb index 778eb5bcae..c613fc6acb 100644 --- a/Library/Homebrew/utils/github.rb +++ b/Library/Homebrew/utils/github.rb @@ -185,9 +185,7 @@ module GitHub data_tmpfile.close args += ["--data", "@#{data_tmpfile.path}"] - if request_method - args += ["--request", request_method.to_s] - end + args += ["--request", request_method.to_s] if request_method end args += ["--dump-header", headers_tmpfile.path] @@ -206,9 +204,10 @@ module GitHub end begin - if !http_code.start_with?("2") || !status.success? - raise_api_error(output, errors, http_code, headers, scopes) - end + raise_api_error(output, errors, http_code, headers, scopes) if !http_code.start_with?("2") || !status.success? + + return if http_code == "204" # No Content + json = JSON.parse output if block_given? yield json @@ -271,7 +270,7 @@ module GitHub def issues_for_formula(name, options = {}) tap = options[:tap] || CoreTap.instance - search_issues(name, state: "open", repo: "#{tap.user}/homebrew-#{tap.repo}", in: "title") + search_issues(name, state: "open", repo: tap.full_name, in: "title") end def user diff --git a/Library/Homebrew/utils/lock.sh b/Library/Homebrew/utils/lock.sh index d8651cd754..060941d78a 100644 --- a/Library/Homebrew/utils/lock.sh +++ b/Library/Homebrew/utils/lock.sh @@ -45,12 +45,12 @@ _create_lock() { if [[ -x "$ruby" ]] && "$ruby" -e "exit(RUBY_VERSION >= '1.8.7')" then "$ruby" -e "File.new($lock_fd).flock(File::LOCK_EX | File::LOCK_NB) || exit(1)" - elif [[ -x "$(type -P flock)" ]] - then - flock -n "$lock_fd" elif [[ -x "$python" ]] then "$python" -c "import fcntl; fcntl.flock($lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)" + elif [[ -x "$(type -P flock)" ]] + then + flock -n "$lock_fd" else onoe "Cannot create $name lock, please avoid running Homebrew in parallel." fi diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 6bee43498e..91b30efe15 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -47,7 +47,6 @@ setup-ruby-path() { then odie "Failed to install vendor Ruby." fi - rm -rf "$vendor_dir/bundle/ruby" HOMEBREW_RUBY_PATH="$vendor_ruby_path" fi fi diff --git a/Library/Homebrew/utils/tty.rb b/Library/Homebrew/utils/tty.rb index 6f3836280c..6d35584661 100644 --- a/Library/Homebrew/utils/tty.rb +++ b/Library/Homebrew/utils/tty.rb @@ -62,9 +62,7 @@ module Tty end def to_s - if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?) - return "" - end + return "" if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?) current_escape_sequence ensure diff --git a/Library/Homebrew/utils/user.rb b/Library/Homebrew/utils/user.rb index d8658d49dc..e572a0a8ee 100644 --- a/Library/Homebrew/utils/user.rb +++ b/Library/Homebrew/utils/user.rb @@ -7,6 +7,7 @@ class User < DelegateClass(String) def gui? out, _, status = system_command "who" return false unless status.success? + out.lines .map(&:split) .any? { |user, type,| user == self && type == "console" } diff --git a/Library/Homebrew/vendor/Gemfile b/Library/Homebrew/vendor/Gemfile deleted file mode 100644 index 043c518a8f..0000000000 --- a/Library/Homebrew/vendor/Gemfile +++ /dev/null @@ -1,10 +0,0 @@ -source "https://rubygems.org" - -gem "activesupport" -gem "concurrent-ruby" -gem "backports" -gem "mechanize" -gem "plist" -gem "ruby-macho" -gem "rubocop-rspec" -gem "rubocop" diff --git a/Library/Homebrew/vendor/Gemfile.lock b/Library/Homebrew/vendor/Gemfile.lock deleted file mode 100644 index c6ab320754..0000000000 --- a/Library/Homebrew/vendor/Gemfile.lock +++ /dev/null @@ -1,81 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (5.2.2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.4.0) - backports (3.11.4) - concurrent-ruby (1.1.4) - connection_pool (2.2.2) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - i18n (1.5.3) - concurrent-ruby (~> 1.0) - jaro_winkler (1.5.2) - mechanize (2.7.6) - domain_name (~> 0.5, >= 0.5.1) - http-cookie (~> 1.0) - mime-types (>= 1.17.2) - net-http-digest_auth (~> 1.1, >= 1.1.1) - net-http-persistent (>= 2.5.2) - nokogiri (~> 1.6) - ntlm-http (~> 0.1, >= 0.1.1) - webrobots (>= 0.0.9, < 0.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_portile2 (2.4.0) - minitest (5.11.3) - net-http-digest_auth (1.4.1) - net-http-persistent (3.0.0) - connection_pool (~> 2.2) - nokogiri (1.10.1) - mini_portile2 (~> 2.4.0) - ntlm-http (0.1.1) - parallel (1.13.0) - parser (2.6.0.0) - ast (~> 2.4.0) - plist (3.5.0) - powerpack (0.1.2) - rainbow (3.0.0) - rubocop (0.64.0) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) - rubocop-rspec (1.32.0) - rubocop (>= 0.60.0) - ruby-macho (2.1.0) - ruby-progressbar (1.10.0) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.4.1) - webrobots (0.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - activesupport - backports - concurrent-ruby - mechanize - plist - rubocop - rubocop-rspec - ruby-macho - -BUNDLED WITH - 1.17.1 diff --git a/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb similarity index 56% rename from Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb rename to Library/Homebrew/vendor/bundle/bundler/setup.rb index 29ffecb742..2002778342 100644 --- a/Library/Homebrew/vendor/bundle-standalone/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -4,19 +4,31 @@ ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' ruby_version = RbConfig::CONFIG["ruby_version"] path = File.expand_path('..', __FILE__) $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.4/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.5.3/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tzinfo-1.2.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-5.2.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.11.4/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/backports-3.12.0/lib" $:.unshift "#{path}/" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/json-2.2.0" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.2.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.20.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-0.19.4/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coveralls-0.8.22/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/unf_ext-0.0.7.5" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf_ext-0.0.7.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf-0.1.4/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/domain_name-0.5.20180417/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/hpricot-0.8.6" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hpricot-0.8.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/http-cookie-1.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/jaro_winkler-1.5.2" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/jaro_winkler-1.5.2/lib" @@ -30,13 +42,29 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.10.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ntlm-http-0.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/webrobots-0.1.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mechanize-2.7.6/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.13.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mustache-1.1.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel-1.14.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parallel_tests-2.28.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/parser-2.6.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.5.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/powerpack-0.1.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/psych-3.1.0" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/psych-3.1.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-18/2.3.0/rdiscount-2.2.0.1" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-support-3.8.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-core-3.8.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-expectations-3.8.2/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-mocks-3.8.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-3.8.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-its-1.2.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-retry-0.6.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rspec-wait-0.0.9/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.1/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.64.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.65.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.32.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.1.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.2.0/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-cobertura-1.3.0/lib" diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/array_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/array_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/array_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/array_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/backtrace_cleaner.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/backtrace_cleaner.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/backtrace_cleaner.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/backtrace_cleaner.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/benchmarkable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/benchmarkable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/benchmarkable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/benchmarkable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/builder.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/builder.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/builder.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/builder.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/callbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/callbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/callbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/callbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/concern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/concern.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/configurable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/configurable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/configurable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/configurable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/access.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/extract_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/extract_options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/extract_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/extract_options.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/grouping.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/grouping.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/grouping.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/grouping.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/prepend_and_append.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/prepend_and_append.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/prepend_and_append.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/prepend_and_append.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/wrap.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/wrap.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/wrap.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/array/wrap.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/benchmark.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/benchmark.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/benchmark.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/benchmark.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/big_decimal/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute_accessors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/subclasses.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/subclasses.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/subclasses.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/class/subclasses.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/acts_like.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/blank.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/blank.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/calculations.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date/zones.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_and_time/zones.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/acts_like.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/blank.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/blank.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/compatibility.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/date_time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/digest/uuid.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/digest/uuid.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/digest/uuid.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/digest/uuid.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/enumerable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/enumerable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/enumerable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file/atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file/atomic.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file/atomic.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/file/atomic.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/compact.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/compact.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/compact.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/compact.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/deep_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/deep_merge.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/deep_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/deep_merge.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/except.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/except.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/except.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/except.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/indifferent_access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/keys.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/keys.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/keys.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/keys.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/reverse_merge.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/reverse_merge.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/reverse_merge.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/reverse_merge.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/slice.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/slice.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/slice.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/slice.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/transform_values.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/transform_values.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/transform_values.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/hash/transform_values.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/inflections.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/multiple.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/multiple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/multiple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/multiple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/integer/time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/agnostics.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/agnostics.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/agnostics.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/agnostics.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/concern.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/concern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/concern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/concern.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/reporting.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/reporting.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/singleton_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/singleton_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/singleton_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/kernel/singleton_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/load_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/load_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/load_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/load_error.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/marshal.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/marshal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/marshal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/marshal.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/aliasing.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/aliasing.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/aliasing.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/aliasing.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/anonymous.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/anonymous.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/anonymous.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/anonymous.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attr_internal.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attr_internal.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attr_internal.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attr_internal.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/concerning.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/concerning.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/concerning.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/concerning.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/delegation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/delegation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/delegation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/delegation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/introspection.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/introspection.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/introspection.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/introspection.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/reachable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/reachable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/reachable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/reachable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/redefine_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/redefine_method.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/redefine_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/redefine_method.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/remove_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/remove_method.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/remove_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/module/remove_method.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/name_error.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/name_error.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/name_error.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/name_error.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/bytes.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/bytes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/bytes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/bytes.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/numeric/time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/acts_like.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/blank.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/blank.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/blank.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/blank.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/deep_dup.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/deep_dup.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/deep_dup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/deep_dup.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/duplicable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/duplicable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/duplicable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/duplicable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/inclusion.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/inclusion.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/inclusion.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/inclusion.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/instance_variables.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/instance_variables.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/instance_variables.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/instance_variables.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/json.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/json.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/json.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/json.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_param.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_param.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_param.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_param.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_query.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_query.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_query.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/to_query.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/try.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/try.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/try.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/try.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/with_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/with_options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/with_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/object/with_options.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/each.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/each.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/each.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/each.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_range.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_range.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_range.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_range.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/include_time_with_zone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/overlaps.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/overlaps.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/overlaps.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/range/overlaps.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/regexp.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/regexp.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/regexp.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/securerandom.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/securerandom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/securerandom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/securerandom.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/access.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/access.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/behavior.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/behavior.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/behavior.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/behavior.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/exclude.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/exclude.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/exclude.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/exclude.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/filters.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/filters.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/filters.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/filters.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/indent.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/indent.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/indent.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/indent.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inflections.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inquiry.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inquiry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inquiry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/inquiry.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/multibyte.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/output_safety.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/output_safety.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/output_safety.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/output_safety.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/starts_ends_with.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/starts_ends_with.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/starts_ends_with.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/starts_ends_with.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/strip.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/strip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/strip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/strip.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/string/zones.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/acts_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/acts_like.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/acts_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/acts_like.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/calculations.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/calculations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/calculations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/calculations.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/compatibility.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/compatibility.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/compatibility.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/compatibility.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/conversions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/conversions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/conversions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/conversions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/zones.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/zones.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/zones.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/time/zones.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/uri.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/uri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/uri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/core_ext/uri.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/current_attributes.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/current_attributes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/current_attributes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/current_attributes.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/behaviors.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/behaviors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/behaviors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/behaviors.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/constant_accessor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/constant_accessor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/constant_accessor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/constant_accessor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/instance_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/instance_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/instance_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/instance_delegator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/method_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/method_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/method_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/method_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/proxy_wrappers.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/proxy_wrappers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/proxy_wrappers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/proxy_wrappers.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/reporting.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/reporting.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/reporting.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/deprecation/reporting.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/descendants_tracker.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/descendants_tracker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/descendants_tracker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/descendants_tracker.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/digest.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/digest.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/digest.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/digest.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/duration.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/duration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/duration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/duration.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_configuration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_configuration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_configuration.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/encrypted_file.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/evented_file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/evented_file_update_checker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/evented_file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/evented_file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/execution_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/execution_wrapper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/execution_wrapper.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/execution_wrapper.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/file_update_checker.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/file_update_checker.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/file_update_checker.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/file_update_checker.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gem_version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gem_version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gem_version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gem_version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gzip.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gzip.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gzip.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/gzip.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/hash_with_indifferent_access.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/hash_with_indifferent_access.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/hash_with_indifferent_access.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/hash_with_indifferent_access.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n_railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n_railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n_railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/i18n_railtie.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflections.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/inflections.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/inflections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/inflections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/inflections.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/methods.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/methods.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/methods.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/transliterate.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/transliterate.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/transliterate.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/inflector/transliterate.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/key_generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/key_generator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/key_generator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/key_generator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/lazy_load_hooks.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/lazy_load_hooks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/lazy_load_hooks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/lazy_load_hooks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/locale/en.yml b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/locale/en.yml similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/locale/en.yml rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/locale/en.yml diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_silence.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_silence.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_silence.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_silence.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_thread_safe_level.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_thread_safe_level.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_thread_safe_level.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/logger_thread_safe_level.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_encryptor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_encryptor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_encryptor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_encryptor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_verifier.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_verifier.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_verifier.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/message_verifier.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/multibyte.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/multibyte.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/multibyte.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/multibyte.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/fanout.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/fanout.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/fanout.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/fanout.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/instrumenter.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/instrumenter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/instrumenter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/notifications/instrumenter.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/option_merger.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/option_merger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/option_merger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/option_merger.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_options.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/ordered_options.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/per_thread_registry.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/per_thread_registry.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/per_thread_registry.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/per_thread_registry.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/proxy_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/proxy_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/proxy_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/proxy_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rails.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rails.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rails.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rails.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/railtie.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/railtie.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/railtie.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/railtie.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/reloader.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/reloader.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/reloader.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/reloader.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rescuable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rescuable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rescuable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/rescuable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/security_utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/security_utils.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/security_utils.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/security_utils.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/string_inquirer.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/string_inquirer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/string_inquirer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/string_inquirer.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/subscriber.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/subscriber.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/subscriber.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/subscriber.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/tagged_logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/tagged_logging.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/tagged_logging.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/tagged_logging.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/test_case.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/test_case.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/test_case.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/test_case.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time_with_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time_with_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time_with_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/time_with_zone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/time_zone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/time_zone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/time_zone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/time_zone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/unicode_tables.dat b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/unicode_tables.dat similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/unicode_tables.dat rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/values/unicode_tables.dat diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/jdom.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/jdom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/jdom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/jdom.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxml.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxml.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxmlsax.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxmlsax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxmlsax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/libxmlsax.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogiri.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogiri.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogiri.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogiri.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogirisax.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogirisax.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogirisax.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/nokogirisax.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/rexml.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/rexml.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/rexml.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/activesupport-5.2.2/lib/active_support/xml_mini/rexml.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/comparable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/comparable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/comparable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/comparable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/enumerable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/enumerable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/enumerable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/false_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/false_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/false_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/false_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/fixnum.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/fixnum.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/fixnum.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/fixnum.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/float.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/float.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/float.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/float.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/nil_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/nil_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/nil_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/nil_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/regexp.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/regexp.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/regexp.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/regexp.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/string.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/string/match.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/string/match.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/string/match.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/string/match.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/true_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/true_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.4.0/true_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.4.0/true_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/array.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/dir.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/dir.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/dir.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/dir.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/enumerable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/enumerable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/enumerable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/enumerable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/integer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/integer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/integer.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/kernel.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/kernel.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/kernel.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/kernel.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/module.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/module.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/module.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/module.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string/delete_prefix.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/delete_prefix.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string/delete_prefix.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/delete_prefix.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string/delete_suffix.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/delete_suffix.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/string/delete_suffix.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/delete_suffix.rb diff --git a/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/undump.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/undump.rb new file mode 100644 index 0000000000..424b98701c --- /dev/null +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/string/undump.rb @@ -0,0 +1,65 @@ +unless String.method_defined? :undump + class String + def undump + # Making sure to return a String and not a subclass + string = to_s + raise 'string contains null byte' if string["\0"] + raise 'non-ASCII character detected' unless string.ascii_only? + + #raise '.force_encoding("...") format is not supported by backports' if string.match(/\A".*"\.force_encoding\("[^"]*"\)\z/) + match = string.match(/\A(".*?"?)(?:\.force_encoding\("([^"]*)"\))?\z/) + if match + string = match[1] + encoding = match[2] + else + raise %(invalid dumped string; not wrapped with '"' nor '"...".force_encoding("...")' form) + end + + # Ruby 1.9.3 does weird things to encoding during gsub + encoding ||= string.encoding.to_s + + # Unescaped have an even number of backslashes in front of them + # because the double-quote is included, the unescaped quotes are where the size is odd + nb_unescaped_quote = string.scan(/\\*"/).select { |s| s.size.odd? }.size + + raise 'unterminated dumped string' if nb_unescaped_quote == 1 + + if string[-1] != '"' || nb_unescaped_quote > 2 + raise %(invalid dumped string; not wrapped with '"' nor '"...".force_encoding("...")' form) + end + + string = string[1...-1] + + if RUBY_VERSION >= '1.9' + # Look-arounds are not supported in ruby 1.8. Using a string with Regexp avoids the SyntaxError in 1.8.7 + # \xY, \x3Y and finishing with \x + regex = Regexp.new("(? e + raise RuntimeError, e.message, e.backtrace + end + end + + if encoding + begin + Encoding.find(encoding) + rescue ArgumentError + raise "dumped string has unknown encoding name" + end + result = result.force_encoding(encoding) + end + result + end + end +end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/struct.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/2.5.0/struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/2.5.0/struct.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/basic_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/basic_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/basic_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/basic_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/std_lib.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/std_lib.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/std_lib.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/std_lib.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/alias_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/alias_method.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/alias_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/alias_method.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/alias_method_chain.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/alias_method_chain.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/alias_method_chain.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/alias_method_chain.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/arguments.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/arguments.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/arguments.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/arguments.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/extreme_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/extreme_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/extreme_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/extreme_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/float_integer_conversion.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/float_integer_conversion.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/float_integer_conversion.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/float_integer_conversion.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/io.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/io.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/io.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/io.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/make_block_optional.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/make_block_optional.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/make_block_optional.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/make_block_optional.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/normalize.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/normalize.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/normalize.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/normalize.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/path.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/path.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/path.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/path.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/require_relative_dir.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/require_relative_dir.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/require_relative_dir.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/require_relative_dir.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/std_lib.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/std_lib.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/std_lib.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/std_lib.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/suppress_verbose_warnings.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/suppress_verbose_warnings.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/backports-3.11.4/lib/backports/tools/suppress_verbose_warnings.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/backports-3.12.0/lib/backports/tools/suppress_verbose_warnings.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent-ruby.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent-ruby.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent-ruby.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent-ruby.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/agent.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/agent.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/agent.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/agent.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/array.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/array.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/array.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/array.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/async.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/async.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/async.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/async.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atom.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atom.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atom.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atom.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/abstract_thread_local_var.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/abstract_thread_local_var.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/abstract_thread_local_var.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/abstract_thread_local_var.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_boolean.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_boolean.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_boolean.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_boolean.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_fixnum.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_fixnum.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_fixnum.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_fixnum.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_markable_reference.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_markable_reference.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_markable_reference.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_markable_reference.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_reference.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_reference.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_reference.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/atomic_reference.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/count_down_latch.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/count_down_latch.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/count_down_latch.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/count_down_latch.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/cyclic_barrier.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/cyclic_barrier.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/cyclic_barrier.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/cyclic_barrier.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/event.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/event.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/event.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/event.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_count_down_latch.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_count_down_latch.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_count_down_latch.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_count_down_latch.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_thread_local_var.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_thread_local_var.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_thread_local_var.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/java_thread_local_var.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_boolean.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_boolean.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_boolean.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_boolean.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_fixnum.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_fixnum.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_fixnum.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_atomic_fixnum.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_count_down_latch.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_count_down_latch.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_count_down_latch.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_count_down_latch.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_semaphore.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_semaphore.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_semaphore.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/mutex_semaphore.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/read_write_lock.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/read_write_lock.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/read_write_lock.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/read_write_lock.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/reentrant_read_write_lock.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/reentrant_read_write_lock.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/reentrant_read_write_lock.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/reentrant_read_write_lock.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/ruby_thread_local_var.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/ruby_thread_local_var.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/ruby_thread_local_var.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/ruby_thread_local_var.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/semaphore.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/semaphore.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/semaphore.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/semaphore.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/thread_local_var.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/thread_local_var.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/thread_local_var.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic/thread_local_var.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/mutex_atomic.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/mutex_atomic.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/mutex_atomic.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/mutex_atomic.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/numeric_cas_wrapper.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/numeric_cas_wrapper.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/numeric_cas_wrapper.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomic_reference/numeric_cas_wrapper.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomics.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomics.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomics.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/atomics.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_notify_observer_set.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_notify_observer_set.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_notify_observer_set.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_notify_observer_set.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_write_observer_set.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_write_observer_set.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_write_observer_set.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/copy_on_write_observer_set.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/java_non_concurrent_priority_queue.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/java_non_concurrent_priority_queue.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/java_non_concurrent_priority_queue.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/java_non_concurrent_priority_queue.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/lock_free_stack.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/lock_free_stack.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/lock_free_stack.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/lock_free_stack.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/atomic_reference_map_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/atomic_reference_map_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/atomic_reference_map_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/atomic_reference_map_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/mri_map_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/mri_map_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/mri_map_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/mri_map_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/non_concurrent_map_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/non_concurrent_map_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/non_concurrent_map_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/non_concurrent_map_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/synchronized_map_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/synchronized_map_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/synchronized_map_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/map/synchronized_map_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/non_concurrent_priority_queue.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/non_concurrent_priority_queue.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/non_concurrent_priority_queue.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/non_concurrent_priority_queue.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/ruby_non_concurrent_priority_queue.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/ruby_non_concurrent_priority_queue.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/ruby_non_concurrent_priority_queue.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/collection/ruby_non_concurrent_priority_queue.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/deprecation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/deprecation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/deprecation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/deprecation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/dereferenceable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/dereferenceable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/dereferenceable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/dereferenceable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/logging.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/logging.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/logging.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/logging.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/obligation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/obligation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/obligation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/obligation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/observable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/observable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/observable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concern/observable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concurrent_ruby.jar b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concurrent_ruby.jar similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concurrent_ruby.jar rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/concurrent_ruby.jar diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/configuration.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/configuration.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/configuration.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/configuration.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/constants.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/constants.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/constants.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/constants.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/dataflow.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/dataflow.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/dataflow.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/dataflow.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/delay.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/delay.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/delay.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/delay.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/errors.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/errors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/errors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/errors.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/exchanger.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/exchanger.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/exchanger.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/exchanger.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/abstract_executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/abstract_executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/abstract_executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/abstract_executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/cached_thread_pool.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/cached_thread_pool.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/cached_thread_pool.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/cached_thread_pool.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/fixed_thread_pool.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/fixed_thread_pool.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/fixed_thread_pool.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/fixed_thread_pool.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/immediate_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/immediate_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/immediate_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/immediate_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/indirect_immediate_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/indirect_immediate_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/indirect_immediate_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/indirect_immediate_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_single_thread_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_single_thread_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_single_thread_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_single_thread_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_thread_pool_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_thread_pool_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_thread_pool_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/java_thread_pool_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_single_thread_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_single_thread_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_single_thread_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_single_thread_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_thread_pool_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_thread_pool_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_thread_pool_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/ruby_thread_pool_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/safe_task_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/safe_task_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/safe_task_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/safe_task_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serial_executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serial_executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serial_executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serial_executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/serialized_execution_delegator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/simple_executor_service.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/simple_executor_service.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/simple_executor_service.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/simple_executor_service.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/single_thread_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/single_thread_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/single_thread_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/single_thread_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/thread_pool_executor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/thread_pool_executor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/thread_pool_executor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/thread_pool_executor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/timer_set.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/timer_set.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/timer_set.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executor/timer_set.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executors.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executors.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executors.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/executors.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/future.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/future.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/future.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/future.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/immutable_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/immutable_struct.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/immutable_struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/immutable_struct.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/ivar.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/ivar.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/ivar.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/ivar.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/map.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/map.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/map.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/map.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/maybe.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/maybe.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/maybe.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/maybe.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mutable_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mutable_struct.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mutable_struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mutable_struct.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mvar.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mvar.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mvar.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/mvar.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/options.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/options.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/options.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/options.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promise.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promise.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promise.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promise.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promises.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promises.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promises.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/promises.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/re_include.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/re_include.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/re_include.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/re_include.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/scheduled_task.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/scheduled_task.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/scheduled_task.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/scheduled_task.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/set.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/set.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/set.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/set.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/settable_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/settable_struct.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/settable_struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/settable_struct.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_lockable_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_lockable_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_lockable_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_lockable_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_struct.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_struct.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_struct.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/abstract_struct.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/condition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/condition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/condition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/condition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_lockable_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_lockable_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_lockable_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_lockable_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/jruby_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lock.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lock.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lock.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lock.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lockable_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lockable_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lockable_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/lockable_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mri_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mri_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mri_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mri_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mutex_lockable_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mutex_lockable_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mutex_lockable_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/mutex_lockable_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_lockable_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_lockable_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_lockable_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_lockable_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/rbx_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/truffleruby_object.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/truffleruby_object.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/truffleruby_object.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/truffleruby_object.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/volatile.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/volatile.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/volatile.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/synchronization/volatile.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/synchronized_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/synchronized_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/synchronized_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/synchronized_delegator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/adder.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/adder.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/adder.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/adder.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/cheap_lockable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/cheap_lockable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/cheap_lockable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/cheap_lockable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/data_structures.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/data_structures.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/data_structures.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/data_structures.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/power_of_two_tuple.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/power_of_two_tuple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/power_of_two_tuple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/power_of_two_tuple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/striped64.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/striped64.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/striped64.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/striped64.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/volatile.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/volatile.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/volatile.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/volatile.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/xor_shift_random.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/xor_shift_random.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/xor_shift_random.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/thread_safe/util/xor_shift_random.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/timer_task.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/timer_task.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/timer_task.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/timer_task.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tuple.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tuple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tuple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tuple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tvar.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tvar.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tvar.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/tvar.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/at_exit.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/at_exit.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/at_exit.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/at_exit.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/engine.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/engine.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/engine.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/engine.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/monotonic_time.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/monotonic_time.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/monotonic_time.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/monotonic_time.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_extension_loader.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_extension_loader.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_extension_loader.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_extension_loader.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_integer.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_integer.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_integer.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/native_integer.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/processor_counter.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/processor_counter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/processor_counter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/utility/processor_counter.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/concurrent-ruby-1.1.4/lib/concurrent/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n.rb similarity index 89% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n.rb index dbf1384be6..b233be3ce2 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n.rb @@ -69,6 +69,13 @@ module I18n config.backend.reload! end + # Tells the backend to load translations now. Used in situations like the + # Rails production environment. Backends can implement whatever strategy + # is useful. + def eager_load! + config.backend.eager_load! + end + # Translates, pluralizes and interpolates a given key using a given locale, # scope, and default, as well as interpolation values. # @@ -169,15 +176,13 @@ module I18n # from the argument values passed to #translate. Therefor your lambdas should # always return the same translations/values per unique combination of argument # values. - def translate(*args) - options = args.last.is_a?(Hash) ? args.pop.dup : {} - key = args.shift - backend = config.backend - locale = options.delete(:locale) || config.locale - handling = options.delete(:throw) && :throw || options.delete(:raise) && :raise # TODO deprecate :raise - + def translate(key = nil, *, throw: false, raise: false, locale: nil, **options) # TODO deprecate :raise + locale ||= config.locale + raise Disabled.new('t') if locale == false enforce_available_locales!(locale) + backend = config.backend + result = catch(:exception) do if key.is_a?(Array) key.map { |k| backend.translate(locale, k, options) } @@ -185,7 +190,12 @@ module I18n backend.translate(locale, key, options) end end - result.is_a?(MissingTranslation) ? handle_exception(handling, result, locale, key, options) : result + + if result.is_a?(MissingTranslation) + handle_exception((throw && :throw || raise && :raise), result, locale, key, options) + else + result + end end alias :t :translate @@ -197,7 +207,9 @@ module I18n alias :t! :translate! # Returns true if a translation exists for a given key, otherwise returns false. - def exists?(key, locale = config.locale) + def exists?(key, _locale = nil, locale: _locale) + locale ||= config.locale + raise Disabled.new('exists?') if locale == false raise I18n::ArgumentError if key.is_a?(String) && key.empty? config.backend.exists?(locale, key) end @@ -253,37 +265,40 @@ module I18n # I18n.transliterate("Jürgen") # => "Juergen" # I18n.transliterate("Jürgen", :locale => :en) # => "Jurgen" # I18n.transliterate("Jürgen", :locale => :de) # => "Juergen" - def transliterate(*args) - options = args.pop.dup if args.last.is_a?(Hash) - key = args.shift - locale = options && options.delete(:locale) || config.locale - handling = options && (options.delete(:throw) && :throw || options.delete(:raise) && :raise) - replacement = options && options.delete(:replacement) + def transliterate(key, *, throw: false, raise: false, locale: nil, replacement: nil, **options) + locale ||= config.locale + raise Disabled.new('transliterate') if locale == false enforce_available_locales!(locale) + config.backend.transliterate(locale, key, replacement) rescue I18n::ArgumentError => exception - handle_exception(handling, exception, locale, key, options || {}) + handle_exception((throw && :throw || raise && :raise), exception, locale, key, options) end # Localizes certain objects, such as dates and numbers to local formatting. - def localize(object, options = nil) - options = options ? options.dup : {} - locale = options.delete(:locale) || config.locale - format = options.delete(:format) || :default + def localize(object, locale: nil, format: nil, **options) + locale ||= config.locale + raise Disabled.new('l') if locale == false enforce_available_locales!(locale) + + format ||= :default config.backend.localize(locale, object, format, options) end alias :l :localize # Executes block with given I18n.locale set. def with_locale(tmp_locale = nil) - if tmp_locale + if tmp_locale == nil + yield + else current_locale = self.locale - self.locale = tmp_locale + self.locale = tmp_locale + begin + yield + ensure + self.locale = current_locale + end end - yield - ensure - self.locale = current_locale if tmp_locale end # Merges the given locale, key and scope into a single array of keys. @@ -307,7 +322,7 @@ module I18n # Raises an InvalidLocale exception when the passed locale is not available. def enforce_available_locales!(locale) - if config.enforce_available_locales + if locale != false && config.enforce_available_locales raise I18n::InvalidLocale.new(locale) if !locale_available?(locale) end end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/base.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/base.rb similarity index 93% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/base.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/base.rb index 769ef46b53..724eb6aa3d 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/base.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/base.rb @@ -95,10 +95,19 @@ module I18n end def reload! + eager_load! if eager_loaded? + end + + def eager_load! + @eager_loaded = true end protected + def eager_loaded? + @eager_loaded ||= false + end + # The method which actually looks up for the translation in the store. def lookup(locale, key, scope = [], options = EMPTY_HASH) raise NotImplementedError @@ -248,12 +257,16 @@ module I18n end def translate_localization_format(locale, object, format, options) - format.to_s.gsub(/%[aAbBpP]/) do |match| + format.to_s.gsub(/%(|\^)[aAbBpP]/) do |match| case match when '%a' then I18n.t!(:"date.abbr_day_names", :locale => locale, :format => format)[object.wday] + when '%^a' then I18n.t!(:"date.abbr_day_names", :locale => locale, :format => format)[object.wday].upcase when '%A' then I18n.t!(:"date.day_names", :locale => locale, :format => format)[object.wday] + when '%^A' then I18n.t!(:"date.day_names", :locale => locale, :format => format)[object.wday].upcase when '%b' then I18n.t!(:"date.abbr_month_names", :locale => locale, :format => format)[object.mon] + when '%^b' then I18n.t!(:"date.abbr_month_names", :locale => locale, :format => format)[object.mon].upcase when '%B' then I18n.t!(:"date.month_names", :locale => locale, :format => format)[object.mon] + when '%^B' then I18n.t!(:"date.month_names", :locale => locale, :format => format)[object.mon].upcase when '%p' then I18n.t!(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).upcase if object.respond_to? :hour when '%P' then I18n.t!(:"time.#{object.hour < 12 ? :am : :pm}", :locale => locale, :format => format).downcase if object.respond_to? :hour end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cache.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cache.rb similarity index 99% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cache.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cache.rb index c8b02b269c..41b58fc20d 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cache.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cache.rb @@ -106,7 +106,7 @@ module I18n private def digest_item(key) - I18n.cache_key_digest ? I18n.cache_key_digest.hexdigest(key.to_s) : key.hash + I18n.cache_key_digest ? I18n.cache_key_digest.hexdigest(key.to_s) : key.to_s.hash end end end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cache_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cache_file.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cache_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cache_file.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cascade.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cascade.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/cascade.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/cascade.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/chain.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/chain.rb similarity index 97% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/chain.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/chain.rb index b3640ab8a6..f88da2d031 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/chain.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/chain.rb @@ -41,6 +41,10 @@ module I18n backends.each { |backend| backend.reload! } end + def eager_load! + backends.each { |backend| backend.eager_load! } + end + def store_translations(locale, data, options = EMPTY_HASH) backends.first.store_translations(locale, data, options) end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/fallbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/fallbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/flatten.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/flatten.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/flatten.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/flatten.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/gettext.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/gettext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/gettext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/interpolation_compiler.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/interpolation_compiler.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/interpolation_compiler.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/interpolation_compiler.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/key_value.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/key_value.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/key_value.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/key_value.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/memoize.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/memoize.rb similarity index 93% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/memoize.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/memoize.rb index 1aa1feb2f3..3293d2b427 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/memoize.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/memoize.rb @@ -26,6 +26,12 @@ module I18n super end + def eager_load! + memoized_lookup + available_locales + super + end + protected def lookup(locale, key, scope = nil, options = EMPTY_HASH) diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/metadata.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/metadata.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/metadata.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/metadata.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/pluralization.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/pluralization.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/pluralization.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/pluralization.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/simple.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/simple.rb similarity index 97% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/simple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/simple.rb index 75939499a9..b13abf1286 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/simple.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/simple.rb @@ -63,6 +63,11 @@ module I18n super end + def eager_load! + init_translations unless initialized? + super + end + def translations(do_init: false) # To avoid returning empty translations, # call `init_translations` diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/transliterator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/transliterator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/backend/transliterator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/backend/transliterator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/config.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/config.rb similarity index 98% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/config.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/config.rb index 106450175d..ea3dd1ee72 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/config.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/config.rb @@ -7,7 +7,7 @@ module I18n # The only configuration value that is not global and scoped to thread is :locale. # It defaults to the default_locale. def locale - defined?(@locale) && @locale ? @locale : default_locale + defined?(@locale) && @locale != nil ? @locale : default_locale end # Sets the current locale pseudo-globally, i.e. in the Thread.current hash. diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/core_ext/hash.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/core_ext/hash.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/core_ext/hash.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/core_ext/hash.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/exceptions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/exceptions.rb similarity index 80% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/exceptions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/exceptions.rb index a9d59dd60b..74b3d34efb 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/exceptions.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/exceptions.rb @@ -15,6 +15,20 @@ module I18n class ArgumentError < ::ArgumentError; end + class Disabled < ArgumentError + def initialize(method) + super(<<~MESSAGE) + I18n.#{method} is currently disabled, likely because your application is still in its loading phase. + + This method is meant to display text in the user locale, so calling it before the user locale has + been set is likely to display text from the wrong locale to some users. + + If you have a legitimate reason to access i18n data outside of the user flow, you can do so by passing + the desired locale explictly with the `locale` argument, e.g. `I18n.#{method}(..., locale: :en)` + MESSAGE + end + end + class InvalidLocale < ArgumentError attr_reader :locale def initialize(locale) diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext/helpers.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext/helpers.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext/helpers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext/helpers.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext/po_parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext/po_parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/gettext/po_parser.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/gettext/po_parser.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/interpolate/ruby.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/interpolate/ruby.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/interpolate/ruby.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/interpolate/ruby.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/fallbacks.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/fallbacks.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/fallbacks.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/fallbacks.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/parents.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/parents.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/parents.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/parents.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/rfc4646.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/rfc4646.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/rfc4646.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/rfc4646.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/simple.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/simple.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/locale/tag/simple.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/locale/tag/simple.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/middleware.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/middleware.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/middleware.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/middleware.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/version.rb similarity index 70% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/version.rb index 7cd24bf635..15575dfa70 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/i18n-1.5.3/lib/i18n/version.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/i18n-1.6.0/lib/i18n/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module I18n - VERSION = "1.5.3" + VERSION = "1.6.0" end diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/http/content_disposition_parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/http/content_disposition_parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/http/content_disposition_parser.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/http/content_disposition_parser.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/mechanize-2.7.6/lib/mechanize/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/generator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/generator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/generator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/generator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/parser.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/parser.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/parser.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/parser.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/plist-3.5.0/lib/plist/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/plist-3.5.0/lib/plist/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/config/default.yml b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/config/default.yml similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/config/default.yml rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/config/default.yml diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop-rspec.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop-rspec.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop-rspec.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop-rspec.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_left_let_brace.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_left_let_brace.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_left_let_brace.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_left_let_brace.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_right_let_brace.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_right_let_brace.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_right_let_brace.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/align_right_let_brace.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/any_instance.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/any_instance.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/any_instance.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/any_instance.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/around_block.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/around_block.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/around_block.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/around_block.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be_eql.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be_eql.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be_eql.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/be_eql.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/before_after_all.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/before_after_all.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/before_after_all.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/before_after_all.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/current_path_expectation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/current_path_expectation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/current_path_expectation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/current_path_expectation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/feature_methods.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/feature_methods.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/feature_methods.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/capybara/feature_methods.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/context_wording.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/context_wording.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/context_wording.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/context_wording.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/cop.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/cop.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/cop.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/cop.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_method.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_method.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_method.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_method.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_symbol.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_symbol.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_symbol.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/describe_symbol.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/described_class.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/described_class.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/described_class.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/described_class.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_example_group.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_example_group.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_example_group.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_example_group.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_example_group.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_example_group.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_example_group.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_example_group.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_final_let.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_final_let.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_final_let.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_final_let.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_hook.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_hook.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_hook.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_hook.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_subject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_subject.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_subject.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/empty_line_after_subject.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_length.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_length.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_length.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_length.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_without_description.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_without_description.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_without_description.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_without_description.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_wording.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_wording.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_wording.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/example_wording.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_actual.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_actual.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_actual.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_actual.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_change.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_change.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_change.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_change.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_in_hook.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_in_hook.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_in_hook.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_in_hook.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_output.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_output.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_output.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/expect_output.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/attribute_defined_statically.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/create_list.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/create_list.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/create_list.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/factory_bot/create_list.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/file_path.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/file_path.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/file_path.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/file_path.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/focus.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/focus.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/focus.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/focus.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hook_argument.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hook_argument.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hook_argument.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hook_argument.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hooks_before_examples.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hooks_before_examples.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hooks_before_examples.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/hooks_before_examples.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_expect.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_expect.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_expect.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_expect.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_subject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_subject.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_subject.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/implicit_subject.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_spy.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_spy.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_spy.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_spy.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_variable.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_variable.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_variable.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/instance_variable.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/invalid_predicate_matcher.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/invalid_predicate_matcher.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/invalid_predicate_matcher.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/invalid_predicate_matcher.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/it_behaves_like.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/it_behaves_like.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/it_behaves_like.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/it_behaves_like.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/iterated_expectation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/iterated_expectation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/iterated_expectation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/iterated_expectation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/leading_subject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/leading_subject.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/leading_subject.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/leading_subject.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_before_examples.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_before_examples.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_before_examples.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_before_examples.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_setup.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_setup.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_setup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/let_setup.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_chain.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_chain.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_chain.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_chain.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_expectation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_expectation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_expectation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_expectation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_spies.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_spies.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_spies.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/message_spies.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/missing_example_group_argument.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/missing_example_group_argument.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/missing_example_group_argument.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/missing_example_group_argument.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_describes.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_describes.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_describes.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_describes.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_expectations.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_expectations.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_expectations.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_expectations.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_subjects.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_subjects.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_subjects.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/multiple_subjects.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/named_subject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/named_subject.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/named_subject.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/named_subject.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/nested_groups.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/nested_groups.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/nested_groups.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/nested_groups.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/not_to_not.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/not_to_not.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/not_to_not.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/not_to_not.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/overwriting_setup.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/overwriting_setup.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/overwriting_setup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/overwriting_setup.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/pending.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/pending.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/pending.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/pending.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/predicate_matcher.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/predicate_matcher.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/predicate_matcher.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/predicate_matcher.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/rails/http_status.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/rails/http_status.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/rails/http_status.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/rails/http_status.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_counts.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_counts.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_counts.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_counts.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_never.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_never.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_never.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/receive_never.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_description.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_description.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_description.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_description.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_example.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_example.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_example.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/repeated_example.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/return_from_stub.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/return_from_stub.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/return_from_stub.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/return_from_stub.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_let.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_let.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_let.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_let.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_setup.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_setup.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_setup.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/scattered_setup.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_context.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_context.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_context.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_context.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_examples.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_examples.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_examples.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/shared_examples.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/single_argument_message_chain.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/single_argument_message_chain.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/single_argument_message_chain.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/single_argument_message_chain.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/subject_stub.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/subject_stub.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/subject_stub.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/subject_stub.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/unspecified_exception.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/unspecified_exception.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/unspecified_exception.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/unspecified_exception.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/verified_doubles.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/verified_doubles.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/verified_doubles.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/verified_doubles.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/void_expect.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/void_expect.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/void_expect.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/void_expect.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/yield.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/yield.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/yield.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec/yield.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec_cops.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec_cops.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec_cops.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/cop/rspec_cops.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/align_let_brace.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/align_let_brace.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/align_let_brace.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/align_let_brace.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/blank_line_separation.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/blank_line_separation.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/blank_line_separation.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/blank_line_separation.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/concept.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/concept.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/concept.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/concept.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/config_formatter.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/config_formatter.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/config_formatter.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/config_formatter.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/description_extractor.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/description_extractor.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/description_extractor.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/description_extractor.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example_group.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example_group.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example_group.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/example_group.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/final_end_location.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/final_end_location.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/final_end_location.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/final_end_location.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/hook.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/hook.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/hook.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/hook.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/inject.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/inject.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/inject.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/inject.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language/node_pattern.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language/node_pattern.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language/node_pattern.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/language/node_pattern.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/node.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/node.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/node.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/node.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/top_level_describe.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/top_level_describe.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/top_level_describe.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/top_level_describe.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/util.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/util.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/util.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/util.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/wording.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/wording.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/wording.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/rubocop-rspec-1.32.0/lib/rubocop/rspec/wording.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho.rb similarity index 97% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho.rb index 7983a72203..bb0336a499 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho.rb @@ -12,7 +12,7 @@ require_relative "macho/tools" # The primary namespace for ruby-macho. module MachO # release version - VERSION = "2.1.0".freeze + VERSION = "2.2.0".freeze # Opens the given filename as a MachOFile or FatFile, depending on its magic. # @param filename [String] the file being opened diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/exceptions.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/exceptions.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/exceptions.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/exceptions.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/fat_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/fat_file.rb similarity index 94% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/fat_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/fat_file.rb index 678ac78919..809f647ca1 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/fat_file.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/fat_file.rb @@ -11,6 +11,10 @@ module MachO # @return [String] the filename loaded from, or nil if loaded from a binary string attr_accessor :filename + # @return [Hash] any parser options that the instance was created with + # @note Options specified in a {FatFile} trickle down into the internal {MachOFile}s. + attr_reader :options + # @return [Headers::FatHeader] the file's header attr_reader :header @@ -49,9 +53,7 @@ module MachO machos.each do |macho| macho_offset = Utils.round(offset, 2**macho.segment_alignment) - if !fat64 && macho_offset > (2**32 - 1) - raise FatArchOffsetOverflowError, macho_offset - end + raise FatArchOffsetOverflowError, macho_offset if !fat64 && macho_offset > (2**32 - 1) macho_pads[macho] = Utils.padding_for(offset, 2**macho.segment_alignment) @@ -72,30 +74,36 @@ module MachO # Creates a new FatFile instance from a binary string. # @param bin [String] a binary string containing raw Mach-O data + # @param opts [Hash] options to control the parser with + # @note see {MachOFile#initialize} for currently valid options # @return [FatFile] a new FatFile - def self.new_from_bin(bin) + def self.new_from_bin(bin, **opts) instance = allocate - instance.initialize_from_bin(bin) + instance.initialize_from_bin(bin, opts) instance end # Creates a new FatFile from the given filename. # @param filename [String] the fat file to load from + # @param opts [Hash] options to control the parser with + # @note see {MachOFile#initialize} for currently valid options # @raise [ArgumentError] if the given file does not exist - def initialize(filename) + def initialize(filename, **opts) raise ArgumentError, "#{filename}: no such file" unless File.file?(filename) @filename = filename + @options = opts @raw_data = File.open(@filename, "rb", &:read) populate_fields end - # Initializes a new FatFile instance from a binary string. + # Initializes a new FatFile instance from a binary string with the given options. # @see new_from_bin # @api private - def initialize_from_bin(bin) + def initialize_from_bin(bin, opts) @filename = nil + @options = opts @raw_data = bin populate_fields end @@ -358,7 +366,7 @@ module MachO machos = [] fat_archs.each do |arch| - machos << MachOFile.new_from_bin(@raw_data[arch.offset, arch.size]) + machos << MachOFile.new_from_bin(@raw_data[arch.offset, arch.size], **options) end machos diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/headers.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/headers.rb similarity index 99% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/headers.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/headers.rb index 1af5822abf..0a940e405c 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/headers.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/headers.rb @@ -241,6 +241,10 @@ module MachO # @api private CPU_SUBTYPE_ARM64_32_V8 = 1 + # the e (A12) sub-type for `CPU_TYPE_ARM64` + # @api private + CPU_SUBTYPE_ARM64E = 2 + # the lowest common sub-type for `CPU_TYPE_MC88000` # @api private CPU_SUBTYPE_MC88000_ALL = 0 @@ -350,6 +354,7 @@ module MachO CPU_TYPE_ARM64 => { CPU_SUBTYPE_ARM64_ALL => :arm64, CPU_SUBTYPE_ARM64_V8 => :arm64v8, + CPU_SUBTYPE_ARM64E => :arm64e, }.freeze, CPU_TYPE_ARM64_32 => { CPU_SUBTYPE_ARM64_32_V8 => :arm64_32v8, diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/load_commands.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/load_commands.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/load_commands.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/load_commands.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/macho_file.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/macho_file.rb similarity index 93% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/macho_file.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/macho_file.rb index 081f1f2ea9..dc5bb3b914 100644 --- a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/macho_file.rb +++ b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/macho_file.rb @@ -9,10 +9,13 @@ module MachO class MachOFile extend Forwardable - # @return [String] the filename loaded from, or nil if loaded from a binary + # @return [String, nil] the filename loaded from, or nil if loaded from a binary # string attr_accessor :filename + # @return [Hash] any parser options that the instance was created with + attr_reader :options + # @return [Symbol] the endianness of the file, :big or :little attr_reader :endianness @@ -27,30 +30,36 @@ module MachO # Creates a new instance from a binary string. # @param bin [String] a binary string containing raw Mach-O data + # @param opts [Hash] options to control the parser with + # @option opts [Boolean] :permissive whether to ignore unknown load commands # @return [MachOFile] a new MachOFile - def self.new_from_bin(bin) + def self.new_from_bin(bin, **opts) instance = allocate - instance.initialize_from_bin(bin) + instance.initialize_from_bin(bin, opts) instance end # Creates a new instance from data read from the given filename. # @param filename [String] the Mach-O file to load from + # @param opts [Hash] options to control the parser with + # @option opts [Boolean] :permissive whether to ignore unknown load commands # @raise [ArgumentError] if the given file does not exist - def initialize(filename) + def initialize(filename, **opts) raise ArgumentError, "#{filename}: no such file" unless File.file?(filename) @filename = filename + @options = opts @raw_data = File.open(@filename, "rb", &:read) populate_fields end - # Initializes a new MachOFile instance from a binary string. + # Initializes a new MachOFile instance from a binary string with the given options. # @see MachO::MachOFile.new_from_bin # @api private - def initialize_from_bin(bin) + def initialize_from_bin(bin, opts) @filename = nil + @options = opts @raw_data = bin populate_fields end @@ -146,16 +155,13 @@ module MachO def insert_command(offset, lc, options = {}) context = LoadCommands::LoadCommand::SerializationContext.context_for(self) cmd_raw = lc.serialize(context) + fileoff = offset + cmd_raw.bytesize - if offset < header.class.bytesize || offset + cmd_raw.bytesize > low_fileoff - raise OffsetInsertionError, offset - end + raise OffsetInsertionError, offset if offset < header.class.bytesize || fileoff > low_fileoff new_sizeofcmds = sizeofcmds + cmd_raw.bytesize - if header.class.bytesize + new_sizeofcmds > low_fileoff - raise HeaderPadError, @filename - end + raise HeaderPadError, @filename if header.class.bytesize + new_sizeofcmds > low_fileoff # update Mach-O header fields to account for inserted load command update_ncmds(ncmds + 1) @@ -178,9 +184,8 @@ module MachO context = LoadCommands::LoadCommand::SerializationContext.context_for(self) cmd_raw = new_lc.serialize(context) new_sizeofcmds = sizeofcmds + cmd_raw.bytesize - old_lc.cmdsize - if header.class.bytesize + new_sizeofcmds > low_fileoff - raise HeaderPadError, @filename - end + + raise HeaderPadError, @filename if header.class.bytesize + new_sizeofcmds > low_fileoff delete_command(old_lc) insert_command(old_lc.view.offset, new_lc) @@ -511,6 +516,7 @@ module MachO # @raise [LoadCommandError] if an unknown load command is encountered # @api private def populate_load_commands + permissive = options.fetch(:permissive, false) offset = header.class.bytesize load_commands = [] @@ -519,11 +525,16 @@ module MachO cmd = @raw_data.slice(offset, 4).unpack(fmt).first cmd_sym = LoadCommands::LOAD_COMMANDS[cmd] - raise LoadCommandError, cmd if cmd_sym.nil? + raise LoadCommandError, cmd unless cmd_sym || permissive + + # If we're here, then either cmd_sym represents a valid load + # command *or* we're in permissive mode. + klass = if (klass_str = LoadCommands::LC_STRUCTURES[cmd_sym]) + LoadCommands.const_get klass_str + else + LoadCommands::LoadCommand + end - # why do I do this? i don't like declaring constants below - # classes, and i need them to resolve... - klass = LoadCommands.const_get LoadCommands::LC_STRUCTURES[cmd_sym] view = MachOView.new(@raw_data, endianness, offset) command = klass.new_from_bin(view) diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/sections.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/sections.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/sections.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/sections.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/structure.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/structure.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/structure.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/structure.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/tools.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/tools.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/tools.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/tools.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/utils.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/utils.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/utils.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/utils.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/view.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/view.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/ruby-macho-2.1.0/lib/macho/view.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/ruby-macho-2.2.0/lib/macho/view.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/atomic_reference_cache_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/atomic_reference_cache_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/atomic_reference_cache_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/atomic_reference_cache_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/cache.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/cache.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/cache.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/cache.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/mri_cache_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/mri_cache_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/mri_cache_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/mri_cache_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/non_concurrent_cache_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/non_concurrent_cache_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/non_concurrent_cache_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/non_concurrent_cache_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_cache_backend.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_cache_backend.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_cache_backend.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_cache_backend.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_delegator.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_delegator.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_delegator.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/synchronized_delegator.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/util.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/util.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/util.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/util.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/version.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/version.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/version.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/thread_safe-0.3.6/lib/thread_safe/version.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_index_definition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_index_definition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_index_definition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_index_definition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_timezone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_timezone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_timezone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/country_timezone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_source.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_source.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_source.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_source.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/data_timezone_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/info_timezone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/info_timezone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/info_timezone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/info_timezone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/linked_timezone_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/offset_rationals.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/offset_rationals.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/offset_rationals.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/offset_rationals.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_core_support.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_core_support.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_core_support.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_core_support.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_country_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_country_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_country_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_country_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_data_source.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_data_source.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_data_source.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/ruby_data_source.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/time_or_datetime.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/time_or_datetime.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/time_or_datetime.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/time_or_datetime.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_definition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_definition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_definition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_definition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_index_definition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_index_definition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_index_definition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_index_definition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_offset.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_offset.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_offset.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_offset.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_period.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_period.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_period.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_period.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_proxy.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_proxy.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_proxy.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_proxy.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition_definition.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition_definition.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition_definition.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/timezone_transition_definition.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/transition_data_timezone_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/transition_data_timezone_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/transition_data_timezone_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/transition_data_timezone_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_country_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_country_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_country_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_country_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_data_source.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_data_source.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_data_source.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_data_source.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_timezone_info.rb b/Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_timezone_info.rb similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_timezone_info.rb rename to Library/Homebrew/vendor/bundle/ruby/2.3.0/gems/tzinfo-1.2.5/lib/tzinfo/zoneinfo_timezone_info.rb diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.4.0 b/Library/Homebrew/vendor/bundle/ruby/2.4.0 similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.4.0 rename to Library/Homebrew/vendor/bundle/ruby/2.4.0 diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.5.0 b/Library/Homebrew/vendor/bundle/ruby/2.5.0 similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.5.0 rename to Library/Homebrew/vendor/bundle/ruby/2.5.0 diff --git a/Library/Homebrew/vendor/bundle-standalone/ruby/2.6.0 b/Library/Homebrew/vendor/bundle/ruby/2.6.0 similarity index 100% rename from Library/Homebrew/vendor/bundle-standalone/ruby/2.6.0 rename to Library/Homebrew/vendor/bundle/ruby/2.6.0 diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index c3ed4fb544..c1eeaa1102 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -206,9 +206,7 @@ class Version end def self.create(val) - unless val.respond_to?(:to_str) - raise TypeError, "Version value must be a string; got a #{val.class} (#{val})" - end + raise TypeError, "Version value must be a string; got a #{val.class} (#{val})" unless val.respond_to?(:to_str) if val.to_str.start_with?("HEAD") HeadVersion.new(val) @@ -365,9 +363,7 @@ class Version private_class_method :_parse def initialize(val) - unless val.respond_to?(:to_str) - raise TypeError, "Version value must be a string; got a #{val.class} (#{val})" - end + raise TypeError, "Version value must be a string; got a #{val.class} (#{val})" unless val.respond_to?(:to_str) @version = val.to_str end diff --git a/README.md b/README.md index a301a3a3ac..a436e15a2f 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,11 @@ Good luck! Please report security issues to our [HackerOne](https://hackerone.com/homebrew/). ## Who Are You? -Homebrew's project lead is [Mike McQuaid](https://github.com/MikeMcQuaid). +Homebrew's [Project Leader](https://github.com/Homebrew/homebrew-governance-private/blob/master/GOVERNANCE.md#6-project-leader) is [Mike McQuaid](https://github.com/MikeMcQuaid). -Homebrew's project leadership committee is [Misty De Meo](https://github.com/mistydemeo), [Shaun Jackman](https://github.com/sjackman), [Jonathan Chang](https://github.com/jonchang), [Mike McQuaid](https://github.com/MikeMcQuaid) and [Markus Reiter](https://github.com/reitermarkus). +Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee) is [Misty De Meo](https://github.com/mistydemeo), [Shaun Jackman](https://github.com/sjackman), [Jonathan Chang](https://github.com/jonchang), [Mike McQuaid](https://github.com/MikeMcQuaid) and [Markus Reiter](https://github.com/reitermarkus). -Homebrew's technical steering committee is [Michka Popoff](https://github.com/imichka), [FX Coudert](https://github.com/fxcoudert), [Markus Reiter](https://github.com/reitermarkus), [Misty De Meo](https://github.com/mistydemeo) and [Mike McQuaid](https://github.com/MikeMcQuaid). +Homebrew's [Technical Steering Committee](https://docs.brew.sh/Homebrew-Governance#7-technical-steering-committee) is [Michka Popoff](https://github.com/imichka), [FX Coudert](https://github.com/fxcoudert), [Markus Reiter](https://github.com/reitermarkus), [Misty De Meo](https://github.com/mistydemeo) and [Mike McQuaid](https://github.com/MikeMcQuaid). Homebrew/brew's Linux support (and Linuxbrew) maintainers are [Michka Popoff](https://github.com/imichka) and [Shaun Jackman](https://github.com/sjackman). diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c21e217b42..a3109338fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,13 +36,10 @@ jobs: pool: vmImage: ubuntu-16.04 steps: - - bash: | - set -e - HOMEBREW_REPOSITORY=/home/linuxbrew/.linuxbrew - sudo mkdir -p /home/linuxbrew - sudo mv "$PWD" "$HOMEBREW_REPOSITORY" - sudo ln -s "$HOMEBREW_REPOSITORY" "$PWD" - "$HOMEBREW_REPOSITORY/bin/brew" test-bot + - bash: docker-compose -f Dockerfile.test.yml build sut + displayName: Build Docker image + + - bash: docker-compose -f Dockerfile.test.yml run --rm -v $(Build.ArtifactStagingDirectory):/tmp/test-bot sut displayName: Run brew test-bot env: HOMEBREW_GITHUB_API_TOKEN: $(github.publicApiToken) @@ -52,4 +49,4 @@ jobs: condition: succeededOrFailed() inputs: testRunner: JUnit - testResultsFiles: brew-test-bot.xml + testResultsFiles: $(Build.ArtifactStagingDirectory)/brew-test-bot.xml diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 8e5feaeb78..34e792fd27 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -41,18 +41,19 @@ __brew_formulae_or_ruby_files() { # completions remain in cache until any tap has new commits __brew_completion_caching_policy() { - # rebuild cache if no cache file exists (anyway we cannot proceed further down) - ! [[ -f "$1" ]] && return 0 - # cache file modification date (seconds since epoch) - local -i cache_mtime=$(date -r "$1" +%s) - # latest modified homebrew tap index file - local latest_modified_git_index=(${HOMEBREW_REPOSITORY:-/usr/local/Homebrew}/Library/Taps/*/*/.git/index(om[1])) - local -i commit_mtime=$(date -r "$latest_modified_git_index" +%s) - (( $cache_mtime < $commit_mtime )) + local -a tmp + + # invalidate if cache file is missing or >=2 weeks old + tmp=( $1(mw-2N) ) + (( $#tmp )) || return 0 + + # otherwise, invalidate if latest tap index file is missing or newer than + # cache file + tmp=( ${HOMEBREW_REPOSITORY:-/usr/local/Homebrew}/Library/Taps/*/*/.git/index(om[1]N) ) + [[ -z $tmp || $tmp -nt $1 ]] } __brew_formulae() { - zstyle ":completion:${curcontext}:" cache-policy __brew_completion_caching_policy local -a formulae local comp_cachename=brew_formulae if _cache_invalid $comp_cachename || ! _retrieve_cache $comp_cachename; then @@ -147,7 +148,6 @@ __brew_common_commands() { } __brew_all_commands() { - zstyle ":completion:${curcontext}:" cache-policy __brew_completion_caching_policy local -a commands local comp_cachename=brew_all_commands if _cache_invalid $comp_cachename || ! _retrieve_cache $comp_cachename; then @@ -808,7 +808,7 @@ _brew_vendor_install() { # the main completion function _brew() { local curcontext="$curcontext" state state_descr line expl - local ret=1 + local tmp ret=1 _arguments -C : \ '(-v)-v[verbose]' \ @@ -816,7 +816,15 @@ _brew() { '*::options:->options' && return 0 case "$state" in - command) __brew_commands && return 0 ;; + command) + # set default cache policy + zstyle -s ":completion:${curcontext%:*}:*" cache-policy tmp + [[ -n $tmp ]] || + zstyle ":completion:${curcontext%:*}:*" cache-policy \ + __brew_completion_caching_policy + + __brew_commands && return 0 + ;; options) local command_or_alias command local -A aliases @@ -827,7 +835,14 @@ _brew() { command="${aliases[$command_or_alias]:-$command_or_alias}" # change context to e.g. brew-list - curcontext="${curcontext%:*:*}:brew-${command}" + curcontext="${curcontext%:*}-${command}:${curcontext##*:}" + + # set default cache policy (we repeat this dance because the context + # service differs from above) + zstyle -s ":completion:${curcontext%:*}:*" cache-policy tmp + [[ -n $tmp ]] || + zstyle ":completion:${curcontext%:*}:*" cache-policy \ + __brew_completion_caching_policy # call completion for named command e.g. _brew_list local completion_func="_brew_${command//-/_}" diff --git a/docs/Formula-Cookbook.md b/docs/Formula-Cookbook.md index d5842e746d..e9fbae0978 100644 --- a/docs/Formula-Cookbook.md +++ b/docs/Formula-Cookbook.md @@ -160,7 +160,7 @@ description can be overridden using the normal option syntax (in this case, the ``` * Some [`Requirement`](https://www.rubydoc.info/github/Homebrew/brew/master/Requirement)s can also take a string specifying their minimum version that the formula depends on. -We frown on [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s in Homebrew/homebrew-core as they are not tested by CI. +**Note:** [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s are not allowed in Homebrew/homebrew-core as they are not tested by CI. ### Specifying conflicts with other formulae @@ -635,6 +635,8 @@ Note that in the context of Homebrew, [`libexec`](https://www.rubydoc.info/githu ### Adding optional steps +**Note:** [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s are not allowed in Homebrew/homebrew-core as they are not tested by CI. + If you want to add an [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method): ```ruby @@ -661,9 +663,7 @@ end [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method) names should be prefixed with the words `with` or `without`. For example, an option to run a test suite should be named `--with-test` or `--with-check` rather than `--test`, and an option to enable a shared library `--with-shared` rather than `--shared` or `--enable-shared`. -**Note:** [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s that aren’t `build.with? ` or `build.without?` should be deprecated with [`deprecated_option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#deprecated_option-class_method). See [`wget`](https://github.com/Homebrew/homebrew-core/blob/3f762b63c6fbbd49191ffdf58574d7e18937d93f/Formula/wget.rb#L27-L31) for an example. - -We frown on [`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s in Homebrew/homebrew-core as they are not tested by CI. +[`option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#option-class_method)s that aren’t `build.with? ` or `build.without?` should be deprecated with [`deprecated_option`](https://www.rubydoc.info/github/Homebrew/brew/master/Formula#deprecated_option-class_method). See [`wget`](https://github.com/Homebrew/homebrew-core/blob/3f762b63c6fbbd49191ffdf58574d7e18937d93f/Formula/wget.rb#L27-L31) for an example. ### File level operations @@ -700,9 +700,9 @@ Homebrew provides two formula DSL methods for launchd plist files: Homebrew has multiple levels of environment variable filtering which affects variables available to formulae. -Firstly, the overall environment in which Homebrew runs is filtered to avoid environment contamination breaking from-source builds (https://github.com/Homebrew/brew/issues/932). In particular, this process filters all but the given whitelisted variables, but allows environment variables prefixed with `HOMEBREW_`. The specific implementation can be seen in [`bin/brew`](https://github.com/Homebrew/brew/blob/master/bin/brew). +Firstly, the overall environment in which Homebrew runs is filtered to avoid environment contamination breaking from-source builds (). In particular, this process filters all but the given whitelisted variables, but allows environment variables prefixed with `HOMEBREW_`. The specific implementation can be seen in [`bin/brew`](https://github.com/Homebrew/brew/blob/master/bin/brew). -The second level of filtering removes sensitive environment variables (such as credentials like keys, passwords or tokens) to avoid malicious subprocesses obtaining them (https://github.com/Homebrew/brew/pull/2524). This has the effect of preventing any such variables from reaching a formula's Ruby code as they are filtered before it is called. The specific implementation can be seen in the [`ENV.clear_sensitive_environment!` method](https://github.com/Homebrew/brew/blob/master/Library/Homebrew/extend/ENV.rb). +The second level of filtering removes sensitive environment variables (such as credentials like keys, passwords or tokens) to avoid malicious subprocesses obtaining them (). This has the effect of preventing any such variables from reaching a formula's Ruby code as they are filtered before it is called. The specific implementation can be seen in the [`ENV.clear_sensitive_environment!` method](https://github.com/Homebrew/brew/blob/master/Library/Homebrew/extend/ENV.rb). In summary, environment variables used by a formula need to conform to these filtering rules in order to be available. diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index e25b344dbb..1a5189e1de 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -31,9 +31,9 @@ GEM ffi (1.10.0) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (196) + github-pages (197) activesupport (= 4.2.10) - github-pages-health-check (= 1.16.0) + github-pages-health-check (= 1.16.1) jekyll (= 3.7.4) jekyll-avatar (= 0.6.0) jekyll-coffeescript (= 1.1.1) @@ -76,7 +76,7 @@ GEM nokogiri (>= 1.8.5, < 2.0) rouge (= 2.2.1) terminal-table (~> 1.4) - github-pages-health-check (1.16.0) + github-pages-health-check (1.16.1) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) @@ -219,7 +219,7 @@ GEM mini_portile2 (~> 2.4.0) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.13.0) + parallel (1.14.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) @@ -232,7 +232,7 @@ GEM i18n ruby_dep (1.5.0) rubyzip (1.2.2) - safe_yaml (1.0.4) + safe_yaml (1.0.5) sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -248,7 +248,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) yell (2.0.7) PLATFORMS diff --git a/docs/Homebrew-Governance.md b/docs/Homebrew-Governance.md new file mode 100644 index 0000000000..28cf93a456 --- /dev/null +++ b/docs/Homebrew-Governance.md @@ -0,0 +1,97 @@ +# Homebrew Governance + +## 1. Definitions + +- PLC: Project Leadership Committee +- TSC: Technical Steering Committee +- AGM: Annual General Meeting + +## 2. Members + +1. New members will be admitted by majority vote of the Project Leadership Committee (PLC) and added to the Homebrew organisation on GitHub. + +2. Members may vote in all general elections and resolutions, hold office for Homebrew, and participate in all other membership functions. + +3. Members are expected to remain active within Homebrew, and are required to affirm their continued interest in Homebrew membership annually. + +4. Members may be dismissed by majority vote of the Project Leadership Committee and removed from the Homebrew organisation on GitHub. Removed members may be reinstated by the usual admission process. + +5. All members will follow the [Homebrew Code of Conduct](https://github.com/Homebrew/brew/blob/master/CODE_OF_CONDUCT.md). Changes to the code of conduct must be approved by the PLC. + +6. Homebrew members will comply with the Software Freedom Conservancy's [conflict of interest policy](https://sfconservancy.org/projects/policies/conflict-of-interest-policy.html). + +7. Members should abstain from voting when they have a conflict of interest not shared by other members. No one may be compelled to abstain from voting. + +## 3. General Meetings of Members + +1. A general meeting of the members may be called by the PLC with at least three weeks notice. + +2. The quorum to vote on resolutions and elections at a general meeting is 3 voting members or 10% of the voting members, whichever is greater. + +3. Homebrew members will meet at the annual general meeting (AGM) in a manner determined by the PLC. + +4. General elections will be held at the AGM. + +5. The PLC will announce candidates and proposals three weeks prior to the election date. + +6. Members may cast a vote any time up to three weeks prior to the election date. + +### 3.1. Amendments to these bylaws + +1. These bylaws may be amended by a special resolution at a general meeting of the members. A special resolution requires a two-thirds supermajority. + +2. Any member may propose an amendment via pull request on GitHub against this document. + +3. Members shall vote on any amendments by approving or requesting changes on the GitHub pull request. Voting will close three weeks after an amendment is proposed, and all votes tallied. + +4. Any approved amendments will take effect three weeks after the close of voting. + +5. No amendment may be proposed which violates Software Freedom Conservancy policies. The PLC may veto such an amendment by an ordinary resolution. + +## 4. Project Leadership Committee + +1. The governance and operation of Homebrew is determined by the PLC. The PLC will represent Homebrew in all dealings with the Software Freedom Conservancy (SFC). The PLC has final authority in all matters related to the operation of Homebrew, and will comply with all Software Freedom Conservancy policies. + +2. The PLC consists of five members. Committee members are elected by majority vote of Homebrew members. Each PLC member will serve a term of two years or until the member's successor is elected. Any sudden vacancy in the PLC will be filled by the usual procedure for electing PLC members at the next general meeting, typically the next AGM. + +3. Three weeks prior to the AGM, the PLC will nominate at least one candidate for each upcoming vacant seat. Any member may also nominate any other member as a candidate for the PLC at this time. + +4. The PLC will deliver a report of their activities, decisions, and financial statements to the Homebrew members at the AGM. + +5. No more than two employees of the same employer may serve on the PLC. + +## 5. Meetings of the Project Leadership Committee + +1. A meeting of the PLC may be called by any two of its members with at least three weeks notice, unless all PLC members agree to a shorter notice period. + +2. The quorum to vote on resolutions at a meeting of the PLC is a majority of its members. + +3. A majority of the entire membership of the PLC is required to pass an ordinary resolution. + +4. The PLC will meet annually to review the status of all members and remove inactive members and those who have not affirmed a commitment to Homebrew in the past year. Voting in the AGM confirms that a member wishes to remain active with the project. After the AGM, the PLC will ask the members who did not vote whether they wish to remain active with the project. The PLC removes any members who don't respond to this second request after three weeks. + +5. The PLC will appoint the members of the Technical Steering Committee (TSC). + +6. Any member may refer any question or dispute to the PLC. All technical matters should first be referred to the TSC. Non-technical matters may be referred directly to the PLC. Members will make a good faith effort to resolve any disputes prior to referral to the PLC. + +7. The PLC may meet by any mutually agreeable means, such as text chat, voice or video call, and in person. Members of the PLC must meet at least once per quarter. Members of the PLC must meet by video call or in person at least once per year. + +## 6. Project Leader + +1. The Project Leader will represent Homebrew publicly, and manage all day-to-day technical decisions related to the operation of Homebrew. + +2. The Project Leader will be elected annually by a majority vote of Homebrew members. The PLC will nominate at least one candidate for Project Leader. Any member may nominate a candidate, or self-nominate. Nominations must be announced to the membership three weeks before the AGM. + +3. Any vacancy of the Project Leader will be filled by appointment of the PLC. + +4. After March 1, 2020, the Project Leader may not be a member of the PLC. + +## 7. Technical Steering Committee + +1. The TSC has the authority to decide on any technical matter, including technical disputes between Homebrew members. The TSC will also decide the long-term roadmap of Homebrew, including large features or major changes to the Homebrew software. + +2. The PLC will appoint between three and five members to the TSC. The Project Leader must be one of these appointees. Appointed TSC members will serve a term of one year or until the member's successor is appointed. + +3. Any member may refer any technical question or dispute to the TSC. Members will make a good faith effort to resolve any disputes prior to referral to the TSC. + +4. No more than two employees of the same employer may serve on the TSC. diff --git a/docs/Installation.md b/docs/Installation.md index 85a5ec5e9d..bf3d07ffe7 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -1,7 +1,6 @@ # Installation -The supported and best way to install Homebrew is on the -[homepage](https://brew.sh). +Instructions for a supported install of Homebrew are on the [homepage](https://brew.sh). This script installs Homebrew to `/usr/local` so that [you don’t need sudo](FAQ.md#why-does-homebrew-say-sudo-is-bad) when you @@ -11,7 +10,7 @@ it does it too. You have to confirm everything it will do before it starts. ## macOS Requirements -* An 64-bit Intel CPU [1](#1) +* A 64-bit Intel CPU [1](#1) * macOS 10.12 (or higher) [2](#2) * Command Line Tools (CLT) for Xcode: `xcode-select --install`, [developer.apple.com/downloads](https://developer.apple.com/downloads) or diff --git a/docs/Interesting-Taps-and-Forks.md b/docs/Interesting-Taps-and-Forks.md index 0b849b2141..5d6c8f7e4e 100644 --- a/docs/Interesting-Taps-and-Forks.md +++ b/docs/Interesting-Taps-and-Forks.md @@ -6,6 +6,7 @@ Homebrew has the capability to add (and remove) multiple taps to your local inst Your taps are Git repositories located at `$(brew --repository)/Library/Taps`. ## Unsupported interesting taps +* [varenc/ffmpeg](https://github.com/varenc/homebrew-ffmpeg): A tap for FFmpeg with additional options, including nonfree additions. * [denji/nginx](https://github.com/denji/homebrew-nginx): A tap for NGINX modules, intended for its `nginx-full` formula which includes more module options. diff --git a/docs/Linuxbrew.md b/docs/Linuxbrew.md index 326bbdb514..5941f073a8 100644 --- a/docs/Linuxbrew.md +++ b/docs/Linuxbrew.md @@ -61,9 +61,9 @@ sudo apt-get install build-essential curl file git sudo yum groupinstall 'Development Tools' && sudo yum install curl file git ``` -### Raspberry Pi +### ARM -Linuxbrew can run on Raspberry Pi (32-bit ARM), but no binary packages (bottles) are available. Support for Raspberry Pi is on a best-effort basis. Pull requests are welcome to improve the experience on Raspberry Pi. +Linuxbrew can run on 32-bit ARM (Raspberry Pi and others) and 64-bit ARM (AArch64), but no binary packages (bottles) are available. Support for ARM is on a best-effort basis. Pull requests are welcome to improve the experience on ARM platforms. ### 32-bit x86 @@ -83,7 +83,7 @@ eval $(~/.linuxbrew/bin/brew shellenv) ## Linuxbrew Community - [@Linuxbrew on Twitter](https://twitter.com/Linuxbrew) -- [Linuxbrew/core on GitHub](https://github.com/Linuxbrew/homebrew-core) +- [Homebrew/linuxbrew-core on GitHub](https://github.com/Homebrew/linuxbrew-core) - [Linuxbrew category](https://discourse.brew.sh/c/linuxbrew) of [Homebrew's Discourse](https://discourse.brew.sh) ## Sponsors diff --git a/docs/Maintainer-Guidelines.md b/docs/Maintainer-Guidelines.md index 129d11515c..32446ce410 100644 --- a/docs/Maintainer-Guidelines.md +++ b/docs/Maintainer-Guidelines.md @@ -164,9 +164,3 @@ This makes it easier for other maintainers, contributors and users to follow alo All maintainers (and lead maintainer) communication through any medium is bound by [Homebrew's Code of Conduct](https://github.com/Homebrew/brew/blob/master/CODE_OF_CONDUCT.md#code-of-conduct). Abusive behaviour towards other maintainers, contributors or users will not be tolerated; the maintainer will be given a warning and if their behaviour continues they will be removed as a maintainer. Maintainers should feel free to pleasantly disagree with the work and decisions of other maintainers. Healthy, friendly, technical disagreement between maintainers is actively encouraged and should occur in public on the issue tracker to make the project better. Interpersonal issues should be handled privately in Slack, ideally with moderation. If work or decisions are insufficiently documented or explained any maintainer or contributor should feel free to ask for clarification. No maintainer may ever justify a decision with e.g. "because I say so" or "it was I who did X" alone. Off-topic discussions on the issue tracker, [bike-shedding](https://en.wikipedia.org/wiki/Law_of_triviality) and personal attacks are forbidden. - -## Project lead guidelines - -There should be one project lead for Homebrew. On February 4, 2019, coinciding with the Homebrew maintainers' conference, Mike McQuaid stepped down as lead maintainer of Homebrew. He was elected by a supermajority of Homebrew maintainers into the new project lead role. - -Additional documentation for the project lead and governance are to follow. diff --git a/docs/Manpage.md b/docs/Manpage.md index 2810b35639..b1c20e9156 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -339,7 +339,7 @@ By default, version information is displayed in interactive shells, and suppressed otherwise. * `--json`: - Show output in JSON format for provided *`version`*. Currently the only accepted value of *`version`* is `v1`. + Print output in JSON format. Currently the default and only accepted value for *`version`* is `v1`. See the docs for examples of using the JSON output: * `--fetch-HEAD`: Fetch the upstream repository to detect if the HEAD installation of the formula is outdated. Otherwise, the repository's HEAD will be checked for updates when a new stable or development version has been released. @@ -479,7 +479,7 @@ Display a brief summary of all installed taps if no *`tap`* are passed. * `--installed`: Display information on all installed taps. * `--json`: - Print a JSON representation of *`taps`*. Currently the only accepted value for *`version`* is `v1`. See the docs for examples of using the JSON output: + Print a JSON representation of *`taps`*. Currently the default and only accepted value for *`version`* is `v1`. See the docs for examples of using the JSON output: ### `tap-pin` *`tap`* @@ -1193,11 +1193,11 @@ Homebrew Documentation: ## AUTHORS -Homebrew's project lead is Mike McQuaid. +Homebrew's Project Leader is Mike McQuaid. -Homebrew's project leadership committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Mike McQuaid and Markus Reiter. +Homebrew's Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Mike McQuaid and Markus Reiter. -Homebrew's technical steering committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid. +Homebrew's Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid. Homebrew/brew's Linux support (and Linuxbrew) maintainers are Michka Popoff and Shaun Jackman. diff --git a/docs/New-Maintainer-Checklist.md b/docs/New-Maintainer-Checklist.md index ebdd68d402..f9839bc273 100644 --- a/docs/New-Maintainer-Checklist.md +++ b/docs/New-Maintainer-Checklist.md @@ -68,9 +68,9 @@ If they are interested in doing system administration work or Homebrew/brew rele - Invite them to the [`homebrew-ops` private operations mailing list](https://lists.sfconservancy.org/mailman/admin/homebrew-ops/members/add). - Invite them to the [`homebrew` private 1Password](https://homebrew.1password.com/people). -If they are elected to the Homebrew's [Software Freedom Conservancy](https://sfconservancy.org) Project Leadership Committee: +If they are elected to the Homebrew's [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee): -- Email their name, email and employer to homebrew@sfconservancy.org +- Email their name, email and employer to the [Software Freedom Conservancy](https://sfconservancy.org) at homebrew@sfconservancy.org - Make them [owners on the Homebrew GitHub organisation](https://github.com/orgs/Homebrew/people) - Invite them to the [**@Homebrew/plc** team](https://github.com/orgs/Homebrew/teams/plc/members) - Invite them to [Google Analytics](https://analytics.google.com/analytics/web/#management/Settings/a76679469w115400090p120682403/%3Fm.page%3DAccountUsers/) and add them to the relevant section of the [Homebrew/brew's README](https://github.com/Homebrew/brew/edit/master/README.md). @@ -80,3 +80,7 @@ If they are elected to the Homebrew's [Software Freedom Conservancy](https://sfc If there are problems, ask them to step down as a maintainer and revoke their access to all of the above. Now sit back, relax and let the new maintainers handle more of our contributions. + +## Members + +People who are either not eligible or willing to be Homebrew maintainers but have shown continued involvement in the Homebrew community may be admitted by a majority vote of the [Project Leadership Committee](https://docs.brew.sh/Homebrew-Governance#4-project-leadership-committee) to join the Homebrew GitHub organisation as [members](https://docs.brew.sh/Homebrew-Governance#2-members). diff --git a/docs/README.md b/docs/README.md index 84a33413d3..995c62ed23 100644 --- a/docs/README.md +++ b/docs/README.md @@ -50,3 +50,7 @@ - [Brew Test Bot For Maintainers](Brew-Test-Bot-For-Core-Contributors.md) - [Common Issues for Maintainers](Common-Issues-for-Core-Contributors.md) - [Releases](Releases.md) + +## Governance + +- [Homebrew Governance](Homebrew-Governance.md) diff --git a/docs/Releases.md b/docs/Releases.md index 9f779b7a25..33a28f6aa0 100644 --- a/docs/Releases.md +++ b/docs/Releases.md @@ -22,14 +22,14 @@ If this is a major or minor release (e.g. X.0.0 or X.Y.0) then there are a few m 1. Before creating the tag you should delete any `odisabled` code, make any `odeprecated` code `odisabled` and add any new `odeprecations` that are desired. -2. Write up a release notes blog post to https://brew.sh - e.g. https://github.com/Homebrew/brew.sh/pull/319. +2. Write up a release notes blog post to + e.g. [brew.sh#319](https://github.com/Homebrew/brew.sh/pull/319). This should use `brew release-notes` as input but have the wording adjusted to be more human readable and explain not just what has changed but why. 3. When the release has shipped and the blog post has been merged, tweet the - blog post as the @MacHomebrew Twitter account or tweet it yourself and - retweet it with the @MacHomebrew Twitter account (credentials are in - 1Password). + blog post as the [@MacHomebrew Twitter account](https://twitter.com/MacHomebrew) + or tweet it yourself and retweet it with the @MacHomebrew Twitter account + (credentials are in 1Password). 4. Send the email to the Homebrew TinyLetter email list (credentials are in 1Password). 5. Consider whether to submit it to other sources e.g. Hacker News, Reddit. diff --git a/docs/Shell-Completion.md b/docs/Shell-Completion.md index 394b70624d..fda2ac7727 100644 --- a/docs/Shell-Completion.md +++ b/docs/Shell-Completion.md @@ -11,7 +11,7 @@ You must configure your shell to enable the completion support. This is because To make Homebrew's completions available in `bash`, you must source the definitions as part of your shell startup. Add the following to your `~/.bashrc` file: ```sh -if type brew 2&>/dev/null; then +if type brew &>/dev/null; then for COMPLETION in $(brew --prefix)/etc/bash_completion.d/* do [[ -f $COMPLETION ]] && source "$COMPLETION" diff --git a/manpages/brew-cask.1 b/manpages/brew-cask.1 index 3e5bbc21e0..dad16b8afb 100644 --- a/manpages/brew-cask.1 +++ b/manpages/brew-cask.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW\-CASK" "1" "February 2019" "Homebrew" "brew-cask" +.TH "BREW\-CASK" "1" "March 2019" "Homebrew" "brew-cask" . .SH "NAME" \fBbrew\-cask\fR \- a friendly binary installer for macOS diff --git a/manpages/brew.1 b/manpages/brew.1 index 2c6cb8d9c7..786bcac947 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW" "1" "February 2019" "Homebrew" "brew" +.TH "BREW" "1" "March 2019" "Homebrew" "brew" . .SH "NAME" \fBbrew\fR \- The missing package manager for macOS @@ -438,7 +438,7 @@ By default, version information is displayed in interactive shells, and suppress . .TP \fB\-\-json\fR -Show output in JSON format for provided \fIversion\fR\. Currently the only accepted value of \fIversion\fR is \fBv1\fR\. +Print output in JSON format\. Currently the default and only accepted value for \fIversion\fR is \fBv1\fR\. See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR . .TP \fB\-\-fetch\-HEAD\fR @@ -603,7 +603,7 @@ Display information on all installed taps\. . .TP \fB\-\-json\fR -Print a JSON representation of \fItaps\fR\. Currently the only accepted value for \fIversion\fR is \fBv1\fR\. See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR +Print a JSON representation of \fItaps\fR\. Currently the default and only accepted value for \fIversion\fR is \fBv1\fR\. See the docs for examples of using the JSON output: \fIhttps://docs\.brew\.sh/Querying\-Brew\fR . .SS "\fBtap\-pin\fR \fItap\fR" Pin \fItap\fR, prioritising its formulae over core when formula names are supplied by the user\. See also \fBtap\-unpin\fR\. @@ -1446,13 +1446,13 @@ Homebrew Documentation: \fIhttps://docs\.brew\.sh\fR \fBbrew\-cask\fR(1), \fBgit\fR(1), \fBgit\-log\fR(1) . .SH "AUTHORS" -Homebrew\'s project lead is Mike McQuaid\. +Homebrew\'s Project Leader is Mike McQuaid\. . .P -Homebrew\'s project leadership committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Mike McQuaid and Markus Reiter\. +Homebrew\'s Project Leadership Committee is Misty De Meo, Shaun Jackman, Jonathan Chang, Mike McQuaid and Markus Reiter\. . .P -Homebrew\'s technical steering committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid\. +Homebrew\'s Technical Steering Committee is Michka Popoff, FX Coudert, Markus Reiter, Misty De Meo and Mike McQuaid\. . .P Homebrew/brew\'s Linux support (and Linuxbrew) maintainers are Michka Popoff and Shaun Jackman\.