puppet 2.7.11 → 2.7.12

data/spec/unit/provider/selmodule_spec.rb

@@ -19,19 +19,19 @@ describe provider_class do
   describe "exists? method" do
     it "should find a module if it is already loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ["bar\t1.2.3\n", "foo\t4.4.4\n", "bang\t1.0.0\n"]
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields "bar\t1.2.3\nfoo\t4.4.4\nbang\t1.0.0\n"
       @provider.exists?.should == :true
     end
 
     it "should return nil if not loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ["bar\t1.2.3\n", "bang\t1.0.0\n"]
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields "bar\t1.2.3\nbang\t1.0.0\n"
       @provider.exists?.should be_nil
     end
 
     it "should return nil if no modules are loaded" do
       @provider.expects(:command).with(:semodule).returns "/usr/sbin/semodule"
-      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields []
+      @provider.expects(:execpipe).with("/usr/sbin/semodule --list").yields ""
       @provider.exists?.should be_nil
     end
   end

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

@@ -7,6 +7,8 @@ describe Puppet::Type.type(:service).provider(:launchd) do
   let (:joblabel) { "com.foo.food" }
   let (:provider) { subject.class }
   let (:launchd_overrides) { '/var/db/launchd.db/com.apple.launchd/overrides.plist' }
+  let(:resource) { Puppet::Type.type(:service).new(:name => joblabel) }
+  subject { Puppet::Type.type(:service).provider(:launchd).new(resource) }
 
   describe "the type interface" do
     %w{ start stop enabled? enable disable status}.each do |method|
@@ -39,18 +41,15 @@ describe Puppet::Type.type(:service).provider(:launchd) do
     it "should return true in if the job plist says disabled is false" do
       subject.expects(:has_macosx_plist_overrides?).returns(false)
       subject.expects(:plist_from_label).with(joblabel).returns(["foo", {"Disabled" => false}])
-      subject.expects(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
     end
     it "should return true in if the job plist has no disabled key" do
       subject.expects(:has_macosx_plist_overrides?).returns(false)
-      subject.expects(:resource).returns({:name => joblabel})
       subject.expects(:plist_from_label).returns(["foo", {}])
       subject.enabled?.should == :true
     end
     it "should return false in if the job plist says disabled is true" do
       subject.expects(:has_macosx_plist_overrides?).returns(false)
-      subject.expects(:resource).returns({:name => joblabel})
       subject.expects(:plist_from_label).returns(["foo", {"Disabled" => true}])
       subject.enabled?.should == :false
     end
@@ -62,7 +61,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
       provider.expects(:read_plist).returns({joblabel => {"Disabled" => false}})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
     end
     it "should return false if the job plist says disabled is false and the global overrides says disabled is true" do
@@ -70,7 +68,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
       provider.expects(:read_plist).returns({joblabel => {"Disabled" => true}})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :false
     end
     it "should return true if the job plist and the global overrides have no disabled keys" do
@@ -78,38 +75,40 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:plist_from_label).returns([joblabel, {}])
       provider.expects(:read_plist).returns({})
       FileTest.expects(:file?).with(launchd_overrides).returns(true)
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.enabled?.should == :true
     end
   end
 
   describe "when starting the service" do
+    it "should call any explicit 'start' command" do
+      resource[:start] = "/bin/false"
+      subject.expects(:texecute).with(:start, ["/bin/false"], true)
+      subject.start
+    end
+
     it "should look for the relevant plist once" do
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :load, joblabel])
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.start
     end
     it "should execute 'launchctl load' once without writing to the plist if the job is enabled" do  
       subject.expects(:plist_from_label).returns([joblabel, {}])
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :load, joblabel]).once
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.start
     end
     it "should execute 'launchctl load' with writing to the plist once if the job is disabled" do
       subject.expects(:plist_from_label).returns([joblabel, {}])
       subject.expects(:enabled?).returns(:false)
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.expects(:execute).with([:launchctl, :load, "-w", joblabel]).once
       subject.start
     end
     it "should disable the job once if the job is disabled and should be disabled at boot" do
+      resource[:enable] = false
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => true}])
       subject.expects(:enabled?).returns :false
       subject.expects(:execute).with([:launchctl, :load, "-w", joblabel])
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :false})
       subject.expects(:disable).once
       subject.start
     end
