Change how plugin deps are identified

Since #8486, hax to make any dependency type work inside bundler
have been removed, so we mark plugins as type: :plugin. Instead,
follow that PR's lead and just make it a dedicated option to
Bundler::Dependency.

Author: ccutrer

bundler/lib/bundler/definition.rb

@@ -286,7 +286,7 @@ def requested_dependencies
     end
 
     def plugin_dependencies
-      requested_dependencies.select {|dep| dep.type == :plugin }
+      requested_dependencies.select(&:plugin?)
     end
 
     def current_dependencies
@@ -1350,9 +1350,9 @@ def remove_plugin_dependencies_if_necessary
       return if Bundler.settings[:plugins_in_lockfile]
       # we already have plugin dependencies in the lockfile; continue to do so regardless
       # of the current setting
-      return if @dependencies.any? {|d| d.type == :plugin && @locked_deps.key?(d.name) }
+      return if @dependencies.any? {|d| d.plugin? && @locked_deps.key?(d.name) }
 
-      @dependencies.reject! {|d| d.type == :plugin }
+      @dependencies.reject!(&:plugin?)
     end
   end
 end

bundler/lib/bundler/dependency.rb

@@ -7,15 +7,7 @@ module Bundler
   class Dependency < Gem::Dependency
     def initialize(name, version, options = {}, &blk)
       type = options["type"] || :runtime
-      if type == :plugin
-        # RubyGems doesn't support plugin type, which only
-        # makes sense in the context of Bundler, so bypass
-        # the RubyGems validation
-        super(name, version, :runtime)
-        @type = type
-      else
-        super(name, version, type)
-      end
+      super(name, version, type)
 
       @options = options
     end
@@ -126,6 +118,10 @@ def gemfile_dep?
       !gemspec_dev_dep?
     end
 
+    def plugin?
+      @plugin ||= @options.fetch("plugin", false)
+    end
+
     def current_env?
       return true unless env
       if env.is_a?(Hash)

bundler/lib/bundler/dsl.rb

@@ -267,7 +267,7 @@ def plugin(name, *args)
       version = args || [">= 0"]
 
       normalize_options(name, version, options)
-      options["type"] = :plugin
+      options["plugin"] = true
       options["require"] = false
 
       add_dependency(name, version, options)

bundler/lib/bundler/plugin/installer.rb

@@ -95,7 +95,7 @@ def install_rubygems(names, version, sources)
       end
 
       def install_all_sources(names, version, source_list, source = nil)
-        deps = names.map {|name| Dependency.new(name, version, { "source" => source, "type" => :plugin }) }
+        deps = names.map {|name| Dependency.new(name, version, { "source" => source, "plugin" => true }) }
 
         Bundler.configure_gem_home_and_path(Plugin.root)
 

spec/bundler/plugin_spec.rb

@@ -140,7 +140,7 @@
 
       before do
         allow(index).to receive(:installed?) { nil }
-        allow(definition).to receive(:dependencies) { [Bundler::Dependency.new("new-plugin", ">=0", "type" => :plugin), Bundler::Dependency.new("another-plugin", ">=0", "type" => :plugin)] }
+        allow(definition).to receive(:dependencies) { [Bundler::Dependency.new("new-plugin", ">=0", "plugin" => true), Bundler::Dependency.new("another-plugin", ">=0", "plugin" => true)] }
         allow(installer).to receive(:install_definition) { plugin_specs }
       end