lib/hem/plugins.rb in hem-1.1.0 vs lib/hem/plugins.rb in hem-1.1.1
- old
+ new
@@ -18,21 +18,10 @@
def Bundler.root(path = nil)
@root = Pathname.new(path) if path
@root
end
- # ensure Bundler doesn't get it's settings from the project
- def Bundler.settings
- return @settings if defined?(@settings)
- @settings = Bundler::Settings.new
- end
-
- # ensure Bundler doesn't use a project's cache
- def Bundler.app_cache
- Bundler.rubygems.gem_cache.first
- end
-
Bundler.root path
@builder = Class.new(Bundler::Dsl) do
define_method(:gemfile_root) do
Bundler.root
end
@@ -63,9 +52,11 @@
begin
missing_specs = definition.missing_specs.any?
rescue Bundler::GemNotFound, Bundler::VersionConflict, Bundler::GitError
missing_specs = true
end
+ # clear the definition after the check, so install/upgrade re-evaluates
+ @definition = nil
return !missing_specs
end
def install(options = {})
return self if definition.dependencies.empty?