@@ -117,39 +116,41 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:plist_from_label).returns([joblabel, {}])
       subject.expects(:enabled?).returns(:true)
       subject.expects(:status).returns(:stopped)
-      subject.expects(:resource).returns({:name => joblabel}).twice
       subject.expects(:execute).with([:launchctl, :load, '-w', joblabel])
       subject.start
     end
   end
 
   describe "when stopping the service" do
+    it "should call any explicit 'stop' command" do
+      resource[:stop] = "/bin/false"
+      subject.expects(:texecute).with(:stop, ["/bin/false"], true)
+      subject.stop
+    end
+
     it "should look for the relevant plist once" do
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel])
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should execute 'launchctl unload' once without writing to the plist if the job is disabled" do
       subject.expects(:plist_from_label).returns([joblabel, {}])
       subject.expects(:enabled?).returns :false
       subject.expects(:execute).with([:launchctl, :unload, joblabel]).once
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should execute 'launchctl unload' with writing to the plist once if the job is enabled" do
       subject.expects(:plist_from_label).returns([joblabel, {}])
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel]).once
-      subject.stubs(:resource).returns({:name => joblabel})
       subject.stop
     end
     it "should enable the job once if the job is enabled and should be enabled at boot" do
+      resource[:enable] = true
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :unload, "-w", joblabel])
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.expects(:enable).once
       subject.stop
     end
@@ -157,47 +158,47 @@ describe Puppet::Type.type(:service).provider(:launchd) do
 
   describe "when enabling the service" do
     it "should look for the relevant plist once" do   ### Do we need this test?  Differentiating it?
+      resource[:enable] = true
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).returns :false
       subject.expects(:execute).with([:launchctl, :unload, joblabel])
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.stop
     end
     it "should check if the job is enabled once" do
+      resource[:enable] = true
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).once
       subject.expects(:execute).with([:launchctl, :unload, joblabel])
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.stop
     end
   end
 
   describe "when disabling the service" do
     it "should look for the relevant plist once" do
+      resource[:enable] = false
       subject.expects(:plist_from_label).returns([joblabel, {}]).once
       subject.expects(:enabled?).returns :true
       subject.expects(:execute).with([:launchctl, :unload, '-w', joblabel])
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :false})
       subject.stop
     end
   end
 
   describe "when enabling the service on OS X 10.6" do
     it "should write to the global launchd overrides file once" do
+      resource[:enable] = true
       provider.expects(:get_macosx_version_major).returns("10.6")
       provider.expects(:read_plist).returns({})
       Plist::Emit.expects(:save_plist).once
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.enable
     end
   end
 
   describe "when disabling the service on OS X 10.6" do
     it "should write to the global launchd overrides file once" do
+      resource[:enable] = false
       provider.stubs(:get_macosx_version_major).returns("10.6")
       provider.stubs(:read_plist).returns({})
       Plist::Emit.expects(:save_plist).once
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :false})
       subject.enable
     end
   end
@@ -207,6 +208,7 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       provider.instance_variable_set(:@macosx_version_major, nil)
     end
     it "should display a deprecation warning" do
+      resource[:enable] = true
       Facter.expects(:value).with(:macosx_productversion_major).returns(nil)
       Facter.expects(:value).with(:macosx_productversion).returns('10.5.8')
       Facter.expects(:loadfacts)
@@ -214,7 +216,6 @@ describe Puppet::Type.type(:service).provider(:launchd) do
       subject.expects(:plist_from_label).returns([joblabel, {"Disabled" => false}])
       subject.expects(:enabled?).returns :false
       File.expects(:open).returns('')
-      subject.stubs(:resource).returns({:name => joblabel, :enable => :true})
       subject.enable
     end
   end

data/spec/unit/provider/service/{upstart.rb → upstart_spec.rb}

@@ -6,13 +6,13 @@ provider_class = Puppet::Type.type(:service).provider(:upstart)
 describe provider_class do
   describe "#instances" do
     it "should be able to find all instances" do
-      processes = ["rc stop/waiting", "ssh start/running, process 712"]
+      processes = ["rc stop/waiting", "ssh start/running, process 712"].join("\n")
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.map {|provider| provider.name}.should =~ ["rc","ssh"]
     end
 
     it "should attach the interface name for network interfaces" do
