diff options
| author | Asutosh Palai <asupalai@gmail.com> | 2016-06-14 18:42:05 +0530 |
|---|---|---|
| committer | Asutosh Palai <asupalai@gmail.com> | 2016-07-03 09:40:26 +0530 |
| commit | 557c0e8999f090e3dd13eeb13797eefad586c13c (patch) | |
| tree | 3cc9094e427db6e4893b60ccbcb76c05bb3aabe1 /lib | |
| parent | f0ebe72ea232e5534cb1fa3d5f9d19badcb0c626 (diff) | |
| download | bundler-557c0e8999f090e3dd13eeb13797eefad586c13c.tar.gz | |
gems from plugin sources are loading
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/lockfile_parser.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/plugin/api/source.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/rubygems_ext.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb index cd066e1f..638a308b 100644 --- a/lib/bundler/lockfile_parser.rb +++ b/lib/bundler/lockfile_parser.rb @@ -22,7 +22,7 @@ module Bundler GIT = "GIT".freeze GEM = "GEM".freeze PATH = "PATH".freeze - PLUGIN = "PATH".freeze + PLUGIN = "PLUGIN".freeze SPECS = " specs:".freeze OPTIONS = /^ ([a-z]+): (.*)$/i SOURCE = [GIT, GEM, PATH, PLUGIN].freeze diff --git a/lib/bundler/plugin/api/source.rb b/lib/bundler/plugin/api/source.rb index dc7406ed..2d16513b 100644 --- a/lib/bundler/plugin/api/source.rb +++ b/lib/bundler/plugin/api/source.rb @@ -54,7 +54,7 @@ module Bundler end def fetch_gemfiles - raise "Source plugins need to define fetch_gemfile method" + [] end def options_to_lock diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb index 53db29a9..88c446e1 100644 --- a/lib/bundler/rubygems_ext.rb +++ b/lib/bundler/rubygems_ext.rb @@ -25,7 +25,7 @@ module Gem attr_writer :full_gem_path unless instance_methods.include?(:full_gem_path=) def full_gem_path - if source.respond_to?(:path) + if source.respond_to?(:path) || source.is_a?(Bundler::Plugin::API::Source) Pathname.new(loaded_from).dirname.expand_path(source.root).to_s.untaint else rg_full_gem_path |