puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'shared_behaviours/all_parsedfile_providers'
 require 'puppet_spec/files'

data/spec/unit/provider/sshkey/parsed_spec.rb

@@ -1,37 +1,67 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:sshkey).provider(:parsed)
 
-describe provider_class do
-  before do
-    @sshkey_class = Puppet::Type.type(:sshkey)
-    @provider_class = @sshkey_class.provider(:parsed)
-    @key = 'AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw=='
+describe "sshkey parsed provider" do
+  let :type do Puppet::Type.type(:sshkey) end
+  let :provider do type.provider(:parsed) end
+  subject { provider }
+
+  def key
+    'AAAAB3NzaC1yc2EAAAABIwAAAQEAzwHhxXvIrtfIwrudFqc8yQcIfMudrgpnuh1F3AV6d2BrLgu/yQE7W5UyJMUjfj427sQudRwKW45O0Jsnr33F4mUw+GIMlAAmp9g24/OcrTiB8ZUKIjoPy/cO4coxGi8/NECtRzpD/ZUPFh6OEpyOwJPMb7/EC2Az6Otw4StHdXUYw22zHazBcPFnv6zCgPx1hA7QlQDWTu4YcL0WmTYQCtMUb3FUqrcFtzGDD0ytosgwSd+JyN5vj5UwIABjnNOHPZ62EY1OFixnfqX/+dUwrFSs5tPgBF/KkC6R7tmbUfnBON6RrGEmu+ajOTOLy23qUZB4CQ53V7nyAWhzqSK+hw=='
   end
 
   it "should parse the name from the first field" do
-    @provider_class.parse_line('test ssh-rsa '+@key)[:name].should == "test"
+    subject.parse_line('test ssh-rsa '+key)[:name].should == "test"
   end
 
   it "should parse the first component of the first field as the name" do
-    @provider_class.parse_line('test,alias ssh-rsa '+@key)[:name].should == "test"
+    subject.parse_line('test,alias ssh-rsa '+key)[:name].should == "test"
   end
 
   it "should parse host_aliases from the remaining components of the first field" do
-    @provider_class.parse_line('test,alias ssh-rsa '+@key)[:host_aliases].should == ["alias"]
+    subject.parse_line('test,alias ssh-rsa '+key)[:host_aliases].should == ["alias"]
   end
 
   it "should parse multiple host_aliases" do
-    @provider_class.parse_line('test,alias1,alias2,alias3 ssh-rsa '+@key)[:host_aliases].should == ["alias1","alias2","alias3"]
+    subject.parse_line('test,alias1,alias2,alias3 ssh-rsa '+key)[:host_aliases].should == ["alias1","alias2","alias3"]
   end
 
   it "should not drop an empty host_alias" do
-    @provider_class.parse_line('test,alias, ssh-rsa '+@key)[:host_aliases].should == ["alias",""]
+    subject.parse_line('test,alias, ssh-rsa '+key)[:host_aliases].should == ["alias",""]
   end
 
   it "should recognise when there are no host aliases" do
-    @provider_class.parse_line('test ssh-rsa '+@key)[:host_aliases].should == []
+    subject.parse_line('test ssh-rsa '+key)[:host_aliases].should == []
   end
 
+  context "with the sample file" do
+    let :fixture do my_fixture('sample') end
+    before :each do subject.stubs(:default_target).returns(fixture) end
+
+    it "should parse to records on prefetch" do
+      subject.target_records(fixture).should be_empty
+      subject.prefetch
+
+      records = subject.target_records(fixture)
+      records.should be_an Array
+      records.should be_all {|x| x.should be_an Hash }
+    end
+
+    it "should reconstitute the file from records" do
+      subject.prefetch
+      records = subject.target_records(fixture)
+
+      text = subject.to_file(records).gsub(/^# HEADER.+\n/, '')
+
+      oldlines = File.readlines(fixture).map(&:chomp)
+      newlines = text.chomp.split("\n")
+      oldlines.length.should == newlines.length
+
+      oldlines.zip(newlines).each do |old, new|
+        old.gsub(/\s+/, '').should == new.gsub(/\s+/, '')
+      end
+    end
+  end
 end

data/spec/unit/provider/user/hpux_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:hpuxuseradd)

data/spec/unit/provider/user/ldap_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:ldap)
@@ -24,6 +24,14 @@ describe provider_class do
     provider_class.should be_manages_passwords
   end
 
+  it "should use the ldap group provider to convert group names to numbers" do
+    provider = provider_class.new(:name => "foo")
+    Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with("bar").returns 10
+
+    provider.gid = 'bar'
+    provider.gid.should == 10
+  end
+
   {:name => "uid",
     :password => "userPassword",
     :comment => "cn",
@@ -45,13 +53,10 @@ describe provider_class do
     end
 
     it "should generate the sn as the last field of the cn" do
-      Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
-
       resource = stub 'resource', :should => %w{whatever}
       resource.stubs(:should).with(:comment).returns ["Luke Kanies"]
       resource.stubs(:should).with(:ensure).returns :present
       instance = provider_class.new(:name => "luke", :ensure => :absent)
-
       instance.stubs(:resource).returns resource
 
       @connection.expects(:add).with { |dn, attrs| attrs["sn"] == ["Kanies"] }
@@ -60,25 +65,8 @@ describe provider_class do
       instance.flush
     end
 
-    it "should translate a group name to the numeric id" do
-      Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with("bar").returns 101
-
-      resource = stub 'resource', :should => %w{whatever}
-      resource.stubs(:should).with(:gid).returns 'bar'
-      resource.stubs(:should).with(:ensure).returns :present
-      instance = provider_class.new(:name => "luke", :ensure => :absent)
-      instance.stubs(:resource).returns resource
-
-      @connection.expects(:add).with { |dn, attrs| attrs["gidNumber"] == ["101"] }
-
-      instance.create
-      instance.flush
-    end
-
     describe "with no uid specified" do
       it "should pick the first available UID after the largest existing UID" do
-        Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
-
         low = {:name=>["luke"], :shell=>:absent, :uid=>["600"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["l k"]}
         high = {:name=>["testing"], :shell=>:absent, :uid=>["640"], :home=>["/h"], :gid=>["1000"], :password=>["blah"], :comment=>["t u"]}
         provider_class.manager.expects(:search).returns([low, high])
@@ -96,8 +84,6 @@ describe provider_class do
       end
 
       it "should pick 501 of no users exist" do
-        Puppet::Type.type(:group).provider(:ldap).expects(:name2id).with(["whatever"]).returns [123]
-
         provider_class.manager.expects(:search).returns nil
 
         resource = stub 'resource', :should => %w{whatever}

data/spec/unit/provider/user/pw_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 provider_class = Puppet::Type.type(:user).provider(:pw)

data/spec/unit/provider/user/user_role_add_spec.rb

@@ -9,8 +9,11 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
 
   before do
     @resource = stub("resource", :name => "myuser", :managehome? => nil)
+
     @resource.stubs(:should).returns "fakeval"
+    @resource.stubs(:should).with(:keys).returns Hash.new
     @resource.stubs(:[]).returns "fakeval"
+
     @resource.stubs(:allowdupe?).returns false
     @provider = provider_class.new(@resource)
   end
@@ -43,7 +46,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
     end
   end
 
-  describe "when calling transition", :'fails_on_ruby_1.9.2' => true do
+  describe "when calling transition" do
     it "should return the type set to whatever is passed in" do
       @provider.expects(:command).with(:modify).returns("foomod")
       @provider.transition("bar").include?("type=bar")
@@ -123,7 +126,7 @@ describe provider_class, :unless => Puppet.features.microsoft_windows? do
       @provider.expects(:execute).with { |args| args.include?("-o") }
     end
 
-    it "should add -o when the user is being created", :'fails_on_ruby_1.9.2' => true do
+    it "should add -o when the user is being created" do
       @provider.stubs(:password=)
       @provider.create
     end

data/spec/unit/provider/user/useradd_spec.rb

@@ -1,140 +1,111 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
-describe Puppet::Type.type(:user).provider(:useradd) do
+provider_class = Puppet::Type.type(:user).provider(:useradd)
 
-  before :each do
-    described_class.stubs(:command).with(:password).returns '/usr/bin/chage'
-    described_class.stubs(:command).with(:add).returns '/usr/sbin/useradd'
-    described_class.stubs(:command).with(:modify).returns '/usr/sbin/usermod'
-    described_class.stubs(:command).with(:delete).returns '/usr/sbin/userdel'
+describe provider_class do
+  before do
+    @resource = stub("resource", :name => "myuser", :managehome? => nil)
+    @resource.stubs(:should).returns "fakeval"
+    @resource.stubs(:[]).returns "fakeval"
+    @provider = provider_class.new(@resource)
   end
 
-  let(:resource) do
-    Puppet::Type.type(:user).new(
-      :name       => 'myuser',
-      :managehome => :false,
-      :system     => :false,
-      :provider   => provider
-    )
+  # #1360
+  it "should add -o when allowdupe is enabled and the user is being created" do
+    @resource.expects(:allowdupe?).returns true
+    @resource.expects(:system?).returns true
+    @provider.stubs(:execute)
+    @provider.expects(:execute).with { |args| args.include?("-o") }
+    @provider.create
   end
 
-  let(:provider) { described_class.new(:name => 'myuser') }
+  it "should add -o when allowdupe is enabled and the uid is being modified" do
+    @resource.expects(:allowdupe?).returns true
+    @provider.expects(:execute).with { |args| args.include?("-o") }
 
-  describe "#create" do
-
-    it "should add -o when allowdupe is enabled and the user is being created" do
-      resource[:allowdupe] = true
-      provider.expects(:execute).with(['/usr/sbin/useradd', '-o', 'myuser'])
-      provider.create
-    end
-
-    describe "on systems that support has_system", :if => described_class.system_users? do
-      it "should add -r when system is enabled" do
-        resource[:system] = :true
-        provider.should be_system_users
-        provider.expects(:execute).with(['/usr/sbin/useradd', '-r', 'myuser'])
-        provider.create
-      end
-    end
-
-    describe "on systems that do not support has_system", :unless => described_class.system_users? do
-      it "should not add -r when system is enabled" do
-        resource[:system] = :true
-        provider.should_not be_system_users
-        provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'])
-        provider.create
-      end
-    end
+    @provider.uid = 150
+  end
 
-    it "should set password age rules" do
-      described_class.has_feature :manages_password_age
-      resource[:password_min_age] = 5
-      resource[:password_max_age] = 10
-      provider.expects(:execute).with(['/usr/sbin/useradd', 'myuser'])
-      provider.expects(:execute).with(['/usr/bin/chage', '-m', 5, '-M', 10, 'myuser'])
-      provider.create
-    end
+  it "should add -r when system is enabled" do
+    @resource.expects(:allowdupe?).returns true
+    @resource.expects(:system?).returns true
+    @provider.stubs(:execute)
+    @provider.expects(:execute).with { |args| args.include?("-r") }
+    @provider.create
   end
 
-  describe "#uid=" do
-    it "should add -o when allowdupe is enabled and the uid is being modified" do
-      resource[:allowdupe] = :true
-      provider.expects(:execute).with(['/usr/sbin/usermod', '-u', 150, '-o', 'myuser'])
-      provider.uid = 150
-    end
+  it "should set password age rules" do
+    provider_class.has_feature :manages_password_age
+    @resource = Puppet::Type.type(:user).new :name => "myuser", :password_min_age => 5, :password_max_age => 10, :provider => :useradd
+    @provider = provider_class.new(@resource)
+    @provider.stubs(:execute)
+    @provider.expects(:execute).with { |cmd, *args| args == ["-m", 5, "-M", 10, "myuser"] }
+    @provider.create
   end
 
-  describe "#check_allow_dup" do
+  describe "when checking to add allow dup" do
     it "should check allow dup" do
-      resource.expects(:allowdupe?)
-      provider.check_allow_dup
+      @resource.expects(:allowdupe?)
+      @provider.check_allow_dup
     end
 
     it "should return an array with a flag if dup is allowed" do
-      resource[:allowdupe] = :true
-      provider.check_allow_dup.must == ["-o"]
+      @resource.stubs(:allowdupe?).returns true
+      @provider.check_allow_dup.must == ["-o"]
     end
 
     it "should return an empty array if no dup is allowed" do
-      resource[:allowdupe] = :false
-      provider.check_allow_dup.must == []
+      @resource.stubs(:allowdupe?).returns false
+      @provider.check_allow_dup.must == []
     end
   end
 
-  describe "#check_system_users" do
+  describe "when checking to add system users" do
     it "should check system users" do
-      described_class.expects(:system_users?).returns true
-      resource.expects(:system?)
-      provider.check_system_users
+      @resource.expects(:system?)
+      @provider.check_system_users
     end
 
     it "should return an array with a flag if it's a system user" do
-      described_class.expects(:system_users?).returns true
-      resource[:system] = :true
-      provider.check_system_users.must == ["-r"]
+      @resource.stubs(:system?).returns true
+      @provider.check_system_users.must == ["-r"]
     end
 
     it "should return an empty array if it's not a system user" do
-      described_class.expects(:system_users?).returns true
-      resource[:system] = :false
-      provider.check_system_users.must == []
-    end
-
-    it "should return an empty array if system user is not featured" do
-      described_class.expects(:system_users?).returns false
-      resource[:system] = :true
-      provider.check_system_users.must == []
+      @resource.stubs(:system?).returns false
+      @provider.check_system_users.must == []
     end
   end
 
-  describe "#check_manage_home" do
+  describe "when checking manage home" do
     it "should check manage home" do
-      resource.expects(:managehome?)
-      provider.check_manage_home
+      @resource.expects(:managehome?)
+      @provider.check_manage_home
     end
 
     it "should return an array with -m flag if home is managed" do
-      resource[:managehome] = :true
-      provider.check_manage_home.must == ["-m"]
+      @resource.stubs(:managehome?).returns true
+      @provider.check_manage_home.must == ["-m"]
     end
-
+    
     it "should return an array with -r flag if home is managed" do
-      resource[:managehome] = :true
-      resource[:ensure] = :absent
-      provider.deletecmd.must == ['/usr/sbin/userdel', '-r', 'myuser']
+      @resource.stubs(:managehome?).returns true
+      @resource.stubs(:ensure) == :absent
+      @provider.stubs(:command).returns("userdel")
+      @provider.deletecmd.must == ["userdel", "-r", "fakeval"]
     end
 
     it "should return an array with -M if home is not managed and on Redhat" do
-      Facter.stubs(:value).with(:operatingsystem).returns("RedHat")
-      resource[:managehome] = :false
-      provider.check_manage_home.must == ["-M"]
+      Facter.stubs(:value).with("operatingsystem").returns("RedHat")
+      @resource.stubs(:managehome?).returns false
+      @provider.check_manage_home.must == ["-M"]
     end
 
     it "should return an empty array if home is not managed and not on Redhat" do
-      Facter.stubs(:value).with(:operatingsystem).returns("some OS")
-      resource[:managehome] = :false
-      provider.check_manage_home.must == []
+      Facter.stubs(:value).with("operatingsystem").returns("some OS")
+      @resource.stubs(:managehome?).returns false
+      @provider.check_manage_home.must == []
     end
   end
 
@@ -145,106 +116,107 @@ describe Puppet::Type.type(:user).provider(:useradd) do
     it "should return and array of flags and values"
   end
 
-  describe "#addcmd" do
+  describe "when calling addcmd" do
     before do
-      resource[:allowdupe] = :true
-      resource[:managehome] = :true
-      resource[:system] = :true
+      @resource.stubs(:allowdupe?).returns true
+      @resource.stubs(:managehome?).returns true
+      @resource.stubs(:system?).returns true
     end
 
     it "should call command with :add" do
-      provider.expects(:command).with(:add)
-      provider.addcmd
+      @provider.expects(:command).with(:add)
+      @provider.addcmd
     end
 
     it "should add properties" do
-      provider.expects(:add_properties).returns(['-foo_add_properties'])
-      provider.addcmd.should include '-foo_add_properties'
+      @provider.expects(:add_properties).returns([])
+      @provider.addcmd
     end
 
     it "should check and add if dup allowed" do
-      provider.expects(:check_allow_dup).returns(['-allow_dup_flag'])
-      provider.addcmd.should include '-allow_dup_flag'
+      @provider.expects(:check_allow_dup).returns([])
+      @provider.addcmd
     end
 
     it "should check and add if home is managed" do
-      provider.expects(:check_manage_home).returns(['-manage_home_flag'])
-      provider.addcmd.should include '-manage_home_flag'
+      @provider.expects(:check_manage_home).returns([])
+      @provider.addcmd
     end
 
     it "should add the resource :name" do
-      provider.addcmd.should include 'myuser'
+      @resource.expects(:[]).with(:name)
+      @provider.addcmd
     end
 
-    describe "on systems featuring system_users", :if => described_class.system_users? do
-      it "should return an array with -r if system? is true" do
-        resource[:system] = :true
-        provider.addcmd.should include("-r")
-      end
+    it "should return an array with -r if system? is true" do
+      resource = Puppet::Type.type(:user).new( :name => "bob", :system => true)
 
-      it "should return an array without -r if system? is false" do
-        resource[:system] = :false
-        provider.addcmd.should_not include("-r")
-      end
+      provider_class.new( resource ).addcmd.should include("-r")
     end
 
-    describe "on systems not featuring system_users", :unless => described_class.system_users? do
-      [:false, :true].each do |system|
-        it "should return an array without -r if system? is #{system}" do
-          resource[:system] = system
-          provider.addcmd.should_not include("-r")
-        end
-      end
+    it "should return an array without -r if system? is false" do
+      resource = Puppet::Type.type(:user).new( :name => "bob", :system => false)
+
+      provider_class.new( resource ).addcmd.should_not include("-r")
     end
 
     it "should return an array with full command" do
-      described_class.expects(:system_users?).returns true
-      provider.stubs(:add_properties).returns(["-G", "somegroup"])
-      resource[:expiry] = "2012-08-18"
-
-      provider.addcmd.must == ["/usr/sbin/useradd", "-G", "somegroup", "-o", "-m", '-e 2012-08-18', "-r", "myuser"]
+      @provider.stubs(:command).with(:add).returns("useradd")
+      @provider.stubs(:add_properties).returns(["-G", "somegroup"])
+      @resource.stubs(:[]).with(:name).returns("someuser")
+      @resource.stubs(:[]).with(:expiry).returns("somedate")
+      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", '-e somedate', "-r", "someuser"]
     end
 
     it "should return an array without -e if expiry is undefined full command" do
-      described_class.expects(:system_users?).returns true
-      provider.stubs(:add_properties).returns(["-G", "somegroup"])
-      provider.addcmd.must == ["/usr/sbin/useradd", "-G", "somegroup", "-o", "-m", "-r", "myuser"]
+      @provider.stubs(:command).with(:add).returns("useradd")
+      @provider.stubs(:add_properties).returns(["-G", "somegroup"])
+      @resource.stubs(:[]).with(:name).returns("someuser")
+      @resource.stubs(:[]).with(:expiry).returns nil
+      @provider.addcmd.must == ["useradd", "-G", "somegroup", "-o", "-m", "-r", "someuser"]
     end
   end
 
-  describe "#passcmd" do
+  describe "when calling passcmd" do
     before do
-      resource[:allowdupe] = :true
-      resource[:managehome] = :true
-      resource[:system] = :true
+      @resource.stubs(:allowdupe?).returns true
+      @resource.stubs(:managehome?).returns true
+      @resource.stubs(:system?).returns true
     end
 
     it "should call command with :pass" do
-      # command(:password) is only called inside passcmd if
-      # password_min_age or password_max_age is set
-      resource[:password_min_age] = 123
-      provider.expects(:command).with(:password)
-      provider.passcmd
+      @provider.expects(:command).with(:password)
+      @provider.passcmd
     end
 
     it "should return nil if neither min nor max is set" do
-      provider.passcmd.must be_nil
+      @resource.stubs(:should).with(:password_min_age).returns nil
+      @resource.stubs(:should).with(:password_max_age).returns nil
+      @provider.passcmd.must == nil
     end
 
     it "should return a chage command array with -m <value> and the user name if password_min_age is set" do
-      resource[:password_min_age] = 123
-      provider.passcmd.must == ['/usr/bin/chage','-m',123,'myuser']
+      @provider.stubs(:command).with(:password).returns("chage")
+      @resource.stubs(:[]).with(:name).returns("someuser")
+      @resource.stubs(:should).with(:password_min_age).returns 123
+      @resource.stubs(:should).with(:password_max_age).returns nil
+      @provider.passcmd.must == ['chage','-m',123,'someuser']
     end
 
     it "should return a chage command array with -M <value> if password_max_age is set" do
-      resource[:password_max_age] = 999
-      provider.passcmd.must == ['/usr/bin/chage','-M',999,'myuser']
+      @provider.stubs(:command).with(:password).returns("chage")
+      @resource.stubs(:[]).with(:name).returns("someuser")
+      @resource.stubs(:should).with(:password_min_age).returns nil
+      @resource.stubs(:should).with(:password_max_age).returns 999
+      @provider.passcmd.must == ['chage','-M',999,'someuser']
     end
 
     it "should return a chage command array with -M <value> -m <value> if both password_min_age and password_max_age are set" do
-      resource[:password_min_age] = 123
-      resource[:password_max_age] = 999
-      provider.passcmd.must == ['/usr/bin/chage','-m',123,'-M',999,'myuser']
+      @provider.stubs(:command).with(:password).returns("chage")
+      @resource.stubs(:[]).with(:name).returns("someuser")
+      @resource.stubs(:should).with(:password_min_age).returns 123
+      @resource.stubs(:should).with(:password_max_age).returns 999
+      @provider.passcmd.must == ['chage','-m',123,'-M',999,'someuser']
     end
   end
 end