rubygems-update 3.2.32 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e453bd13f69a120fdadd84b3a57e16527b54f7283a5077d742eb218b634bfa
-  data.tar.gz: ce3cfe1c1c8a515e4904fdcddae871c2012b374aea224ce66ffdd92dfd007d8f
+  metadata.gz: 032d5c25431f07d56614be5feb4310775b0beca1cd1150d477655a46999c25e4
+  data.tar.gz: 1c45327dfd8164fbafc2407a6fe2ba21257a827d25a3040ccc803fd4d8ef2400
 SHA512:
-  metadata.gz: 57fe0ccc4919643d63c6bf2016458924af17d3ec8aab9ddca552781aceebe44bfc8ac350a20e8323265ef6d3e943c4399bf0ccd280cdc000fbe4be9acdfa1a0a
-  data.tar.gz: c354269b3a4e084d76ada0c3547cf2890aaa989554a4011f51654cea114677ccf76c5944ea669c93b9ad7dc09d9b533d51ade69f96f167aadd372311bc208bac
+  metadata.gz: 5edd1acdf9e66fe8e5e3b263da1921c30a687b2a83defac7c74a39530e7c63dc6b4eaea4dfec3c0c162123cacbc0d1e20a39e53030566efb7ba56b464ced97cf
+  data.tar.gz: 0f3c91e64ca5e5c28e8ccd3baf74b44785b8d1c129b2d155b58b5dcef0f68dbb0be67a4ff2b00d2dbfb8dd066827960afde2c11da6a25c2b474e3a086b30bb21

data/CHANGELOG.md

@@ -1,3 +1,91 @@
+# 3.3.2 / 2021-12-23
+
+## Enhancements:
+
+* Fix deprecations when activating DidYouMean for misspelled command
+  suggestions. Pull request #5211 by yuki24
+* Installs bundler 2.3.2 as a default gem.
+
+## Bug fixes:
+
+* Fix gemspec truncation. Pull request #5208 by deivid-rodriguez
+
+# 3.3.1 / 2021-12-22
+
+## Enhancements:
+
+* Fix compatibility with OpenSSL 3.0. Pull request #5196 by rhenium
+* Remove hard errors when matching major bundler not found. Pull request
+  #5181 by deivid-rodriguez
+* Installs bundler 2.3.1 as a default gem.
+
+# 3.3.0 / 2021-12-21
+
+## Breaking changes:
+
+* Removed deprecated `gem server` command. Pull request #5034 by hsbt
+* Remove MacOS specific gem layout. Pull request #4833 by deivid-rodriguez
+* Default `gem update` documentation format is now only `ri`. Pull request
+  #3888 by hsbt
+
+## Features:
+
+* Give command misspelled suggestions via `did_you_mean` gem. Pull request
+  #3904 by hsbt
+
+## Performance:
+
+* Avoid some unnecessary stat calls. Pull request #3887 by kares
+* Improve spell checking suggestion performance by
+  vendoring`DidYouMean::Levenshtein.distance` from `did_you_mean-1.4.0`.
+  Pull request #3856 by austinpray
+
+## Enhancements:
+
+* Set `BUNDLER_VERSION` when `bundle _<version>_` is passed. Pull request
+  #5180 by deivid-rodriguez
+* Don't require `rdoc` for `gem uninstall`. Pull request #4691 by ndren
+* More focused rescue on extension builder exception to get more
+  information on errors. Pull request #4189 by deivid-rodriguez
+* Installs bundler 2.3.0 as a default gem.
+
+## Bug fixes:
+
+* Fix encoding mismatch issues when writing gem packages. Pull request
+  #5162 by deivid-rodriguez
+* Fix broken brew formula due to loading `operating_system.rb`
+  customizations too late. Pull request #5154 by deivid-rodriguez
+* Properly fetch `Gem#latest_spec_for` with multiple sources. Pull request
+  #2764 by kevlogan90
+* Fix upgrade crashing when multiple versions of `fileutils` installed.
+  Pull request #5140 by deivid-rodriguez
+
+# 3.2.33 / 2021-12-07
+
+## Deprecations:
+
+* Deprecate typo name. Pull request #5109 by nobu
+
+## Enhancements:
+
+* Add login & logout alias for the signin & signout commands. Pull request
+  #5133 by colby-swandale
+* Fix race conditions when reading & writing gemspecs concurrently. Pull
+  request #4408 by deivid-rodriguez
+* Installs bundler 2.2.33 as a default gem.
+
+## Bug fixes:
+
+* Fix `ruby setup.rb` trying to write outside of `--destdir`. Pull request
+  #5053 by deivid-rodriguez
+
+## Documentation:
+
+* Move required_ruby_version gemspec attribute to recommended section.
+  Pull request #5130 by simi
+* Ignore to generate the documentation from vendored libraries. Pull
+  request #5118 by hsbt
+
 # 3.2.32 / 2021-11-23
 
 ## Enhancements:
