serverspec 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8edd4963deb2e7b23ef335b950ebc792673e3e30
-  data.tar.gz: bc1603d10231013079feffb6085856a9d47d6aee
+  metadata.gz: 2357bc882b39784c3e9f025f9491348e94b7ee36
+  data.tar.gz: 7e9d2f2dd860de370a1c9de63d8313cf650a418f
 SHA512:
-  metadata.gz: 8840110f0a0c2b89162cbd7a07891ff3f09cae7e1fca05e24a4c7a537a2c684d4c3757d85767d4daca0e43ff56241998809a0440d172e7a53131666b915f40f2
-  data.tar.gz: 32be2bb82ceba5b45cc5e4f877098bfb345d56789c784fd6223f0ad82ecb126bf15a12d6521929ad52ddbacfe021769c456bb4200c63d815aec98327c1eae7bb
+  metadata.gz: de6a83c920cadf8cc0eb71356ed4368304d4cbd7878919e1037851a28c9f6cb058980ff9b18cbeb344bbef0c957a9fe8b9ab8850d6694cc9a172550fbea473b6
+  data.tar.gz: 34d5a26c1c15f774bf893216237794d170531969f5d8e9bf67cb257a66fb3ec4187d65a5dd8b08600e9cf78c1c1f50fde084d50f5ab217688811af365ff20ad8

data/lib/serverspec/type/package.rb

@@ -25,7 +25,7 @@ module Serverspec::Type
       attr_reader :epoch, :version
 
       def initialize(val)
-        matches = val.match(/^(?:(\d+):)?(\d[0-9a-zA-Z.+:~-]*)$/)
+        matches = val.match(/^(?:(\d+):)?(\d[0-9a-zA-Z.+:~_-]*)$/)
         if matches.nil?
           raise ArgumentError, "Malformed version number string #{val}"
         end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ module Specinfra
         CommandResult.new({
           :stdout      => ::Specinfra.configuration.stdout,
           :stderr      => ::Specinfra.configuration.stderr,
-          :exit_status => 0,
+          :exit_status => ::Specinfra.configuration.exit_status,
           :exit_signal => nil,
         })
       end
@@ -19,7 +19,7 @@ module Specinfra
         CommandResult.new({
           :stdout      => ::Specinfra.configuration.stdout,
           :stderr      => ::Specinfra.configuration.stderr,
-          :exit_status => 0,
+          :exit_status => ::Specinfra.configuration.exit_status,
           :exit_signal => nil,
         })
       end

data/spec/type/base/routing_table_spec.rb

@@ -3,52 +3,28 @@ require 'spec_helper'
 set :os, :family => 'base'
 
 describe routing_table do
-  let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }
+  let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\n" }
   it { should have_entry( :destination => '192.168.100.0/24' ) }
 end
 
 describe routing_table do
-  let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }
+  let(:exit_status) { 1 }
   it { should_not have_entry( :destination => '192.168.100.100/24' ) }
 end
 
 describe routing_table do
-  let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }
+  let(:stdout) { "192.168.100.0/24 dev eth1  proto kernel  scope link  src 192.168.100.10 \r\n" }
   it do
     should have_entry(
       :destination => '192.168.100.0/24',
-      :gateway     => '192.168.100.1'
-    )
-  end
-
-  it do
-    should have_entry(
-      :destination => '192.168.100.0/24',
-      :gateway     => '192.168.100.1',
-      :interface   => 'eth1'
-    )
-  end
-
-  it do
-    should_not have_entry(
-      :gateway   => '192.168.100.1',
-      :interface => 'eth1'
-    )
-  end
-
-  it do
-    should_not have_entry(
-      :destination => '192.168.100.0/32',
-      :gateway     => '192.168.100.1',
       :interface   => 'eth1'
     )
   end
 end
 
 describe routing_table do
-  let(:stdout) { "192.168.200.0/24 via 192.168.200.1 dev eth0 \r\ndefault via 192.168.100.1 dev eth0 \r\n" }
-  it { should     have_entry( :destination => '192.168.200.0/24' ) }
-  it { should_not have_entry( :destination => '192.168.200.200/24' ) }
+  let(:stdout) { "192.168.200.0/24 via 192.168.200.1 dev eth0 \r\n" }
+  it { should have_entry( :destination => '192.168.200.0/24' ) }
 
   it do
     should have_entry(
@@ -64,27 +40,11 @@ describe routing_table do
       :interface   => 'eth0'
     )
   end
-
-  it do
-    should_not have_entry(
-      :gateway     => '192.168.200.1',
-      :interface   => 'eth0'
-    )
-  end
-
-  it do
-    should_not have_entry(
-      :destination => '192.168.200.0/32',
-      :gateway     => '192.168.200.1',
-      :interface   => 'eth0'
-    )
-  end
 end
 
 describe routing_table do
   let(:stdout) { "default via 10.0.2.2 dev eth0 \r\n" }
   it { should     have_entry( :destination => 'default' ) }
-  it { should_not have_entry( :destination => 'defaulth' ) }
 
   it do
     should have_entry(
@@ -100,19 +60,4 @@ describe routing_table do
       :interface   => 'eth0'
     )
   end
-
-  it do
-    should_not have_entry(
-      :gateway     => '10.0.2.2',
-      :interface   => 'eth0'
-    )
-  end
-
-  it do
-    should_not have_entry(
-      :destination => 'default',
-      :gateway     => '10.0.2.1',
-      :interface   => 'eth0'
-    )
-  end
 end

data/spec/type/base/service_spec.rb

@@ -19,6 +19,10 @@ describe service('sshd') do
   it { should be_running.under(:upstart) }
 end
 
+describe service('sshd') do
+  it { should be_running.under(:daemontools) }
+end
+
 describe service('sshd') do
   it {
     expect {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec