puppet 2.7.1 → 2.7.3

data/spec/unit/semver_spec.rb

@@ -0,0 +1,187 @@
+require 'spec_helper'
+require 'semver'
+
+describe SemVer do
+  describe '::valid?' do
+    it 'should validate basic version strings' do
+      %w[ 0.0.0 999.999.999 v0.0.0 v999.999.999 ].each do |vstring|
+        SemVer.valid?(vstring).should be_true
+      end
+    end
+
+    it 'should validate special version strings' do
+      %w[ 0.0.0foo 999.999.999bar v0.0.0a v999.999.999beta ].each do |vstring|
+        SemVer.valid?(vstring).should be_true
+      end
+    end
+
+    it 'should fail to validate invalid version strings' do
+      %w[ nope 0.0foo 999.999 x0.0.0 z.z.z 1.2.3-beta 1.x.y ].each do |vstring|
+        SemVer.valid?(vstring).should be_false
+      end
+    end
+  end
+
+  describe '::find_matching' do
+    before :all do
+      @versions = %w[
+        0.0.1
+        0.0.2
+        1.0.0rc1
+        1.0.0rc2
+        1.0.0
+        1.0.1
+        1.1.0
+        1.1.1
+        1.1.2
+        1.1.3
+        1.1.4
+        1.2.0
+        1.2.1
+        2.0.0rc1
+      ].map { |v| SemVer.new(v) }
+    end
+
+    it 'should match exact versions by string' do
+      @versions.each do |version|
+        SemVer.find_matching(version, @versions).should == version
+      end
+    end
+
+    it 'should return nil if no versions match' do
+      %w[ 3.0.0 2.0.0rc2 1.0.0alpha ].each do |v|
+        SemVer.find_matching(v, @versions).should be_nil
+      end
+    end
+
+    it 'should find the greatest match for partial versions' do
+      SemVer.find_matching('1.0', @versions).should == 'v1.0.1'
+      SemVer.find_matching('1.1', @versions).should == 'v1.1.4'
+      SemVer.find_matching('1', @versions).should   == 'v1.2.1'
+      SemVer.find_matching('2', @versions).should   == 'v2.0.0rc1'
+      SemVer.find_matching('2.1', @versions).should == nil
+    end
+
+
+    it 'should find the greatest match for versions with placeholders' do
+      SemVer.find_matching('1.0.x', @versions).should == 'v1.0.1'
+      SemVer.find_matching('1.1.x', @versions).should == 'v1.1.4'
+      SemVer.find_matching('1.x', @versions).should   == 'v1.2.1'
+      SemVer.find_matching('1.x.x', @versions).should == 'v1.2.1'
+      SemVer.find_matching('2.x', @versions).should   == 'v2.0.0rc1'
+      SemVer.find_matching('2.x.x', @versions).should == 'v2.0.0rc1'
+      SemVer.find_matching('2.1.x', @versions).should == nil
+    end
+  end
+
+  describe 'instantiation' do
+    it 'should raise an exception when passed an invalid version string' do
+      expect { SemVer.new('invalidVersion') }.to raise_exception ArgumentError
+    end
+
+    it 'should populate the appropriate fields for a basic version string' do
+      version = SemVer.new('1.2.3')
+      version.major.should   == 1
+      version.minor.should   == 2
+      version.tiny.should    == 3
+      version.special.should == ''
+    end
+
+    it 'should populate the appropriate fields for a special version string' do
+      version = SemVer.new('3.4.5beta6')
+      version.major.should   == 3
+      version.minor.should   == 4
+      version.tiny.should    == 5
+      version.special.should == 'beta6'
+    end
+  end
+
+  describe '#matched_by?' do
+    subject { SemVer.new('v1.2.3beta') }
+
+    describe 'should match against' do
+      describe 'literal version strings' do
+        it { should be_matched_by('1.2.3beta') }
+
+        it { should_not be_matched_by('1.2.3alpha') }
+        it { should_not be_matched_by('1.2.4beta') }
+        it { should_not be_matched_by('1.3.3beta') }
+        it { should_not be_matched_by('2.2.3beta') }
+      end
+
+      describe 'partial version strings' do
+        it { should be_matched_by('1.2.3') }
+        it { should be_matched_by('1.2') }
+        it { should be_matched_by('1') }
+      end
+
+      describe 'version strings with placeholders' do
+        it { should be_matched_by('1.2.x') }
+        it { should be_matched_by('1.x.3') }
+        it { should be_matched_by('1.x.x') }
+        it { should be_matched_by('1.x') }
+      end
+    end
+  end
+
+  describe 'comparisons' do
+    describe 'against a string' do
+      it 'should just work' do
+        SemVer.new('1.2.3').should == '1.2.3'
+      end
+    end
+
+    describe 'against a symbol' do
+      it 'should just work' do
+        SemVer.new('1.2.3').should == :'1.2.3'
+      end
+    end
+
+    describe 'on a basic version (v1.2.3)' do
+      subject { SemVer.new('v1.2.3') }
+
+      it { should == SemVer.new('1.2.3') }
+
+      # Different major versions
+      it { should > SemVer.new('0.2.3') }
+      it { should < SemVer.new('2.2.3') }
+
+      # Different minor versions
+      it { should > SemVer.new('1.1.3') }
+      it { should < SemVer.new('1.3.3') }
+
+      # Different tiny versions
+      it { should > SemVer.new('1.2.2') }
+      it { should < SemVer.new('1.2.4') }
+
+      # Against special versions
+      it { should > SemVer.new('1.2.3beta') }
+      it { should < SemVer.new('1.2.4beta') }
+    end
+
+    describe 'on a special version (v1.2.3beta)' do
+      subject { SemVer.new('v1.2.3beta') }
+
+      it { should == SemVer.new('1.2.3beta') }
+
+      # Same version, final release
+      it { should < SemVer.new('1.2.3') }
+
+      # Different major versions
+      it { should > SemVer.new('0.2.3') }
+      it { should < SemVer.new('2.2.3') }
+
+      # Different minor versions
+      it { should > SemVer.new('1.1.3') }
+      it { should < SemVer.new('1.3.3') }
+
+      # Different tiny versions
+      it { should > SemVer.new('1.2.2') }
+      it { should < SemVer.new('1.2.4') }
+
+      # Against special versions
+      it { should > SemVer.new('1.2.3alpha') }
+      it { should < SemVer.new('1.2.3beta2') }
+    end
+  end
+end

data/spec/unit/ssl/certificate_spec.rb

@@ -89,6 +89,31 @@ describe Puppet::SSL::Certificate do
       @certificate.should respond_to(:content)
     end
 
+    describe "#alternate_names" do
+      before do
+        Puppet[:certdnsnames] = 'foo:bar:baz'
+        @csr            = OpenSSL::X509::Request.new
+        @csr.subject    = OpenSSL::X509::Name.new([['CN', 'quux']])
+        @csr.public_key = OpenSSL::PKey::RSA.generate(Puppet[:keylength]).public_key
+      end
+
+      it "should list all alternate names when the extension is present" do
+        cert = Puppet::SSL::CertificateFactory.new('server', @csr, @csr, 14).result
+
+        @certificate = @class.from_s(cert.to_pem)
+
+        @certificate.alternate_names.should =~ ['foo', 'bar', 'baz', 'quux']
+      end
+
+      it "should return an empty list of names if the extension is absent" do
+        cert = Puppet::SSL::CertificateFactory.new('client', @csr, @csr, 14).result
+
+        @certificate = @class.from_s(cert.to_pem)
+
+        @certificate.alternate_names.should == []
+      end
+    end
+
     it "should return a nil expiration if there is no actual certificate" do
       @certificate.stubs(:content).returns nil
 

data/spec/unit/transaction/report_spec.rb

@@ -9,9 +9,9 @@ describe Puppet::Transaction::Report do
     Puppet::Util::Storage.stubs(:store)
   end
 
-  it "should set its host name to the certname" do
-    Puppet.settings.expects(:value).with(:certname).returns "myhost"
-    Puppet::Transaction::Report.new("apply").host.should == "myhost"
+  it "should set its host name to the node_name_value" do
+    Puppet[:node_name_value] = 'mynode'
+    Puppet::Transaction::Report.new("apply").host.should == "mynode"
   end
 
   it "should return its host name as its name" do

data/spec/unit/transaction_spec.rb

