bundler 2.3.12 → 2.4.17

data/lib/bundler/man/gemfile.5.ronn

@@ -15,23 +15,28 @@ directory as the `Rakefile`.
 A `Gemfile` is evaluated as Ruby code, in a context which makes available
 a number of methods used to describe the gem requirements.
 
-## GLOBAL SOURCES
+## GLOBAL SOURCE
 
-At the top of the `Gemfile`, add a line for the `Rubygems` source that contains
-the gems listed in the `Gemfile`.
+At the top of the `Gemfile`, add a single line for the `RubyGems` source that
+contains the gems listed in the `Gemfile`.
 
     source "https://rubygems.org"
 
-It is possible, but not recommended as of Bundler 1.7, to add multiple global
-`source` lines. Each of these `source`s `MUST` be a valid Rubygems repository.
+You can add only one global source. In Bundler 1.13, adding multiple global
+sources was deprecated. The `source` `MUST` be a valid RubyGems repository.
 
-Sources are checked for gems following the heuristics described in
-[SOURCE PRIORITY][]. If a gem is found in more than one global source, Bundler
+To use more than one source of RubyGems, you should use [`source` block
+](#BLOCK-FORM-OF-SOURCE-GIT-PATH-GROUP-and-PLATFORMS).
+
+A source is checked for gems following the heuristics described in
+[SOURCE PRIORITY][].
+
+**Note about a behavior of the feature deprecated in Bundler 1.13**:
+If a gem is found in more than one global source, Bundler
 will print a warning after installing the gem indicating which source was used,
 and listing the other sources where the gem is available. A specific source can
 be selected for gems that need to use a non-standard repository, suppressing
-this warning, by using the [`:source` option](#SOURCE) or a
-[`source` block](#BLOCK-FORM-OF-SOURCE-GIT-PATH-GROUP-and-PLATFORMS).
+this warning, by using the [`:source` option](#SOURCE) or `source` block.
 
 ### CREDENTIALS
 
@@ -59,10 +64,10 @@ All parameters are `OPTIONAL` unless otherwise specified.
 ### VERSION (required)
 
 The version of Ruby that your application requires. If your application
-requires an alternate Ruby engine, such as JRuby, Rubinius or TruffleRuby, this
+requires an alternate Ruby engine, such as JRuby, TruffleRuby, etc., this
 should be the Ruby version that the engine is compatible with.
 
-    ruby "1.9.3"
+    ruby "3.1.2"
 
 ### ENGINE
 
@@ -81,9 +86,10 @@ What exactly is an Engine?
 
   - [Other implementations](https://www.ruby-lang.org/en/about/) of Ruby exist.
     Some of the more well-known implementations include
-    [Rubinius](https://rubinius.com/), and [JRuby](http://jruby.org/).
+    [JRuby](http://jruby.org/) and [TruffleRuby](https://www.graalvm.org/ruby/).
     Rubinius is an alternative implementation of Ruby written in Ruby.
     JRuby is an implementation of Ruby on the JVM, short for Java Virtual Machine.
+    TruffleRuby is a Ruby implementation on the GraalVM, a language toolkit built on the JVM.
 
 ### ENGINE VERSION
 
@@ -91,13 +97,17 @@ Each application _may_ specify a Ruby engine version. If an engine version is
 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 "2.6.8", engine: "jruby", engine_version: "9.3.8.0"
 
 ### PATCHLEVEL
 
-Each application _may_ specify a Ruby patchlevel.
+Each application _may_ specify a Ruby patchlevel. Specifying the patchlevel has
+been meaningless since Ruby 2.1.0 was released as the patchlevel is now
+uniquely determined by a combination of major, minor, and teeny version numbers.
 
-    ruby "2.0.0", :patchlevel => "247"
+This option was implemented in Bundler 1.4.0 for Ruby 2.0 or earlier.
+
+    ruby "3.1.2", patchlevel: "20"
 
 ## GEMS
 
@@ -124,23 +134,23 @@ Each _gem_ `MAY` specify files that should be used when autorequiring via
 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.
@@ -185,70 +195,71 @@ platforms.
 There are a number of `Gemfile` platforms:
 
   * `ruby`:
-    C Ruby (MRI), Rubinius or TruffleRuby, but `NOT` Windows
+    C Ruby (MRI), Rubinius, or TruffleRuby, but not Windows
   * `mri`:
-    Same as _ruby_, but only C Ruby (MRI)
-  * `mingw`:
-    Windows 32 bit 'mingw32' platform (aka RubyInstaller)
-  * `x64_mingw`:
-    Windows 64 bit 'mingw32' platform (aka RubyInstaller x64)
+    C Ruby (MRI) only, but not Windows
+  * `windows`:
+    Windows C Ruby (MRI), including RubyInstaller 32-bit and 64-bit versions
+  * `mswin`:
+    Windows C Ruby (MRI), including RubyInstaller 32-bit versions
+  * `mswin64`:
+    Windows C Ruby (MRI), including RubyInstaller 64-bit versions
   * `rbx`:
     Rubinius
   * `jruby`:
     JRuby
   * `truffleruby`:
     TruffleRuby
-  * `mswin`:
-    Windows
-
-You can restrict further by platform and version for all platforms *except* for
-`rbx`, `jruby`, `truffleruby` and `mswin`.
 
-To specify a version in addition to a platform, append the version number without
-the delimiter to the platform. For example, to specify that a gem should only be
-used on platforms with Ruby 2.3, use:
+On platforms `ruby`, `mri`, `mswin`, `mswin64`, and `windows`, you may
+additionally specify a version by appending the major and minor version numbers
+without a delimiter. For example, to specify that a gem should only be used on
+platform `ruby` version 3.1, use:
 
-    ruby_23
+    ruby_31
 
-The full list of platforms and supported versions includes:
+As with groups (above), you may specify one or more platforms:
 
-  * `ruby`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
-  * `mri`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
-  * `mingw`:
-    1.8, 1.9, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
-  * `x64_mingw`:
-    2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
-
-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_31
+    gem "nokogiri",   platforms: [:windows_31, :jruby]
 
 All operations involving groups ([`bundle install`](bundle-install.1.html), `Bundler.setup`,
 `Bundler.require`) behave exactly the same as if any groups not
 matching the current platform were explicitly excluded.
 
+### FORCE_RUBY_PLATFORM
+
+If you always want the pure ruby variant of a gem to be chosen over platform
+specific variants, you can use the `force_ruby_platform` option:
+
+    gem "ffi", force_ruby_platform: true
+
+This can be handy (assuming the pure ruby variant works fine) when:
+
+* You're having issues with the platform specific variant.
+* The platform specific variant does not yet support a newer ruby (and thus has
+  a `required_ruby_version` upper bound), but you still want your Gemfile{.lock}
+  files to resolve under that ruby.
+
 ### SOURCE
 
-You can select an alternate Rubygems repository for a gem using the ':source'
+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_internal_gem", source: "https://gems.example.com"
 
-This forces the gem to be loaded from this source and ignores any global sources
+This forces the gem to be loaded from this source and ignores the global source
 declared at the top level of the file. If the gem does not exist in this source,
 it will not be installed.
 
 Bundler will search for child dependencies of this gem by first looking in the
 source selected for the parent, but if they are not found there, it will fall
-back on global sources using the ordering described in [SOURCE PRIORITY][].
+back on the global source.
 
+**Note about a behavior of the feature deprecated in Bundler 1.13**:
 Selecting a specific source repository this way also suppresses the ambiguous
-gem warning described above in
-[GLOBAL SOURCES (#source)](#GLOBAL-SOURCES).
+gem warning described above in [GLOBAL SOURCE](#GLOBAL-SOURCE).
 
 Using the `:source` option for an individual gem will also make that source
 available as a possible global source for any other gems which do not specify
@@ -263,11 +274,11 @@ git repository using the `:git` parameter. The repository can be accessed via
 several protocols:
 
   * `HTTP(S)`:
-    gem "rails", :git => "https://github.com/rails/rails.git"
+    gem "rails", git: "https://github.com/rails/rails.git"
   * `SSH`:
-    gem "rails", :git => "git@github.com:rails/rails.git"
+    gem "rails", git: "git@github.com:rails/rails.git"
   * `git`:
-    gem "rails", :git => "git://github.com/rails/rails.git"
+    gem "rails", git: "git://github.com/rails/rails.git"
 
 If using SSH, the user that you use to run `bundle install` `MUST` have the
 appropriate keys available in their `$HOME/.ssh`.
@@ -295,7 +306,7 @@ to, a version specifier, if provided, means that the git repository is
 only valid if the `.gemspec` specifies a version matching the version
 specifier. If not, bundler will print a warning.
 
-    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
 
@@ -307,18 +318,18 @@ Git repositories support a number of additional options.
 
   * `branch`, `tag`, and `ref`:
     You `MUST` only specify at most one of these options. The default
-    is `:branch => "master"`.  For example:
+    is `branch: "master"`.  For example:
 
-      gem "rails", :git => "https://github.com/rails/rails.git", :branch => "5-0-stable"
+      gem "rails", git: "https://github.com/rails/rails.git", branch: "5-0-stable"
 
-      gem "rails", :git => "https://github.com/rails/rails.git", :tag => "v5.0.0"
+      gem "rails", git: "https://github.com/rails/rails.git", tag: "v5.0.0"
 
-      gem "rails", :git => "https://github.com/rails/rails.git", :ref => "4aded"
+      gem "rails", git: "https://github.com/rails/rails.git", ref: "4aded"
 
   * `submodules`:
     For reference, a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules)
     lets you have another git repository within a subfolder of your repository.
-    Specify `:submodules => true` to cause bundler to expand any
+    Specify `submodules: true` to cause bundler to expand any
     submodules included in the git repository
 
 If a git repository contains multiple `.gemspecs`, each `.gemspec`
@@ -346,11 +357,11 @@ as an argument, and a block which receives a single argument and interpolates it
 string to return the full repo address:
 
     git_source(:stash){ |repo_name| "https://stash.corp.acme.pl/#{repo_name}.git" }
-    gem 'rails', :stash => 'forks/rails'
+    gem 'rails', stash: 'forks/rails'
 
 In addition, if you wish to choose a specific branch:
 
-    gem "rails", :stash => "forks/rails", :branch => "branch_name"
+    gem "rails", stash: "forks/rails", branch: "branch_name"
 
 ### GITHUB
 
@@ -363,33 +374,33 @@ If the git repository you want to use is hosted on GitHub and is public, you can
 trailing ".git"), separated by a slash. If both the username and repository name are the
 same, you can omit one.
 
-    gem "rails", :github => "rails/rails"
-    gem "rails", :github => "rails"
+    gem "rails", github: "rails/rails"
+    gem "rails", github: "rails"
 
 Are both equivalent to
 
-    gem "rails", :git => "git://github.com/rails/rails.git"
+    gem "rails", git: "https://github.com/rails/rails.git"
 
 Since the `github` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
 You can also directly pass a pull request URL:
 
-    gem "rails", :github => "https://github.com/rails/rails/pull/43753"
+    gem "rails", github: "https://github.com/rails/rails/pull/43753"
 
 Which is equivalent to:
 
-    gem "rails", :github => "rails/rails", branch: "refs/pull/43753/head"
+    gem "rails", github: "rails/rails", branch: "refs/pull/43753/head"
 
 ### GIST
 
 If the git repository you want to use is hosted as a GitHub Gist and is public, you can use
 the :gist shorthand to specify the gist identifier (without the trailing ".git").
 
-    gem "the_hatch", :gist => "4815162342"
+    gem "the_hatch", gist: "4815162342"
 
 Is equivalent to:
 
-    gem "the_hatch", :git => "https://gist.github.com/4815162342.git"
+    gem "the_hatch", git: "https://gist.github.com/4815162342.git"
 
 Since the `gist` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
@@ -400,12 +411,12 @@ If the git repository you want to use is hosted on Bitbucket and is public, you
 trailing ".git"), separated by a slash. If both the username and repository name are the
 same, you can omit one.
 
-    gem "rails", :bitbucket => "rails/rails"
-    gem "rails", :bitbucket => "rails"
+    gem "rails", bitbucket: "rails/rails"
+    gem "rails", bitbucket: "rails"
 
 Are both equivalent to
 
-    gem "rails", :git => "https://rails@bitbucket.org/rails/rails.git"
+    gem "rails", git: "https://rails@bitbucket.org/rails/rails.git"
 
 Since the `bitbucket` method is a specialization of `git_source`, it accepts a `:branch` named argument.
 
@@ -423,7 +434,7 @@ version that bundler should use.
 Unlike `:git`, bundler does not compile C extensions for
 gems specified as paths.
 
-    gem "rails", :path => "vendor/rails"
+    gem "rails", path: "vendor/rails"
 
 If you would like to use multiple local gems directly from the filesystem, you can set a global `path` option to the path containing the gem's files. This will automatically load gemspec files from subdirectories.
 
@@ -452,7 +463,7 @@ applied to a group of gems by using block form.
       gem "sqlite3"
     end
 
-    group :development, :optional => true do
+    group :development, optional: true do
       gem "wirble"
       gem "faker"
     end
@@ -495,15 +506,15 @@ the `.gemspec` file.
 
 The `gemspec` method adds any runtime dependencies as gem requirements in the
 default group. It also adds development dependencies as gem requirements in the
-`development` group. Finally, it adds a gem requirement on your project (`:path
-=> '.'`). In conjunction with `Bundler.setup`, this allows you to require project
+`development` group. Finally, it adds a gem requirement on your project (`path:
+'.'`). In conjunction with `Bundler.setup`, this allows you to require project
 files in your test code as you would if the project were installed as a gem; you
 need not manipulate the load path manually or require project files via relative
 paths.
 
 The `gemspec` method supports optional `:path`, `:glob`, `:name`, and `:development_group`
 options, which control where bundler looks for the `.gemspec`, the glob it uses to look
-for the gemspec (defaults to: "{,*,*/*}.gemspec"), what named `.gemspec` it uses
+for the gemspec (defaults to: `{,*,*/*}.gemspec`), what named `.gemspec` it uses
 (if more than one is present), and which group development dependencies are included in.
 
 When a `gemspec` dependency encounters version conflicts during resolution, the
@@ -521,5 +532,7 @@ bundler uses the following priority order:
      repository declared on the parent. This results in bundler prioritizing the
      ActiveSupport gem from the Rails git repository over ones from
      `rubygems.org`
-  3. The sources specified via global `source` lines, searching each source in
-     your `Gemfile` from last added to first added.
+  3. If neither of the above conditions are met, the global source will be used.
+     If multiple global sources are specified, they will be prioritized from
+     last to first, but this is deprecated since Bundler 1.13, so Bundler prints
+     a warning and will abort with an error in the future.

data/lib/bundler/man/index.txt

@@ -6,9 +6,11 @@ bundle-cache(1)       bundle-cache.1
 bundle-check(1)       bundle-check.1
 bundle-clean(1)       bundle-clean.1
 bundle-config(1)      bundle-config.1
+bundle-console(1)     bundle-console.1
 bundle-doctor(1)      bundle-doctor.1
 bundle-exec(1)        bundle-exec.1
 bundle-gem(1)         bundle-gem.1
+bundle-help(1)        bundle-help.1
 bundle-info(1)        bundle-info.1
 bundle-init(1)        bundle-init.1
 bundle-inject(1)      bundle-inject.1
@@ -18,8 +20,10 @@ bundle-lock(1)        bundle-lock.1
 bundle-open(1)        bundle-open.1
 bundle-outdated(1)    bundle-outdated.1
 bundle-platform(1)    bundle-platform.1
+bundle-plugin(1)      bundle-plugin.1
 bundle-pristine(1)    bundle-pristine.1
 bundle-remove(1)      bundle-remove.1
 bundle-show(1)        bundle-show.1
 bundle-update(1)      bundle-update.1
+bundle-version(1)     bundle-version.1
 bundle-viz(1)         bundle-viz.1

data/lib/bundler/match_metadata.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Bundler
+  module MatchMetadata
+    def matches_current_ruby?
+      @required_ruby_version.satisfied_by?(Gem.ruby_version)
+    end
+
+    def matches_current_rubygems?
+      @required_rubygems_version.satisfied_by?(Gem.rubygems_version)
+    end
+  end
+end

data/lib/bundler/match_platform.rb

@@ -15,7 +15,6 @@ module Bundler
       return true if Gem::Platform::RUBY == gemspec_platform
       return true if local_platform == gemspec_platform
       gemspec_platform = Gem::Platform.new(gemspec_platform)
-      return true if GemHelpers.generic(gemspec_platform) === local_platform
       return true if gemspec_platform === local_platform
 
       false

data/lib/bundler/match_remote_metadata.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Bundler
+  module FetchMetadata
+    # A fallback is included because the original version of the specification
+    # API didn't include that field, so some marshalled specs in the index have it
+    # set to +nil+.
+    def matches_current_ruby?
+      @required_ruby_version ||= _remote_specification.required_ruby_version || Gem::Requirement.default
+
+      super
+    end
+
+    def matches_current_rubygems?
+      # A fallback is included because the original version of the specification
+      # API didn't include that field, so some marshalled specs in the index have it
+      # set to +nil+.
+      @required_rubygems_version ||= _remote_specification.required_rubygems_version || Gem::Requirement.default
+
+      super
+    end
+  end
+
+  module MatchRemoteMetadata
+    include MatchMetadata
+
+    prepend FetchMetadata
+  end
+end

data/lib/bundler/mirror.rb

@@ -148,13 +148,11 @@ module Bundler
     class TCPSocketProbe
       def replies?(mirror)
         MirrorSockets.new(mirror).any? do |socket, address, timeout|
-          begin
-            socket.connect_nonblock(address)
-          rescue Errno::EINPROGRESS
-            wait_for_writtable_socket(socket, address, timeout)
-          rescue RuntimeError # Connection failed somehow, again
-            false
-          end
+          socket.connect_nonblock(address)
+        rescue Errno::EINPROGRESS
+          wait_for_writtable_socket(socket, address, timeout)
+        rescue RuntimeError # Connection failed somehow, again
+          false
         end
       end
 

data/lib/bundler/plugin/api/source.rb

@@ -258,7 +258,7 @@ module Bundler
           @dependencies |= Array(names)
         end
 
-        # Note: Do not override if you don't know what you are doing.
+        # NOTE: Do not override if you don't know what you are doing.
         def can_lock?(spec)
           spec.source == self
         end
@@ -285,7 +285,7 @@ module Bundler
         end
         alias_method :identifier, :to_s
 
-        # Note: Do not override if you don't know what you are doing.
+        # NOTE: Do not override if you don't know what you are doing.
         def include?(other)
           other == self
         end
@@ -294,7 +294,7 @@ module Bundler
           SharedHelpers.digest(:SHA1).hexdigest(uri)
         end
 
-        # Note: Do not override if you don't know what you are doing.
+        # NOTE: Do not override if you don't know what you are doing.
         def gem_install_dir
           Bundler.install_path
         end

data/lib/bundler/plugin/index.rb

@@ -167,11 +167,11 @@ module Bundler
       # to be only String key value pairs)
       def save_index
         index = {
-          "commands"     => @commands,
-          "hooks"        => @hooks,
-          "load_paths"   => @load_paths,
+          "commands" => @commands,
+          "hooks" => @hooks,
+          "load_paths" => @load_paths,
           "plugin_paths" => @plugin_paths,
-          "sources"      => @sources,
+          "sources" => @sources,
         }
 
         require_relative "../yaml_serializer"

data/lib/bundler/plugin/installer/git.rb

@@ -20,10 +20,6 @@ module Bundler
           end
         end
 
-        def version_message(spec)
-          "#{spec.name} #{spec.version}"
-        end
-
         def root
           Plugin.root
         end

data/lib/bundler/plugin/installer/rubygems.rb

@@ -4,16 +4,8 @@ module Bundler
   module Plugin
     class Installer
       class Rubygems < Bundler::Source::Rubygems
-        def version_message(spec)
-          "#{spec.name} #{spec.version}"
-        end
-
         private
 
-        def requires_sudo?
-          false # Will change on implementation of project level plugins
-        end
-
         def rubygems_dir
           Plugin.root
         end

data/lib/bundler/plugin/installer.rb

@@ -83,8 +83,11 @@ module Bundler
 
         Bundler.configure_gem_home_and_path(Plugin.root)
 
-        definition = Definition.new(nil, deps, source_list, true)
-        install_definition(definition)
+        Bundler.settings.temporary(:deployment => false, :frozen => false) do
+          definition = Definition.new(nil, deps, source_list, true)
+
+          install_definition(definition)
+        end
       end
 
       # Installs the plugins and deps from the provided specs and returns map of

data/lib/bundler/plugin.rb

@@ -15,7 +15,7 @@ module Bundler
     class UnknownSourceError < PluginError; end
     class PluginInstallError < PluginError; end
 
-    PLUGIN_FILE_NAME = "plugins.rb".freeze
+    PLUGIN_FILE_NAME = "plugins.rb"
 
     module_function
 
@@ -36,6 +36,8 @@ module Bundler
     # @param [Hash] options various parameters as described in description.
     #               Refer to cli/plugin for available options
     def install(names, options)
+      raise InvalidOption, "You cannot specify `--branch` and `--ref` at the same time." if options["branch"] && options["ref"]
+
       specs = Installer.new.install(names, options)
 
       save_plugins names, specs

data/lib/bundler/process_lock.rb

@@ -12,7 +12,7 @@ module Bundler
         yield
         f.flock(File::LOCK_UN)
       end
-    rescue Errno::EACCES, Errno::ENOLCK, Errno::ENOTSUP
+    rescue Errno::EACCES, Errno::ENOLCK, Errno::ENOTSUP, Errno::EPERM, Errno::EROFS
       # In the case the user does not have access to
       # create the lock file or is using NFS where
       # locks are not available we skip locking.

data/lib/bundler/remote_specification.rb

@@ -6,6 +6,7 @@ module Bundler
   # be seeded with what we're given from the source's abbreviated index - the
   # full specification will only be fetched when necessary.
   class RemoteSpecification
+    include MatchRemoteMetadata
     include MatchPlatform
     include Comparable
 
@@ -16,7 +17,8 @@ module Bundler
     def initialize(name, version, platform, spec_fetcher)
       @name         = name
       @version      = Gem::Version.create version
-      @platform     = platform
+      @original_platform = platform || Gem::Platform::RUBY
+      @platform     = Gem::Platform.new(platform)
       @spec_fetcher = spec_fetcher
       @dependencies = nil
     end
@@ -27,18 +29,11 @@ module Bundler
       @platform = _remote_specification.platform
     end
 
-    # A fallback is included because the original version of the specification
-    # API didn't include that field, so some marshalled specs in the index have it
-    # set to +nil+.
-    def required_rubygems_version
-      @required_rubygems_version ||= _remote_specification.required_rubygems_version || Gem::Requirement.default
-    end
-
     def full_name
-      if platform == Gem::Platform::RUBY || platform.nil?
+      @full_name ||= if @platform == Gem::Platform::RUBY
         "#{@name}-#{@version}"
       else
-        "#{@name}-#{@version}-#{platform}"
+        "#{@name}-#{@version}-#{@platform}"
       end
     end
 
@@ -105,9 +100,9 @@ module Bundler
     end
 
     def _remote_specification
-      @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @platform])
+      @_remote_specification ||= @spec_fetcher.fetch_spec([@name, @version, @original_platform])
       @_remote_specification || raise(GemspecError, "Gemspec data for #{full_name} was" \
-        " missing from the server! Try installing with `--full-index` as a workaround.")
+        " missing from the server!")
     end
 
     def method_missing(method, *args, &blk)