serverspec 2.25.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a03e6f60304c57dec40573257efbe513c639ed5
-  data.tar.gz: 644b2486bd76847fee44a1c0e13849fe188f250f
+  metadata.gz: b1f873fb5b21dddc593ba1c5351f3f84c7580efa
+  data.tar.gz: 61265de50e9471e57d1c14299937454f02892a21
 SHA512:
-  metadata.gz: 4005856472a31c0e6d62d8a1195aca2c26788f8e38628f0dab601e302a4edd45a6592ef5f647a54e257cd72dcf309f7b5cd20a80723094ac3e8f44800da8f820
-  data.tar.gz: c9d4c593e6fba329fc7c9db09e534d817418f31e6a898b60b3ef052ea6d6a4f82069a182c3a33e9bd81e71f9aaaa3ca756a732e744509a00a6ed73acf7716ea0
+  metadata.gz: d8a069060fc429ac5739f347934d6da85885e169fc1089a61399630c67ac477b6d29c40f41c0cb363a41c983152b7ab471fa06c5ea19318e2137a4fb90837554
+  data.tar.gz: 205516008ec4c9f87f564ef140872f623a0812a8e69ee8bc25e0a21619b90640c119c67fdee4ae6c674baf347ab6d5300609122aeb066aa374271cc625bd208e

data/lib/serverspec/type/base.rb

@@ -3,9 +3,10 @@ module Serverspec::Type
     
     attr_reader :name
     
-    def initialize(name=nil)
-      @name   = name
-      @runner = Specinfra::Runner
+    def initialize(name=nil, options = {})
+      @name    = name
+      @options = options
+      @runner  = Specinfra::Runner
     end
 
     def to_s

data/lib/serverspec/type/file.rb

@@ -117,6 +117,10 @@ module Serverspec::Type
       @runner.check_file_has_version(@name, version)
     end
 
+    def link_target
+      @runner.get_file_link_target(@name).stdout.strip
+    end
+
     def mtime
       d = @runner.get_file_mtime(@name).stdout.strip
       DateTime.strptime(d, '%s').new_offset(DateTime.now.offset)

data/lib/serverspec/type/php_config.rb

@@ -1,7 +1,9 @@
 module Serverspec::Type
   class PhpConfig < Base
     def value
-      ret = @runner.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
+      extra = '';
+      extra = extra + "-c #{@options[:ini]}" if @options.has_key?(:ini)
+      ret = @runner.run_command("php #{extra} -r 'echo get_cfg_var( \"#{@name}\" );'")
       val = ret.stdout
       val = val.to_i if val.match(/^\d+$/)
       val

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.25.0"
+  VERSION = "2.26.0"
 end

data/spec/type/base/file_spec.rb

@@ -337,6 +337,11 @@ EOF
   its(:content) { should match /root:x:0:0/ }
 end
 
+describe file('/etc/pam.d/system-auth') do
+  let(:stdout) { "/etc/pam.dsystem-auth-ac\r\n" }
+  its(:link_target) { should eq '/etc/pam.dsystem-auth-ac' }
+end
+
 describe file('/etc/passwd') do
   let(:stdout) { Time.now.to_i.to_s }
   its(:mtime) { should > DateTime.now - 1 }

data/spec/type/base/php_config_spec.rb

@@ -31,3 +31,7 @@ describe php_config('mbstring.http_output_conv_mimetypes') do
   let(:stdout) { 'application' }
   its(:value) { should_not match /html/ }
 end
+describe php_config('default_mimetype', :ini => '/etc/php5/php.ini') do
+  let(:stdout) { 'text/html' }
+  its(:value) { should eq 'text/html' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.25.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec