rubygems-update 3.5.4 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb7b6f7687a1507b8536010f6eed4228f0e940ba642a684070d9e5b7676813b
-  data.tar.gz: df18b884768e1c6ce0b9566cee7df79dba8f07b40bb7798b109e4c2834b6991b
+  metadata.gz: 441d0ff90372c26b0c6ecb291af1dffa910597060b81e655cd17fdd0f28f0fac
+  data.tar.gz: bd7079f9e2f60401c275254d5418986baadc1578788cfb4ed20dd9c163d00df7
 SHA512:
-  metadata.gz: 660660053dd83e660146422b033644d7ecf5f8ba13fb38995d37248979ef8c259aad042b9b9f741b0a5cf405bea117e86e5e7ef30c7d1db76f0de3b1d9fe2e59
-  data.tar.gz: b6036f05191c48ca663ea87e3e5f142f60da79f97d2adaba0796f30de65be4bdf039ccd122433a5ae5ba161f6df2e436cd2627c8a65107049b7ea0fc9bce5f1e
+  metadata.gz: 58c8b6329079a1a2b8849fd17167e31fd7bb9dc255b226489db1be189ec245b004bc49bd58e6e336608260c24e88a40003e903b35445d3b8f5bf546be2e06a92
+  data.tar.gz: a4154c7e57d48f9c88e25ef975340b49b51195455ae1548285439bc0fd776019f3c4d250f170b743cfe83ac4132b2165f39d528bbd73470c65008792ac092fea

data/CHANGELOG.md

@@ -1,4 +1,51 @@
-# 3.5.4 / 2024-01-03
+# 3.5.6 / 2024-02-06
+
+## Enhancements:
+
+* Deep copy requirements in `Gem::Specification` and `Gem::Requirement`.
+  Pull request [#7439](https://github.com/rubygems/rubygems/pull/7439) by
+  flavorjones
+* Change gem login message to clear up that username can be also used.
+  Pull request [#7422](https://github.com/rubygems/rubygems/pull/7422) by
+  VitaliySerov
+* Add metadata for rubygems.org. Pull request
+  [#7435](https://github.com/rubygems/rubygems/pull/7435) by m-nakamura145
+* Improve gem login scope selection. Pull request
+  [#7342](https://github.com/rubygems/rubygems/pull/7342) by williantenfen
+* Vendor uri in RubyGems. Pull request
+  [#7386](https://github.com/rubygems/rubygems/pull/7386) by
+  deivid-rodriguez
+* Installs bundler 2.5.6 as a default gem.
+
+## Bug fixes:
+
+* Skip to load commented out words. Pull request
+  [#7413](https://github.com/rubygems/rubygems/pull/7413) by hsbt
+* Fix rake runtime dependency warning for rake based extension. Pull
+  request [#7395](https://github.com/rubygems/rubygems/pull/7395) by ntkme
+
+# 3.5.5 / 2024-01-18
+
+## Enhancements:
+
+* Installs bundler 2.5.5 as a default gem.
+
+## Bug fixes:
+
+* Fix `require` activation conflicts when requiring default gems under
+  some situations. Pull request
+  [#7379](https://github.com/rubygems/rubygems/pull/7379) by
+  deivid-rodriguez
+* Use cache_home instead of data_home in default_spec_cache_dir. Pull
+  request [#7331](https://github.com/rubygems/rubygems/pull/7331) by mrkn
+
+## Documentation:
+
+* Use squiggly heredocs in `Gem::Specification#description` documentation,
+  so it doesn't add leading whitespace. Pull request
+  [#7373](https://github.com/rubygems/rubygems/pull/7373) by bravehager
+
+# 3.5.4 / 2024-01-04
 
 ## Enhancements:
 

data/Manifest.txt

@@ -431,37 +431,9 @@ lib/rubygems/installer.rb
 lib/rubygems/installer_uninstaller_utils.rb
 lib/rubygems/local_remote_options.rb
 lib/rubygems/name_tuple.rb
-lib/rubygems/net-http/.document
-lib/rubygems/net-http/LICENSE.txt
-lib/rubygems/net-http/lib/net/http.rb
-lib/rubygems/net-http/lib/net/http/backward.rb
-lib/rubygems/net-http/lib/net/http/exceptions.rb
-lib/rubygems/net-http/lib/net/http/generic_request.rb
-lib/rubygems/net-http/lib/net/http/header.rb
-lib/rubygems/net-http/lib/net/http/proxy_delta.rb
-lib/rubygems/net-http/lib/net/http/request.rb
-lib/rubygems/net-http/lib/net/http/requests.rb
-lib/rubygems/net-http/lib/net/http/response.rb
-lib/rubygems/net-http/lib/net/http/responses.rb
-lib/rubygems/net-http/lib/net/http/status.rb
-lib/rubygems/net-http/lib/net/https.rb
-lib/rubygems/net-protocol/.document
-lib/rubygems/net-protocol/LICENSE.txt
-lib/rubygems/net-protocol/lib/net/protocol.rb
 lib/rubygems/net/http.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
-lib/rubygems/optparse/lib/optparse/ac.rb
-lib/rubygems/optparse/lib/optparse/date.rb
-lib/rubygems/optparse/lib/optparse/kwargs.rb
-lib/rubygems/optparse/lib/optparse/shellwords.rb
-lib/rubygems/optparse/lib/optparse/time.rb
-lib/rubygems/optparse/lib/optparse/uri.rb
-lib/rubygems/optparse/lib/optparse/version.rb
 lib/rubygems/package.rb
 lib/rubygems/package/digest_io.rb
 lib/rubygems/package/file_source.rb
@@ -489,9 +461,6 @@ lib/rubygems/request_set/lockfile.rb
 lib/rubygems/request_set/lockfile/parser.rb
 lib/rubygems/request_set/lockfile/tokenizer.rb
 lib/rubygems/requirement.rb
-lib/rubygems/resolv/.document
-lib/rubygems/resolv/LICENSE.txt
-lib/rubygems/resolv/lib/resolv.rb
 lib/rubygems/resolver.rb
 lib/rubygems/resolver/activation_request.rb
 lib/rubygems/resolver/api_set.rb
@@ -511,29 +480,6 @@ lib/rubygems/resolver/installer_set.rb
 lib/rubygems/resolver/local_specification.rb
 lib/rubygems/resolver/lock_set.rb
 lib/rubygems/resolver/lock_specification.rb
-lib/rubygems/resolver/molinillo.rb
-lib/rubygems/resolver/molinillo/.document
-lib/rubygems/resolver/molinillo/LICENSE
-lib/rubygems/resolver/molinillo/lib/molinillo.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/action.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/log.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/set_payload.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/tag.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
-lib/rubygems/resolver/molinillo/lib/molinillo/state.rb
 lib/rubygems/resolver/requirement_list.rb
 lib/rubygems/resolver/set.rb
 lib/rubygems/resolver/source_set.rb
@@ -574,13 +520,7 @@ lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem
 lib/rubygems/stub_specification.rb
 lib/rubygems/text.rb
 lib/rubygems/timeout.rb
-lib/rubygems/timeout/.document
-lib/rubygems/timeout/LICENSE.txt
-lib/rubygems/timeout/lib/timeout.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/update_suggestion.rb
@@ -591,6 +531,83 @@ lib/rubygems/util.rb
 lib/rubygems/util/licenses.rb
 lib/rubygems/util/list.rb
 lib/rubygems/validator.rb
+lib/rubygems/vendor/molinillo/.document
+lib/rubygems/vendor/molinillo/LICENSE
+lib/rubygems/vendor/molinillo/lib/molinillo.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/action.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_edge_no_circular.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/add_vertex.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/delete_edge.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/detach_vertex_named.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/log.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/set_payload.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/tag.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/dependency_graph/vertex.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/errors.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/gem_metadata.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/modules/ui.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/resolution.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/resolver.rb
+lib/rubygems/vendor/molinillo/lib/molinillo/state.rb
+lib/rubygems/vendor/net-http/.document
+lib/rubygems/vendor/net-http/LICENSE.txt
+lib/rubygems/vendor/net-http/lib/net/http.rb
+lib/rubygems/vendor/net-http/lib/net/http/backward.rb
+lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb
+lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb
+lib/rubygems/vendor/net-http/lib/net/http/header.rb
+lib/rubygems/vendor/net-http/lib/net/http/proxy_delta.rb
+lib/rubygems/vendor/net-http/lib/net/http/request.rb
+lib/rubygems/vendor/net-http/lib/net/http/requests.rb
+lib/rubygems/vendor/net-http/lib/net/http/response.rb
+lib/rubygems/vendor/net-http/lib/net/http/responses.rb
+lib/rubygems/vendor/net-http/lib/net/http/status.rb
+lib/rubygems/vendor/net-http/lib/net/https.rb
+lib/rubygems/vendor/net-protocol/.document
+lib/rubygems/vendor/net-protocol/LICENSE.txt
+lib/rubygems/vendor/net-protocol/lib/net/protocol.rb
+lib/rubygems/vendor/optparse/.document
+lib/rubygems/vendor/optparse/COPYING
+lib/rubygems/vendor/optparse/lib/optionparser.rb
+lib/rubygems/vendor/optparse/lib/optparse.rb
+lib/rubygems/vendor/optparse/lib/optparse/ac.rb
+lib/rubygems/vendor/optparse/lib/optparse/date.rb
+lib/rubygems/vendor/optparse/lib/optparse/kwargs.rb
+lib/rubygems/vendor/optparse/lib/optparse/shellwords.rb
+lib/rubygems/vendor/optparse/lib/optparse/time.rb
+lib/rubygems/vendor/optparse/lib/optparse/uri.rb
+lib/rubygems/vendor/optparse/lib/optparse/version.rb
+lib/rubygems/vendor/resolv/.document
+lib/rubygems/vendor/resolv/LICENSE.txt
+lib/rubygems/vendor/resolv/lib/resolv.rb
+lib/rubygems/vendor/timeout/.document
+lib/rubygems/vendor/timeout/LICENSE.txt
+lib/rubygems/vendor/timeout/lib/timeout.rb
+lib/rubygems/vendor/tsort/.document
+lib/rubygems/vendor/tsort/LICENSE.txt
+lib/rubygems/vendor/tsort/lib/tsort.rb
+lib/rubygems/vendor/uri/.document
+lib/rubygems/vendor/uri/LICENSE.txt
+lib/rubygems/vendor/uri/lib/uri.rb
+lib/rubygems/vendor/uri/lib/uri/common.rb
+lib/rubygems/vendor/uri/lib/uri/file.rb
+lib/rubygems/vendor/uri/lib/uri/ftp.rb
+lib/rubygems/vendor/uri/lib/uri/generic.rb
+lib/rubygems/vendor/uri/lib/uri/http.rb
+lib/rubygems/vendor/uri/lib/uri/https.rb
+lib/rubygems/vendor/uri/lib/uri/ldap.rb
+lib/rubygems/vendor/uri/lib/uri/ldaps.rb
+lib/rubygems/vendor/uri/lib/uri/mailto.rb
+lib/rubygems/vendor/uri/lib/uri/rfc2396_parser.rb
+lib/rubygems/vendor/uri/lib/uri/rfc3986_parser.rb
+lib/rubygems/vendor/uri/lib/uri/version.rb
+lib/rubygems/vendor/uri/lib/uri/ws.rb
+lib/rubygems/vendor/uri/lib/uri/wss.rb
+lib/rubygems/vendored_molinillo.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
 lib/rubygems/yaml_serializer.rb

data/POLICIES.md

@@ -79,11 +79,11 @@ changelog.
 If PRs don't have a proper label, they won't be backported to patch releases.
 
 If you want a PR to be backported to a patch level release, but don't want to
-include it in the changelog, you can use the special `rubygems: backport` and
-`bundler: backport` labels. For example, this is useful when backporting a PR
-generates conflicts that are solved by backporting another PR with no user
-visible changes. You can use these special labels to also backport the other PR
-and not get any conflicts.
+include it in the changelog, you can use the special `rubygems: skip changelog`
+and `bundler: skip changelog` labels. For example, this is useful when
+backporting a PR generates conflicts that are solved by backporting another PR
+with no user visible changes. You can use these special labels to also backport
+the other PR and not get any conflicts.
 
 ### Steps for patch releases
 

data/bundler/CHANGELOG.md

@@ -1,4 +1,30 @@
-# 2.5.4 (January 3, 2024)
+# 2.5.6 (February 6, 2024)
+
+## Deprecations:
+
+  - Refactor lockfile generation and deprecate `Definition#lock` with explicit lockfile [#7047](https://github.com/rubygems/rubygems/pull/7047)
+
+## Enhancements:
+
+  - Bump `required_ruby_version` to be used in `bundle gem` template [#7430](https://github.com/rubygems/rubygems/pull/7430)
+
+## Bug fixes:
+
+  - Fix musl platform not being added to the lockfile [#7441](https://github.com/rubygems/rubygems/pull/7441)
+  - Let `Bundler.with_original_env` properly restore env variables originally empty [#7383](https://github.com/rubygems/rubygems/pull/7383)
+
+# 2.5.5 (January 18, 2024)
+
+## Bug fixes:
+
+  - Fix development dependency not being added if introduced by two gemspecs [#7358](https://github.com/rubygems/rubygems/pull/7358)
+  - Fix ETag quoting regression in If-None-Match header of compact index request [#7352](https://github.com/rubygems/rubygems/pull/7352)
+
+## Documentation:
+
+  - Refer to underscores as underscores [#7364](https://github.com/rubygems/rubygems/pull/7364)
+
+# 2.5.4 (January 4, 2024)
 
 ## Bug fixes:
 

data/bundler/lib/bundler/build_metadata.rb

@@ -4,8 +4,8 @@ module Bundler
   # Represents metadata from when the Bundler gem was built.
   module BuildMetadata
     # begin ivars
-    @built_at = "2024-01-04".freeze
-    @git_commit_sha = "7ffda9ba9b".freeze
+    @built_at = "2024-02-06".freeze
+    @git_commit_sha = "7ac045dcaa".freeze
     @release = true
     # end ivars
 

data/bundler/lib/bundler/cli/gem.rb

@@ -437,7 +437,7 @@ module Bundler
     end
 
     def required_ruby_version
-      "2.6.0"
+      "3.0.0"
     end
 
     def rubocop_version

data/bundler/lib/bundler/cli/lock.rb

@@ -33,8 +33,11 @@ module Bundler
         update = { bundler: bundler }
       end
 
+      file = options[:lockfile]
+      file = file ? Pathname.new(file).expand_path : Bundler.default_lockfile
+
       Bundler.settings.temporary(frozen: false) do
-        definition = Bundler.definition(update)
+        definition = Bundler.definition(update, file)
 
         Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
 
@@ -60,10 +63,8 @@ module Bundler
         if print
           puts definition.to_lock
         else
-          file = options[:lockfile]
-          file = file ? File.expand_path(file) : Bundler.default_lockfile
           puts "Writing lockfile to #{file}"
-          definition.lock(file)
+          definition.lock
         end
       end
 

data/bundler/lib/bundler/cli.rb

@@ -785,7 +785,7 @@ module Bundler
       return unless SharedHelpers.md5_available?
 
       latest = Fetcher::CompactIndex.
-               new(nil, Source::Rubygems::Remote.new(Bundler::URI("https://rubygems.org")), nil, nil).
+               new(nil, Source::Rubygems::Remote.new(Gem::URI("https://rubygems.org")), nil, nil).
                send(:compact_index_client).
                instance_variable_get(:@cache).
                dependencies("bundler").

data/bundler/lib/bundler/compact_index_client/updater.rb

@@ -42,7 +42,7 @@ module Bundler
           else
             file.write(response.body)
           end
-          CacheFile.write(etag_path, etag(response))
+          CacheFile.write(etag_path, etag_from_response(response))
           true
         end
       end
@@ -53,13 +53,13 @@ module Bundler
         response = @fetcher.call(remote_path, request_headers(etag))
         return true if response.is_a?(Gem::Net::HTTPNotModified)
         CacheFile.write(local_path, response.body, parse_digests(response))
-        CacheFile.write(etag_path, etag(response))
+        CacheFile.write(etag_path, etag_from_response(response))
       end
 
       def request_headers(etag, range_start = nil)
         headers = {}
         headers["Range"] = "bytes=#{range_start}-" if range_start
-        headers["If-None-Match"] = etag if etag
+        headers["If-None-Match"] = %("#{etag}") if etag
         headers
       end
 
@@ -77,7 +77,7 @@ module Bundler
         etag
       end
 
-      def etag(response)
+      def etag_from_response(response)
         return unless response["ETag"]
         etag = response["ETag"].delete_prefix("W/")
         return if etag.delete_prefix!('"') && !etag.delete_suffix!('"')

data/bundler/lib/bundler/definition.rb

@@ -320,38 +320,26 @@ module Bundler
       dependencies.map(&:groups).flatten.uniq
     end
 
-    def lock(file, preserve_unknown_sections = false)
-      return if Definition.no_lock
-
-      contents = to_lock
-
-      # Convert to \r\n if the existing lock has them
-      # i.e., Windows with `git config core.autocrlf=true`
-      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
-
-      if @locked_bundler_version
-        locked_major = @locked_bundler_version.segments.first
-        current_major = bundler_version_to_lock.segments.first
-
-        updating_major = locked_major < current_major
-      end
+    def lock(file_or_preserve_unknown_sections = false, preserve_unknown_sections_or_unused = false)
+      if [true, false, nil].include?(file_or_preserve_unknown_sections)
+        target_lockfile = lockfile || Bundler.default_lockfile
+        preserve_unknown_sections = file_or_preserve_unknown_sections
+      else
+        target_lockfile = file_or_preserve_unknown_sections
+        preserve_unknown_sections = preserve_unknown_sections_or_unused
 
-      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+        suggestion = if target_lockfile == lockfile
+          "To fix this warning, remove it from the `Definition#lock` call."
+        else
+          "Instead, instantiate a new definition passing `#{target_lockfile}`, and call `lock` without a file argument on that definition"
+        end
 
-      if file && File.exist?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
-        return if Bundler.frozen_bundle?
-        SharedHelpers.filesystem_access(file) { FileUtils.touch(file) }
-        return
-      end
+        msg = "`Definition#lock` was passed a target file argument. #{suggestion}"
 
-      if Bundler.frozen_bundle?
-        Bundler.ui.error "Cannot write a changed lockfile while frozen."
-        return
+        Bundler::SharedHelpers.major_deprecation 2, msg
       end
 
-      SharedHelpers.filesystem_access(file) do |p|
-        File.open(p, "wb") {|f| f.puts(contents) }
-      end
+      write_lock(target_lockfile, preserve_unknown_sections)
     end
 
     def locked_ruby_version
@@ -518,7 +506,45 @@ module Bundler
     end
 
     def lockfile_exists?
-      lockfile && File.exist?(lockfile)
+      file_exists?(lockfile)
+    end
+
+    def file_exists?(file)
+      file && File.exist?(file)
+    end
+
+    def write_lock(file, preserve_unknown_sections)
+      return if Definition.no_lock
+
+      contents = to_lock
+
+      # Convert to \r\n if the existing lock has them
+      # i.e., Windows with `git config core.autocrlf=true`
+      contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match?("\r\n")
+
+      if @locked_bundler_version
+        locked_major = @locked_bundler_version.segments.first
+        current_major = bundler_version_to_lock.segments.first
+
+        updating_major = locked_major < current_major
+      end
+
+      preserve_unknown_sections ||= !updating_major && (Bundler.frozen_bundle? || !(unlocking? || @unlocking_bundler))
+
+      if file_exists?(file) && lockfiles_equal?(@lockfile_contents, contents, preserve_unknown_sections)
+        return if Bundler.frozen_bundle?
+        SharedHelpers.filesystem_access(file) { FileUtils.touch(file) }
+        return
+      end
+
+      if Bundler.frozen_bundle?
+        Bundler.ui.error "Cannot write a changed lockfile while frozen."
+        return
+      end
+
+      SharedHelpers.filesystem_access(file) do |p|
+        File.open(p, "wb") {|f| f.puts(contents) }
+      end
     end
 
     def resolver

data/bundler/lib/bundler/dsl.rb

@@ -102,9 +102,6 @@ module Bundler
 
       # if there's already a dependency with this name we try to prefer one
       if current = @dependencies.find {|d| d.name == dep.name }
-        # Always prefer the dependency from the Gemfile
-        @dependencies.delete(current) if current.gemspec_dev_dep?
-
         if current.requirement != dep.requirement
           current_requirement_open = current.requirements_list.include?(">= 0")
 
@@ -116,8 +113,6 @@ module Bundler
               Bundler.ui.warn "A gemspec development dependency (#{gemspec_dep.name}, #{gemspec_dep.requirement}) is being overridden by a Gemfile dependency (#{gemfile_dep.name}, #{gemfile_dep.requirement}).\n" \
                               "This behaviour may change in the future. Please remove either of them, or make sure they both have the same requirement\n"
             end
-
-            return if dep.gemspec_dev_dep?
           else
             update_prompt = ""
 
@@ -135,8 +130,13 @@ module Bundler
                            "You specified: #{current.name} (#{current.requirement}) and #{dep.name} (#{dep.requirement})" \
                            "#{update_prompt}"
           end
-        elsif current.gemspec_dev_dep? || dep.gemspec_dev_dep?
-          return if dep.gemspec_dev_dep?
+        end
+
+        # Always prefer the dependency from the Gemfile
+        if current.gemspec_dev_dep?
+          @dependencies.delete(current)
+        elsif dep.gemspec_dev_dep?
+          return
         elsif current.source != dep.source
           raise GemfileError, "You cannot specify the same gem twice coming from different sources.\n" \
                           "You specified that #{dep.name} (#{dep.requirement}) should come from " \

data/bundler/lib/bundler/environment_preserver.rb

@@ -58,9 +58,9 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value = env[key]
-        if !value.nil? && !value.empty?
+        if !value.nil?
           env[@prefix + key] ||= value
-        elsif value.nil?
+        else
           env[@prefix + key] ||= INTENTIONALLY_NIL
         end
       end
@@ -72,7 +72,7 @@ module Bundler
       env = @original.clone
       @keys.each do |key|
         value_original = env[@prefix + key]
-        next if value_original.nil? || value_original.empty?
+        next if value_original.nil?
         if value_original == INTENTIONALLY_NIL
           env.delete(key)
         else

data/bundler/lib/bundler/fetcher/downloader.rb

@@ -23,7 +23,7 @@ module Bundler
         when Gem::Net::HTTPSuccess, Gem::Net::HTTPNotModified
           response
         when Gem::Net::HTTPRedirection
-          new_uri = Bundler::URI.parse(response["location"])
+          new_uri = Gem::URI.parse(response["location"])
           if new_uri.host == uri.host
             new_uri.user = uri.user
             new_uri.password = uri.password

data/bundler/lib/bundler/fetcher.rb

@@ -111,7 +111,7 @@ module Bundler
       spec -= [nil, "ruby", ""]
       spec_file_name = "#{spec.join "-"}.gemspec"
 
-      uri = Bundler::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
+      uri = Gem::URI.parse("#{remote_uri}#{Gem::MARSHAL_SPEC_DIR}#{spec_file_name}.rz")
       spec = if uri.scheme == "file"
         path = Gem::Util.correct_for_windows_path(uri.path)
         Bundler.safe_load_marshal Bundler.rubygems.inflate(Gem.read_binary(path))
@@ -255,7 +255,7 @@ module Bundler
 
         con = Gem::Net::HTTP::Persistent.new name: "bundler", proxy: :ENV
         if gem_proxy = Gem.configuration[:http_proxy]
-          con.proxy = Bundler::URI.parse(gem_proxy) if gem_proxy != :no_proxy
+          con.proxy = Gem::URI.parse(gem_proxy) if gem_proxy != :no_proxy
         end
 
         if remote_uri.scheme == "https"

data/bundler/lib/bundler/injector.rb

@@ -50,7 +50,7 @@ module Bundler
         append_to(gemfile_path, build_gem_lines(@options[:conservative_versioning])) if @deps.any?
 
         # since we resolved successfully, write out the lockfile
-        @definition.lock(Bundler.default_lockfile)
+        @definition.lock
 
         # invalidate the cached Bundler.definition
         Bundler.reset_paths!

data/bundler/lib/bundler/installer.rb

@@ -260,8 +260,8 @@ module Bundler
       true
     end
 
-    def lock(opts = {})
-      @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
+    def lock
+      @definition.lock
     end
   end
 end

data/bundler/lib/bundler/man/bundle-config.1

@@ -302,9 +302,9 @@ Note that any configured credentials will be redacted by informative commands su
 .P
 Also note that to guarantee a sane mapping between valid environment variable names and valid host names, bundler makes the following transformations:
 .IP "\(bu" 4
-Any \fB\-\fR characters in a host name are mapped to a triple dash (\fB___\fR) in the corresponding environment variable\.
+Any \fB\-\fR characters in a host name are mapped to a triple underscore (\fB___\fR) in the corresponding environment variable\.
 .IP "\(bu" 4
-Any \fB\.\fR characters in a host name are mapped to a double dash (\fB__\fR) in the corresponding environment variable\.
+Any \fB\.\fR characters in a host name are mapped to a double underscore (\fB__\fR) in the corresponding environment variable\.
 .IP "" 0
 .P
 This means that if you have a gem server named \fBmy\.gem\-host\.com\fR, you'll need to use the \fBBUNDLE_MY__GEM___HOST__COM\fR variable to configure credentials for it through ENV\.

data/bundler/lib/bundler/man/bundle-config.1.ronn

@@ -388,10 +388,10 @@ copy-pasting bundler output.
 Also note that to guarantee a sane mapping between valid environment variable
 names and valid host names, bundler makes the following transformations:
 
-* Any `-` characters in a host name are mapped to a triple dash (`___`) in the
+* Any `-` characters in a host name are mapped to a triple underscore (`___`) in the
   corresponding environment variable.
 
-* Any `.` characters in a host name are mapped to a double dash (`__`) in the
+* Any `.` characters in a host name are mapped to a double underscore (`__`) in the
   corresponding environment variable.
 
 This means that if you have a gem server named `my.gem-host.com`, you'll need to

data/bundler/lib/bundler/mirror.rb

@@ -47,7 +47,7 @@ module Bundler
 
       def fetch_valid_mirror_for(uri)
         downcased = uri.to_s.downcase
-        mirror = @mirrors[downcased] || @mirrors[Bundler::URI(downcased).host] || Mirror.new(uri)
+        mirror = @mirrors[downcased] || @mirrors[Gem::URI(downcased).host] || Mirror.new(uri)
         mirror.validate!(@prober)
         mirror = Mirror.new(uri) unless mirror.valid?
         mirror
@@ -74,7 +74,7 @@ module Bundler
         @uri = if uri.nil?
           nil
         else
-          Bundler::URI(uri.to_s)
+          Gem::URI(uri.to_s)
         end
         @valid = nil
       end
@@ -126,7 +126,7 @@ module Bundler
         if uri == "all"
           @all = true
         else
-          @uri = Bundler::URI(uri).absolute? ? Settings.normalize_uri(uri) : uri
+          @uri = Gem::URI(uri).absolute? ? Settings.normalize_uri(uri) : uri
         end
         @value = value
       end