serverspec 2.22.0 → 2.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe870a4f62eab55bcd338386a1b3a411cf3555d
-  data.tar.gz: 930d1b761744265d1a5e9d7de697a16d05d6cedd
+  metadata.gz: 705b4d622f116fbfed3b96df2f953bc6ee30a6bd
+  data.tar.gz: 2256ecca97ef36a6f2a3d66e991cfcb88cc56dd0
 SHA512:
-  metadata.gz: da7f45792568ae16f82f7077163106f10f2926fd075cf4a7365100db08026a8707780a1e10f800d8dca1aba5b0ea259cc8a564f5633217ba3467b9aba20f12a6
-  data.tar.gz: 16d6e83b2339c43d0fec1cc21d747f2c789565bff83926312f5c68036e3c046ca46cb72df49234e169f9997cfb15364d4ee994ed339910910ec91186cf6d7066
+  metadata.gz: 2a835bf90047183d9856594134f4bb78afc6c84c3f5916fcb53e487cc4e237645d285161c0b0b7d1af9d1daf7fb69b3d37dd15c3695588fac181eff3a6264a43
+  data.tar.gz: 8d905cfe1827b3cf0b1901efbe0001b38ae1b758e11f2910f801b2a5a5b91f82bd8daed0b9ee2a0c6db9fcf80af23bdf8a2c7ee4a63f65f8bd550b9ca63cc61c

data/lib/serverspec/matcher.rb

@@ -15,6 +15,10 @@ require 'serverspec/matcher/be_reachable'
 # package
 require 'serverspec/matcher/be_installed'
 
+# selinux
+require 'serverspec/matcher/be_enforcing'
+require 'serverspec/matcher/be_permissive'
+
 # service
 require 'serverspec/matcher/be_enabled'
 require 'serverspec/matcher/be_running'

data/lib/serverspec/matcher/be_enforcing.rb

@@ -0,0 +1,10 @@
+RSpec::Matchers.define :be_enforcing do
+  match do |selinux|
+    selinux.enforcing?(@with_policy)
+  end
+
+  chain :with_policy do |with_policy|
+    @with_policy = with_policy
+  end
+
+end

data/lib/serverspec/matcher/be_permissive.rb

@@ -0,0 +1,10 @@
+RSpec::Matchers.define :be_permissive do
+  match do |selinux|
+    selinux.permissive?(@with_policy)
+  end
+
+  chain :with_policy do |with_policy|
+    @with_policy = with_policy
+  end
+
+end

data/lib/serverspec/type/selinux.rb

@@ -4,12 +4,12 @@ module Serverspec::Type
       @runner.check_selinux_has_mode('disabled')
     end
 
-    def enforcing?
-      @runner.check_selinux_has_mode('enforcing')
+    def enforcing?(with_policy)
+      @runner.check_selinux_has_mode('enforcing', with_policy)
     end
 
-    def permissive?
-      @runner.check_selinux_has_mode('permissive')
+    def permissive?(with_policy)
+      @runner.check_selinux_has_mode('permissive', with_policy)
     end
 
     def to_s

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.22.0"
+  VERSION = "2.23.0"
 end

data/serverspec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "rspec-its"
   spec.add_runtime_dependency "multi_json"
-  spec.add_runtime_dependency "specinfra", "~> 2.42"
+  spec.add_runtime_dependency "specinfra", "~> 2.43"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.23.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: '2.43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.42'
+        version: '2.43'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,10 +120,12 @@ files:
 - lib/serverspec/helper/type.rb
 - lib/serverspec/matcher.rb
 - lib/serverspec/matcher/be_enabled.rb
+- lib/serverspec/matcher/be_enforcing.rb
 - lib/serverspec/matcher/be_executable.rb
 - lib/serverspec/matcher/be_installed.rb
 - lib/serverspec/matcher/be_listening.rb
 - lib/serverspec/matcher/be_mounted.rb
+- lib/serverspec/matcher/be_permissive.rb
 - lib/serverspec/matcher/be_reachable.rb
 - lib/serverspec/matcher/be_readable.rb
 - lib/serverspec/matcher/be_resolvable.rb