From bb6475e7536c5509f8acc5b6e571b6b88d83d460 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Mon, 6 Oct 2014 16:32:34 +0100 Subject: Fix issue encountered with bundler 1.1.4 --- import/rubygems.to_chunk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/import/rubygems.to_chunk b/import/rubygems.to_chunk index 0a939a0f..1e8cd893 100755 --- a/import/rubygems.to_chunk +++ b/import/rubygems.to_chunk @@ -28,9 +28,9 @@ class << Bundler end end -def spec_is_from_current_source_tree(spec) +def spec_is_from_current_source_tree(spec, source_dir) spec.source.instance_of? Bundler::Source::Path and - spec.source.path.fnmatch?('.') + spec.source.path.fnmatch?(source_dir) end BANNER = "Usage: rubygems.to_chunk SOURCE_DIR GEM_NAME [VERSION]" @@ -223,7 +223,7 @@ class RubyGemChunkMorphologyGenerator < Importer::Base spec = get_spec_for_gem(resolved_specs, gem_name) - if not spec_is_from_current_source_tree(spec) + if not spec_is_from_current_source_tree(spec, source_dir_name) error "Specified gem '#{spec.name}' doesn't live in the source in " + "'#{source_dir_name}'" log.debug "SPEC: #{spec.inspect} #{spec.source}" -- cgit v1.2.1