lib/bundler/rubygems_integration.rb in bundler-1.1.pre.2 vs lib/bundler/rubygems_integration.rb in bundler-1.1.pre.3
- old
+ new
@@ -3,30 +3,20 @@
def initialize
# Work around a RubyGems bug
configuration
end
- def is_19?
- false
- end
-
- # Make sure that rubygems has fully loaded (1.9 partially loads
- # sometimes)
- def fully_load!
- Gem.source_index if is_19?
- end
-
def loaded_specs(name)
Gem.loaded_specs[name]
end
def mark_loaded(spec)
Gem.loaded_specs[spec.name] = spec
end
def path(obj)
- Gem::Path.path(obj)
+ obj.to_s
end
def platforms
Gem.platforms
end
@@ -66,11 +56,13 @@
def user_home
Gem.user_home
end
def gem_path
- Gem.path.to_s
+ # Make sure that Gem.path is an array of Strings, not some
+ # internal Rubygems object
+ Gem.path.map { |x| x.to_s }
end
def marshal_spec_dir
Gem::MARSHAL_SPEC_DIR
end
@@ -258,14 +250,10 @@
class Legacy < RubygemsIntegration
def stub_rubygems(specs)
stub_source_index137(specs)
end
- def path(obj)
- obj.to_s
- end
-
def all_specs
Gem.source_index.all_gems.values
end
def find_name(name)
@@ -274,13 +262,9 @@
end
class Transitional < Legacy
def stub_rubygems(specs)
stub_source_index170(specs)
- end
-
- def path(obj)
- obj.to_s
end
end
end