serverspec 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb9f644fd856ee0aab06fe035f9bed7af778f61
-  data.tar.gz: 608dc6ee8cc695b3fb48f3426303245c51c63f98
+  metadata.gz: 22e4b599ab3a4fc8ff81faf1e55f41712e109631
+  data.tar.gz: 7dd6658d68a7ab903add025a20225b151985e9c6
 SHA512:
-  metadata.gz: cf6c417482127ec3ceca5363de2488829644212f028a67e4601b3c196e72952c65449774d09dc0bf3d7a6b212f564c847d1ca53eafabda8f0549b8e72aeba1f5
-  data.tar.gz: 520fa26e75439d84da59aa679db5e42bfa8184dcabad1a745dc3889bcac9f14400955390ffaa61c81a4be4ad6044b8e067e354dc38bf9b9f64033a36cfe3dda2
+  metadata.gz: e929ccd2fd728a64bfd5e612319ec8d17c247f8dd7d1bc08bb590a70c8afc2c47c9deb69a0c8d101e8d98d7af004bb843c6d66e063a3817f9aa3188e4d334556
+  data.tar.gz: 79b9091221264fb2ae68cdd43d3170acf804024bf2b5028d8f879a9e621f177c8f52c00f577b7193b8314588e0cf60ed705f1af653c757f00894caec2a761b58

data/lib/serverspec/type/command.rb

@@ -1,6 +1,8 @@
 module Serverspec
   module Type
     class Command < Base
+      attr_accessor :result
+
       def return_stdout?(content)
         ret = backend.run_command(@name)
         if content.instance_of?(Regexp)
@@ -26,6 +28,18 @@ module Serverspec
         ret = backend.run_command(@name)
         ret[:exit_status].to_i == status
       end
+
+      def stdout
+        if @result.nil?
+          @result = backend.run_command(@name)[:stdout]
+        end
+        @result
+      end
+
+      # In ssh access with pty, stderr is merged to stdout
+      # See http://stackoverflow.com/questions/7937651/receiving-extended-data-with-ssh-using-twisted-conch-as-client
+      # So I use stdout instead of stderr
+      alias :stderr :stdout
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.10.5"
+  VERSION = "0.10.6"
 end

data/spec/aix/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/darwin/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/debian/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/freebsd/command_spec.rb

@@ -46,3 +46,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/gentoo/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/plamo/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/redhat/command_spec.rb

@@ -4,6 +4,7 @@ RSpec.configure do |c|
   c.os = 'RedHat'
 end
 
+=begin
 describe command('cat /etc/resolv.conf') do
   let(:stdout) { "nameserver 127.0.0.1\r\n" }
   it { should return_stdout("nameserver 127.0.0.1") }
@@ -48,3 +49,23 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+=end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/solaris/command_spec.rb

@@ -46,3 +46,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

data/spec/solaris11/command_spec.rb

@@ -48,3 +48,22 @@ describe command('cat /etc/resolv.conf') do
   it { should return_exit_status 0 }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
+
+describe command('ls -al /') do
+ let(:stdout) { <<EOF
+total 88
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 .
+drwxr-xr-x  23 root root  4096 Oct 10 17:19 ..
+drwxr-xr-x   2 root root  4096 Sep 11 16:43 bin
+drwxr-xr-x   3 root root  4096 Sep 23 18:14 boot
+drwxr-xr-x  14 root root  4260 Oct 14 16:14 dev
+drwxr-xr-x 104 root root  4096 Oct 14 17:34 etc
+drwxr-xr-x   8 root root  4096 Oct  1 15:09 home
+EOF
+    }
+
+  its(:stdout) { should match /bin/ }
+  its(:stderr) { should match /bin/ }
+
+  its(:stdout) { should eq stdout }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -310,7 +310,6 @@ files:
 - spec/plamo/zfs_spec.rb
 - spec/redhat/cgroup_spec.rb
 - spec/redhat/command_spec.rb
-- spec/redhat/commands_spec.rb
 - spec/redhat/cron_spec.rb
 - spec/redhat/default_gateway_spec.rb
 - spec/redhat/file_spec.rb
@@ -330,7 +329,6 @@ files:
 - spec/redhat/user_spec.rb
 - spec/redhat/yumrepo_spec.rb
 - spec/redhat/zfs_spec.rb
-- spec/smartos/commands_spec.rb
 - spec/smartos/mail_alias_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/cron_spec.rb
@@ -349,7 +347,6 @@ files:
 - spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
-- spec/solaris10/commands_spec.rb
 - spec/solaris10/mail_alias_spec.rb
 - spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb
@@ -509,7 +506,6 @@ test_files:
 - spec/plamo/zfs_spec.rb
 - spec/redhat/cgroup_spec.rb
 - spec/redhat/command_spec.rb
-- spec/redhat/commands_spec.rb
 - spec/redhat/cron_spec.rb
 - spec/redhat/default_gateway_spec.rb
 - spec/redhat/file_spec.rb
@@ -529,7 +525,6 @@ test_files:
 - spec/redhat/user_spec.rb
 - spec/redhat/yumrepo_spec.rb
 - spec/redhat/zfs_spec.rb
-- spec/smartos/commands_spec.rb
 - spec/smartos/mail_alias_spec.rb
 - spec/solaris/command_spec.rb
 - spec/solaris/cron_spec.rb
@@ -548,7 +543,6 @@ test_files:
 - spec/solaris/svcprop_spec.rb
 - spec/solaris/user_spec.rb
 - spec/solaris/zfs_spec.rb
-- spec/solaris10/commands_spec.rb
 - spec/solaris10/mail_alias_spec.rb
 - spec/solaris10/php_config_spec.rb
 - spec/solaris11/command_spec.rb

data/spec/redhat/commands_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-RSpec.configure do |c|
-  c.os = 'RedHat'
-end
-
-describe 'check_yumrepo' do
-  subject { commands.check_yumrepo('epel') }
-  it { should eq 'yum repolist all -C | grep ^epel' }
-end
-
-describe 'check_yumrepo_enabled' do
-  subject { commands.check_yumrepo_enabled('epel') }
-  it { should eq 'yum repolist all -C | grep ^epel | grep enabled' }
-end

data/spec/smartos/commands_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-
-RSpec.configure do |c|
-  c.os = 'SmartOS'
-end
-
-## SmartOS
-describe 'check_installed' do
-  subject { commands.check_installed('httpd') }
-  it { should eq '/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^httpd' }
-end
-
-## SmartOS
-describe 'check_installed' do
-  subject { commands.check_installed('httpd', '2.2') }
-  it { should eq '/opt/local/bin/pkgin list 2> /dev/null | grep -qw ^httpd-2.2' }
-end
-
-describe 'check_zfs' do
-  context 'check without properties' do
-    subject { commands.check_zfs('rpool') }
-    it { should eq "zfs list -H rpool" }
-  end
-
-  context 'check with a property' do
-    subject { commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) }
-    it { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-
-  context 'check with multiple properties' do
-    subject { commands.check_zfs('rpool', { 'mountpoint'  => '/rpool', 'compression' => 'off' }) }
-    it { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-end
-
-describe 'check_ip_filter_rule' do
-  subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
-  it { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
-end
-
-describe 'check_ipnat_rule' do
-  subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
-  it { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
-end
-
-describe 'check_svcprop' do
-  subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
-end
-
-describe 'check_svcprops' do
-  subject {
-    commands.check_svcprops('svc:/network/http:apache22', {
-      'httpd/enable_64bit' => 'false',
-      'httpd/server_type'  => 'worker',
-    })
-  }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
-end

data/spec/solaris10/commands_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-RSpec.configure do |c|
-  c.os = 'Solaris10'
-end
-
-describe 'check_zfs' do
-  context 'check without properties' do
-    subject { commands.check_zfs('rpool') }
-    it { should eq "zfs list -H rpool" }
-  end
-
-  context 'check with a property' do
-    subject { commands.check_zfs('rpool', { 'mountpoint' => '/rpool' }) }
-    it { should eq "zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-
-  context 'check with multiple properties' do
-    subject { commands.check_zfs('rpool', { 'mountpoint'  => '/rpool', 'compression' => 'off' }) }
-    it { should eq "zfs list -H -o compression rpool | grep -- \\^off\\$ && zfs list -H -o mountpoint rpool | grep -- \\^/rpool\\$" }
-  end
-end
-
-describe 'check_ip_filter_rule' do
-  subject { commands.check_ipfilter_rule('pass in quick on lo0 all') }
-  it { should eq "ipfstat -io 2> /dev/null | grep -- pass\\ in\\ quick\\ on\\ lo0\\ all" }
-end
-
-describe 'check_ipnat_rule' do
-  subject { commands.check_ipnat_rule('map net1 192.168.0.0/24 -> 0.0.0.0/32') }
-  it { should eq "ipnat -l 2> /dev/null | grep -- \\^map\\ net1\\ 192.168.0.0/24\\ -\\>\\ 0.0.0.0/32\\$" }
-end
-
-describe 'check_svcprop' do
-  subject { commands.check_svcprop('svc:/network/http:apache22', 'httpd/enable_64bit','false') }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$" }
-end
-
-describe 'check_svcprops' do
-  subject {
-    commands.check_svcprops('svc:/network/http:apache22', {
-      'httpd/enable_64bit' => 'false',
-      'httpd/server_type'  => 'worker',
-    })
-  }
-  it { should eq "svcprop -p httpd/enable_64bit svc:/network/http:apache22 | grep -- \\^false\\$ && svcprop -p httpd/server_type svc:/network/http:apache22 | grep -- \\^worker\\$" }
-end