puppet 2.7.16 → 2.7.17

data/CHANGELOG

@@ -1,3 +1,15 @@
+2.7.17
+===
+30d89d3 (maint) Add symlink stub to gentoo service provider spec
+ff1b37a Add comment to upstart provider explaining exclusion of 'wait-for-state'
+6b854f7 Upstart code cleanup, init provider improvement
+0f81d9a Add spec test for network-interface-security
+a2c1e23 Add basic service resource test to upstart acceptance
+2c85d4d Handle network-interface-security in upstart
+ed00e74 Add exclude list to upstart provider
+17cc177 (#15027, #15028, #15029) Fix upstart version parsing
+b0ee6ad (maint) Add --test to puppet run
+
 2.7.16
 ===
 99fecc3 Update facter dep to reflect epoch 1

data/conf/redhat/puppet.spec

@@ -5,7 +5,7 @@
 %global confdir conf/redhat
 
 Name:           puppet
-Version:        2.7.16
+Version:        2.7.17
 #Release:        0.1rc1.2%{?dist}
 Release:        1%{?dist}
 Summary:        A network tool for managing many disparate systems
@@ -289,7 +289,10 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Wed Jun 13 2012 Matthaus Litteken <matthaus@puppelabs.com> - 2.7.16-1
+* Tue Jun 19 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.17-1
+- Update for 2.7.17
+
+* Wed Jun 13 2012 Matthaus Litteken <matthaus@puppetlabs.com> - 2.7.16-1
 - Update for 2.7.16
 
 * Fri Jun 08 2012 Moses Mendoza <moses@puppetlabs.com> - 2.7.16-0.1rc1.2

data/lib/puppet.rb

@@ -24,7 +24,7 @@ require 'puppet/util/run_mode'
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.7.16'
+  PUPPETVERSION = '2.7.17'
 
   def Puppet.version
     PUPPETVERSION

data/lib/puppet/provider/service/init.rb

@@ -42,6 +42,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         next if name =~ /^\./
         next if exclude.include? name
         next if not FileTest.executable?(fullpath)
+        next if not is_init?(fullpath)
         instances << new(:name => name, :path => path, :hasstatus => true)
       end
     end
@@ -130,5 +131,10 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
+private
+
+  def self.is_init?(script = initscript)
+    !File.symlink?(script) || File.readlink(script) != "/lib/init/upstart-job"
+  end
 end
 

data/lib/puppet/provider/service/upstart.rb

@@ -25,7 +25,18 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   # http://www.linuxplanet.com/linuxplanet/tutorials/7033/2/
   has_feature :enableable
 
+  # 'wait-for-state' is excluded from instances here because it takes
+  # parameters that have unclear meaning. It looks like 'wait-for-state' is
+  # mainly used internally for other upstart services as a 'sleep until something happens'
+  # (http://lists.debian.org/debian-devel/2012/02/msg01139.html). There is an open launchpad bug
+  # (https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/962047) that may
+  # eventually explain how to use this service or perhaps why it should remain
+  # excluded. When that bug is adddressed this should be reexamined.
   def self.instances
+    self.get_services(['wait-for-state'])
+  end
+
+  def self.get_services(exclude=[])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
       process.each_line { |line|
@@ -37,13 +48,15 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
         name = \
           if matcher = line.match(/^(network-interface)\s\(([^\)]+)\)/)
             "#{matcher[1]} INTERFACE=#{matcher[2]}"
+          elsif matcher = line.match(/^(network-interface-security)\s\(([^\)]+)\)/)
+            "#{matcher[1]} JOB=#{matcher[2]}"
           else
             line.split.first
           end
         instances << new(:name => name)
       }
     }
-    instances
+    instances.reject { |instance| exclude.include?(instance.name) }
   end
 
   def self.defpath
@@ -51,7 +64,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def upstart_version
-    @@upstart_version ||= SemVer.new(initctl(" --version").match(/initctl \(upstart (\d\.\d[\.\d]?)\)/)[1])
+    @@upstart_version ||= initctl("--version").match(/initctl \(upstart ([^\)]*)\)/)[1]
   end
 
   # Where is our override script?
@@ -63,7 +76,8 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     # Search prefers .conf as that is what upstart uses
     [".conf", "", ".sh"].each do |suffix|
       paths.each do |path|
-        fqname = File.join(path,name+suffix)
+        service_name = name.match(/^(\S+)/)[1]
+        fqname = File.join(path, service_name + suffix)
         if File.exists?(fqname)
           return fqname
         end
@@ -79,11 +93,11 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     return super if not is_upstart?
 
     script_contents = read_script_from(initscript)
-    if upstart_version < "0.6.7"
+    if version_is_pre_0_6_7
       enabled_pre_0_6_7?(script_contents)
