serverspec 0.15.5 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bfa1196daebf86961d9664e6a500ad33b16c1e1
-  data.tar.gz: 7133f65128990b40cf58e1397f0a6c95e04e9f38
+  metadata.gz: 5f9e60dffbf889e149689ae2ea4756c01481327c
+  data.tar.gz: edb2f01c08ea0b3dac4756db8d3a3e3d5e335946
 SHA512:
-  metadata.gz: a67a4626bbc5d6b17c6ae1ae6a3f888a65704d6e0d3a4987a8dc3ca1b71d3068e5be3039c18b18426d5b97c82d34fb8e7d4067111c03ac3bf8e225c2193dbdfb
-  data.tar.gz: 96f233411903341b59b8af59d92d8d2b02e42077f22f0ee2ce782dd6ea30f0af958c8d011c1e25889e514b9c0ae5dfebe57181b30ae80a0298ad29f96745f798
+  metadata.gz: e4824f8eb7bec9311ba75c841fcab072ba5fc798ba1d6549d9a1b36c55ed6b73fd280050a360c2330b35275166365a4040d99a8002f11d1fbeb96d5084586e00
+  data.tar.gz: 4f7dcf8119978f055aa659c65f998db32ec3d4cf0b270f76b2dbdd7b433485b369ace1873d18c7061ba8e0a0d2b1b22389f1c6b82a9b58f6e7e720db6da1e0f2

data/lib/serverspec/type/command.rb

@@ -14,13 +14,10 @@ module Serverspec
 
       def return_stderr?(content)
         ret = backend.run_command(@name)
-        # 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
         if content.instance_of?(Regexp)
-          ret.stdout =~ content
+          ret.stderr =~ content
         else
-          ret.stdout.strip == content
+          ret.stderr.strip == content
         end
       end
 
@@ -36,10 +33,12 @@ module Serverspec
         @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
+      def stderr
+        if @result.nil?
+          @result = backend.run_command(@name).stderr
+        end
+        @result
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.15.5"
+  VERSION = "0.16.0"
 end

data/spec/aix/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/darwin/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/debian/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/freebsd/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/gentoo/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/plamo/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/redhat/command_spec.rb

@@ -24,21 +24,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -63,7 +63,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/solaris/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/solaris11/command_spec.rb

@@ -23,21 +23,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('cat /etc/resolv.conf') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'cat /etc/resolv.conf' }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -61,7 +61,5 @@ EOF
     }
 
   its(:stdout) { should match /bin/ }
-  its(:stderr) { should match /bin/ }
-
   its(:stdout) { should eq stdout }
 end

data/spec/windows/command_spec.rb

@@ -24,21 +24,21 @@ describe 'regexp matching of stdout' do
 end
 
 describe command('test_cmd /test/path/file') do
-  let(:stdout) { "No such file or directory\r\n" }
+  let(:stderr) { "No such file or directory\r\n" }
   it { should return_stderr("No such file or directory") }
   its(:command) { should eq 'test_cmd /test/path/file' }
 end
 
 describe 'complete matching of stderr' do
   context command('test_cmd /test/path/file') do
-    let(:stdout) { "No such file or directory\r\n" }
-    it { should_not return_stdout('file') }
+    let(:stderr) { "No such file or directory\r\n" }
+    it { should_not return_stderr('file') }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('test_cmd /test/path/file') do
-    let(:stdout) { "No such file or directory\r\n" }
+    let(:stderr) { "No such file or directory\r\n" }
     it { should return_stderr(/file/) }
   end
 end
@@ -63,7 +63,5 @@ EOF
     }
 
   its(:stdout) { should match /Program Files/ }
-  its(:stderr) { should match /Program Files/ }
-
   its(:stdout) { should eq stdout }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.16.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh