[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Pieter van de Bruggen]

The following commit has been merged in the experimental branch:
commit 0bdbe18b3f3981c1e1f661e211e20ccab1278f81
Merge: 635751d809af309c7c36c0c9d7a94a731ef8bd1c c25fb94725c9abfb36e67938356f97823f8b605e
Author: Pieter van de Bruggen <pieter at puppetlabs.com>
Date:   Wed Mar 23 16:39:42 2011 -0700

    Merge branch 'tickets/master/6770'
    
    Conflicts:
    	lib/puppet/interface/certificate.rb
    	spec/unit/application/interface_base_spec.rb
    	spec/unit/interface/interface_collection_spec.rb

diff --combined lib/puppet/interface/v0.0.1/certificate.rb
index 86ac6d6,52019fd..2615e3d
--- a/lib/puppet/interface/v0.0.1/certificate.rb
+++ b/lib/puppet/interface/v0.0.1/certificate.rb
@@@ -1,28 -1,4 +1,28 @@@
  require 'puppet/interface/indirector'
 +require 'puppet/ssl/host'
  
- Puppet::Interface::Indirector.interface(:certificate) do
+ Puppet::Interface::Indirector.define(:certificate, '0.0.1') do
 +
 +  action :generate do
 +    invoke do |name|
 +      host = Puppet::SSL::Host.new(name)
 +      host.generate_certificate_request
 +      host.certificate_request.class.indirection.save(host.certificate_request)
 +    end
 +  end
 +
 +  action :list do
 +    invoke do
 +      Puppet::SSL::Host.indirection.search("*", {
 +        :for => :certificate_request,
 +      }).map { |h| h.inspect }
 +    end
 +  end
 +
-   action :sign do |name|
++  action :sign do
 +    invoke do |name|
 +      Puppet::SSL::Host.indirection.save(Puppet::SSL::Host.new(name))
 +    end
 +  end
 +
  end
diff --combined spec/unit/application/interface_base_spec.rb
index 0df0308,7a247c0..15d4655
--- a/spec/unit/application/interface_base_spec.rb
+++ b/spec/unit/application/interface_base_spec.rb
@@@ -2,12 -2,13 +2,12 @@@
  
  require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
  require 'puppet/application/interface_base'
 -require 'puppet/application/interface_base'
 -
 -base_interface = Puppet::Interface[:basetest, '0.0.1']
 -class Puppet::Application::InterfaceBase::Basetest < Puppet::Application::InterfaceBase
 -end
  
  describe Puppet::Application::InterfaceBase do
-   base_interface = Puppet::Interface.interface(:basetest)
++  base_interface = Puppet::Interface[:basetest, '0.0.1']
 +  class Puppet::Application::InterfaceBase::Basetest < Puppet::Application::InterfaceBase
 +  end
 +
    before do
      @app = Puppet::Application::InterfaceBase::Basetest.new
      @app.stubs(:interface).returns base_interface

-- 
Puppet packaging for Debian