@@ -20,6 +108,7 @@
   deivid-rodriguez
 * Use a vendored copy of `tsort` internally. Pull request #5027 by
   deivid-rodriguez
+* Install bundler 2.2.31 as a default gem.
 
 ## Bug fixes:
 
@@ -40,6 +129,7 @@
   by deivid-rodriguez
 * Add missing `require` of `time` within
   `Gem::Request.verify_certificate_message`. Pull request #4975 by nobu
+* Install bundler 2.2.30 as a default gem.
 
 ## Performance:
 
@@ -52,6 +142,7 @@
 
 * Only disallow FIXME/TODO for first word of gemspec description. Pull
   request #4937 by duckinator
+* Install bundler 2.2.29 as a default gem.
 
 ## Bug fixes:
 
@@ -72,6 +163,7 @@
   by duckinator
 * Avoid loading `uri` unnecessarily when activating gems. Pull request
   #4897 by deivid-rodriguez
+* Install bundler 2.2.28 as a default gem.
 
 ## Bug fixes:
 
@@ -87,6 +179,7 @@
   request #4858 by deivid-rodriguez
 * Prioritise gems with higher version for fetching metadata, and stop
   fetching once we find a valid candidate. Pull request #4843 by intuxicated
+* Install bundler 2.2.27 as a default gem.
 
 # 3.2.26 / 2021-08-17
 
@@ -97,6 +190,7 @@
   intuxicated
 * Ignore `RUBYGEMS_GEMDEPS` for the bundler gem. Pull request #4532 by
   deivid-rodriguez
+* Install bundler 2.2.26 as a default gem.
 
 ## Bug fixes:
 
@@ -114,6 +208,7 @@
 * Lazily load `shellwords` library. Pull request #4783 by deivid-rodriguez
 * Check requirements class before loading marshalled requirements. Pull
   request #4651 by nobu
+* Install bundler 2.2.25 as a default gem.
 
 ## Bug fixes:
 
@@ -122,6 +217,10 @@
 
 # 3.2.24 / 2021-07-15
 
+## Enhancements:
+
+* Install bundler 2.2.24 as a default gem.
+
 ## Bug fixes:
 
 * Fix contradictory message about deletion of default gem. Pull request
@@ -138,6 +237,7 @@
 
 * Rewind IO source to allow working with contents in memory. Pull request
   #4729 by drcapulet
+* Install bundler 2.2.23 as a default gem.
 
 # 3.2.22 / 2021-07-06
 
@@ -147,6 +247,7 @@
   CGA1123
 * Fixes for the edge case when openssl library is missing. Pull request
   #4695 by rhenium
+* Install bundler 2.2.22 as a default gem.
 
 # 3.2.21 / 2021-06-23
 
@@ -156,6 +257,7 @@
 * Add the most recent licenses from spdx.org. Pull request #4662 by nobu
 * Simplify setup.rb code to allow installing rubygems from source on
   truffleruby 21.0 and 21.1. Pull request #4624 by deivid-rodriguez
+* Install bundler 2.2.21 as a default gem.
 
 ## Bug fixes:
 
@@ -173,12 +275,14 @@
 
 * Add better specification policy error description. Pull request #4658 by
   ceritium
+* Install bundler 2.2.20 as a default gem.
 
 # 3.2.19 / 2021-05-31
 
 ## Enhancements:
 
 * Fix `gem help build` output format. Pull request #4613 by tnir
+* Install bundler 2.2.19 as a default gem.
 
 # 3.2.18 / 2021-05-25
 
@@ -186,6 +290,7 @@
 
 * Don't leave temporary directory around when building extensions to
   improve build reproducibility. Pull request #4610 by baloo
+* Install bundler 2.2.18 as a default gem.
 
 # 3.2.17 / 2021-05-05
 
@@ -197,6 +302,7 @@
   #4558 by mame
 * Update the default bindir on macOS. Pull request #4524 by nobu
 * Prefer File.open instead of Kernel#open. Pull request #4529 by mame
+* Install bundler 2.2.17 as a default gem.
 
 ## Documentation:
 
@@ -205,6 +311,10 @@
 
 # 3.2.16 / 2021-04-08
 
+## Enhancements:
+
+* Install bundler 2.2.16 as a default gem.
+
 ## Bug fixes:
 
 * Correctly handle symlinks. Pull request #2836 by voxik
@@ -215,6 +325,7 @@
 
 * Prevent downgrades to untested rubygems versions. Pull request #4460 by
   deivid-rodriguez
+* Install bundler 2.2.15 as a default gem.
 
 ## Bug fixes:
 
@@ -225,6 +336,7 @@
 ## Enhancements:
 
 * Less wrapping of network errors. Pull request #4064 by deivid-rodriguez
+* Install bundler 2.2.14 as a default gem.
 
 ## Bug fixes:
 
@@ -233,12 +345,20 @@
 
 # 3.2.13 / 2021-03-03
 
+## Enhancements:
+
+* Install bundler 2.2.13 as a default gem.
+
 ## Bug fixes:
 
 * Support non-gnu libc linux platforms. Pull request #4082 by lloeki
 
 # 3.2.12 / 2021-03-01
 
+## Enhancements:
+
+* Install bundler 2.2.12 as a default gem.
+
 ## Bug fixes:
 
 * Restore the ability to manually install extension gems. Pull request
@@ -250,9 +370,14 @@
 
 * Optionally fallback to IPv4 when IPv6 is unreachable. Pull request #2662
   by sonalkr132
+* Install bundler 2.2.11 as a default gem.
 
 # 3.2.10 / 2021-02-15
 
+## Enhancements:
+
+* Install bundler 2.2.10 as a default gem.
+
 ## Documentation:
 
 * Add a `gem push` example to `gem help`. Pull request #4373 by
@@ -262,6 +387,10 @@
 
 # 3.2.9 / 2021-02-08
 
+## Enhancements:
+
+* Install bundler 2.2.9 as a default gem.
+
 ## Bug fixes:
 
 * Fix error message when underscore selection can't find bundler. Pull
@@ -275,6 +404,10 @@
 
 # 3.2.8 / 2021-02-02
 
+## Enhancements:
+
+* Install bundler 2.2.8 as a default gem.
+
 ## Bug fixes:
 
 * Fix `gem install` crashing on gemspec with nil required_ruby_version.
@@ -282,6 +415,10 @@
 
 # 3.2.7 / 2021-01-26
 
+## Enhancements:
+
+* Install bundler 2.2.7 as a default gem.
+
 ## Bug fixes:
 
 * Generate plugin wrappers with relative requires. Pull request #4317 by
@@ -293,6 +430,7 @@
 
 * Fix `Gem::Platform#inspect` showing duplicate information. Pull request
   #4276 by deivid-rodriguez
+* Install bundler 2.2.6 as a default gem.
 
 ## Bug fixes:
 
@@ -303,6 +441,10 @@
 
 # 3.2.5 / 2021-01-11
 
+## Enhancements:
+
+* Install bundler 2.2.5 as a default gem.
+
 ## Bug fixes:
 
 * Don't load more specs after the whole set of specs has been setup. Pull
@@ -318,6 +460,7 @@
   deivid-rodriguez
 * Never spawn subshells when building extensions. Pull request #4190 by
   deivid-rodriguez
+* Install bundler 2.2.4 as a default gem.
 
 ## Bug fixes:
 
@@ -331,6 +474,7 @@
 ## Enhancements:
 
 * Fix misspellings in default API key name. Pull request #4177 by hsbt
+* Install bundler 2.2.3 as a default gem.
 
 ## Bug fixes:
 
@@ -340,6 +484,10 @@
 
 # 3.2.2 / 2020-12-17
 
+## Enhancements:
+
+* Install bundler 2.2.2 as a default gem.
+
 ## Bug fixes:
 
 * Fix issue where CLI commands making more than one request to
@@ -356,6 +504,7 @@
 
 * Added help message for gem i webrick in gem server command. Pull request
   #4117 by hsbt
+* Install bundler 2.2.1 as a default gem.
 
 ## Bug fixes:
 
@@ -384,6 +533,7 @@
 * Lazily load `openssl`. Pull request #3850 by deivid-rodriguez
 * Pass more information when comparing platforms. Pull request #3817 by
   eregon
+* Install bundler 2.2.0 as a default gem.
 
 ## Bug fixes:
 
@@ -4513,7 +4663,7 @@ Lavena and Daniel Berger for continuing windows support.
 * Tar handling code refactoring and cleanup.
 * Gem::DependencyInstaller's API has changed.
 
-For a full list of changes to RubyGems, see the ChangeLog file.
+For a full list of changes to RubyGems, see the git log.
 
 # 1.0.1 / 2007-12-20
 
@@ -4657,7 +4807,7 @@ have permanently enabled the work around on all versions.
 
 # 0.9.1 / 2007-01-16
 
-See ChangeLog
+See git log
 
 # 0.9.0 / 2006-06-28
 
@@ -4905,11 +5055,11 @@ There has been some minor usability enhancements and changes ...
 
 # 0.7.0 / 2004-07-09
 
-See ChangeLog
+See git log
 
 # 0.6.1 / 2004-06-08
 
-See ChangeLog
+See git log
 
 # 0.6.0 / 2004-06-08
 

data/CONTRIBUTING.md

@@ -13,7 +13,6 @@ contributors to follow to reduce the time it takes to get changes merged in.
     *   Match indentation (two spaces)
     *   Match coding style (run `rake rubocop`)
 
-
 3.  If any new files are added or existing files removed in a commit or PR,
     please update the `Manifest.txt` accordingly. This can be done by running
     `rake update_manifest`
@@ -30,20 +29,51 @@ here: https://guides.rubygems.org/contributing/
 
 ## Getting Started
 
-    $ rake setup
-    $ rake test
+    rake setup
 
-> Optional you can configure git hooks with: rake git_hooks
+> Optionally you can configure git hooks with: rake git_hooks
 
 To run commands like `gem install` from the repo:
 
