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

Refactor away String#indent

Browse Source
This commit is contained in:
Douglas Eichelberger 2024-01-08 13:26:41 -08:00
parent e74dc47d67
commit 0852e1d7b6
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Homebrew/test/dev-cmd/bottle_spec.rb
View File

@ -511,11 +511,11 @@ describe "brew bottle" do
bottle.sha256(catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e")
expect(homebrew.bottle_output(bottle, nil)).to eq(
<<~RUBY.indent(2),
bottle do
root_url "https://example.com"
sha256 catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e"
end
<<-RUBY,
bottle do
root_url "https://example.com"
sha256 catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e"
end
RUBY
)
end
@ -526,12 +526,12 @@ describe "brew bottle" do
bottle.sha256(catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e")
expect(homebrew.bottle_output(bottle, "ExampleStrategy")).to eq(
<<~RUBY.indent(2),
bottle do
root_url "https://example.com",
using: ExampleStrategy
sha256 catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e"
end
<<-RUBY,
bottle do
root_url "https://example.com",
using: ExampleStrategy
sha256 catalina: "109c0cb581a7b5d84da36d84b221fb9dd0f8a927b3044d82611791c9907e202e"
end
RUBY
)
end

2
Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
View File

@ -177,7 +177,7 @@ RSpec.shared_context "integration test" do # rubocop:disable RSpec/ContextWordin
Formulary.core_path(name).tap do |formula_path|
formula_path.write <<~RUBY
class #{Formulary.class_s(name)} < Formula
#{content.indent(2)}
#{content.gsub(/^(?!$)/, " ")}
end
RUBY
end

18
Library/Homebrew/test/utils/ast/ast_spec.rb
View File

@ -5,12 +5,12 @@ require "utils/ast"
describe Utils::AST do
describe ".stanza_text" do
let(:compound_license) do
<<~RUBY.chomp
license all_of: [
:public_domain,
"MIT",
"GPL-3.0-or-later" => { with: "Autoconf-exception-3.0" },
]
<<-RUBY
license all_of: [
:public_domain,
"MIT",
"GPL-3.0-or-later" => { with: "Autoconf-exception-3.0" },
]
RUBY
end
@ -36,14 +36,14 @@ describe Utils::AST do
it "adds indent to stanza text if specified" do
expect(described_class.stanza_text(:revision, "revision 1", indent: 2)).to eq(" revision 1")
expect(described_class.stanza_text(:license, 'license "MIT"', indent: 2)).to eq(' license "MIT"')
expect(described_class.stanza_text(:license, compound_license, indent: 2)).to eq(compound_license.indent(2))
expect(described_class.stanza_text(:license, compound_license, indent: 2)).to eq(compound_license)
end
it "does not add indent if already indented" do
expect(described_class.stanza_text(:revision, " revision 1", indent: 2)).to eq(" revision 1")
expect(
described_class.stanza_text(:license, compound_license.indent(2), indent: 2),
).to eq(compound_license.indent(2))
described_class.stanza_text(:license, compound_license, indent: 2),
).to eq(compound_license)
end
end
end

8
Library/Homebrew/test/utils/ast/formula_ast_spec.rb
View File

@ -248,10 +248,10 @@ describe Utils::AST::FormulaAST do
describe "#add_bottle_block" do
let(:bottle_output) do
<<~RUBY.chomp.indent(2)
bottle do
sha256 "f7b1fc772c79c20fddf621ccc791090bc1085fcef4da6cca03399424c66e06ca" => :sierra
end
<<-RUBY
bottle do
sha256 "f7b1fc772c79c20fddf621ccc791090bc1085fcef4da6cca03399424c66e06ca" => :sierra
end
RUBY
end

2
Library/Homebrew/utils/ast.rb
View File

@ -35,7 +35,7 @@ module Utils
value if (node.is_a?(SendNode) || node.is_a?(BlockNode)) && node.method_name == name
end
text ||= "#{name} #{value.inspect}"
text = text.indent(indent) if indent && !text.match?(/\A\n* +/)
text = text.gsub(/^(?!$)/, " " * indent) if indent && !text.match?(/\A\n* +/)
text
end