-      processes = ["network-interface (eth0)"]
+      processes = ["network-interface (eth0)"].join("\n")
       provider_class.stubs(:execpipe).yields(processes)
       provider_class.instances.first.name.should == "network-interface INTERFACE=eth0"
     end
@@ -23,7 +23,11 @@ describe provider_class do
       resource = Puppet::Type.type(:service).new(:name => "foo", :provider => :upstart, :status => "/bin/foo")
       provider = provider_class.new(resource)
 
-      provider.expects(:ucommand).with { `true`; true }
+      # 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
     end
 

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

@@ -106,6 +106,25 @@ describe provider_class do
       provider.expects(:execute).with([provider_class.command(:pw), "userdel", "testuser"])
       provider.delete
     end
+
+    # The above test covers this, but given the consequences of
+    # accidently deleting a user's home directory it seems better to
+    # have an explicit test.
+    it "should not use -r when managehome is not set" do
+      provider = resource.provider
+      provider.expects(:exists?).returns true
+      resource[:managehome] = false
+      provider.expects(:execute).with(Not(includes("-r")))
+      provider.delete
+    end
+
+    it "should use -r when managehome is set" do
+      provider = resource.provider
+      provider.expects(:exists?).returns true
+      resource[:managehome] = true
+      provider.expects(:execute).with(includes("-r"))
+      provider.delete
+    end
   end
 
   describe "when modifying users" do

data/spec/unit/resource/catalog_spec.rb

@@ -639,7 +639,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
         @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/)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias Multiple\[another resource\] to \["red", "5"\].*resource \["Multiple", "red", "5"\] already declared/)
       end
 
       it "should conflict when its uniqueness key matches another resource's title" do
@@ -648,7 +648,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
         @other    = Puppet::Type.type(:file).new(:title => "another file", :path => path)
 
         @catalog.add_resource(@resource)
-        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias File\[another file\] to \["#{Regexp.escape(path)}"\].*resource \["File", "#{Regexp.escape(path)}"\] already defined/)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias File\[another file\] to \["#{Regexp.escape(path)}"\].*resource \["File", "#{Regexp.escape(path)}"\] already declared/)
       end
 
       it "should conflict when its uniqueness key matches the uniqueness key derived from another resource's title" do
@@ -656,7 +656,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
         @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/)
+        expect { @catalog.add_resource(@other) }.to raise_error(ArgumentError, /Cannot alias Multiple\[another resource\] to \["red", "leader"\].*resource \["Multiple", "red", "leader"\] already declared/)
       end
     end
   end

data/spec/unit/semver_spec.rb

@@ -10,13 +10,13 @@ describe SemVer do
     end
 
     it 'should validate special version strings' do
-      %w[ 0.0.0foo 999.999.999bar v0.0.0a v999.999.999beta ].each do |vstring|
+      %w[ 0.0.0-foo 999.999.999-bar v0.0.0-a v999.999.999-beta ].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|
+      %w[ nope 0.0foo 999.999 x0.0.0 z.z.z 1.2.3beta 1.x.y ].each do |vstring|
         SemVer.valid?(vstring).should be_false
       end
     end
@@ -27,8 +27,8 @@ describe SemVer do
       @versions = %w[
         0.0.1
         0.0.2
-        1.0.0rc1
-        1.0.0rc2
+        1.0.0-rc1
+        1.0.0-rc2
         1.0.0
         1.0.1
         1.1.0
@@ -38,7 +38,7 @@ describe SemVer do
         1.1.4
         1.2.0
         1.2.1
-        2.0.0rc1
+        2.0.0-rc1
       ].map { |v| SemVer.new(v) }
     end
 
@@ -49,7 +49,7 @@ describe SemVer do
     end
 
     it 'should return nil if no versions match' do
-      %w[ 3.0.0 2.0.0rc2 1.0.0alpha ].each do |v|
+      %w[ 3.0.0 2.0.0-rc2 1.0.0-alpha ].each do |v|
         SemVer.find_matching(v, @versions).should be_nil
       end
     end
@@ -58,7 +58,7 @@ describe SemVer 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', @versions).should   == 'v2.0.0-rc1'
       SemVer.find_matching('2.1', @versions).should == nil
     end
 