-    $ ruby -Ilib bin/gem install
+    ruby -Ilib bin/gem install
+
+To run commands like `bundle install` from the repo:
+
+    ruby bundler/spec/support/bundle.rb install
+
+### Running Tests
+
+To run the entire test suite you can use: 
+
+    rake test
+
+To run an individual test file located for example in `test/rubygems/test_deprecate.rb` you can use: 
+
+    ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb
+    
+And to run an individual test method named `test_default` within a test file, you can use: 
+
+    ruby -Ilib:test:bundler/lib test/rubygems/test_deprecate.rb -n /test_default/
+
+### Running bundler tests
+
+Everything needs to be run from the `bundler/` subfolder.
+
+To setup bundler tests:
+
+    bin/rake spec:parallel_deps
+
+To run the entire bundler test suite in parallel (it takes a while):
+
+    bin/parallel_rspec
+
+To run the entire bundler test suite sequentially (get a coffee because it's very slow):
+
+    bin/rspec
 
-To run bundler test:
+To run an individual test file location for example in `spec/install/gems/standalone_spec.rb` you can use:
 
-    $ cd bundler
-    $ bin/rake spec:deps
-    $ bin/rspec spec
+    bin/rspec spec/install/gems/standalone_spec.rb
 
 ## Issues
 
@@ -108,7 +138,7 @@ where it is in the process from being submitted to being closed.  These are
 listed in rough  progression order from submitted to closed.
 
 *   **triage** - This is an issue or pull request that needs to be properly
-    labeled by by a maintainer.
+    labeled by a maintainer.
 *   **confirmed** - This issue/pull request has been accepted as valid, but is
     not yet immediately ready for work.
 *   **ready** - An issue that is available for collaboration. This issue

data/Manifest.txt

@@ -18,6 +18,7 @@ bundler/bundler.gemspec
 bundler/exe/bundle
 bundler/exe/bundler
 bundler/lib/bundler.rb
+bundler/lib/bundler/.document
 bundler/lib/bundler/build_metadata.rb
 bundler/lib/bundler/capistrano.rb
 bundler/lib/bundler/cli.rb
@@ -78,7 +79,6 @@ bundler/lib/bundler/gem_helper.rb
 bundler/lib/bundler/gem_helpers.rb
 bundler/lib/bundler/gem_tasks.rb
 bundler/lib/bundler/gem_version_promoter.rb
-bundler/lib/bundler/gemdeps.rb
 bundler/lib/bundler/graph.rb
 bundler/lib/bundler/index.rb
 bundler/lib/bundler/injector.rb
@@ -166,6 +166,7 @@ bundler/lib/bundler/rubygems_ext.rb
 bundler/lib/bundler/rubygems_gem_installer.rb
 bundler/lib/bundler/rubygems_integration.rb
 bundler/lib/bundler/runtime.rb
+bundler/lib/bundler/self_manager.rb
 bundler/lib/bundler/settings.rb
 bundler/lib/bundler/settings/validator.rb
 bundler/lib/bundler/setup.rb
@@ -212,11 +213,12 @@ bundler/lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 bundler/lib/bundler/templates/newgem/newgem.gemspec.tt
 bundler/lib/bundler/templates/newgem/rspec.tt
 bundler/lib/bundler/templates/newgem/rubocop.yml.tt
+bundler/lib/bundler/templates/newgem/sig/newgem.rbs.tt
 bundler/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt
 bundler/lib/bundler/templates/newgem/spec/spec_helper.rb.tt
 bundler/lib/bundler/templates/newgem/standard.yml.tt
-bundler/lib/bundler/templates/newgem/test/minitest/newgem_test.rb.tt
 bundler/lib/bundler/templates/newgem/test/minitest/test_helper.rb.tt
+bundler/lib/bundler/templates/newgem/test/minitest/test_newgem.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/newgem_test.rb.tt
 bundler/lib/bundler/templates/newgem/test/test-unit/test_helper.rb.tt
 bundler/lib/bundler/templates/newgem/travis.yml.tt
@@ -225,6 +227,7 @@ bundler/lib/bundler/ui/rg_proxy.rb
 bundler/lib/bundler/ui/shell.rb
 bundler/lib/bundler/ui/silent.rb
 bundler/lib/bundler/uri_credentials_filter.rb
+bundler/lib/bundler/vendor/.document
 bundler/lib/bundler/vendor/connection_pool/LICENSE
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool.rb
 bundler/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb
@@ -307,6 +310,8 @@ bundler/lib/bundler/vendor/uri/lib/uri/mailto.rb
 bundler/lib/bundler/vendor/uri/lib/uri/rfc2396_parser.rb
 bundler/lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb
 bundler/lib/bundler/vendor/uri/lib/uri/version.rb
+bundler/lib/bundler/vendor/uri/lib/uri/ws.rb
+bundler/lib/bundler/vendor/uri/lib/uri/wss.rb
 bundler/lib/bundler/vendored_fileutils.rb
 bundler/lib/bundler/vendored_molinillo.rb
 bundler/lib/bundler/vendored_persistent.rb
@@ -395,6 +400,7 @@ lib/rubygems/mock_gem_ui.rb
 lib/rubygems/name_tuple.rb
 lib/rubygems/openssl.rb
 lib/rubygems/optparse.rb
+lib/rubygems/optparse/.document
 lib/rubygems/optparse/COPYING
 lib/rubygems/optparse/lib/optionparser.rb
 lib/rubygems/optparse/lib/optparse.rb
@@ -490,7 +496,6 @@ lib/rubygems/security/policy.rb
 lib/rubygems/security/signer.rb
 lib/rubygems/security/trust_dir.rb
 lib/rubygems/security_option.rb
-lib/rubygems/server.rb
 lib/rubygems/source.rb
 lib/rubygems/source/git.rb
 lib/rubygems/source/installed.rb
@@ -508,9 +513,11 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/text.rb
 lib/rubygems/tsort.rb
+lib/rubygems/tsort/.document
 lib/rubygems/tsort/LICENSE.txt
 lib/rubygems/tsort/lib/tsort.rb
 lib/rubygems/uninstaller.rb
+lib/rubygems/unknown_command_spell_checker.rb
 lib/rubygems/uri.rb
 lib/rubygems/uri_formatter.rb
 lib/rubygems/user_interaction.rb
@@ -526,7 +533,6 @@ test/rubygems/alternate_cert.pem
 test/rubygems/alternate_cert_32.pem
 test/rubygems/alternate_key.pem
 test/rubygems/bad_rake.rb
-test/rubygems/bogussources.rb
 test/rubygems/ca_cert.pem
 test/rubygems/child_cert.pem
 test/rubygems/child_cert_32.pem
@@ -583,6 +589,7 @@ test/rubygems/ssl_key.pem
 test/rubygems/test_bundled_ca.rb
 test/rubygems/test_config.rb
 test/rubygems/test_deprecate.rb
+test/rubygems/test_exit.rb
 test/rubygems/test_gem.rb
 test/rubygems/test_gem_available_set.rb
 test/rubygems/test_gem_bundler_version_finder.rb
@@ -685,7 +692,6 @@ test/rubygems/test_gem_security.rb
 test/rubygems/test_gem_security_policy.rb
 test/rubygems/test_gem_security_signer.rb
 test/rubygems/test_gem_security_trust_dir.rb
-test/rubygems/test_gem_server.rb
 test/rubygems/test_gem_silent_ui.rb
 test/rubygems/test_gem_source.rb
 test/rubygems/test_gem_source_fetch_problem.rb

data/POLICIES.md

@@ -45,7 +45,7 @@ at version 2.7, so when RubyGems 2.8 is released, it will only support Ruby
 Releases of new versions should follow these steps, to ensure the process is
 smooth and no needed steps are missed.
 
-### Steps for security releases
+### Recommendations for security releases
 
 *   Obtain CVE numbers as needed from HackerOne or Red Hat.
 *   Agree on a release date with ruby-core, so patches can be backported to
@@ -55,16 +55,30 @@ smooth and no needed steps are missed.
 *   Continue with the regular release process below.
 
 
-### Steps for all releases
+### Steps for patch releases
 
 *   Confirm all PRs that you want backported are properly tagged with `rubygems:
-    <type>` labels at GitHub.
-*   Run `rake prepare_stable_branch[<target_version>]`, create a PR and merge it
+    <type>` or `bundler: <type>` labels at GitHub.
+*   Run `rake prepare_release[<target_version>]`, create a PR and merge it
     to the stable branch once CI passes.
-*   Create and push git tag
-*   Create and push `rubygems-update` gem and tgz
-*   Publish blog post
-
+*   Switch to the stable branch and pull the PR just merged.
+*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Release `rubygems` with `rake release`.
+
+### Steps for minor and major releases
+
+*   Confirm all PRs that you want listed in changelogs are properly tagged with
+    `rubygems: <type>` or `bundler: <type>` labels at GitHub.
+*   Run `rake prepare_release[<target_version>]`.
+*   Add the new stable branch `x.y` where `x.y` are the first two components of
+    the rubygems version being released to the CI workflows as an extra commit
+    on top of what the `prepare_release` task generated.
+*   Create a PR to the main branch, and merge it once CI passes.
+*   From the main branch, cut a new stable branch with `git pull && git checkout
+    -b x.y`.
+*   Push the stable branch and wait for CI to be green.
+*   Release `bundler` with `(cd bundler && bin/rake release)`.
+*   Release `rubygems` with `rake release`.
 
 ## Committer Access
 

data/README.md

@@ -33,9 +33,15 @@ For more information about how to use RubyGems, see our RubyGems basics guide at
 
 ## Installation
 
-RubyGems is likely already installed in your Ruby environment, you can check by running `gem --version` in your terminal emulator.
-In some cases your OS's package manager may install RubyGems as a separate package from Ruby. It's recommended to check
-with your OS's package manager before installing RubyGems manually.
+RubyGems is already installed in your Ruby environment, you can check the version you have installed by running `gem --version` in your terminal emulator.
+
+In some cases Ruby & RubyGems may be provided as OS packages. This is not a
+recommended way to use Ruby & RubyGems. It's better to use a Ruby Version
+Manager, such as [rbenv](https://github.com/rbenv/rbenv) or
+[chruby](https://github.com/postmodern/chruby). If you still want to use the
+version provided by your OS package manager, please also use your OS package
+manager to upgrade rubygems, and disregard any other installation instructions
+given below.
 
 If you would like to manually install RubyGems:
 
@@ -46,8 +52,6 @@ Install RubyGems by running:
 
     $ ruby setup.rb
 
-Note: You may need to run the install script with admin/root privileges.
-
 For more details and other options, see:
 
     $ ruby setup.rb --help
@@ -58,8 +62,6 @@ To upgrade to the latest RubyGems, run:
 
     $ gem update --system
 
-Note: You might need to run the command as an administrator or root user.
-
 See [UPGRADING](UPGRADING.md) for more details and alternative instructions.
 
 ## Documentation