serverspec 0.10.7 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c1dc06b5b4833b7e537d596b488b3bb07aba0e
-  data.tar.gz: c8fa93b1eab1507daa911da2a1e1b55c20dcac9c
+  metadata.gz: ee22569ea7858b5dc4817a5a94c5e078cd23b978
+  data.tar.gz: 901515d1acf81c1fa811e25fd7ba021b85e810d5
 SHA512:
-  metadata.gz: eeab306443ccc7261c6dacf25553d98481fed15453e650c55f79c574223485a02dab66ac73751b8ca7468275defb4fbf5de8d66dbc763b941023c26f4a00c5e4
-  data.tar.gz: 7c53f323cfcee38681c359ce7bdbef51b0e85089cec4dda10537a11aebf1af200ec93f1ca8a88a4d26e7a1084f5533b8483f57d44eba993737ccadf66ee2ba60
+  metadata.gz: 38b35ba251f384147a3dc0a98e658ed4cd56c72087be4796e3ab2fb310e90cadc179a4cd0506023393dd435684444406e39fee6f636a896557829dd2f9677ef1
+  data.tar.gz: c98ab2cecdb1c54fca0c3971bfddb164a5d38280fac9c0eccfbf05258e8168d172c9c36f23b5e15704ebf384b02024baf4109ededdeec10d608b20cd635cf740

data/lib/serverspec/commands/base.rb

@@ -288,6 +288,10 @@ module Serverspec
         target = "[[:space:]]#{target}"
         "getent aliases #{escape(recipient)} | grep -- #{escape(target)}$"
       end
+
+      def get_file_content(file)
+        "cat #{file}"
+      end
     end
   end
 end

data/lib/serverspec/type/file.rb

@@ -1,6 +1,8 @@
 module Serverspec
   module Type
     class File < Base
+      attr_accessor :content
+
       def file?
         backend.check_file(@name)
       end
@@ -73,6 +75,12 @@ module Serverspec
         backend.check_file_sha256checksum(@name, sha256sum)
       end
 
+      def content
+        if @content.nil?
+          @content = backend.run_command(commands.get_file_content(@name))[:stdout]
+        end
+        @content
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.10.7"
+  VERSION = "0.10.8"
 end

data/spec/aix/file_spec.rb

@@ -386,3 +386,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/darwin/file_spec.rb

@@ -395,3 +395,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/debian/file_spec.rb

@@ -395,3 +395,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/freebsd/file_spec.rb

@@ -367,3 +367,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/gentoo/file_spec.rb

@@ -393,3 +393,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/plamo/cgroup_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.configure do |c|
-  c.os = 'RedHat'
+  c.os = 'Plamo'
 end
 
 describe cgroup('group1') do

data/spec/plamo/file_spec.rb

@@ -395,3 +395,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/redhat/file_spec.rb

@@ -395,3 +395,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/solaris/file_spec.rb

@@ -393,3 +393,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

data/spec/solaris11/file_spec.rb

@@ -395,3 +395,21 @@ end
 describe file('invalid-file') do
   it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
 end
+
+describe file('/etc/passwd') do
+  let(:stdout) {<<EOF
+root:x:0:0:root:/root:/bin/bash
+bin:x:1:1:bin:/bin:/sbin/nologin
+daemon:x:2:2:daemon:/sbin:/sbin/nologin
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
+operator:x:11:0:operator:/root:/sbin/nologin
+nobody:x:99:99:Nobody:/:/sbin/nologin
+dbus:x:81:81:System message bus:/:/sbin/nologin
+EOF
+  }
+
+  its(:content) { should match /root:x:0:0/ }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.10.7
+  version: 0.10.8
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -305,7 +305,6 @@ files:
 - spec/plamo/routing_table_spec.rb
 - spec/plamo/selinux_spec.rb
 - spec/plamo/service_spec.rb
-- spec/plamo/service_spec.rb.plamo
 - spec/plamo/user_spec.rb
 - spec/plamo/zfs_spec.rb
 - spec/redhat/cgroup_spec.rb
@@ -503,7 +502,6 @@ test_files:
 - spec/plamo/routing_table_spec.rb
 - spec/plamo/selinux_spec.rb
 - spec/plamo/service_spec.rb
-- spec/plamo/service_spec.rb.plamo
 - spec/plamo/user_spec.rb
 - spec/plamo/zfs_spec.rb
 - spec/redhat/cgroup_spec.rb

data/spec/plamo/service_spec.rb.plamo

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-RSpec.configure do |c|
-  c.os = 'Debian'
-end
-
-describe service('sshd') do
-  it { should be_enabled }
-  its(:command) { should eq "test -x /etc/rc.d/init.d/sshd" }
-end
-
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
-describe service('sshd') do
-  it { should be_enabled.with_level(4) }
-  its(:command) { should eq "test -x /etc/rc.d/init.d/sshd" }
-end
-
-describe service('invalid-service') do
-  it { should_not be_enabled.with_level(4) }
-end
-
-describe service('sshd') do
-  it {
-    expect {
-      should be_running.under('not implemented')
-    }.to raise_error(ArgumentError, %r/\A`be_running` matcher doesn\'t support/)
-  }
-end
-
-describe service('sshd') do
-  let(:stdout) { "Process 'sshd'\r\n  status running\r\n  monitoring status  monitored" }
-  it { should be_monitored_by('monit') }
-  its(:command) { should eq "monit status" }
-end
-
-describe service('sshd') do
-  let(:stdout) { "Process 'sshd'\r\n  status  not monitored\r\n  monitoring status  not monitored" }
-  it { should_not be_monitored_by('monit') }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_monitored_by('monit') }
-end
-
-describe service('unicorn') do
-  it { should be_monitored_by('god') }
-  its(:command) { should eq "god status unicorn" }
-end
-
-describe service('invalid-daemon') do
-  it { should_not be_monitored_by('god') }
-end
-
-describe service('sshd') do
-  it {
-    expect {
-      should be_monitored_by('not implemented')
-    }.to raise_error(ArgumentError, %r/\A`be_monitored_by` matcher doesn\'t support/)
-  }
-end