puppet-pip 0.0.2 → 0.0.3

data/lib/puppet/provider/package/pip.rb

@@ -11,12 +11,6 @@ Puppet::Type.type(:package).provide :pip,
 
   has_feature :installable, :uninstallable, :upgradeable, :versionable
 
-  if pathname = `which pip`.chomp
-    commands :pip => pathname
-  else
-    raise NotImplementedError
-  end
-
   def self.parse(line)
     if line.chomp =~ /^([^=]+)==([^=]+)$/
       {:ensure => $2, :name => $1, :provider => name}
@@ -34,6 +28,8 @@ Puppet::Type.type(:package).provide :pip,
       end
     end
     packages
+  rescue Puppet::DevError
+    []
   end
 
   def query
@@ -44,6 +40,8 @@ Puppet::Type.type(:package).provide :pip,
       end
     end
     nil
+  rescue Puppet::DevError
+    nil
   end
 
   def latest
@@ -54,24 +52,48 @@ Puppet::Type.type(:package).provide :pip,
   end
 
   def install
-    case @resource[:ensure]
-    when String
-      pip "install", "-q", "#{@resource[:name]}==#{@resource[:ensure]}"
-    when :latest
-      pip "install", "-q", "--upgrade", @resource[:name]
+    args = %w{install -q}
+    if @resource[:source]
+      args << "-e"
+      if String === @resource[:ensure]
+        args << "#{@resource[:source]}@#{@resource[:ensure]}#egg=#{
+          @resource[:name]}"
+      else
+        args << "#{@resource[:source]}#egg=#{@resource[:name]}"
+      end
     else
-      pip "install", "-q", @resource[:name]
+      case @resource[:ensure]
+      when String
+        args << "#{@resource[:name]}==#{@resource[:ensure]}"
+      when :latest
+        args << "--upgrade" << @resource[:name]
+      else
+        args << @resource[:name]
+      end
     end
+    lazy_pip *args
   end
 
   # Uninstall won't work unless this issue gets fixed.
   # <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562544>
   def uninstall
-    pip "uninstall", "-y", "-q", @resource[:name]
+    lazy_pip "uninstall", "-y", "-q", @resource[:name]
   end
 
   def update
     install
   end
 
+  private
+  def lazy_pip(*args)
+    pip *args
+  rescue NoMethodError
+    if pathname = `which pip`.chomp
+      self.class.commands :pip => pathname
+      retry
+    else
+      raise e
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-pip
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Richard Crowley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +00:00
+date: 2011-03-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: Puppet provider of Python packages via pip.
-email: richard@devstructure.com
+email: r@rcrowley.org
 executables: []
 
 extensions: []
@@ -43,7 +43,7 @@ extra_rdoc_files: []
 files: 
 - lib/puppet/provider/package/pip.rb
 has_rdoc: true
-homepage: http://github.com/rcrowley/python-pip
+homepage: http://github.com/rcrowley/puppet-pip
 licenses: []
 
 post_install_message: