puppet 2.7.1 → 2.7.3

data/spec/unit/provider/network_device_spec.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/provider/network_device'
 require 'ostruct'

data/spec/unit/provider/package/pacman_spec.rb

@@ -0,0 +1,237 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+provider = Puppet::Type.type(:package).provider(:pacman)
+
+describe provider do
+  before do
+    provider.stubs(:command).with(:pacman).returns('/usr/bin/pacman')
+    @resource = stub 'resource'
+    @resource.stubs(:[]).returns("package")
+    @resource.stubs(:name).returns("name")
+    @provider = provider.new(@resource)
+  end
+
+  describe "when installing" do
+    before do
+      @provider.stubs(:query).returns({
+        :ensure => '1.0'
+      })
+    end
+
+    it "should call pacman" do
+      provider.
+        expects(:execute).
+        at_least_once.
+        with { |args|
+          args[0] == "/usr/bin/pacman"
+        }.
+        returns ""
+
+      @provider.install
+    end
+
+    it "should be quiet" do
+      provider.
+        expects(:execute).
+        with { |args|
+          args[1,2] == ["--noconfirm", "--noprogressbar"]
+        }.
+        returns("")
+
+      @provider.install
+    end
+
+    it "should install the right package" do
+      provider.
+        expects(:execute).
+        with { |args|
+          args[3,4] == ["-Sy", @resource[0]]
+        }.
+        returns("")
+
+      @provider.install
+    end
+
+    it "should raise an ExecutionFailure if the installation failed" do
+      provider.stubs(:execute).returns("")
+      @provider.expects(:query).returns(nil)
+
+      lambda { @provider.install }.should raise_exception(Puppet::ExecutionFailure)
+    end
+  end
+
+  describe "when updating" do
+    it "should call install" do
+      @provider.expects(:install).returns("install return value")
+      @provider.update.should == "install return value"
+    end
+  end
+
+  describe "when uninstalling" do
+    it "should call pacman" do
+      provider.
+        expects(:execute).
+        with { |args|
+          args[0] == "/usr/bin/pacman"
+        }.
+        returns ""
+
+      @provider.uninstall
+    end
+
+    it "should be quiet" do
+      provider.
+        expects(:execute).
+        with { |args|
+          args[1,2] == ["--noconfirm", "--noprogressbar"]
+        }.
+        returns("")
+
+      @provider.uninstall
+    end
+
+    it "should remove the right package" do
+      provider.
+        expects(:execute).
+        with { |args|
+          args[3,4] == ["-R", @resource[0]]
+        }.
+        returns("")
+
+      @provider.uninstall
+    end
+  end
+
+  describe "when querying" do
+    it "should query pacman" do
+      provider.
+        expects(:execute).
+        with(["/usr/bin/pacman", "-Qi", @resource[0]])
+      @provider.query
+    end
+
+    it "should return the version" do
+      query_output = <<EOF
+Name           : package
+Version        : 1.01.3-2
+URL            : http://www.archlinux.org/pacman/
+Licenses       : GPL
+Groups         : base
+Provides       : None
+Depends On     : bash  libarchive>=2.7.1  libfetch>=2.25  pacman-mirrorlist
+Optional Deps  : fakeroot: for makepkg usage as normal user
+                 curl: for rankmirrors usage
+Required By    : None
+Conflicts With : None
+Replaces       : None
+Installed Size : 2352.00 K
+Packager       : Dan McGee <dan@archlinux.org>
+Architecture   : i686
+Build Date     : Sat 22 Jan 2011 03:56:41 PM EST
+Install Date   : Thu 27 Jan 2011 06:45:49 AM EST
+Install Reason : Explicitly installed
+Install Script : Yes
+Description    : A library-based package manager with dependency support
+EOF
+
+      provider.expects(:execute).returns(query_output)
+      @provider.query.should == {:ensure => "1.01.3-2"}
+    end
+
+    it "should return a nil if the package isn't found" do
+      provider.expects(:execute).returns("")
+      @provider.query.should be_nil
+    end
+
+    it "should return a hash indicating that the package is missing on error" do
+      provider.expects(:execute).raises(Puppet::ExecutionFailure.new("ERROR!"))
+      @provider.query.should == {
+        :ensure => :purged,
+        :status => 'missing',
+        :name => @resource[0],
+        :error => 'ok',
+      }
+    end
+  end
+
+  describe "when fetching a package list" do
+    it "should query pacman" do
+      provider.expects(:execpipe).with(["/usr/bin/pacman", ' -Q'])
+      provider.instances
+    end
+
+    it "should return installed packages with their versions" do
+      provider.expects(:execpipe).yields("package1 1.23-4\npackage2 2.00\n")
+      packages = provider.instances
+
+      packages.length.should == 2
+
+      packages[0].properties.should == {
+        :provider => :pacman,
+        :ensure => '1.23-4',
+        :name => 'package1'
+      }
+
+      packages[1].properties.should == {
+        :provider => :pacman,
+        :ensure => '2.00',
+        :name => 'package2'
+      }
+    end
+
+    it "should return nil on error" do
+      provider.expects(:execpipe).raises(Puppet::ExecutionFailure.new("ERROR!"))
+      provider.instances.should be_nil
+    end
+
+    it "should warn on invalid input" do
+      provider.expects(:execpipe).yields("blah")
+      provider.expects(:warning).with("Failed to match line blah")
+      provider.instances.should == []
+    end
+  end
+
+  describe "when determining the latest version" do
+    it "should refresh package list" do
+      refreshed = states('refreshed').starts_as('unrefreshed')
+      provider.
+        expects(:execute).
+        when(refreshed.is('unrefreshed')).
+        with(['/usr/bin/pacman', '-Sy']).
+        then(refreshed.is('refreshed'))
+
+      provider.
+        stubs(:execute).
+        when(refreshed.is('refreshed')).
+        returns("")
+
+      @provider.latest
+    end
+
+    it "should get query pacman for the latest version" do
+      refreshed = states('refreshed').starts_as('unrefreshed')
+      provider.
+        stubs(:execute).
+        when(refreshed.is('unrefreshed')).
+        then(refreshed.is('refreshed'))
+
+      provider.
+        expects(:execute).
+        when(refreshed.is('refreshed')).
+        with(['/usr/bin/pacman', '-Sp', '--print-format', '%v', @resource[0]]).
+        returns("")
+
+      @provider.latest
+    end
+
+    it "should return the version number from pacman" do
+      provider.
+        expects(:execute).
+        at_least_once().
+        returns("1.00.2-3\n")
+
+      @provider.latest.should == "1.00.2-3"
+    end
+  end
+end

data/spec/unit/provider/package/pkgutil_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 provider = Puppet::Type.type(:package).provider(:pkgutil)
 

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

@@ -9,23 +9,19 @@ describe provider_class do
   include PuppetSpec::Files
 
   before :each do
-    @sshauthkey_class = Puppet::Type.type(:ssh_authorized_key)
-    @provider = @sshauthkey_class.provider(:parsed)
     @keyfile = tmpfile('authorized_keys')
-    @provider.any_instance.stubs(:target).returns @keyfile
+    @provider_class = provider_class
+    @provider_class.initvars
+    @provider_class.any_instance.stubs(:target).returns @keyfile
     @user = 'random_bob'
     Puppet::Util.stubs(:uid).with(@user).returns 12345
   end
 
-  after :each do
-    @provider.initvars
-  end
-
   def mkkey(args)
     args[:target] = @keyfile
     args[:user]   = @user
     resource = Puppet::Type.type(:ssh_authorized_key).new(args)
-    key = @provider.new(resource)
+    key = @provider_class.new(resource)
     args.each do |p,v|
       key.send(p.to_s + "=", v)
     end
@@ -33,26 +29,26 @@ describe provider_class do
   end
 
   def genkey(key)
-    @provider.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
+    @provider_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
     File.stubs(:chown)
     File.stubs(:chmod)
     Puppet::Util::SUIDManager.stubs(:asuser).yields
     key.flush
-    @provider.target_object(@keyfile).read
+    @provider_class.target_object(@keyfile).read
   end
 
   it_should_behave_like "all parsedfile providers", provider_class
 
   it "should be able to generate a basic authorized_keys file" do
 
-    key = mkkey(:name    => "Just Testing",
+    key = mkkey(:name    => "Just_Testing",
                 :key     => "AAAAfsfddsjldjgksdflgkjsfdlgkj",
                 :type    => "ssh-dss",
                 :ensure  => :present,
                 :options => [:absent]
               )
 
-    genkey(key).should == "ssh-dss AAAAfsfddsjldjgksdflgkjsfdlgkj Just Testing\n"
+    genkey(key).should == "ssh-dss AAAAfsfddsjldjgksdflgkjsfdlgkj Just_Testing\n"
   end
 
   it "should be able to generate a authorized_keys file with options" do
@@ -71,25 +67,25 @@ describe provider_class do
     options = %w{from="host1.reductlivelabs.com,host.reductivelabs.com" command="/usr/local/bin/run" ssh-pty}
     optionstr = options.join(", ")
 
-    @provider.parse_options(optionstr).should == options
+    @provider_class.parse_options(optionstr).should == options
   end
 
   it "should use '' as name for entries that lack a comment" do
     line = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAut8aOSxenjOqF527dlsdHWV4MNoAsX14l9M297+SQXaQ5Z3BedIxZaoQthkDALlV/25A1COELrg9J2MqJNQc8Xe9XQOIkBQWWinUlD/BXwoOTWEy8C8zSZPHZ3getMMNhGTBO+q/O+qiJx3y5cA4MTbw2zSxukfWC87qWwcZ64UUlegIM056vPsdZWFclS9hsROVEa57YUMrehQ1EGxT4Z5j6zIopufGFiAPjZigq/vqgcAqhAKP6yu4/gwO6S9tatBeEjZ8fafvj1pmvvIplZeMr96gHE7xS3pEEQqnB3nd4RY7AF6j9kFixnsytAUO7STPh/M3pLiVQBN89TvWPQ=="
 
-    @provider.parse(line)[0][:name].should == ""
+    @provider_class.parse(line)[0][:name].should == ""
   end
 end
 
 describe provider_class do
   before :each do
-    @resource = stub("resource", :name => "foo")
-    @resource.stubs(:[]).returns "foo"
-    @resource.class.stubs(:key_attributes).returns( [:name] )
+    @resource = Puppet::Type.type(:ssh_authorized_key).new(:name => "foo", :user => "random_bob")
 
     @provider = provider_class.new(@resource)
     provider_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
     Puppet::Util::SUIDManager.stubs(:asuser).yields
+
+    provider_class.initvars
   end
 
   describe "when flushing" do
@@ -103,9 +99,9 @@ describe provider_class do
     describe "and both a user and a target have been specified" do
       before :each do
         Puppet::Util.stubs(:uid).with("random_bob").returns 12345
-        @resource.stubs(:should).with(:user).returns "random_bob"
+        @resource[:user] = "random_bob"
         target = "/tmp/.ssh_dir/place_to_put_authorized_keys"
-        @resource.stubs(:should).with(:target).returns target
+        @resource[:target] = target
       end
 
       it "should create the directory" do
@@ -134,8 +130,7 @@ describe provider_class do
 
     describe "and a user has been specified with no target" do
       before :each do
-        @resource.stubs(:should).with(:user).returns "nobody"
-        @resource.stubs(:should).with(:target).returns nil
+        @resource[:user] = "nobody"
         #
         # I'd like to use random_bob here and something like
         #
@@ -186,26 +181,20 @@ describe provider_class do
     end
 
     describe "and a target has been specified with no user" do
-      before :each do
-        @resource.stubs(:should).with(:user).returns nil
-        @resource.stubs(:should).with(:target).returns("/tmp/.ssh_dir/place_to_put_authorized_keys")
-      end
-
       it "should raise an error" do
+        @resource = Puppet::Type.type(:ssh_authorized_key).new(:name => "foo", :target => "/tmp/.ssh_dir/place_to_put_authorized_keys")
+        @provider = provider_class.new(@resource)
+
         proc { @provider.flush }.should raise_error
       end
     end
 
     describe "and a invalid user has been specified with no target" do
-      before :each do
-        @resource.stubs(:should).with(:user).returns "thisusershouldnotexist"
-        @resource.stubs(:should).with(:target).returns nil
-      end
-
       it "should catch an exception and raise a Puppet error" do
+        @resource[:user] = "thisusershouldnotexist"
+
         lambda { @provider.flush }.should raise_error(Puppet::Error)
       end
     end
-
   end
 end

data/spec/unit/provider/vlan/cisco_spec.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 
 require 'puppet/provider/vlan/cisco'
 

data/spec/unit/rails/host_spec.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
 
+require 'puppet/node/environment'
+
 describe "Puppet::Rails::Host", :if => Puppet.features.rails? do
   def column(name, type)
     ActiveRecord::ConnectionAdapters::Column.new(name, nil, type, false)
@@ -42,6 +44,12 @@ describe "Puppet::Rails::Host", :if => Puppet.features.rails? do
       Puppet::Rails::Host.from_puppet(@node)
     end
 
+    it "should stringify the environment" do
+      host = Puppet::Rails::Host.new
+      host.environment = Puppet::Node::Environment.new("production")
+      host.environment.class.should == String
+    end
+
     it "should copy the ipaddress from the Puppet instance" do
       Puppet::Rails::Host.expects(:find_by_name).with("foo").returns @host
 

data/spec/unit/resource/catalog_spec.rb

@@ -500,7 +500,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
       lambda { @catalog.alias(@one, "other") }.should_not raise_error
     end
 
-    it "should create aliases for resources isomorphic resources whose names do not match their titles" do
+    it "should create aliases for isomorphic resources whose names do not match their titles" do
       resource = Puppet::Type::File.new(:title => "testing", :path => @basepath+"/something")
 
       @catalog.add_resource(resource)
@@ -508,7 +508,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.resource(:file, @basepath+"/something").should equal(resource)
     end
 
-    it "should not create aliases for resources non-isomorphic resources whose names do not match their titles" do
+    it "should not create aliases for non-isomorphic resources whose names do not match their titles" do
       resource = Puppet::Type.type(:exec).new(:title => "testing", :command => "echo", :path => %w{/bin /usr/bin /usr/local/bin})
 
       @catalog.add_resource(resource)
@@ -524,11 +524,6 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.resource("notify", "other").should equal(@one)
     end
 
-    it "should ignore conflicting aliases that point to the aliased resource" do
-      @catalog.alias(@one, "other")
-      lambda { @catalog.alias(@one, "other") }.should_not raise_error
-    end
-
     it "should fail to add an alias if the aliased name already exists" do
       @catalog.add_resource @one
       proc { @catalog.alias @two, "one" }.should raise_error(ArgumentError)
@@ -582,13 +577,65 @@ describe Puppet::Resource::Catalog, "when compiling" do
       @catalog.create_resource :file, args
       @catalog.resource("File[/yay]").should equal(resource)
     end
+
+    describe "when adding resources with multiple namevars" do
+      before :each do
+        Puppet::Type.newtype(:multiple) do
+          newparam(:color, :namevar => true)
+          newparam(:designation, :namevar => true)
+
+          def self.title_patterns
+            [ [
+                /^(\w+) (\w+)$/,
+                [
+                  [:color,  lambda{|x| x}],
+                  [:designation, lambda{|x| x}]
+                ]
+            ] ]
+          end
+        end
+      end
+
+      it "should add an alias using the uniqueness key" do
+        @resource = Puppet::Type.type(:multiple).new(:title => "some resource", :color => "red", :designation => "5")
+
+        @catalog.add_resource(@resource)
+        @catalog.resource(:multiple, "some resource").must == @resource
+        @catalog.resource("Multiple[some resource]").must == @resource
+        @catalog.resource("Multiple[red 5]").must == @resource
+      end
+
+      it "should conflict with a resource with the same uniqueness key" do
+        @resource = Puppet::Type.type(:multiple).new(:title => "some resource", :color => "red", :designation => "5")
+        @other    = Puppet::Type.type(:multiple).new(:title => "another resource", :color => "red", :designation => "5")
+
+        @catalog.add_resource(@resource)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias Multiple\[another resource\] to \["red", "5"\].*resource \["Multiple", "red", "5"\] already defined/)
+      end
+
+      it "should conflict when its uniqueness key matches another resource's title" do
+        @resource = Puppet::Type.type(:file).new(:title => "/tmp/foo")
+        @other    = Puppet::Type.type(:file).new(:title => "another file", :path => "/tmp/foo")
+
+        @catalog.add_resource(@resource)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias File\[another file\] to \["\/tmp\/foo"\].*resource \["File", "\/tmp\/foo"\] already defined/)
+      end
+
+      it "should conflict when its uniqueness key matches the uniqueness key derived from another resource's title" do
+        @resource = Puppet::Type.type(:multiple).new(:title => "red leader")
+        @other    = Puppet::Type.type(:multiple).new(:title => "another resource", :color => "red", :designation => "leader")
+
+        @catalog.add_resource(@resource)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias Multiple\[another resource\] to \["red", "leader"\].*resource \["Multiple", "red", "leader"\] already defined/)
+      end
+    end
   end
 
   describe "when applying" do
     before :each do
       @catalog = Puppet::Resource::Catalog.new("host")
 
-      @transaction = mock 'transaction'
+      @transaction = Puppet::Transaction.new(@catalog)
       Puppet::Transaction.stubs(:new).returns(@transaction)
       @transaction.stubs(:evaluate)
       @transaction.stubs(:add_times)