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

partly revert log verbose npm pack output commit

Browse Source 
to fix issues with shwoing npm debug output even on non-verbose install runs.
This commit is contained in:
Christian Moritz 2017-06-29 20:49:29 +02:00
parent 7910e4a5b4
commit 5e00c277ce
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/language/node.rb
View File

@ -10,9 +10,8 @@ module Language
# fed to `npm install` only symlinks are created linking back to that # fed to `npm install` only symlinks are created linking back to that
# directory, consequently breaking that assumption. We require a tarball # directory, consequently breaking that assumption. We require a tarball
# because npm install creates a "real" installation when fed a tarball. # because npm install creates a "real" installation when fed a tarball.
pack_cmd = "npm pack -ddd --ignore-scripts" pack_cmd = "npm pack --ignore-scripts"
ohai pack_cmd output = Utils.popen_read(pack_cmd)
output = `#{pack_cmd}`
if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty? if !$CHILD_STATUS.exitstatus.zero? || output.lines.empty?
raise "npm failed to pack #{Dir.pwd}" raise "npm failed to pack #{Dir.pwd}"
end end

10
Library/Homebrew/test/language/node_spec.rb
View File

@ -23,10 +23,10 @@ describe Language::Node do
describe "#std_npm_install_args" do describe "#std_npm_install_args" do
npm_install_arg = "libexec" npm_install_arg = "libexec"
npm_pack_cmd = "npm pack -ddd --ignore-scripts" npm_pack_cmd = "npm pack --ignore-scripts"
it "raises error with non zero exitstatus" do it "raises error with non zero exitstatus" do
allow(Language::Node).to receive(:`).with(npm_pack_cmd).and_return("error msg") allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("error msg")
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(42) allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(42)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(42) allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(42)
expect { subject.std_npm_install_args(npm_install_arg) }.to \ expect { subject.std_npm_install_args(npm_install_arg) }.to \
@ -34,13 +34,15 @@ describe Language::Node do
end end
it "raises error with empty npm pack output" do it "raises error with empty npm pack output" do
allow(Language::Node).to receive(:`).with(npm_pack_cmd).and_return("") allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("")
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(0)
expect { subject.std_npm_install_args(npm_install_arg) }.to \ expect { subject.std_npm_install_args(npm_install_arg) }.to \
raise_error("npm failed to pack #{Dir.pwd}") raise_error("npm failed to pack #{Dir.pwd}")
end end
it "does not raise error with a zero exitstatus" do it "does not raise error with a zero exitstatus" do
allow(Language::Node).to receive(:`).with(npm_pack_cmd).and_return("pack.tgz") allow(Utils).to receive(:popen_read).with(npm_pack_cmd).and_return("pack.tgz")
allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0) allow_any_instance_of(Process::Status).to receive(:exitstatus).and_return(0)
allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(0) allow_any_instance_of(nil::NilClass).to receive(:exitstatus).and_return(0)
resp = subject.std_npm_install_args(npm_install_arg) resp = subject.std_npm_install_args(npm_install_arg)