bundler.rb in licensed-2.3.1

- old
+ new

@@ -149,11 +149,11 @@
 
         # find a specifiction from the resolved ::Bundler::Definition specs
         spec = definition.resolve.find { |s| s.satisfies?(dependency) }
 
         # a nil spec should be rare, generally only seen from bundler
-        return matching_spec(dependency) || bundle_exec_gem_spec(dependency.name) if spec.nil?
+        return matching_spec(dependency) || bundle_exec_gem_spec(dependency.name, dependency.requirement) if spec.nil?
 
         # try to find a non-lazy specification that matches `spec`
         # spec.source.specs gives access to specifications with more
         # information than spec itself, including platform-specific gems.
         # these objects should have all the information needed to detect license metadata
@@ -164,11 +164,11 @@
         spec_path = ::Bundler.specs_path.join("#{spec.full_name}.gemspec")
         return Gem::Specification.load(spec_path.to_s) if File.exist?(spec_path.to_s)
 
         # if the specification file doesn't exist, get the specification using
         # the bundler and gem CLI
-        bundle_exec_gem_spec(dependency.name)
+        bundle_exec_gem_spec(dependency.name, dependency.requirement)
       end
 
       # Returns whether a dependency should be included in the final
       def include?(dependency, source)
         # ::Bundler::Dependency has an extra `should_include?`
@@ -198,23 +198,24 @@
         end
       end
 
       # Load a gem specification from the YAML returned from `gem specification`
       # This is a last resort when licensed can't obtain a specification from other means
-      def bundle_exec_gem_spec(name)
+      def bundle_exec_gem_spec(name, requirement)
         # `gem` must be available to run `gem specification`
         return unless Licensed::Shell.tool_available?("gem")
 
         # use `gem specification` with a clean ENV and clean Gem.dir paths
         # to get gem specification at the right directory
         begin
           ::Bundler.with_original_env do
             ::Bundler.rubygems.clear_paths
-            yaml = Licensed::Shell.execute(*ruby_command_args("gem", "specification", name))
+            yaml = Licensed::Shell.execute(*ruby_command_args("gem", "specification", name, "-v", requirement.to_s))
             spec = Gem::Specification.from_yaml(yaml)
             # this is horrible, but it will cache the gem_dir using the clean env
-            # so that it can be used outside of this block
-            spec.gem_dir
+            # so that it can be used outside of this block when running from
+            # the ruby packer executable environment
+            spec.gem_dir if ruby_packer?
             spec
           end
         rescue Licensed::Shell::Error
           # return nil
         ensure