-    elsif upstart_version < "0.9.0"
+    elsif version_is_pre_0_9_0
       enabled_pre_0_9_0?(script_contents)
-    elsif upstart_version >= "0.9.0"
+    elsif version_is_post_0_9_0
       enabled_post_0_9_0?(script_contents, read_override_file)
     end
   end
@@ -92,7 +106,7 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     return super if not is_upstart?
 
     script_text = read_script_from(initscript)
-    if upstart_version < "0.9.0"
+    if version_is_pre_0_9_0
       enable_pre_0_9_0(script_text)
     else
       enable_post_0_9_0(script_text, read_override_file)
@@ -103,11 +117,11 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
     return super if not is_upstart?
 
     script_text = read_script_from(initscript)
-    if upstart_version < "0.6.7"
+    if version_is_pre_0_6_7
       disable_pre_0_6_7(script_text)
-    elsif upstart_version < "0.9.0"
+    elsif version_is_pre_0_9_0
       disable_pre_0_9_0(script_text)
-    elsif upstart_version >= "0.9.0"
+    elsif version_is_post_0_9_0
       disable_post_0_9_0(read_override_file)
     end
   end
@@ -129,36 +143,32 @@ Puppet::Type.type(:service).provide :upstart, :parent => :debian do
   end
 
   def status
-    if @resource[:status]
-      is_upstart?(@resource[:status]) ? upstart_status(@resource[:status]) : normal_status
-    elsif is_upstart?
-      upstart_status
-    else
-      super
-    end
-  end
-
-  def normal_status
-    ucommand(:status, false)
-    ($?.exitstatus == 0) ? :running : :stopped
-  end
+    return super if not is_upstart?
 
-  def upstart_status(exec = @resource[:name])
     output = status_exec(@resource[:name].split)
