From 8a57c37c33a735f2b87ec9e99910961bbbd2a5bf Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Wed, 8 Mar 2023 10:12:46 -0800 Subject: [PATCH] Fix extend/array_spec --- Library/Homebrew/test/extend/array_spec.rb | 8 ++++---- completions/fish/brew.fish | 2 +- completions/zsh/_brew | 2 +- docs/Manpage.md | 2 +- manpages/brew.1 | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/test/extend/array_spec.rb b/Library/Homebrew/test/extend/array_spec.rb index 876cf90494..7d422389ad 100644 --- a/Library/Homebrew/test/extend/array_spec.rb +++ b/Library/Homebrew/test/extend/array_spec.rb @@ -9,12 +9,12 @@ describe Array do expect([].to_sentence).to eq("") expect(["one"].to_sentence).to eq("one") expect(["one", "two"].to_sentence).to eq("one and two") - expect(["one", "two", "three"].to_sentence).to eq("one, two, and three") + expect(["one", "two", "three"].to_sentence).to eq("one, two and three") end it "converts an array to a sentence with a custom connector" do - expect(["one", "two", "three"].to_sentence(words_connector: " ")).to eq("one two, and three") - expect(["one", "two", "three"].to_sentence(words_connector: " & ")).to eq("one & two, and three") + expect(["one", "two", "three"].to_sentence(words_connector: " ")).to eq("one two and three") + expect(["one", "two", "three"].to_sentence(words_connector: " & ")).to eq("one & two and three") end it "converts an array to a sentence with a custom last word connector" do @@ -38,7 +38,7 @@ describe Array do end it "converts an array with blank elements to a sentence" do - expect([nil, "one", "", "two", "three"].to_sentence).to eq(", one, , two, and three") + expect([nil, "one", "", "two", "three"].to_sentence).to eq(", one, , two and three") end it "does not return a frozen string" do diff --git a/completions/fish/brew.fish b/completions/fish/brew.fish index 63dfd274f2..9d88c13fab 100644 --- a/completions/fish/brew.fish +++ b/completions/fish/brew.fish @@ -542,7 +542,7 @@ __fish_brew_complete_arg 'contributions' -l debug -d 'Display any debugging info __fish_brew_complete_arg 'contributions' -l from -d 'Date (ISO-8601 format) to start searching contributions' __fish_brew_complete_arg 'contributions' -l help -d 'Show this message' __fish_brew_complete_arg 'contributions' -l quiet -d 'Make some output more quiet' -__fish_brew_complete_arg 'contributions' -l repositories -d 'Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts`, and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask' +__fish_brew_complete_arg 'contributions' -l repositories -d 'Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask' __fish_brew_complete_arg 'contributions' -l to -d 'Date (ISO-8601 format) to stop searching contributions' __fish_brew_complete_arg 'contributions' -l user -d 'A GitHub username or email address of a specific person to find contribution data for' __fish_brew_complete_arg 'contributions' -l verbose -d 'Make some output more verbose' diff --git a/completions/zsh/_brew b/completions/zsh/_brew index 0d4f7437c9..6e14cc5711 100644 --- a/completions/zsh/_brew +++ b/completions/zsh/_brew @@ -671,7 +671,7 @@ _brew_contributions() { '--from[Date (ISO-8601 format) to start searching contributions]' \ '--help[Show this message]' \ '--quiet[Make some output more quiet]' \ - '--repositories[Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts`, and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask]' \ + '--repositories[Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask]' \ '--to[Date (ISO-8601 format) to stop searching contributions]' \ '--user[A GitHub username or email address of a specific person to find contribution data for]' \ '--verbose[Make some output more verbose]' diff --git a/docs/Manpage.md b/docs/Manpage.md index 8407854076..45fbf5ad7e 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1116,7 +1116,7 @@ Display the path to the file being used when invoking `brew` *`cmd`*. Contributions to Homebrew repos. * `--repositories`: - Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts`, and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask. + Specify a comma-separated (no spaces) list of repositories to search. Supported repositories: `brew`, `core`, `cask`, `aliases`, `autoupdate`, `bundle`, `command-not-found`, `test-bot`, `services`, `cask-drivers`, `cask-fonts` and `cask-versions`. Omitting this flag, or specifying `--repositories=all`, searches all repositories. Use `--repositories=primary` to search only the main repositories: brew,core,cask. * `--from`: Date (ISO-8601 format) to start searching contributions. * `--to`: diff --git a/manpages/brew.1 b/manpages/brew.1 index 487254d0e3..3680c41a7a 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1603,7 +1603,7 @@ Contributions to Homebrew repos\. . .TP \fB\-\-repositories\fR -Specify a comma\-separated (no spaces) list of repositories to search\. Supported repositories: \fBbrew\fR, \fBcore\fR, \fBcask\fR, \fBaliases\fR, \fBautoupdate\fR, \fBbundle\fR, \fBcommand\-not\-found\fR, \fBtest\-bot\fR, \fBservices\fR, \fBcask\-drivers\fR, \fBcask\-fonts\fR, and \fBcask\-versions\fR\. Omitting this flag, or specifying \fB\-\-repositories=all\fR, searches all repositories\. Use \fB\-\-repositories=primary\fR to search only the main repositories: brew,core,cask\. +Specify a comma\-separated (no spaces) list of repositories to search\. Supported repositories: \fBbrew\fR, \fBcore\fR, \fBcask\fR, \fBaliases\fR, \fBautoupdate\fR, \fBbundle\fR, \fBcommand\-not\-found\fR, \fBtest\-bot\fR, \fBservices\fR, \fBcask\-drivers\fR, \fBcask\-fonts\fR and \fBcask\-versions\fR\. Omitting this flag, or specifying \fB\-\-repositories=all\fR, searches all repositories\. Use \fB\-\-repositories=primary\fR to search only the main repositories: brew,core,cask\. . .TP \fB\-\-from\fR