Merge branch 'master' into dependabot/bundler/examples/simple_rails_api/tzinfo-1.2.10

Author: kigster

examples/simple_script/Gemfile

@@ -5,5 +5,5 @@ source 'https://rubygems.org'
 gem 'awesome_print'
 gem 'colored2'
 gem 'rspec', '~> 3.7.0'
-gem 'rspec-its'
+gem 'rspec-its', github: "rspec/rspec-its", ref: "3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf" # v1.3.0
 gem 'rubocop'

examples/simple_script/Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/rspec/rspec-its.git
+  revision: 3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf
+  ref: 3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf
+  specs:
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -20,9 +29,6 @@ GEM
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
@@ -48,7 +54,7 @@ DEPENDENCIES
   awesome_print
   colored2
   rspec (~> 3.7.0)
-  rspec-its
+  rspec-its!
   rubocop
 
 BUNDLED WITH

ruby/private/bundle/create_bundle_build_file.rb

@@ -252,12 +252,22 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries)
     # Do not register local gems
     return if spec.source.path?
 
-    gem_path = GEM_PATH[ruby_version, spec.name, spec.version]
-    spec_path = SPEC_PATH[ruby_version, spec.name, spec.version]
     base_dir = "lib/ruby/#{ruby_version}"
+    if spec.source.is_a?(Bundler::Source::Git)
+      stub = spec.source.specs.find { |s| s.name == spec.name }.stub
+      gem_path = "#{base_dir}/bundler/gems/#{Pathname(stub.full_gem_path).relative_path_from(stub.base_dir)}"
+      spec_path = "#{base_dir}/bundler/gems/#{Pathname(stub.loaded_from).relative_path_from(stub.base_dir)}"
+
+      # paths to register to $LOAD_PATH
+      require_paths = stub.require_paths
+    else
+      gem_path = GEM_PATH[ruby_version, spec.name, spec.version]
+      spec_path = SPEC_PATH[ruby_version, spec.name, spec.version]
+
+      # paths to register to $LOAD_PATH
+      require_paths = Gem::StubSpecification.gemspec_stub(spec_path, base_dir, "#{base_dir}/gems").require_paths
+    end
 
-    # paths to register to $LOAD_PATH
-    require_paths = Gem::StubSpecification.gemspec_stub(spec_path, base_dir, "#{base_dir}/gems").require_paths
     # Usually, registering the directory paths listed in the `require_paths` of gemspecs is sufficient, but
     # some gems also require additional paths to be included in the load paths.
     require_paths += include_array(spec.name)