rubygems-update 2.7.11 → 3.0.9

data/{UPGRADING.rdoc → UPGRADING.md}

@@ -1,57 +1,56 @@
-= How to upgrade/downgrade Rubygems:
+# How to upgrade/downgrade Rubygems:
 
-== For RubyGems 1.5.0 and 1.5.1:
+## For RubyGems 1.5.0 and 1.5.1:
 
-RubyGems 1.5.0 and 1.5.1 shipped with a broken <tt>gem update --system</tt>.
-You will need to use the Manual Upgrade Recipe below.
+RubyGems 1.5.0 and 1.5.1 shipped with a broken `gem update --system`. You will
+need to use the Manual Upgrade Recipe below.
 
-== On Ruby 1.9.x:
+## On Ruby 1.9.x:
 
-=== From stock ruby shipping with 1.9:
+### From stock ruby shipping with 1.9:
 
 Use the Normal Upgrade Method below. (finally!)
 
-== On Ruby 1.8.x:
+## On Ruby 1.8.x:
 
-=== From rubygems 1.3.x:
+### From rubygems 1.3.x:
 
 Use the Normal Upgrade Recipe below.
 
-=== From rubygems 1-1.x through 1.2.x:
+### From rubygems 1-1.x through 1.2.x:
 
-RubyGems 1.1 and 1.2 have problems upgrading when there is no
-rubygems-update installed. You will need to use the following
-instructions if you see "Nothing to update".
+RubyGems 1.1 and 1.2 have problems upgrading when there is no rubygems-update
+installed. You will need to use the following instructions if you see "Nothing
+to update".
 
 Use the Manual Upgrade Recipe below.
 
-=== From rubygems < 1.1.x:
+### From rubygems < 1.1.x:
 
 Use the Normal Upgrade Recipe below.
 
-== Downgrade Recipe
+## Downgrade Recipe
 
-=== Normal Downgrade
+### Normal Downgrade
 
-==== With rubygems 1.5.2 and higher:
+#### With rubygems 1.5.2 and higher:
 
     $ gem update --system 1.3.7
 
-==== With rubygems 1.5.1 and lower:
+#### With rubygems 1.5.1 and lower:
 
 Use sudo/su as appropriate:
 
     $ gem install rubygems-update -v 1.3.7
     $ update_rubygems _1.3.7_
 
-Replace 1.3.7 with whatever version you want to downgrade to. This
-recipe can also be used to upgrade to a specific version instead of
-the latest.
+Replace 1.3.7 with whatever version you want to downgrade to. This recipe can
+also be used to upgrade to a specific version instead of the latest.
 
 Do make sure that you don't have any other versions of rubygems-update
 installed when you run the second command.
 
-=== 1.9.2 Downgrade from Rubygems 1.4.x+ to stock 1.9 rubygems:
+### 1.9.2 Downgrade from Rubygems 1.4.x+ to stock 1.9 rubygems:
 
 Use sudo/su as appropriate:
 
@@ -62,31 +61,31 @@ Use sudo/su as appropriate:
     $ gem -v
     1.3.7
 
-== Upgrade Recipes
+## Upgrade Recipes
 
-=== Normal Upgrade
+### Normal Upgrade
 
 Use sudo/su as appropriate:
 
     $ gem update --system
 
-=== Manual Upgrade
+### Manual Upgrade
 
-If you have an older version of RubyGems installed, then you can still
-do it in two steps:
+If you have an older version of RubyGems installed, then you can still do it
+in two steps:
 
 Use sudo/su as appropriate:
 
     $ gem install rubygems-update
     $ update_rubygems
 
-=== Manual Install
+### Manual Install
 
-If you don't have any RubyGems install, there is still the pre-gem
-approach to getting software, doing it manually:
+If you don't have any RubyGems install, there is still the pre-gem approach to
+getting software, doing it manually:
 
 Use sudo/su as appropriate:
 
-* Download from: https://rubygems.org/pages/download
-* Unpack into a directory and cd there
-* Install with: ruby setup.rb
+*   Download from: https://rubygems.org/pages/download
+*   Unpack into a directory and cd there
+*   Install with: ruby setup.rb

data/appveyor.yml

@@ -7,62 +7,37 @@ branches:
 skip_tags: true
 clone_depth: 10
 
-init:
-  - mklink /d C:\git "C:\Program Files\Git"
-  - if %ruby_version%==_trunk (
-      appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
-      7z x C:\ruby_trunk.7z -oC:\ruby_trunk )
-
 environment:
-  PATH: C:/ruby%ruby_version%/bin;C:/Program Files/7-Zip;C:/Program Files/AppVeyor/BuildAgent;C:/git/cmd;C:/Program Files (x86)/GNU/GnuPG/pub;C:/Windows/system32;C:\Windows;
-  WINDIR: C:\Windows
   matrix:
-  - ruby_version: 193
-  - ruby_version: 200
-  - ruby_version: 200-x64
-  - ruby_version: 21
-  - ruby_version: 21-x64
-  - ruby_version: 22
-  - ruby_version: 22-x64
   - ruby_version: 23-x64
-    GIT:  C:/git/cmd/git.exe
   - ruby_version: 24-x64
-    GIT:  C:/git/cmd/git.exe
+  - ruby_version: 25-x64
   - ruby_version: _trunk
-    GIT:  C:/git/cmd/git.exe
 
-matrix:
-  allow_failures:
-    - ruby_version: _trunk
+init:
+  - set PATH=C:/Ruby%ruby_version%/bin;C:/Program Files/7-Zip;C:/Program Files/AppVeyor/BuildAgent;C:/git/cmd;C:/Program Files (x86)/GNU/GnuPG/pub;C:/Windows/system32;C:\Windows;
+  - mklink /j C:\git "C:\Program Files\Git"
+  - set GIT=C:/git/cmd/git.exe
+  - ps: >-
+      if ($env:ruby_version -eq '_trunk') {
+        $trunk_uri = 'https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z'
+        (New-Object Net.WebClient).DownloadFile($trunk_uri, 'C:\ruby_trunk.7z')
+        7z.exe x C:\ruby_trunk.7z -oC:\Ruby_trunk
+      }
 
 install:
-- ps: >-
-    git submodule update --init --recursive
-
-    $env:path = 'C:\Ruby' + $env:ruby_version + '\bin;' + $env:path
-
-    if ((gem query -i rake) -eq $False){ gem install rake --no-document }
+  - git submodule update --init --recursive
+  - gem install "rake:>=10.4.2" "minitest:>=5.4.3" --conservative --no-document
 
-    if ((gem query -i hoe) -eq $False){ gem install hoe --no-document }
-
-    gem install minitest -v "~> 4.7" --no-document
+test_script:
+  - rake test
 
-    ruby -v
+on_finish:
+  - ruby -v
 
-cache:
-- C:\Ruby193\lib\ruby\gems\1.9.1
-- C:\Ruby200\lib\ruby\gems\2.0.0
-- C:\Ruby200-x64\lib\ruby\gems\2.0.0
-- C:\Ruby21\lib\ruby\gems\2.1.0
-- C:\Ruby21-x64\lib\ruby\gems\2.1.0
-- C:\Ruby22\lib\ruby\gems\2.2.0
-- C:\Ruby22-x64\lib\ruby\gems\2.2.0
-- C:\Ruby23-x64\lib\ruby\gems\2.3.0
-- C:\Ruby24-x64\lib\ruby\gems\2.4.0
+matrix:
+  allow_failures:
+    - ruby_version: _trunk
 
 build: off
-test_script:
-- rake -rdevkit test
-on_finish:
-- ruby -v
 deploy: off

data/bin/gem

@@ -11,7 +11,7 @@ require 'rubygems/exceptions'
 
 required_version = Gem::Requirement.new ">= 1.8.7"
 
-unless required_version.satisfied_by? Gem.ruby_version then
+unless required_version.satisfied_by? Gem.ruby_version
   abort "Expected Ruby version #{required_version}, is #{Gem.ruby_version}"
 end
 
@@ -22,4 +22,3 @@ begin
 rescue Gem::SystemExitException => e
   exit e.exit_code
 end
-

data/bin/update_rubygems

@@ -7,7 +7,7 @@
 
 require 'rubygems'
 
-if ARGV.include? '-h' or ARGV.include? '--help' then
+if ARGV.include? '-h' or ARGV.include? '--help'
   $stderr.puts "rubygems_update [options]"
   $stderr.puts
   $stderr.puts "This will install the latest version of RubyGems."
@@ -16,7 +16,7 @@ if ARGV.include? '-h' or ARGV.include? '--help' then
   exit
 end
 
-unless ARGV.grep(/--version=([\d\.]*)/).empty? then
+unless ARGV.grep(/--version=([\d\.]*)/).empty?
   exec Gem.ruby, '-S', $PROGRAM_NAME, "_#{$1}_"
 end
 
@@ -34,4 +34,3 @@ else
   ENV["GEM_PREV_VER"] = Gem::VERSION
   system(Gem.ruby, 'setup.rb', *ARGV)
 end
-

data/bundler/CHANGELOG.md

@@ -1,3 +1,68 @@
+## 1.17.3 (2018-12-27)
+
+Bugfixes:
+
+ - Fix a Bundler error when installing gems on old versions of RubyGems ([#6839](https://github.com/bundler/bundler/issues/6839), @colby-swandale)
+ - Fix a rare issue where Bundler was removing itself after a `bundle clean` ([#6829](https://github.com/bundler/bundler/issues/6829), @colby-swandale)
+
+Documentation:
+
+  - Add entry for the `bundle remove` command to the main Bundler manual page
+
+## 1.17.2 (2018-12-11)
+
+ - Add compatibility for bundler merge with Ruby 2.6
+
+## 1.17.1 (2018-10-25)
+
+ - Convert `Pathname`s to `String`s before sorting them, fixing #6760 and #6758 ([#6761](https://github.com/bundler/bundler/pull/6761), @alexggordon)
+
+## 1.17.0 (2018-10-25)
+
+No new changes.
+
+## 1.17.0.pre.2 (2018-10-13)
+
+Features:
+
+  - Configure Bundler home, cache, config and plugin directories with `BUNDLE_USER_HOME`, `BUNDLE_USER_CACHE`, `BUNDLE_USER_CONFIG` and `BUNDLE_USER_PLUGIN` env vars ([#4333](https://github.com/bundler/bundler/issues/4333), @gwerbin)
+  - Add `--all` option to `bundle binstubs` that will generate an executable file for all gems with commands in the bundle
+  - Add `bundle remove` command to remove gems from the Gemfile via the CLI
+  - Improve checking file permissions and asking for `sudo` in Bundler when it doesn't need to
+  - Add error message to `bundle add` to check adding duplicate gems to the Gemfile
+  - When asking for `sudo`, Bundler will show a list of folders/files that require elevated permissions to write to.
+
+The following new features are available but are not enabled by default. These are intended to be tested by users for the upcoming release of Bundler 2.
+
+  - Improve deprecation warning message for `bundle show` command
+  - Improve deprecation warning message for the `--force` option in `bundle install`
+
+## 1.17.0.pre.1 (2018-09-24)
+
+Features:
+
+  - Check folder/file permissions of the Bundle home directory in the `bundle doctor` command ([#5786](https://github.com/bundler/bundler/issues/5786), @ajwann)
+  - Remove compiled gem extensions when running `bundle clean` ([#5596](https://github.com/bundler/bundler/issues/5596), @akhramov)
+  - Add `--paths` option to `bundle list` command ([#6172](https://github.com/bundler/bundler/issues/6172), @colby-swandale)
+  - Add base error class to gems generated from `bundle gem` ([#6260](https://github.com/bundler/bundler/issues/6260), @christhekeele)
+  - Correctly re-install gem extensions with a git source when running `bundle pristine` ([#6294](https://github.com/bundler/bundler/issues/6294), @wagenet)
+  - Add config option to disable platform warnings ([#6124](https://github.com/bundler/bundler/issues/6124), @agrim123)
+  - Add `--skip-install` option to `bundle add` command to add gems to the Gemfile without installation ([#6511](https://github.com/bundler/bundler/issues/6511), @agrim123)
+  - Add `--only-explicit` option to `bundle outdated` to list only outdated gems in the Gemfile ([#5366](https://github.com/bundler/bundler/issues/5366), @peret)
+  - Support adding multiple gems to the Gemfile with `bundle add` ([#6543](https://github.com/bundler/bundler/issues/6543), @agrim123)
+  - Make registered plugin events easier to manage in the Plugin API (@jules2689)
+  - Add new gem install hooks to the Plugin API (@jules2689)
+  - Add `--optimistic` and `--strict` options to `bundle add` ([#6553](https://github.com/bundler/bundler/issues/6553), @agrim123)
+  - Add `--without-group` and `--only-group` options to `bundle list` ([#6564](https://github.com/bundler/bundler/issues/6564), @agrim123)
+  - Add `--gemfile` option to the `bundle exec` command ([#5924](https://github.com/bundler/bundler/issues/5924), @ankitkataria)
+
+The following new features are available but are not enabled by default. These are intended to be tested by users for the upcoming release of Bundler 2.
+
+  - Make `install --path` relative to the current working directory ([#2048](https://github.com/bundler/bundler/issues/2048), @igorbozato)
+  - Auto-configure job count ([#5808](https://github.com/bundler/bundler/issues/5808), @segiddins)
+  - Use the Gem Version Promoter for major gem updates ([#5993](https://github.com/bundler/bundler/issues/5993), @segiddins)
+  - Add config option to add the Ruby scope to `bundle config path` when configured globally (@segiddins)
+
 ## 1.16.6 (2018-10-05)
 
 Changes:

data/bundler/bundler.gemspec

@@ -1,7 +1,13 @@
 # coding: utf-8
 # frozen_string_literal: true
 
-require File.expand_path("../lib/bundler/version", __FILE__)
+begin
+  require File.expand_path("../lib/bundler/version", __FILE__)
+rescue LoadError
+  # for Ruby core repository
+  require File.expand_path("../bundler/version", __FILE__)
+end
+
 require "shellwords"
 
 Gem::Specification.new do |s|

data/bundler/lib/bundler/build_metadata.rb

@@ -5,7 +5,7 @@ module Bundler
   module BuildMetadata
     # begin ivars
     @built_at = "2020-12-09".freeze
-    @git_commit_sha = "8a789f00bf".freeze
+    @git_commit_sha = "d7089abb6a".freeze
     @release = false
     # end ivars
 

data/bundler/lib/bundler/cli/add.rb

@@ -2,13 +2,18 @@
 
 module Bundler
   class CLI::Add
-    def initialize(options, gem_name)
-      @gem_name = gem_name
+    def initialize(options, gems)
+      @gems = gems
       @options = options
       @options[:group] = @options[:group].split(",").map(&:strip) if !@options[:group].nil? && !@options[:group].empty?
     end
 
     def run
+      raise InvalidOption, "You can not specify `--strict` and `--optimistic` at the same time." if @options[:strict] && @options[:optimistic]
+
+      # raise error when no gems are specified
+      raise InvalidOption, "Please specify gems to add." if @gems.empty?
+
       version = @options[:version].nil? ? nil : @options[:version].split(",").map(&:strip)
 
       unless version.nil?
@@ -16,10 +21,15 @@ module Bundler
           raise InvalidOption, "Invalid gem requirement pattern '#{v}'" unless Gem::Requirement::PATTERN =~ v.to_s
         end
       end
-      dependency = Bundler::Dependency.new(@gem_name, version, @options)
 
-      Injector.inject([dependency], :conservative_versioning => @options[:version].nil?) # Perform conservative versioning only when version is not specified
-      Installer.install(Bundler.root, Bundler.definition)
+      dependencies = @gems.map {|g| Bundler::Dependency.new(g, version, @options) }
+
+      Injector.inject(dependencies,
+        :conservative_versioning => @options[:version].nil?, # Perform conservative versioning only when version is not specified
+        :optimistic => @options[:optimistic],
+        :strict => @options[:strict])
+
+      Installer.install(Bundler.root, Bundler.definition) unless @options["skip-install"]
     end
   end
 end

data/bundler/lib/bundler/cli/binstubs.rb

@@ -16,7 +16,13 @@ module Bundler
       Bundler.settings.set_command_option_if_given :shebang, options["shebang"]
       installer = Installer.new(Bundler.root, Bundler.definition)
 
-      if gems.empty?
+      installer_opts = { :force => options[:force], :binstubs_cmd => true }
+
+      if options[:all]
+        raise InvalidOption, "Cannot specify --all with specific gems" unless gems.empty?
+        @gems = Bundler.definition.specs.map(&:name)
+        installer_opts.delete(:binstubs_cmd)
+      elsif gems.empty?
         Bundler.ui.error "`bundle binstubs` needs at least one gem to run."
         exit 1
       end
@@ -35,7 +41,7 @@ module Bundler
             installer.generate_standalone_bundler_executable_stubs(spec)
           end
         else
-          installer.generate_bundler_executable_stubs(spec, :force => options[:force], :binstubs_cmd => true)
+          installer.generate_bundler_executable_stubs(spec, installer_opts)
         end
       end
     end

data/bundler/lib/bundler/cli/doctor.rb

@@ -78,6 +78,8 @@ module Bundler
         end
       end
 
+      permissions_valid = check_home_permissions
+
       if broken_links.any?
         message = "The following gems are missing OS dependencies:"
         broken_links.map do |spec, paths|
@@ -86,9 +88,53 @@ module Bundler
           end
         end.flatten.sort.each {|m| message += m }
         raise ProductionError, message
-      else
+      elsif !permissions_valid
         Bundler.ui.info "No issues found with the installed bundle"
       end
     end
+
+  private
+
+    def check_home_permissions
+      require "find"
+      files_not_readable_or_writable = []
+      files_not_rw_and_owned_by_different_user = []
+      files_not_owned_by_current_user_but_still_rw = []
+      Find.find(Bundler.home.to_s).each do |f|
+        if !File.writable?(f) || !File.readable?(f)
+          if File.stat(f).uid != Process.uid
+            files_not_rw_and_owned_by_different_user << f
+          else
+            files_not_readable_or_writable << f
+          end
+        elsif File.stat(f).uid != Process.uid
+          files_not_owned_by_current_user_but_still_rw << f
+        end
+      end
+
+      ok = true
+      if files_not_owned_by_current_user_but_still_rw.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, but are still readable/writable. These files are:\n - #{files_not_owned_by_current_user_but_still_rw.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_rw_and_owned_by_different_user.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are owned by another " \
+          "user, and are not readable/writable. These files are:\n - #{files_not_rw_and_owned_by_different_user.join("\n - ")}"
+
+        ok = false
+      end
+
+      if files_not_readable_or_writable.any?
+        Bundler.ui.warn "Files exist in the Bundler home that are not " \
+          "readable/writable by the current user. These files are:\n - #{files_not_readable_or_writable.join("\n - ")}"
+
+        ok = false
+      end
+
+      ok
+    end
   end
 end

data/bundler/lib/bundler/cli/install.rb

@@ -71,8 +71,7 @@ module Bundler
       if Bundler.use_system_gems?
         Bundler.ui.confirm "Use `bundle info [gemname]` to see where a bundled gem is installed."
       else
-        absolute_path = File.expand_path(Bundler.configured_bundle_path.base_path)
-        relative_path = absolute_path.sub(File.expand_path(".") + File::SEPARATOR, "." + File::SEPARATOR)
+        relative_path = Bundler.configured_bundle_path.base_path_relative_to_pwd
         Bundler.ui.confirm "Bundled gems are installed into `#{relative_path}`"
       end
 
@@ -169,9 +168,13 @@ module Bundler
 
     def normalize_settings
       Bundler.settings.set_command_option :path, nil if options[:system]
-      Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
-      Bundler.settings.set_command_option_if_given :path, options["path"]
-      Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
+      end
+      Bundler.settings.set_command_option_if_given :path, options[:path]
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      end
 
       bin_option = options["binstubs"]
       bin_option = nil if bin_option && bin_option.empty?

data/bundler/lib/bundler/cli/list.rb

@@ -7,16 +7,52 @@ module Bundler
     end
 
     def run
-      specs = Bundler.load.specs.reject {|s| s.name == "bundler" }.sort_by(&:name)
-      return specs.each {|s| Bundler.ui.info s.name } if @options["name-only"]
+      raise InvalidOption, "The `--only-group` and `--without-group` options cannot be used together" if @options["only-group"] && @options["without-group"]
+
+      raise InvalidOption, "The `--name-only` and `--paths` options cannot be used together" if @options["name-only"] && @options[:paths]
+
+      specs = if @options["only-group"] || @options["without-group"]
+        filtered_specs_by_groups
+      else
+        Bundler.load.specs
+      end.reject {|s| s.name == "bundler" }.sort_by(&:name)
 
       return Bundler.ui.info "No gems in the Gemfile" if specs.empty?
+
+      return specs.each {|s| Bundler.ui.info s.name } if @options["name-only"]
+      return specs.each {|s| Bundler.ui.info s.full_gem_path } if @options["paths"]
+
       Bundler.ui.info "Gems included by the bundle:"
-      specs.each do |s|
-        Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
-      end
+
+      specs.each {|s| Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})" }
 
       Bundler.ui.info "Use `bundle info` to print more detailed information about a gem"
     end
+
+  private
+
+    def verify_group_exists(groups)
+      raise InvalidOption, "`#{@options["without-group"]}` group could not be found." if @options["without-group"] && !groups.include?(@options["without-group"].to_sym)
+
+      raise InvalidOption, "`#{@options["only-group"]}` group could not be found." if @options["only-group"] && !groups.include?(@options["only-group"].to_sym)
+    end
+
+    def filtered_specs_by_groups
+      definition = Bundler.definition
+      groups = definition.groups
+
+      verify_group_exists(groups)
+
+      show_groups =
+        if @options["without-group"]
+          groups.reject {|g| g == @options["without-group"].to_sym }
+        elsif @options["only-group"]
+          groups.select {|g| g == @options["only-group"].to_sym }
+        else
+          groups
+        end.map(&:to_sym)
+
+      definition.specs_for(show_groups)
+    end
   end
 end

data/bundler/lib/bundler/cli/outdated.rb

@@ -66,7 +66,13 @@ module Bundler
         current_dependencies.key? spec.name
       end
 
-      (gemfile_specs + dependency_specs).sort_by(&:name).each do |current_spec|
+      specs = if options["only-explicit"]
+        gemfile_specs
+      else
+        gemfile_specs + dependency_specs
+      end
+
+      specs.sort_by(&:name).each do |current_spec|
         next if !gems.empty? && !gems.include?(current_spec.name)
 
         dependency = current_dependencies[current_spec.name]

data/bundler/lib/bundler/cli/pristine.rb

@@ -30,6 +30,10 @@ module Bundler
           FileUtils.rm_rf spec.full_gem_path
         when Source::Git
           source.remote!
+          if extension_cache_path = source.extension_cache_path(spec)
+            FileUtils.rm_rf extension_cache_path
+          end
+          FileUtils.rm_rf spec.extension_dir if spec.respond_to?(:extension_dir)
           FileUtils.rm_rf spec.full_gem_path
         else
           Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is sourced from local path.")

data/bundler/lib/bundler/cli/remove.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Bundler
+  class CLI::Remove
+    def initialize(gems, options)
+      @gems = gems
+      @options = options
+    end
+
+    def run
+      raise InvalidOption, "Please specify gems to remove." if @gems.empty?
+
+      Injector.remove(@gems, {})
+
+      Installer.install(Bundler.root, Bundler.definition) if @options["install"]
+    end
+  end
+end