-    if (! $?.nil?) && (output =~ /start\//)
+    if output =~ /start\//
       return :running
     else
       return :stopped
     end
   end
 
+private
   def is_upstart?(script = initscript)
-    return true if (File.symlink?(script) && File.readlink(script) == "/lib/init/upstart-job")
-    return true if (File.file?(script) && (not script.include?("init.d")))
-    return false
+    File.exists?(script) && script.match(/\/etc\/init\/\S+\.conf/)
   end
 
-private
+  def version_is_pre_0_6_7
+    Puppet::Util::Package.versioncmp(upstart_version, "0.6.7") == -1
+  end
+
+  def version_is_pre_0_9_0
+    Puppet::Util::Package.versioncmp(upstart_version, "0.9.0") == -1
+  end
+
+  def version_is_post_0_9_0
+    Puppet::Util::Package.versioncmp(upstart_version, "0.9.0") >= 0
+  end
 
   def enabled_pre_0_6_7?(script_text)
     # Upstart version < 0.6.7 means no manual stanza.

data/spec/unit/provider/service/gentoo_spec.rb

@@ -48,6 +48,7 @@ describe Puppet::Type.type(:service).provider(:gentoo) do
 
     it "should get a list of services from /etc/init.d but exclude helper scripts" do
       FileTest.expects(:directory?).with('/etc/init.d').returns true
+      File.stubs(:symlink?).returns(false)
       Dir.expects(:entries).with('/etc/init.d').returns initscripts
       (initscripts - helperscripts).each do |script|
         FileTest.expects(:executable?).with("/etc/init.d/#{script}").returns true

data/spec/unit/provider/service/init_spec.rb

@@ -14,9 +14,7 @@ describe provider_class do
     @resource = stub 'resource'
     @resource.stubs(:[]).returns(nil)
     @resource.stubs(:[]).with(:name).returns "myservice"
-#        @resource.stubs(:[]).with(:ensure).returns :enabled
     @resource.stubs(:[]).with(:path).returns ["/service/path","/alt/service/path"]
-#        @resource.stubs(:ref).returns "Service[myservice]"
     File.stubs(:directory?).returns(true)
 
     @provider = provider_class.new
@@ -31,41 +29,64 @@ describe provider_class do
       FileTest.stubs(:executable?).returns(true)
       @class.stubs(:defpath).returns('tmp')
     end
+
     it "should return instances for all services" do
       @services.each do |inst|
         @class.expects(:new).with{|hash| hash[:name] == inst}.returns("#{inst}_instance")
       end
       results = @services.collect {|x| "#{x}_instance"}
+
       @class.instances.should == results
     end
+
     it "should omit an array of services from exclude list" do
       exclude = ['two', 'four']
-      (@services-exclude).each do |inst|
+      (@services - exclude).each do |inst|
         @class.expects(:new).with{|hash| hash[:name] == inst}.returns("#{inst}_instance")
       end
       results = (@services-exclude).collect {|x| "#{x}_instance"}
+
       @class.get_services(@class.defpath, exclude).should == results
     end
+
     it "should omit a single service from the exclude list" do
       exclude = 'two'
-      (@services-[exclude]).each do |inst|
+      (@services - [exclude]).each do |inst|
         @class.expects(:new).with{|hash| hash[:name] == inst}.returns("#{inst}_instance")
       end
-      results = @services.reject{|x| x==exclude }.collect {|x| "#{x}_instance"}
+      results = @services.reject{|x| x == exclude }.collect {|x| "#{x}_instance"}
+
       @class.get_services(@class.defpath, exclude).should == results
     end
+
     it "should use defpath" do
       @services.each do |inst|
         @class.expects(:new).with{|hash| hash[:path] == @class.defpath}.returns("#{inst}_instance")
       end
       results = @services.sort.collect {|x| "#{x}_instance"}
+
       @class.instances.sort.should == results
     end
+
     it "should set hasstatus to true for providers" do
       @services.each do |inst|
         @class.expects(:new).with{|hash| hash[:name] == inst && hash[:hasstatus] == true}.returns("#{inst}_instance")
       end
       results = @services.collect {|x| "#{x}_instance"}
+
+      @class.instances.should == results
+    end
+
+    it "should discard upstart jobs" do
+      not_init_service, *valid_services = @services
+      valid_services.each do |inst|
+        @class.expects(:new).with{|hash| hash[:name] == inst && hash[:hasstatus] == true}.returns("#{inst}_instance")
+      end
+      File.stubs(:symlink?).returns(false)
+      File.stubs(:symlink?).with("tmp/#{not_init_service}").returns(true)
+      File.stubs(:readlink).with("tmp/#{not_init_service}").returns("/lib/init/upstart-job")
+
+      results = valid_services.collect {|x| "#{x}_instance"}
       @class.instances.should == results
     end
   end

data/spec/unit/provider/service/upstart_spec.rb

@@ -25,25 +25,47 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
 
     it "should attach the interface name for network interfaces" do
-      processes = ["network-interface (eth0)"].join("\n")
+      processes = "network-interface (eth0)"
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.first.name.should == "network-interface INTERFACE=eth0"
     end
+
+    it "should attach the job name for network interface security" do
+      processes = "network-interface-security (network-interface/eth0)"
+      provider_class.stubs(:execpipe).yields(processes)
+      provider_class.instances.first.name.should == "network-interface-security JOB=network-interface/eth0"
+    end
+
+    it "should not find excluded services" do
+      processes = "wait-for-state stop/waiting"
+      provider_class.stubs(:execpipe).yields(processes)
+      provider_class.instances.should be_empty
+    end
   end
 
-  describe "#status" do
-    it "should allow the user to override the status command" do
-      resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart, :status => "/bin/foo")
+  describe "#search" do
+    it "searches through paths to find a matching conf file" do
+      File.stubs(:directory?).returns(true)
+      File.stubs(:exists?).returns(false)
+      File.expects(:exists?).with("/etc/init/foo-bar.conf").returns(true)
+      resource = Puppet::Type.type(:service).new(:name => "foo-bar", :provider => :upstart)
       provider = provider_class.new(resource)
 
-      # Because we stub execution, we also need to stub the result of it, or a
-      # previously failing command execution will cause this test to do the
-      # wrong thing.
-      provider.expects(:ucommand)
-      $?.stubs(:exitstatus).returns(0)
-      provider.status.should == :running
+      provider.initscript.should == "/etc/init/foo-bar.conf"
     end
 
+    it "searches for just the name of a compound named service" do
+      File.stubs(:directory?).returns(true)
+      File.stubs(:exists?).returns(false)
+      File.expects(:exists?).with("/etc/init/network-interface.conf").returns(true)
+      resource = Puppet::Type.type(:service).new(:name => "network-interface INTERFACE=lo", :provider => :upstart)
+      provider = provider_class.new(resource)
+
+      provider.initscript.should == "/etc/init/network-interface.conf"
+    end
+  end
+
+  describe "#status" do
     it "should use the default status command if none is specified" do
       resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart)
       provider = provider_class.new(resource)
@@ -87,18 +109,6 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
         provider.statuscmd.should be_nil
       end
     end
-
-    describe "when init script" do
-      before(:each) do
-        provider.stubs(:is_upstart?).returns(false)
-      end
-      ["start", "stop", "status"].each do |command|
-        it "should return the #{command}cmd of its parent provider" do
-          provider.expects(:search).with('foo').returns("/etc/init.d/foo")
-          provider.send("#{command}cmd".to_sym).should == ["/etc/init.d/foo", command.to_sym]
-        end
-      end
-    end
   end
 
   describe "should be enableable" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 2
   - 7
-  - 16
-  version: 2.7.16
+  - 17
+  version: 2.7.17
 platform: ruby
 authors: 
 - Puppet Labs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facter