bundler 1.12.6 → 1.13.0.pre.1

data/lib/bundler/source/rubygems.rb

@@ -21,12 +21,13 @@ module Bundler
         @dependency_names = []
         @allow_remote = false
         @allow_cached = false
-        @caches = [Bundler.app_cache, *Bundler.rubygems.gem_cache]
+        @caches = [cache_path, *Bundler.rubygems.gem_cache]
 
         Array(options["remotes"] || []).reverse_each {|r| add_remote(r) }
       end
 
       def remote!
+        @specs = nil
         @allow_remote = true
       end
 
@@ -123,11 +124,11 @@ module Bundler
           Bundler.ui.confirm message
 
           path = cached_gem(spec)
-          if Bundler.requires_sudo?
+          if requires_sudo?
             install_path = Bundler.tmp(spec.full_name)
             bin_path     = install_path.join("bin")
           else
-            install_path = Bundler.rubygems.gem_dir
+            install_path = rubygems_dir
             bin_path     = Bundler.system_bindir
           end
 
@@ -142,12 +143,13 @@ module Bundler
               :env_shebang         => true
             ).install
           end
+          spec.full_gem_path = installed_spec.full_gem_path
 
           # SUDO HAX
-          if Bundler.requires_sudo?
+          if requires_sudo?
             Bundler.rubygems.repository_subdirectories.each do |name|
               src = File.join(install_path, name, "*")
-              dst = File.join(Bundler.rubygems.gem_dir, name)
+              dst = File.join(rubygems_dir, name)
               if name == "extensions" && Dir.glob(src).any?
                 src = File.join(src, "*/*")
                 ext_src = Dir.glob(src).first
@@ -173,7 +175,7 @@ module Bundler
 
         spec.post_install_message
       ensure
-        Bundler.rm_rf(install_path) if Bundler.requires_sudo?
+        Bundler.rm_rf(install_path) if requires_sudo?
       end
 
       def cache(spec, custom_path = nil)
@@ -247,7 +249,7 @@ module Bundler
       end
 
       def loaded_from(spec)
-        "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
+        "#{rubygems_dir}/specifications/#{spec.full_name}.gemspec"
       end
 
       def cached_gem(spec)
@@ -315,8 +317,7 @@ module Bundler
         @cached_specs ||= begin
           idx = installed_specs.dup
 
-          path = Bundler.app_cache
-          Dir["#{path}/*.gem"].each do |gemfile|
+          Dir["#{cache_path}/*.gem"].each do |gemfile|
             next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
             s ||= Bundler.rubygems.spec_from_gem(gemfile)
             s.source = self
@@ -343,7 +344,7 @@ module Bundler
 
           # because ensuring we have all the gems we need involves downloading
           # the gemspecs of those gems, if the non-api sites contain more than
-          # about 100 gems, we just treat all sites as non-api for speed.
+          # about 100 gems, we treat all sites as non-api for speed.
           allow_api = idx.size < API_REQUEST_LIMIT && dependency_names.size < API_REQUEST_LIMIT
           Bundler.ui.debug "Need to query more than #{API_REQUEST_LIMIT} gems." \
             " Downloading full index instead..." unless allow_api
@@ -401,16 +402,16 @@ module Bundler
         uri = spec.remote.uri
         spec.fetch_platform
 
-        download_path = Bundler.requires_sudo? ? Bundler.tmp(spec.full_name) : Bundler.rubygems.gem_dir
-        gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
+        download_path = requires_sudo? ? Bundler.tmp(spec.full_name) : rubygems_dir
+        gem_path = "#{rubygems_dir}/cache/#{spec.full_name}.gem"
 
         SharedHelpers.filesystem_access("#{download_path}/cache") do |p|
           FileUtils.mkdir_p(p)
         end
         Bundler.rubygems.download_gem(spec, uri, download_path)
 
-        if Bundler.requires_sudo?
-          SharedHelpers.filesystem_access("#{Bundler.rubygems.gem_dir}/cache") do |p|
+        if requires_sudo?
+          SharedHelpers.filesystem_access("#{rubygems_dir}/cache") do |p|
             Bundler.mkdir_p(p)
           end
           Bundler.sudo "mv #{download_path}/cache/#{spec.full_name}.gem #{gem_path}"
@@ -418,7 +419,7 @@ module Bundler
 
         gem_path
       ensure
-        Bundler.rm_rf(download_path) if Bundler.requires_sudo?
+        Bundler.rm_rf(download_path) if requires_sudo?
       end
 
       def builtin_gem?(spec)
@@ -432,6 +433,18 @@ module Bundler
       def installed?(spec)
         installed_specs[spec].any?
       end
+
+      def requires_sudo?
+        Bundler.requires_sudo?
+      end
+
+      def rubygems_dir
+        Bundler.rubygems.gem_dir
+      end
+
+      def cache_path
+        Bundler.app_cache
+      end
     end
   end
 end

data/lib/bundler/source_list.rb

@@ -12,7 +12,11 @@ module Bundler
     end
 
     def add_path_source(options = {})
