dev-cmd/bottle: fix positioning of bottle block in some cases

[Bo98]

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same change?
• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your changes? Here's an example.
• Have you successfully run brew style with your changes locally?
• Have you successfully run brew tests with your changes locally?

---

Fixes the bottle commit breaking brew style when the license line or livecheck block is included.

[Rylan12]

Just curious, the components_order rubocop has a few additional components that precede the bottle block:

brew/Library/Homebrew/rubocops/components_order.rb

Lines 18 to 33 in 1b1e3b4

	def audit_formula(_node, _class_node, _parent_class_node, body_node)
	component_precedence_list = [
	[{ name: :include, type: :method_call }],
	[{ name: :desc, type: :method_call }],
	[{ name: :homepage, type: :method_call }],
	[{ name: :url, type: :method_call }],
	[{ name: :mirror, type: :method_call }],
	[{ name: :version, type: :method_call }],
	[{ name: :sha256, type: :method_call }],
	[{ name: :license, type: :method_call }],
	[{ name: :revision, type: :method_call }],
	[{ name: :version_scheme, type: :method_call }],
	[{ name: :head, type: :method_call }],
	[{ name: :stable, type: :block_call }],
	[{ name: :livecheck, type: :block_call }],
	[{ name: :bottle, type: :block_call }],

Namely: livecheck, stable, head, url and include.

Should these be added here as well?

Also, can sha1 be removed given that Homebrew has removed sha1 support as of ~4 years ago?

[Bo98]

url and head is already there.

I will test the others.

Also, can sha1 be removed given that Homebrew has removed sha1 support as of ~4 years ago?

Probably.

[Bo98]

stable do was also already supported but not very well (no blank line after the end), I've tweaked it now.

Regex on code is kinda horrible to do, but doing anything else is a bigger task than I expected to do here.

[MikeMcQuaid]

Looks good to me. This is probably something we should consider doing with brew style --fix instead. Pretty sure if you write the bottle block basically anywhere it'll put it in the right place.

[Bo98]

Yeah, that's an idea.

I'll merge as is to mitigate the impact it's currently having though.