Skip to content
This repository was archived by the owner on Oct 2, 2018. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions providers/pip.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,13 @@ def load_current_resource

def current_installed_version
@current_installed_version ||= begin
delimeter = /==/

normalized_package_name = new_resource.package_name.gsub('_', '-')
version_check_cmd = "#{which_pip(new_resource)} freeze | grep -i '^#{normalized_package_name}=='"
# incase you upgrade pip with pip!
if new_resource.package_name.eql?('pip')
delimeter = /\s/
version_check_cmd = "#{which_pip(@new_resource)} --version"
out = nil
package_name = new_resource.package_name.gsub('_', '-')
pattern = Regexp.new("^#{Regexp.escape(package_name)} \\(([^)]+)\\)$", true)
shell_out("#{which_pip(new_resource)} list").stdout.lines.find do |line|
out = pattern.match(line)
end
result = shell_out(version_check_cmd)
(result.exitstatus == 0) ? result.stdout.split(delimeter)[1].strip : nil
out.nil? ? nil : out[1]
end
end

Expand Down