@@ -68,12 +68,105 @@ describe SemVer do
       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.x', @versions).should   == 'v2.0.0-rc1'
+      SemVer.find_matching('2.x.x', @versions).should == 'v2.0.0-rc1'
       SemVer.find_matching('2.1.x', @versions).should == nil
     end
   end
 
+  describe '::[]' do
+    it "should produce expected ranges" do
+      tests = {
+        '1.2.3'           => SemVer.new('v1.2.3-') ..  SemVer.new('v1.2.3'),
+        '>1.2.3'          => SemVer.new('v1.2.4-') ..  SemVer::MAX,
+        '<1.2.3'          => SemVer::MIN           ... SemVer.new('v1.2.3-'),
+        '>=1.2.3'         => SemVer.new('v1.2.3-') ..  SemVer::MAX,
+        '<=1.2.3'         => SemVer::MIN           ..  SemVer.new('v1.2.3'),
+        '>1.2.3 <1.2.5'   => SemVer.new('v1.2.4-') ... SemVer.new('v1.2.5-'),
+        '>=1.2.3 <=1.2.5' => SemVer.new('v1.2.3-') ..  SemVer.new('v1.2.5'),
+        '1.2.3 - 2.3.4'   => SemVer.new('v1.2.3-') ..  SemVer.new('v2.3.4'),
+        '~1.2.3'          => SemVer.new('v1.2.3-') ... SemVer.new('v1.3.0-'),
+        '~1.2'            => SemVer.new('v1.2.0-') ... SemVer.new('v2.0.0-'),
+        '~1'              => SemVer.new('v1.0.0-') ... SemVer.new('v2.0.0-'),
+        '1.2.x'           => SemVer.new('v1.2.0')  ... SemVer.new('v1.3.0-'),
+        '1.x'             => SemVer.new('v1.0.0')  ... SemVer.new('v2.0.0-'),
+      }
+
+      tests.each do |vstring, expected|
+        SemVer[vstring].should == expected
+      end
+    end
+
+    it "should suit up" do
+      suitability = {
+        [ '1.2.3',         'v1.2.2' ] => false,
+        [ '>=1.2.3',       'v1.2.2' ] => false,
+        [ '<=1.2.3',       'v1.2.2' ] => true,
+        [ '>= 1.2.3',      'v1.2.2' ] => false,
+        [ '<= 1.2.3',      'v1.2.2' ] => true,
+        [ '1.2.3 - 1.2.4', 'v1.2.2' ] => false,
+        [ '~1.2.3',        'v1.2.2' ] => false,
+        [ '~1.2',          'v1.2.2' ] => true,
+        [ '~1',            'v1.2.2' ] => true,
+        [ '1.2.x',         'v1.2.2' ] => true,
+        [ '1.x',           'v1.2.2' ] => true,
+
+        [ '1.2.3',         'v1.2.3-alpha' ] => true,
+        [ '>=1.2.3',       'v1.2.3-alpha' ] => true,
+        [ '<=1.2.3',       'v1.2.3-alpha' ] => true,
+        [ '>= 1.2.3',      'v1.2.3-alpha' ] => true,
+        [ '<= 1.2.3',      'v1.2.3-alpha' ] => true,
+        [ '>1.2.3',        'v1.2.3-alpha' ] => false,
+        [ '<1.2.3',        'v1.2.3-alpha' ] => false,
+        [ '> 1.2.3',       'v1.2.3-alpha' ] => false,
+        [ '< 1.2.3',       'v1.2.3-alpha' ] => false,
+        [ '1.2.3 - 1.2.4', 'v1.2.3-alpha' ] => true,
+        [ '1.2.3 - 1.2.4', 'v1.2.4-alpha' ] => true,
+        [ '1.2.3 - 1.2.4', 'v1.2.5-alpha' ] => false,
+        [ '~1.2.3',        'v1.2.3-alpha' ] => true,
+        [ '~1.2.3',        'v1.3.0-alpha' ] => false,
+        [ '~1.2',          'v1.2.3-alpha' ] => true,
+        [ '~1.2',          'v2.0.0-alpha' ] => false,
+        [ '~1',            'v1.2.3-alpha' ] => true,
+        [ '~1',            'v2.0.0-alpha' ] => false,
+        [ '1.2.x',         'v1.2.3-alpha' ] => true,
+        [ '1.2.x',         'v1.3.0-alpha' ] => false,
+        [ '1.x',           'v1.2.3-alpha' ] => true,
+        [ '1.x',           'v2.0.0-alpha' ] => false,
+
+        [ '1.2.3',         'v1.2.3' ] => true,
+        [ '>=1.2.3',       'v1.2.3' ] => true,
+        [ '<=1.2.3',       'v1.2.3' ] => true,
+        [ '>= 1.2.3',      'v1.2.3' ] => true,
+        [ '<= 1.2.3',      'v1.2.3' ] => true,
+        [ '1.2.3 - 1.2.4', 'v1.2.3' ] => true,
+        [ '~1.2.3',        'v1.2.3' ] => true,
+        [ '~1.2',          'v1.2.3' ] => true,
+        [ '~1',            'v1.2.3' ] => true,
+        [ '1.2.x',         'v1.2.3' ] => true,
+        [ '1.x',           'v1.2.3' ] => true,
+
+        [ '1.2.3',         'v1.2.4' ] => false,
+        [ '>=1.2.3',       'v1.2.4' ] => true,
+        [ '<=1.2.3',       'v1.2.4' ] => false,
+        [ '>= 1.2.3',      'v1.2.4' ] => true,
+        [ '<= 1.2.3',      'v1.2.4' ] => false,
+        [ '1.2.3 - 1.2.4', 'v1.2.4' ] => true,
+        [ '~1.2.3',        'v1.2.4' ] => true,
+        [ '~1.2',          'v1.2.4' ] => true,
+        [ '~1',            'v1.2.4' ] => true,
+        [ '1.2.x',         'v1.2.4' ] => true,
+        [ '1.x',           'v1.2.4' ] => true,
+      }
+
+      suitability.each do |arguments, expected|
+        range, vstring = arguments
+        actual = SemVer[range] === SemVer.new(vstring)
+        actual.should == expected
+      end
+    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
@@ -88,25 +181,25 @@ describe SemVer do
     end
 
     it 'should populate the appropriate fields for a special version string' do