-      add_source_to_list Source::Path.new(options), path_sources
+      if options["gemspec"]
+        add_source_to_list Source::Gemspec.new(options), path_sources
+      else
+        add_source_to_list Source::Path.new(options), path_sources
+      end
     end
 
     def add_git_source(options = {})

data/lib/bundler/spec_set.rb

@@ -7,7 +7,7 @@ module Bundler
     extend Forwardable
     include TSort, Enumerable
 
-    def_delegators :@specs, :<<, :length, :add, :remove
+    def_delegators :@specs, :<<, :length, :add, :remove, :size
     def_delegators :sorted, :each
 
     def initialize(specs)
@@ -117,8 +117,8 @@ module Bundler
       rescue TSort::Cyclic => error
         cgems = extract_circular_gems(error)
         raise CyclicDependencyError, "Your bundle requires gems that depend" \
-          " depend on each other, creating an infinite loop. Please remove" \
-          " either gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again."
+          " on each other, creating an infinite loop. Please remove either" \
+          " gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again."
       end
     end
 

data/lib/bundler/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----

data/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt

@@ -1,24 +1,41 @@
-# Contributor Code of Conduct
+# Contributor Covenant Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
@@ -26,24 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at <%=config[:email]%>. All
+reported by contacting the project team at <%= config[:email] %>. All
 complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[version]: http://contributor-covenant.org/version/1/4/

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -21,10 +21,13 @@ Gem::Specification.new do |spec|
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]

data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe <%= config[:constant_name] %> do
-  it 'has a version number' do
+  it "has a version number" do
     expect(<%= config[:constant_name] %>::VERSION).not_to be nil
   end
 
-  it 'does something useful' do
+  it "does something useful" do
     expect(false).to eq(true)
   end
 end

data/lib/bundler/templates/newgem/spec/spec_helper.rb.tt

@@ -1,2 +1,2 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require '<%= config[:namespaced_path] %>'
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "<%= config[:namespaced_path] %>"

data/lib/bundler/ui/shell.rb

@@ -17,6 +17,10 @@ module Bundler
         @warning_history = []
       end
 
+      def add_color(string, color)
+        @shell.set_color(string, color)
+      end
+
       def info(msg, newline = nil)
         tell_me(msg, nil, newline) if level("info")
       end

data/lib/bundler/ui/silent.rb

@@ -2,6 +2,9 @@
 module Bundler
   module UI
     class Silent
+      def add_color(string, color)
+      end
+
       def info(message, newline = nil)
       end
 

data/lib/bundler/uri_credentials_filter.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Bundler
+  module URICredentialsFilter
+  module_function
+
+    def credential_filtered_uri(uri_to_anonymize)
+      return uri_to_anonymize if uri_to_anonymize.nil?
+      uri = uri_to_anonymize.dup
+      uri = URI(uri.to_s) unless uri.is_a?(URI)
+      if uri.userinfo
+        # oauth authentication
+        if uri.password == "x-oauth-basic" || uri.password == "x"
+          # URI as string does not display with password if no user is set
+          oauth_designation = uri.password
+          uri.user = oauth_designation
+        end
+        uri.password = nil
+      end
+      return uri if uri_to_anonymize.is_a?(URI)
+      return uri.to_s if uri_to_anonymize.is_a?(String)
+    rescue URI::InvalidURIError # uri is not canonical uri scheme
+      uri
+    end
+
+    def credential_filtered_string(str_to_filter, uri)
+      return str_to_filter if uri.nil? || str_to_filter.nil?
+      str_with_no_credentials = str_to_filter.dup
+      anonymous_uri_str = credential_filtered_uri(uri).to_s
+      uri_str = uri.to_s
+      if anonymous_uri_str != uri_str
+        str_with_no_credentials = str_with_no_credentials.gsub(uri_str, anonymous_uri_str)
+      end
+      str_with_no_credentials
+    end
+  end
+end

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

@@ -50,7 +50,7 @@ class Bundler::CompactIndexClient
         mode = response.is_a?(Net::HTTPPartialContent) ? "a" : "w"
         local_temp_path.open(mode) {|f| f << content }
 
-        response_etag = response["ETag"].gsub(%r{\AW/}, "")
+        response_etag = response["ETag"]
         if etag_for(local_temp_path) == response_etag
           FileUtils.mv(local_temp_path, local_path)
           return

data/lib/bundler/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+module Bundler::Molinillo
+  # @!visibility private
+  module Delegates
+    # Delegates all {Bundler::Molinillo::ResolutionState} methods to a `#state` property.
+    module ResolutionState
+      # (see Bundler::Molinillo::ResolutionState#name)
+      def name
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.name
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#requirements)
+      def requirements
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.requirements
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#activated)
+      def activated
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.activated
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#requirement)
+      def requirement
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.requirement
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#possibilities)
+      def possibilities
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.possibilities
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#depth)
+      def depth
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.depth
+      end
+
+      # (see Bundler::Molinillo::ResolutionState#conflicts)
+      def conflicts
+        current_state = state || Bundler::Molinillo::ResolutionState.empty
+        current_state.conflicts
+      end
+    end
+  end
+end