ruby-changes:72375
From: David <ko1@a...>
Date: Thu, 30 Jun 2022 18:55:53 +0900 (JST)
Subject: [ruby-changes:72375] b0c639f249 (master): [rubygems/rubygems] Fix unintended double spaces in DSL documentation
https://git.ruby-lang.org/ruby.git/commit/?id=b0c639f249 From b0c639f249165d759596f9579fa985cb30533de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Thu, 30 Jun 2022 09:53:33 +0200 Subject: [rubygems/rubygems] Fix unintended double spaces in DSL documentation https://github.com/rubygems/rubygems/commit/b1826876d0 --- lib/bundler/man/gemfile.5 | 56 ++++++++++++++++---------------- lib/bundler/man/gemfile.5.ronn | 72 +++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/bundler/man/gemfile.5 b/lib/bundler/man/gemfile.5 index a7287bf725..eaef7c99be 100644 --- a/lib/bundler/man/gemfile.5 +++ b/lib/bundler/man/gemfile.5 @@ -100,7 +100,7 @@ Each application \fImay\fR specify a Ruby engine version\. If an engine version https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L100 . .nf -ruby "1\.8\.7", engine: "jruby", engine_version: "1\.6\.7" +ruby "1\.8\.7", engine: "jruby", engine_version: "1\.6\.7" . .fi . @@ -113,7 +113,7 @@ Each application \fImay\fR specify a Ruby patchlevel\. https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L113 . .nf -ruby "2\.0\.0", patchlevel: "247" +ruby "2\.0\.0", patchlevel: "247" . .fi . @@ -156,9 +156,9 @@ Each \fIgem\fR \fBMAY\fR specify files that should be used when autorequiring vi https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L156 . .nf -gem "redis", require: ["redis/connection/hiredis", "redis"] -gem "webmock", require: false -gem "byebug", require: true +gem "redis", require: ["redis/connection/hiredis", "redis"] +gem "webmock", require: false +gem "byebug", require: true . .fi . @@ -172,8 +172,8 @@ The argument defaults to the name of the gem\. For example, these are identical: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L172 .nf gem "nokogiri" -gem "nokogiri", require: "nokogiri" -gem "nokogiri", require: true +gem "nokogiri", require: "nokogiri" +gem "nokogiri", require: true . .fi . @@ -186,8 +186,8 @@ Each \fIgem\fR \fBMAY\fR specify membership in one or more groups\. Any \fIgem\f https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L186 . .nf -gem "rspec", group: :test -gem "wirble", groups: [:development, :test] +gem "rspec", group: :test +gem "wirble", groups: [:development, :test] . .fi . @@ -320,9 +320,9 @@ As with groups, you can specify one or more platforms: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L320 . .nf -gem "weakling", platforms: :jruby -gem "ruby\-debug", platforms: :mri_18 -gem "nokogiri", platforms: [:mri_18, :jruby] +gem "weakling", platforms: :jruby +gem "ruby\-debug", platforms: :mri_18 +gem "nokogiri", platforms: [:mri_18, :jruby] . .fi . @@ -338,7 +338,7 @@ You can select an alternate Rubygems repository for a gem using the \':source\' https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L338 . .nf -gem "some_internal_gem", source: "https://gems\.example\.com" +gem "some_internal_gem", source: "https://gems\.example\.com" . .fi . @@ -393,7 +393,7 @@ If a git repository does have a \fB\.gemspec\fR for the gem you attached it to, https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L393 . .nf -gem "rails", "2\.3\.8", git: "https://github\.com/rails/rails\.git" +gem "rails", "2\.3\.8", git: "https://github\.com/rails/rails\.git" # bundle install will fail, because the \.gemspec in the rails # repository\'s master branch specifies version 3\.0\.0 . @@ -454,7 +454,7 @@ A custom git source can be defined via the \fBgit_source\fR method\. Provide the https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L454 .nf git_source(:stash){ |repo_name| "https://stash\.corp\.acme\.pl/#{repo_name}\.git" } -gem \'rails\', stash: \'forks/rails\' +gem \'rails\', stash: \'forks/rails\' . .fi . @@ -467,7 +467,7 @@ In addition, if you wish to choose a specific branch: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L467 . .nf -gem "rails", stash: "forks/rails", branch: "branch_name" +gem "rails", stash: "forks/rails", branch: "branch_name" . .fi . @@ -483,8 +483,8 @@ If the git repository you want to use is hosted on GitHub and is public, you can https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L483 . .nf -gem "rails", github: "rails/rails" -gem "rails", github: "rails" +gem "rails", github: "rails/rails" +gem "rails", github: "rails" . .fi . @@ -497,7 +497,7 @@ Are both equivalent to https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L497 . .nf -gem "rails", git: "git://github\.com/rails/rails\.git" +gem "rails", git: "git://github\.com/rails/rails\.git" . .fi . @@ -513,7 +513,7 @@ You can also directly pass a pull request URL: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L513 . .nf -gem "rails", github: "https://github\.com/rails/rails/pull/43753" +gem "rails", github: "https://github\.com/rails/rails/pull/43753" . .fi . @@ -526,7 +526,7 @@ Which is equivalent to: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L526 . .nf -gem "rails", github: "rails/rails", branch: "refs/pull/43753/head" +gem "rails", github: "rails/rails", branch: "refs/pull/43753/head" . .fi . @@ -539,7 +539,7 @@ If the git repository you want to use is hosted as a GitHub Gist and is public, https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L539 . .nf -gem "the_hatch", gist: "4815162342" +gem "the_hatch", gist: "4815162342" . .fi . @@ -552,7 +552,7 @@ Is equivalent to: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L552 . .nf -gem "the_hatch", git: "https://gist\.github\.com/4815162342\.git" +gem "the_hatch", git: "https://gist\.github\.com/4815162342\.git" . .fi . @@ -568,8 +568,8 @@ If the git repository you want to use is hosted on Bitbucket and is public, you https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L568 . .nf -gem "rails", bitbucket: "rails/rails" -gem "rails", bitbucket: "rails" +gem "rails", bitbucket: "rails/rails" +gem "rails", bitbucket: "rails" . .fi . @@ -582,7 +582,7 @@ Are both equivalent to https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L582 . .nf -gem "rails", git: "https://rails@bitbucket\.org/rails/rails\.git" +gem "rails", git: "https://rails@bitbucket\.org/rails/rails\.git" . .fi . @@ -604,7 +604,7 @@ Unlike \fB:git\fR, bundler does not compile C extensions for gems specified as p https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L604 . .nf -gem "rails", path: "vendor/rails" +gem "rails", path: "vendor/rails" . .fi . @@ -648,7 +648,7 @@ platforms :ruby do https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5#L648 gem "sqlite3" end -group :development, optional: true do +group :development, optional: true do gem "wirble" gem "faker" end diff --git a/lib/bundler/man/gemfile.5.ronn b/lib/bundler/man/gemfile.5.ronn index 76ee33a10e..f94a174b72 100644 --- a/lib/bundler/man/gemfile.5.ronn +++ b/lib/bundler/man/gemfile.5.ronn @@ -91,13 +91,13 @@ Each application _may_ specify a Ruby engine version. If an engine version is https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5.ronn#L91 specified, an engine _must_ also be specified. If the engine is "ruby" the engine version specified _must_ match the Ruby version. - ruby "1.8.7", engine: "jruby", engine_version: "1.6.7" + ruby "1.8.7", engine: "jruby", engine_version: "1.6.7" ### PATCHLEVEL Each application _may_ specify a Ruby patchlevel. - ruby "2.0.0", patchlevel: "247" + ruby "2.0.0", patchlevel: "247" ## GEMS @@ -124,23 +124,23 @@ Each _gem_ `MAY` specify files that should be used when autorequiring via https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5.ronn#L124 you want `required` has the same name as _gem_ or `false` to prevent any file from being autorequired. - gem "redis", require: ["redis/connection/hiredis", "redis"] - gem "webmock", require: false - gem "byebug", require: true + gem "redis", require: ["redis/connection/hiredis", "redis"] + gem "webmock", require: false + gem "byebug", require: true The argument defaults to the name of the gem. For example, these are identical: gem "nokogiri" - gem "nokogiri", require: "nokogiri" - gem "nokogiri", require: true + gem "nokogiri", require: "nokogiri" + gem "nokogiri", require: true ### GROUPS Each _gem_ `MAY` specify membership in one or more groups. Any _gem_ that does not specify membership in any group is placed in the `default` group. - gem "rspec", group: :test - gem "wirble", groups: [:development, :test] + gem "rspec", group: :test + gem "wirble", groups: [:development, :test] The Bundler runtime allows its two main methods, `Bundler.setup` and `Bundler.require`, to limit their impact to particular groups. @@ -223,9 +223,9 @@ The full list of platforms and supported versions includes: https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5.ronn#L223 As with groups, you can specify one or more platforms: - gem "weakling", platforms: :jruby - gem "ruby-debug", platforms: :mri_18 - gem "nokogiri", platforms: [:mri_18, :jruby] + gem "weakling", platforms: :jruby + gem "ruby-debug", platforms: :mri_18 + gem "nokogiri", platforms: [:mri_18, :jruby] All operations involving groups ([`bundle install`](bundle-install.1.html), `Bundler.setup`, `Bundler.require`) behave exactly the same as if any groups not @@ -236,7 +236,7 @@ matching the current platform were explicitly excluded. https://github.com/ruby/ruby/blob/trunk/lib/bundler/man/gemfile.5.ronn#L236 You can select an alternate Rubygems repository for a gem using the ':source' option. - gem "some_internal_gem", source: "https://gems.example.com" + gem "some (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/