-      version = SemVer.new('3.4.5beta6')
+      version = SemVer.new('3.4.5-beta6')
       version.major.should   == 3
       version.minor.should   == 4
       version.tiny.should    == 5
-      version.special.should == 'beta6'
+      version.special.should == '-beta6'
     end
   end
 
   describe '#matched_by?' do
-    subject { SemVer.new('v1.2.3beta') }
+    subject { SemVer.new('v1.2.3-beta') }
 
     describe 'should match against' do
       describe 'literal version strings' do
-        it { should be_matched_by('1.2.3beta') }
+        it { should be_matched_by('1.2.3-beta') }
 
-        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') }
+        it { should_not be_matched_by('1.2.3-alpha') }
+        it { should_not be_matched_by('1.2.4-beta') }
+        it { should_not be_matched_by('1.3.3-beta') }
+        it { should_not be_matched_by('2.2.3-beta') }
       end
 
       describe 'partial version strings' do
@@ -155,14 +248,14 @@ describe SemVer do
       it { should < SemVer.new('1.2.4') }
 
       # Against special versions
-      it { should > SemVer.new('1.2.3beta') }
-      it { should < SemVer.new('1.2.4beta') }
+      it { should > SemVer.new('1.2.3-beta') }
+      it { should < SemVer.new('1.2.4-beta') }
     end
 
-    describe 'on a special version (v1.2.3beta)' do
-      subject { SemVer.new('v1.2.3beta') }
+    describe 'on a special version (v1.2.3-beta)' do
+      subject { SemVer.new('v1.2.3-beta') }
 
-      it { should == SemVer.new('1.2.3beta') }
+      it { should == SemVer.new('1.2.3-beta') }
 
       # Same version, final release
       it { should < SemVer.new('1.2.3') }
@@ -180,8 +273,8 @@ describe SemVer do
       it { should < SemVer.new('1.2.4') }
 
       # Against special versions
-      it { should > SemVer.new('1.2.3alpha') }
-      it { should < SemVer.new('1.2.3beta2') }
+      it { should > SemVer.new('1.2.3-alpha') }
+      it { should < SemVer.new('1.2.3-beta2') }
     end
   end
 end