lib/chef/provider/package/rubygems.rb in chef-0.10.10.beta.1 vs lib/chef/provider/package/rubygems.rb in chef-0.10.10.rc.1
- old
+ new
@@ -351,11 +351,11 @@
Chef::Log.debug("#{@new_resource} using gem from running ruby environment")
end
end
def is_omnibus?
- if RbConfig::CONFIG['bindir'] == "/opt/opscode/embedded/bin"
+ if RbConfig::CONFIG['bindir'] == "/opt/chef/embedded/bin"
Chef::Log.debug("#{@new_resource} detected omnibus installation in #{RbConfig::CONFIG['bindir']}")
# Omnibus installs to a static path because of linking on unix, find it.
true
elsif RbConfig::CONFIG['bindir'].sub(/^[\w]:/, '') == "/opscode/chef/embedded/bin"
Chef::Log.debug("#{@new_resource} detected omnibus installation in #{RbConfig::CONFIG['bindir']}")
@@ -442,12 +442,10 @@
end
def target_version_already_installed?
return false unless @current_resource && @current_resource.version
return false if @current_resource.version.nil?
- # in the future we could support squiggly requirements like "~> 1.2.0"
- # for now, the behavior when using anything other than exact
- # requirements is undefined.
+
Gem::Requirement.new(@new_resource.version).satisfied_by?(Gem::Version.new(@current_resource.version))
end
##
# Installs the gem, using either the gems API or shelling out to `gem`