@@ -87,13 +87,19 @@ describe Puppet::Transaction do
     @transaction.should_not be_any_failed
   end
 
-  it "should be possible to replace the report object" do
+  it "should use the provided report object" do
     report = Puppet::Transaction::Report.new("apply")
-    @transaction.report = report
+    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new, report)
 
     @transaction.report.should == report
   end
 
+  it "should create a report if none is provided" do
+    @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new)
+
+    @transaction.report.should be_kind_of Puppet::Transaction::Report
+  end
+
   describe "when initializing" do
     it "should create an event manager" do
       @transaction = Puppet::Transaction.new(Puppet::Resource::Catalog.new)

data/spec/unit/type/file_spec.rb

@@ -168,6 +168,25 @@ describe Puppet::Type.type(:file) do
         reqs[0].target.must == file
       end
 
+      it "should autorequire its nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "/foo/bar/baz")
+        dir = Puppet::Type::File.new(:path => "/foo")
+        root = Puppet::Type::File.new(:path => "/")
+        @catalog.add_resource file
+        @catalog.add_resource dir
+        @catalog.add_resource root
+        reqs = file.autorequire
+        reqs.length.must == 1
+        reqs[0].source.must == dir
+        reqs[0].target.must == file
+      end
+
+      it "should not autorequire anything when there is no nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "/foo/bar/baz")
+        @catalog.add_resource file
+        file.autorequire.should be_empty
+      end
+
       it "should not autorequire its parent dir if its parent dir is itself" do
         file = Puppet::Type::File.new(:path => "/")
         @catalog.add_resource file
@@ -241,6 +260,25 @@ describe Puppet::Type.type(:file) do
         reqs[0].target.must == file
       end
 
+      it "should autorequire its nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "X:/foo/bar/baz")
+        dir = Puppet::Type::File.new(:path => "X:/foo")
+        root = Puppet::Type::File.new(:path => "X:/")
+        @catalog.add_resource file
+        @catalog.add_resource dir
+        @catalog.add_resource root
+        reqs = file.autorequire
+        reqs.length.must == 1
+        reqs[0].source.must == dir
+        reqs[0].target.must == file
+      end
+
+      it "should not autorequire anything when there is no nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "X:/foo/bar/baz")
+        @catalog.add_resource file
+        file.autorequire.should be_empty
+      end
+
       it "should not autorequire its parent dir if its parent dir is itself" do
         file = Puppet::Type::File.new(:path => "X:/")
         @catalog.add_resource file
@@ -302,6 +340,25 @@ describe Puppet::Type.type(:file) do
         reqs[0].target.must == file
       end
 
+      it "should autorequire its nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "//server/foo/bar/baz/qux")
+        dir = Puppet::Type::File.new(:path => "//server/foo/bar")
+        root = Puppet::Type::File.new(:path => "//server/foo")
+        @catalog.add_resource file
+        @catalog.add_resource dir
+        @catalog.add_resource root
+        reqs = file.autorequire
+        reqs.length.must == 1
+        reqs[0].source.must == dir
+        reqs[0].target.must == file
+      end
+
+      it "should not autorequire anything when there is no nearest ancestor directory" do
+        file = Puppet::Type::File.new(:path => "//server/foo/bar/baz/qux")
+        @catalog.add_resource file
+        file.autorequire.should be_empty
+      end
+
       it "should not autorequire its parent dir if its parent dir is itself" do
         file = Puppet::Type::File.new(:path => "//server/foo")
         @catalog.add_resource file

data/spec/unit/type/interface_spec.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env rspec
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Puppet::Type.type(:interface) do
 

data/spec/unit/type/schedule_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 
 module ScheduleTesting
 
-  def format(time)
-    time.strftime("%H:%M:%S")
-  end
-
   def diff(unit, incr, method, count)
     diff = Time.now.to_i.send(method, incr * count)
     Time.at(diff)
@@ -54,7 +50,7 @@ describe Puppet::Type.type(:schedule) do
 
     it "should never match when the period is :never" do
       @schedule[:period] = :never
-      @schedule.match?.should be_false
+      @schedule.should_not be_match
     end
   end
 
@@ -80,19 +76,44 @@ describe Puppet::Type.type(:schedule) do
   describe Puppet::Type.type(:schedule), "when matching ranges" do
     include ScheduleTesting
 
