Merge pull request #1947 from reitermarkus/rubocop-constants

Use constants for RuboCop version.
This commit is contained in:
Markus Reiter 2017-02-12 23:27:22 +01:00 committed by GitHub
commit cfc90af3cb
6 changed files with 25 additions and 4 deletions

View File

@ -23,12 +23,10 @@ module Hbc
$CHILD_STATUS.success?
end
RUBOCOP_CASK_VERSION = "~> 0.10.6".freeze
def install_rubocop
Utils.capture_stderr do
begin
Homebrew.install_gem_setup_path! "rubocop-cask", RUBOCOP_CASK_VERSION, "rubocop"
Homebrew.install_gem_setup_path! "rubocop-cask", HOMEBREW_RUBOCOP_CASK_VERSION, "rubocop"
rescue SystemExit
raise CaskError, Tty.strip_ansi($stderr.string).chomp.sub(/\AError: /, "")
end

View File

@ -1,4 +1,6 @@
require "English"
require "open3"
require "rubygems"
describe Hbc::CLI::Style do
let(:args) { [] }
@ -77,6 +79,20 @@ describe Hbc::CLI::Style do
expect { subject }.to raise_error(Hbc::CaskError)
end
end
context "version" do
it "matches `HOMEBREW_RUBOCOP_VERSION`" do
stdout, status = Open3.capture2("gem", "dependency", "rubocop-cask", "--version", HOMEBREW_RUBOCOP_CASK_VERSION, "--pipe", "--remote")
expect(status).to be_a_success
requirement = Gem::Requirement.new(stdout.scan(/rubocop --version '(.*)'/).flatten.first)
version = Gem::Version.new(HOMEBREW_RUBOCOP_VERSION)
expect(requirement).not_to be_none
expect(requirement).to be_satisfied_by(version)
end
end
end
describe "#cask_paths" do

View File

@ -47,7 +47,7 @@ module Homebrew
def check_style_impl(files, output_type, options = {})
fix = options[:fix]
Homebrew.install_gem_setup_path! "rubocop", "0.47.1"
Homebrew.install_gem_setup_path! "rubocop", HOMEBREW_RUBOCOP_VERSION
args = %w[
--force-exclusion

View File

@ -2,6 +2,8 @@ unless ENV["HOMEBREW_BREW_FILE"]
raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
end
require "constants"
# Path to `bin/brew` main executable in HOMEBREW_PREFIX
HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])

View File

@ -0,0 +1,3 @@
# RuboCop version used for `brew style` and `brew cask style`
HOMEBREW_RUBOCOP_VERSION = "0.47.1".freeze
HOMEBREW_RUBOCOP_CASK_VERSION = "~> 0.11.0".freeze # has to be updated when RuboCop version changes

View File

@ -2,6 +2,8 @@ unless ENV["HOMEBREW_BREW_FILE"]
raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
end
require "constants"
require "tmpdir"
require "pathname"