serverspec 2.29.2 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed47abd0163d425439cda72a1f516b7089ece17
-  data.tar.gz: 0101db4c86239636a97353473f70341d3cbd86c8
+  metadata.gz: 805aa103f31a41ff32676fa36c1f6e54801ee299
+  data.tar.gz: 7feea0c4b60f88ed26264b530db7e194807f1806
 SHA512:
-  metadata.gz: 1e98f71979be7f14e858c00ad7c8ce240178dfb30d5a64390d9ea074120688c2f055d9dc8570bd83c77e1c8ab4c74cd5829992528375e2d7f26645b4cb753c5a
-  data.tar.gz: 6545a00487106a805620819380cfeaed53103a1902354707aca3afa88a270e146ebdda0c0f87b1f72a99ba559052ed7306e59d05057c748cf1879ff561b5195b
+  metadata.gz: bc4cc36245e7a9d9ba25ebc82ec428ffa4b9086595b3db43374b81056d37ef91c652ab24305baee7f7bf6d25f45fd751f5ab4d2763b5ac7ea1d10685f2ddc8cf
+  data.tar.gz: e74039e4443f224733b816790d7b9521ea8e0cbab9dbdfe7b4707e7c2b232d2f54ab504f9be0152958503ca89d3d13cf29e840db90c2d369d86163bffa547adf

data/appveyor.yml

@@ -14,10 +14,6 @@ environment:
     - ruby_version: "21"
     - ruby_version: "22"
 
-matrix:
-  allow_failures:
-    - ruby_version: "22" # waiting for net-ssh update
-
 clone_depth: 5
 
 cache:

data/lib/serverspec/matcher.rb

@@ -22,6 +22,7 @@ require 'serverspec/matcher/be_permissive'
 # service
 require 'serverspec/matcher/be_enabled'
 require 'serverspec/matcher/be_running'
+require 'serverspec/matcher/be_monitored_by'
 
 # user
 require 'serverspec/matcher/belong_to_group'

data/lib/serverspec/matcher/be_enabled.rb

@@ -7,6 +7,12 @@ RSpec::Matchers.define :be_enabled do
     end
   end
 
+  description do
+    message = 'be enabled'
+    message << " with level #{@level}" if @level
+    message
+  end
+
   chain :with_level do |level|
     @level = level
   end

data/lib/serverspec/matcher/be_listening.rb

@@ -3,6 +3,13 @@ RSpec::Matchers.define :be_listening do
     port.listening? @with, @local_address
   end
 
+  description do
+    message = 'be listening'
+    message << " on #{@local_address}" if @local_address
+    message << " with #{@with}" if @with
+    message
+  end
+
   chain :with do |with|
     @with = with
   end

data/lib/serverspec/matcher/be_monitored_by.rb

@@ -0,0 +1,17 @@
+RSpec::Matchers.define :be_monitored_by do |monitor|
+  match do |service|
+    service.monitored_by?(monitor, @monitor_name)
+  end
+  description do 
+    if @monitor_name
+      "be monitored by #{monitor} with name #{@monitor_name}"
+    else 
+      "be monitored by #{monitor}" 
+    end 
+  end 
+
+  chain :with_name do |name|
+    @monitor_name = (name ? name : nil)
+  end
+
+end

data/lib/serverspec/matcher/be_running.rb

@@ -7,6 +7,12 @@ RSpec::Matchers.define :be_running do
     end
   end
 
+  description do
+    message = 'be running'
+    message << " under #{@under}" if @under
+    message
+  end
+
   chain :under do |under|
     @under = under
   end

data/lib/serverspec/matcher/have_rule.rb

@@ -7,6 +7,14 @@ RSpec::Matchers.define :have_rule do |rule|
     end
   end
 
+  description do
+    message = %Q{have rule "#{rule}"}
+    message << " with table #{@table}" if @table
+    message << ' and' if @table && @chain
+    message << " with chain #{@chain}" if @chain
+    message
+  end
+
   chain :with_table do |table|
     @table = table
   end

data/lib/serverspec/type/service.rb

@@ -25,9 +25,11 @@ module Serverspec::Type
       end
     end
 
-    def monitored_by?(monitor)
+    def monitored_by?(monitor, monitor_name)
       check_method = "check_service_is_monitored_by_#{monitor}".to_sym
-      res = @runner.send(check_method, @name)
+      # use the with_name value if set instead of the service name
+      monitor_name = (monitor_name ? monitor_name : @name)
+      res = @runner.send(check_method, monitor_name)
     end
 
     def has_property?(property)

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.29.2"
+  VERSION = "2.30.0"
 end

data/spec/type/base/service_spec.rb

@@ -36,6 +36,11 @@ describe service('sshd') do
   it { should be_monitored_by(:monit) }
 end
 
+describe service('tinc') do
+  let(:stdout) { "Process 'tinc-myvpn'\r\n  status running\r\n  monitoring status  monitored" }
+  it { should be_monitored_by(:monit).with_name('tinc-myvpn') }
+end
+
 describe service('unicorn') do
   it { should be_monitored_by(:god) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.29.2
+  version: 2.30.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,6 +124,7 @@ files:
 - lib/serverspec/matcher/be_executable.rb
 - lib/serverspec/matcher/be_installed.rb
 - lib/serverspec/matcher/be_listening.rb
+- lib/serverspec/matcher/be_monitored_by.rb
 - lib/serverspec/matcher/be_mounted.rb
 - lib/serverspec/matcher/be_permissive.rb
 - lib/serverspec/matcher/be_reachable.rb