+    before do
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
+    end
+
     it "should match when the start time is before the current time and the end time is after the current time" do
-      @schedule[:range] = "#{format(Time.now - 10)} - #{format(Time.now + 10)}"
-      @schedule.match?.should be_true
+      @schedule[:range] = "10:59:50 - 11:00:10"
+      @schedule.should be_match
     end
 
     it "should not match when the start time is after the current time" do
-      @schedule[:range] = "#{format(Time.now + 5)} - #{format(Time.now + 10)}"
-      @schedule.match?.should be_false
+      @schedule[:range] = "11:00:05 - 11:00:10"
+      @schedule.should_not be_match
     end
 
     it "should not match when the end time is previous to the current time" do
-      @schedule[:range] = "#{format(Time.now - 10)} - #{format(Time.now - 5)}"
-      @schedule.match?.should be_false
+      @schedule[:range] = "10:59:50 - 10:59:55"
+      @schedule.should be_match
+    end
+
+    it "should throw an error if the upper limit is less than the lower limit" do
+      pending "bug #7639"
+      @schedule[:range] = "01:02:03 - 01:00:00"
+      @schedule.should_throw Puppet::Error
+    end
+
+    it "should not match the current time fails between an array of ranges" do
+      @schedule[:range] = ["4-6", "20-23"]
+      @schedule.should_not be_match
+    end
+
+    it "should match the lower array of ranges" do
+      @schedule[:range] = ["9-11", "14-16"]
+      @schedule.should be_match
+    end
+
+    it "should match the upper array of ranges" do
+      @schedule[:range] = ["4-6", "11-12"]
+      @schedule.should be_match
     end
   end
 
@@ -102,18 +123,20 @@ describe Puppet::Type.type(:schedule) do
     before do
       @schedule[:period] = :hourly
       @schedule[:periodmatch] = :distance
+
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
 
-    it "should match an hour ago" do
-      @schedule.match?(hour("-", 1)).should be_true
+    it "should match when the previous time was an hour ago" do
+      @schedule.should be_match(hour("-", 1))
     end
 
-    it "should not match now" do
-      @schedule.match?(Time.now).should be_false
+    it "should not match when the previous time was now" do
+      @schedule.should_not be_match(Time.now)
     end
 
-    it "should not match 59 minutes ago" do
-      @schedule.match?(min("-", 59)).should be_false
+    it "should not match when the previous time was 59 minutes ago" do
+      @schedule.should_not be_match(min("-", 59))
     end
   end
 
@@ -123,18 +146,20 @@ describe Puppet::Type.type(:schedule) do
     before do
       @schedule[:period] = :daily
       @schedule[:periodmatch] = :distance
+
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
 
     it "should match when the previous time was one day ago" do
-      @schedule.match?(day("-", 1)).should be_true
+      @schedule.should be_match(day("-", 1))
     end
 
     it "should not match when the previous time is now" do
-      @schedule.match?(Time.now).should be_false
+      @schedule.should_not be_match(Time.now)
     end
 
     it "should not match when the previous time was 23 hours ago" do
-      @schedule.match?(hour("-", 23)).should be_false
+      @schedule.should_not be_match(hour("-", 23))
     end
   end
 
@@ -144,18 +169,20 @@ describe Puppet::Type.type(:schedule) do
     before do
       @schedule[:period] = :weekly
       @schedule[:periodmatch] = :distance
+
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
 
-    it "should match seven days ago" do
-      @schedule.match?(day("-", 7)).should be_true
+    it "should match when the previous time was seven days ago" do
+      @schedule.should be_match(day("-", 7))
     end
 
-    it "should not match now" do
-      @schedule.match?(Time.now).should be_false
+    it "should not match when the previous time was now" do
+      @schedule.should be_match(Time.now)
     end
 
-    it "should not match six days ago" do
-      @schedule.match?(day("-", 6)).should be_false
+    it "should not match when the previous time was six days ago" do
+      @schedule.should_not be_match(day("-", 6))
     end
   end
 
@@ -165,18 +192,20 @@ describe Puppet::Type.type(:schedule) do
     before do
       @schedule[:period] = :monthly
       @schedule[:periodmatch] = :distance
+
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
 
-    it "should match 32 days ago" do
-      @schedule.match?(day("-", 32)).should be_true
+    it "should match when the previous time was 32 days ago" do
+      @schedule.should be_match(day("-", 32))
     end
 
-    it "should not match now" do
-      @schedule.match?(Time.now).should be_false
+    it "should not match when the previous time was now" do
+      @schedule.should_not be_match(Time.now)
     end
 
-    it "should not match 27 days ago" do
-      @schedule.match?(day("-", 27)).should be_false
+    it "should not match when the previous time was 27 days ago" do
+      @schedule.should_not be_match(day("-", 27))
     end
   end
 
@@ -193,7 +222,7 @@ describe Puppet::Type.type(:schedule) do
       previous = Time.utc(2007, 12, 31, 23, 59, 0)
 
       Time.stubs(:now).returns(current)
-      @schedule.match?(previous).should be_true
+      @schedule.should be_match(previous)
     end
 
     it "should not match if the times are 59 minutes apart and the current minute is 59" do
@@ -201,7 +230,7 @@ describe Puppet::Type.type(:schedule) do
       previous = Time.utc(2009, 2, 1, 12, 0, 0)
 
       Time.stubs(:now).returns(current)
-      @schedule.match?(previous).should be_false
+      @schedule.should_not be_match(previous)
     end
   end
 
@@ -220,7 +249,7 @@ describe Puppet::Type.type(:schedule) do
       previous = current - 60
 
       Time.stubs(:now).returns(current)
-      @schedule.match?(previous).should be_true
+      @schedule.should be_match(previous)
     end
 
     it "should not match if the times are 23 hours and 58 minutes apart and the current hour is 23 and the current minute is 59" do
@@ -232,7 +261,7 @@ describe Puppet::Type.type(:schedule) do
       now = previous + (23 * 3600) + (59 * 60)
 
       Time.stubs(:now).returns(now)
-      @schedule.match?(previous).should be_false
+      @schedule.should_not be_match(previous)
     end
   end
 
@@ -249,7 +278,7 @@ describe Puppet::Type.type(:schedule) do
       Time.stubs(:now).returns(now)
       previous = Time.utc(2010, "nov", 6, 23, 59, 59) # Sat
 
-      @schedule.match?(previous).should be_true
+      @schedule.should be_match(previous)
     end
 
     it "should not match if the previous time is after the most recent Saturday" do
@@ -257,7 +286,7 @@ describe Puppet::Type.type(:schedule) do
       Time.stubs(:now).returns(now)
       previous = Time.utc(2010, "nov", 7, 0, 0, 0) # Sunday
 
-      @schedule.match?(previous).should be_false
+      @schedule.should_not be_match(previous)
     end
   end
 
@@ -274,7 +303,7 @@ describe Puppet::Type.type(:schedule) do
       Time.stubs(:now).returns(now)
       previous = Time.utc(2010, "oct", 31, 23, 59, 59)
 
-      @schedule.match?(previous).should be_true
+      @schedule.should be_match(previous)
     end
 
     it "should not match when the previous time is after the last day of last month" do
@@ -282,7 +311,7 @@ describe Puppet::Type.type(:schedule) do
       Time.stubs(:now).returns(now)
       previous = Time.utc(2010, "nov", 1, 0, 0, 0)
 
-      @schedule.match?(previous).should be_false
+      @schedule.should_not be_match(previous)
     end
   end
 
@@ -292,6 +321,8 @@ describe Puppet::Type.type(:schedule) do
     before do
       @schedule[:period] = :daily
       @schedule[:repeat] = 2
+
+      Time.stubs(:now).returns(Time.local(2011, "may", 23, 11, 0, 0))
     end
 
     it "should fail if the periodmatch is 'number'" do
@@ -301,12 +332,12 @@ describe Puppet::Type.type(:schedule) do
 
     it "should match if the previous run was further away than the distance divided by the repeat" do
       previous = Time.now - (3600 * 13)
-      @schedule.match?(previous).should be_true
+      @schedule.should be_match(previous)
     end
 
     it "should not match if the previous run was closer than the distance divided by the repeat" do
       previous = Time.now - (3600 * 11)
-      @schedule.match?(previous).should be_false
+      @schedule.should_not be_match(previous)
     end
   end
 end