serverspec 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4151c1dd14ac7c8a41825e4b8659d98a3426ff94
-  data.tar.gz: 3d105167edd74f57dc71e321eee26b3d2fbd67fb
+  metadata.gz: 1ca3bcf1f6efac657936cc0064fb51ecc0a01927
+  data.tar.gz: f64e50988f5bf0116d4ed835a2eec52e0f117f58
 SHA512:
-  metadata.gz: ad0007d48da6d56116f418b20fbdca90ea825a374646da93e839cfa29a904f5632473ff55f1e5a5390fb40fb96b53ba2677353a273d10b099b1f59140a9f5c43
-  data.tar.gz: ae7fd0c2aca5b57ffd61917f820b93973634afc1632c4aee6538987b7188fa68c8616e0da9fd61febe6554233553e75620241210444d0074035e9165c50b06f0
+  metadata.gz: 8dafb55c9a980e8b2fcd70519f3a01bcc71b5ee91fa3a427da3d1e141ba384b514d211bb07ed903b05711c6cd4f85ec9d2c854c59c86de39157440a6df06255e
+  data.tar.gz: 57094986659254825a329245b57122387c7007e9a74e15f0bdbe5daeb253fa99438831cdc57c715da7cb9d0f3d5c45e3ddccccf379a7845ffe1ae4a515e74075

data/lib/serverspec/commands/freebsd.rb

@@ -6,13 +6,18 @@ module Serverspec
       end
 
       def check_installed(package, version=nil)
-        "pkg_version -X -s #{escape(package)}"
+        "pkg_info -Ix #{escape(package)}"
       end
 
       def check_listening(port)
         regexp = ":#{port} "
         "sockstat -46l -p #{port} | grep -- #{escape(regexp)}"
       end
+
+      def check_mode(file, mode)
+        regexp = "^#{mode}$"
+        "stat -f%Lp #{escape(file)} | grep -- #{escape(regexp)}"
+      end
     end
   end
 end

data/lib/serverspec/type/default_gateway.rb

@@ -3,13 +3,13 @@ module Serverspec
     class DefaultGateway < Base
       def ipaddress
         ret = backend.run_command(commands.check_routing_table('default'))
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+\r\n(?:default via (\S+))?/
+        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $2 ? $2 : $4
       end
 
       def interface
         ret = backend.run_command(commands.check_routing_table('default'))
-        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+\r\n(?:default via (\S+))?/
+        ret[:stdout] =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $3
       end
 

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/freebsd/file_spec.rb

@@ -74,7 +74,7 @@ end
 
 describe file('/etc/passwd') do
   it { should be_mode 644 }
-  its(:command) { should eq "stat -c %a /etc/passwd | grep -- \\^644\\$" }
+  its(:command) { should eq "stat -f%Lp /etc/passwd | grep -- \\^644\\$" }
 end
 
 describe file('/etc/passwd') do

data/spec/freebsd/package_spec.rb

@@ -6,7 +6,7 @@ end
 
 describe package('httpd') do
   it { should be_installed }
-  its(:command) { should eq "pkg_version -X -s httpd" }
+  its(:command) { should eq "pkg_info -Ix httpd" }
 end
 
 describe package('invalid-package') do
@@ -15,7 +15,7 @@ end
 
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
-  its(:command) { should eq "pkg_version -X -s httpd"}
+  its(:command) { should eq "pkg_info -Ix httpd"}
 end
 
 describe package('jekyll') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh