Merge branch 'tickets/2.6.x/2331-macports-provider' into 2.6.next

2 files changed, 106 insertions, 86 deletions

diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb
deleted file mode 100755
index c5f9ba28f..000000000
--- a/lib/puppet/provider/package/darwinport.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'puppet/provider/package'
-
-Puppet::Type.type(:package).provide :darwinport, :parent => Puppet::Provider::Package do
-  desc "Package management using DarwinPorts on OS X."
-
-  confine :operatingsystem => :darwin
-  commands :port => "/opt/local/bin/port"
-
-  def self.eachpkgashash
-    # list out all of the packages
-    open("| #{command(:port)} list installed") { |process|
-      regex = %r{(\S+)\s+@(\S+)\s+(\S+)}
-      fields = [:name, :ensure, :location]
-      hash = {}
-
-      # now turn each returned line into a package object
-      process.each { |line|
-        hash.clear
-
-        if match = regex.match(line)
-          fields.zip(match.captures) { |field,value|
-            hash[field] = value
-          }
-
-          hash.delete :location
-          hash[:provider] = self.name
-          yield hash.dup
-        else
-          raise Puppet::DevError,
-            "Failed to match dpkg line #{line}"
-        end
-      }
-    }
-  end
-
-  def self.instances
-    packages = []
-
-    eachpkgashash do |hash|
-      packages << new(hash)
-    end
-
-    packages
-  end
-
-  def install
-    should = @resource.should(:ensure)
-
-    # Seems like you can always say 'upgrade'
-    output = port "upgrade", @resource[:name]
-    if output =~ /^Error: No port/
-      raise Puppet::ExecutionFailure, "Could not find package #{@resource[:name]}"
-    end
-  end
-
-  def query
-    version = nil
-    self.class.eachpkgashash do |hash|
-      return hash if hash[:name] == @resource[:name]
-    end
-
-    nil
-  end
-
-  def latest
-    info = port :search, "^#{@resource[:name]}$"
-
-    if $CHILD_STATUS != 0 or info =~ /^Error/
-      return nil
-    end
-
-    ary = info.split(/\s+/)
-    version = ary[2].sub(/^@/, '')
-
-    version
-  end
-
-  def uninstall
-    port :uninstall, @resource[:name]
-  end
-
-  def update
-    install
-  end
-end
-
diff --git a/lib/puppet/provider/package/macports.rb b/lib/puppet/provider/package/macports.rb
new file mode 100755
index 000000000..c43eb72f3
--- /dev/null
+++ b/lib/puppet/provider/package/macports.rb
@@ -0,0 +1,106 @@
+require 'puppet/provider/package'
+
+Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Package do
+  desc "Package management using MacPorts on OS X.
+
+    Supports MacPorts versions and revisions, but not variants.
+    Variant preferences may be specified using the MacPorts variants.conf file
+    http://guide.macports.org/chunked/internals.configuration-files.html#internals.configuration-files.variants-conf
+
+    When specifying a version in the Puppet DSL, only specify the version, not the revision
+    Revisions are only used internally for ensuring the latest version/revision of a port.
+  "
+
+  confine :operatingsystem => :darwin
+  commands :port => "/opt/local/bin/port"
+
+  has_feature :installable
+  has_feature :uninstallable
+  has_feature :upgradeable
+  has_feature :versionable
+
+
+  def self.parse_installed_query_line(line)
+    regex = /(\S+)\s+@(\S+)_(\S+)\s+\(active\)/
+    fields = [:name, :ensure, :revision]
+    hash_from_line(line, regex, fields)
+  end
+
+  def self.parse_info_query_line(line)
+    regex = /(\S+)\s+(\S+)/
+    fields = [:version, :revision]
+    hash_from_line(line, regex, fields)
+  end
+
+  def self.hash_from_line(line, regex, fields)
+    hash = {}
+    if match = regex.match(line)
+      fields.zip(match.captures) { |field, value|
+        hash[field] = value
+      }
+      hash[:provider] = self.name
+      return hash
+    end
+    nil
+  end
+
+  def self.instances
+    packages = []
+    port("-q", :installed).each do |line|
+      if hash = parse_installed_query_line(line)
+        packages << new(hash)
+      end
+    end
+    packages
+  end
+
+  def install
+    should = @resource.should(:ensure)
+    if [:latest, :installed, :present].include?(should)
+      output = port("-q", :install, @resource[:name])
+    else
+      output = port("-q", :install, @resource[:name], "@#{should}")
+    end
+    # MacPorts now correctly exits non-zero with appropriate errors in
+    # situations where a port cannot be found or installed.
+  end
+
+  def query
+    return self.class.parse_installed_query_line(port("-q", :installed, @resource[:name]))
+  end
+
+  def latest
+    # We need both the version and the revision to be confident
+    # we've got the latest revision of a specific version
+    # Note we're still not doing anything with variants here.
+    info_line = port("-q", :info, "--line", "--version", "--revision", @resource[:name])
+    return nil if info_line == ""
+
+    if newest = self.class.parse_info_query_line(info_line)
+      current = query
+      # We're doing some fiddling behind the scenes here to cope with updated revisions.
+      # If we're already at the latest version/revision, then just return the version
+      # so the current and desired values match. Otherwise return version and revision
+      # to trigger an upgrade to the latest revision.
+      if newest[:version] == current[:ensure] and newest[:revision] == current[:revision]
+        return current[:ensure]
+      else
+        return "#{newest[:version]}_#{newest[:revision]}"
+      end
+    end
+    nil
+  end
+
+  def uninstall
+    port("-q", :uninstall, @resource[:name])
+  end
+
+  def update
+    if query[:name] == @resource[:name]  # 'port upgrade' cannot install new ports
+      port("-q", :upgrade, @resource[:name])
+    else
+      install
+    end
+  end
+end
+