admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Fix brew cask style on Travis.

Browse Source
This commit is contained in:
Markus Reiter 2018-01-27 23:29:55 +01:00
parent d558ec0933
commit 884c57f9f4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/lib/hbc/cli/style.rb
View File

@ -10,9 +10,9 @@ module Hbc
def run def run
install_rubocop install_rubocop
cache_env = { "XDG_CACHE_HOME" => "#{HOMEBREW_CACHE}/style" } cache_env = { "XDG_CACHE_HOME" => "#{HOMEBREW_CACHE}/style" }
system(cache_env, "rubocop", *rubocop_args, "--", *cask_paths) hide_warnings = debug? ? [] : [ENV["HOMEBREW_RUBY_PATH"], "-W0", "-S"]
system(cache_env, *hide_warnings, "rubocop", *rubocop_args, "--", *cask_paths)
raise CaskError, "style check failed" unless $CHILD_STATUS.success? raise CaskError, "style check failed" unless $CHILD_STATUS.success?
true
end end
def install_rubocop def install_rubocop
@ -43,8 +43,8 @@ module Hbc
[ [
"--require", "rubocop-cask", "--require", "rubocop-cask",
"--force-default-config", "--force-default-config",
"--force-exclusion", "--format", "simple",
"--format", "simple" "--parallel"
] ]
end end

7
Library/Homebrew/test/cask/cli/style_spec.rb
View File

@ -22,7 +22,10 @@ describe Hbc::CLI::Style, :cask do
context "when rubocop succeeds" do context "when rubocop succeeds" do
let(:success) { true } let(:success) { true }
it { is_expected.to be_truthy }
it "does not raise an error" do
expect { subject }.not_to raise_error
end
end end
context "when rubocop fails" do context "when rubocop fails" do
@ -132,7 +135,7 @@ describe Hbc::CLI::Style, :cask do
describe "#default_args" do describe "#default_args" do
subject { cli.default_args } subject { cli.default_args }
it { is_expected.to include("--require", "rubocop-cask", "--format", "simple", "--force-exclusion") } it { is_expected.to include("--require", "rubocop-cask", "--format", "simple") }
end end
describe "#autocorrect_args" do describe "#autocorrect_args" do