serverspec 2.0.0.beta17 → 2.0.0.beta18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873dab8b4bb7288f62a1999e0e1d545b822b7746
-  data.tar.gz: f30d9f80fc651c0ed80fd4abbec0a59418ee6e35
+  metadata.gz: 57528c35adf6105e153b7dbe26c0a1db093a7b6a
+  data.tar.gz: d3ede874674a3ca5a4abb4d830aa7c64f90014ea
 SHA512:
-  metadata.gz: 4f4a49792ab4facfa84f282090f0d6762f6de74f2c3611f99f0d92b5ef3aacebb49b9ba82b311cb2f407a3706cd208e1d8e3f9e3bc8f33e964de29fa2389fc2a
-  data.tar.gz: bf85e074cffb9c5d281db1fba3f983b0b02d75d75c7b5e65b07571b1b6c5db5fcafd92310071895714c3158797642029254c41f7a2b7ddc325b90031c0ff55cb
+  metadata.gz: d8546b8a206c0fb3d516f77dc9b73a29e0ede2b532b40bdb544820776d8fbe17439192a02628a95b78b3b626658e53bc2c3e16b9d7c2203bb194aee55289bf07
+  data.tar.gz: b8ead4874e92c031eab156534eb309a301ac4e9b999d35b2e7062d01c650c7e8e0c5408693367edfdb6599fb34f2fb9e66a758d8923b192fcbac8bcb0bd2bbc7

data/lib/serverspec/matcher.rb

@@ -4,8 +4,6 @@ require 'serverspec/matcher/contain'
 require 'serverspec/matcher/be_readable'
 require 'serverspec/matcher/be_writable'
 require 'serverspec/matcher/be_executable'
-require 'serverspec/matcher/match_md5checksum'
-require 'serverspec/matcher/match_sha256checksum'
 
 # port
 require 'serverspec/matcher/be_listening'

data/lib/serverspec/type/file.rb

@@ -77,16 +77,12 @@ module Serverspec
         @runner.check_file_is_immutable(@name)
       end
 
-      def match_checksum(checksum)
-        @runner.check_file_has_checksum(@name, checksum)
+      def md5sum
+        @runner.get_file_md5sum(@name).stdout.strip
       end
 
-      def match_md5checksum(md5sum)
-        @runner.check_file_has_md5checksum(@name, md5sum)
-      end
-
-      def match_sha256checksum(sha256sum)
-        @runner.check_file_has_sha256checksum(@name, sha256sum)
+      def sha256sum
+        @runner.get_file_sha256sum(@name).stdout.strip
       end
 
       def content

data/lib/serverspec/version.rb

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

data/serverspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rspec", "~> 3.0.0"
   spec.add_runtime_dependency "rspec-its"
-  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta29"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta30"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end

data/spec/type/base/file_spec.rb

@@ -335,19 +335,21 @@ describe file('/etc/invalid-mount') do
 end
 
 describe file('/etc/services') do
-  it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
+  let(:stdout) { "35435ea447c19f0ea5ef971837ab9ced\n" }
+  its(:md5sum) { should eq '35435ea447c19f0ea5ef971837ab9ced' }
 end
 
 describe file('invalid-file') do
-  it { should_not match_md5checksum 'INVALIDMD5CHECKSUM' }
+  its(:md5sum) { should_not eq 'INVALIDMD5CHECKSUM' }
 end
 
 describe file('/etc/services') do
-  it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
+  let(:stdout)  {"0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:sha256sum) { should eq '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
 end
 
 describe file('invalid-file') do
-  it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
+  its(:sha256sum) { should_not eq 'INVALIDSHA256CHECKSUM' }
 end
 
 describe file('/etc/passwd') do

data/spec/type/darwin/file_spec.rb

@@ -15,11 +15,13 @@ describe file('/tmp') do
 end
 
 describe file('/etc/services') do
-  it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
+  let(:stdout) { "35435ea447c19f0ea5ef971837ab9ced\n" }
+  its(:md5sum) { should eq '35435ea447c19f0ea5ef971837ab9ced' }
 end
 
 describe file('/etc/services') do
-  it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
+  let(:stdout)  {"0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:sha256sum) { should eq '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
 end
 
 describe file('/etc/pam.d/system-auth') do

data/spec/type/openbsd/file_spec.rb

@@ -154,17 +154,11 @@ describe file('/etc/invalid-mount') do
 end
 
 describe file('/etc/services') do
-  it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-end
-
-describe file('invalid-file') do
-  it { should_not match_md5checksum 'INVALIDMD5CHECKSUM' }
+  let(:stdout) { "35435ea447c19f0ea5ef971837ab9ced\n" }
+  its(:md5sum) { should eq '35435ea447c19f0ea5ef971837ab9ced' }
 end
 
 describe file('/etc/services') do
-  it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-end
-
-describe file('invalid-file') do
-  it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
+  let(:stdout)  {"0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:sha256sum) { should eq '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
 end

data/spec/type/solaris10/file_spec.rb

@@ -335,19 +335,13 @@ describe file('/etc/invalid-mount') do
 end
 
 describe file('/etc/services') do
-  it { should match_md5checksum '35435ea447c19f0ea5ef971837ab9ced' }
-end
-
-describe file('invalid-file') do
-  it { should_not match_md5checksum 'INVALIDMD5CHECKSUM' }
+  let(:stdout) { "35435ea447c19f0ea5ef971837ab9ced\n" }
+  its(:md5sum) { should eq '35435ea447c19f0ea5ef971837ab9ced' }
 end
 
 describe file('/etc/services') do
-  it { should match_sha256checksum '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
-end
-
-describe file('invalid-file') do
-  it { should_not match_sha256checksum 'INVALIDSHA256CHECKSUM' }
+  let(:stdout)  {"0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a" }
+  its(:md5sum) { should eq '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a' }
 end
 
 describe file('/etc/passwd') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta17
+  version: 2.0.0.beta18
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta29
+        version: 2.0.0.beta30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta29
+        version: 2.0.0.beta30
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,8 +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/match_md5checksum.rb
-- lib/serverspec/matcher/match_sha256checksum.rb
 - lib/serverspec/matcher/return_exit_status.rb
 - lib/serverspec/matcher/return_stderr.rb
 - lib/serverspec/matcher/return_stdout.rb

data/lib/serverspec/matcher/match_md5checksum.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :match_md5checksum do |pattern|
-  match do |file|
-    file.match_md5checksum(pattern)
-  end
-end

data/lib/serverspec/matcher/match_sha256checksum.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :match_sha256checksum do |pattern|
-  match do |file|
-    file.match_sha256checksum(pattern)
-  end
-end