serverspec 2.0.0.beta18 → 2.0.0.beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57528c35adf6105e153b7dbe26c0a1db093a7b6a
-  data.tar.gz: d3ede874674a3ca5a4abb4d830aa7c64f90014ea
+  metadata.gz: 34bfc818daa6085b0fa154fe2228c9b5cd51b7ce
+  data.tar.gz: dbf6210c50fd26d4d9131114eb3784952c2f4cbf
 SHA512:
-  metadata.gz: d8546b8a206c0fb3d516f77dc9b73a29e0ede2b532b40bdb544820776d8fbe17439192a02628a95b78b3b626658e53bc2c3e16b9d7c2203bb194aee55289bf07
-  data.tar.gz: b8ead4874e92c031eab156534eb309a301ac4e9b999d35b2e7062d01c650c7e8e0c5408693367edfdb6599fb34f2fb9e66a758d8923b192fcbac8bcb0bd2bbc7
+  metadata.gz: 7a30443127f10a9c7c340380ea636be0c6faff0ed8d67e230292c6f64ce85ca84c633dbaa3a2f833792900929c278b177415abb8618aa780fd6c9b7b81910e01
+  data.tar.gz: 149c7b4759356c918a0abcc9943f3af70c743e25e370b63072ed988fc60e5c515255f87736df15ae787cd3fd163b1ad0d7d84832e07679b5759b9256ed7296c0

data/lib/serverspec/matcher.rb

@@ -23,10 +23,6 @@ require 'serverspec/matcher/be_running'
 require 'serverspec/matcher/belong_to_group'
 require 'serverspec/matcher/belong_to_primary_group'
 
-require 'serverspec/matcher/return_exit_status'
-require 'serverspec/matcher/return_stdout'
-require 'serverspec/matcher/return_stderr'
-
 # ipfiter, ipnat, iptables
 require 'serverspec/matcher/have_rule'
 

data/lib/serverspec/type/command.rb

@@ -1,26 +1,6 @@
 module Serverspec
   module Type
     class Command < Base
-      def return_stdout?(content)
-        if content.instance_of?(Regexp)
-          stdout =~ content
-        else
-          stdout.strip == content
-        end
-      end
-
-      def return_stderr?(content)
-        if content.instance_of?(Regexp)
-          stderr =~ content
-        else
-          stderr.strip == content
-        end
-      end
-
-      def return_exit_status?(status)
-        exit_status == status
-      end
-
       def stdout
         command_result.stdout
       end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta18"
+  VERSION = "2.0.0.beta19"
 end

data/spec/type/base/command_spec.rb

@@ -4,44 +4,44 @@ set :os, :family => 'base'
 
 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") }
+  its(:stdout) { should match /nameserver 127.0.0.1/ }
 end
 
 describe 'complete matching of stdout' do
   context command('cat /etc/resolv.conf') do
     let(:stdout) { "foocontent-should-be-includedbar\r\n" }
-    it { should_not return_stdout('content-should-be-included') }
+    its(:stdout) { should_not eq 'content-should-be-included' }
   end
 end
 
 describe 'regexp matching of stdout' do
   context command('cat /etc/resolv.conf') do
     let(:stdout) { "nameserver 127.0.0.1\r\n" }
-    it { should return_stdout(/127\.0\.0\.1/) }
+    its(:stdout) { should match /127\.0\.0\.1/ }
   end
 end
 
 describe command('cat /etc/resolv.conf') do
   let(:stderr) { "No such file or directory\r\n" }
-  it { should return_stderr("No such file or directory") }
+  its(:stderr) { should match /No such file or directory/ }
 end
 
 describe 'complete matching of stderr' do
   context command('cat /etc/resolv.conf') do
     let(:stderr) { "No such file or directory\r\n" }
-    it { should_not return_stderr('file') }
+    its(:stdout) { should_not eq 'file' }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('cat /etc/resolv.conf') do
     let(:stderr) { "No such file or directory\r\n" }
-    it { should return_stderr(/file/) }
+    its(:stderr) { should match /file/ }
   end
 end
 
 describe command('cat /etc/resolv.conf') do
-  it { should return_exit_status 0 }
+  its(:exit_status) { should eq 0 }
 end
 
 describe command('ls -al /') do

data/spec/type/windows/command_spec.rb

@@ -5,44 +5,44 @@ set :os, :family => 'windows'
 
 describe command('test_cmd /test/path/file') do
   let(:stdout) { "test output 1.2.3\r\n" }
-  it { should return_stdout("test output 1.2.3") }
+  its(:stdout) { should match /test output 1.2.3/ }
 end
 
 describe 'complete matching of stdout' do
   context command('test_cmd /test/path/file') do
     let(:stdout) { "foocontent-should-be-includedbar\r\n" }
-    it { should_not return_stdout('content-should-be-included') }
+    its(:stdout) { should_not eq 'content-should-be-included' }
   end
 end
 
 describe 'regexp matching of stdout' do
   context command('test_cmd /test/path/file') do
     let(:stdout) { "test output 1.2.3\r\n" }
-    it { should return_stdout(/1\.2\.3/) }
+    its(:stdout) { should match /1\.2\.3/ }
   end
 end
 
 describe command('test_cmd /test/path/file') do
   let(:stderr) { "No such file or directory\r\n" }
-  it { should return_stderr("No such file or directory") }
+  its(:stderr) { should match /No such file or directory/ }
 end
 
 describe 'complete matching of stderr' do
   context command('test_cmd /test/path/file') do
     let(:stderr) { "No such file or directory\r\n" }
-    it { should_not return_stderr('file') }
+    its(:stderr) { should_not eq 'file' }
   end
 end
 
 describe 'regexp matching of stderr' do
   context command('test_cmd /test/path/file') do
     let(:stderr) { "No such file or directory\r\n" }
-    it { should return_stderr(/file/) }
+    its(:stderr) { should match /file/ }
   end
 end
 
 describe command('test_cmd /test/path/file') do
-  it { should return_exit_status 0 }
+  its(:exit_status) { should eq 0 }
 end
 
 describe command('dir "c:\"') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta18
+  version: 2.0.0.beta19
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -122,9 +122,6 @@ files:
 - lib/serverspec/matcher/have_site_application.rb
 - lib/serverspec/matcher/have_site_bindings.rb
 - lib/serverspec/matcher/have_virtual_dir.rb
-- lib/serverspec/matcher/return_exit_status.rb
-- lib/serverspec/matcher/return_stderr.rb
-- lib/serverspec/matcher/return_stdout.rb
 - lib/serverspec/setup.rb
 - lib/serverspec/subject.rb
 - lib/serverspec/type/base.rb

data/lib/serverspec/matcher/return_exit_status.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :return_exit_status do |status|
-  match do |command|
-    command.return_exit_status?(status)
-  end
-end

data/lib/serverspec/matcher/return_stderr.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :return_stderr do |content|
-  match do |command|
-    command.return_stderr?(content)
-  end
-end

data/lib/serverspec/matcher/return_stdout.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :return_stdout do |content|
-  match do |command|
-    command.return_stdout?(content)
-  end
-end