serverspec 2.36.0 → 2.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3689402c5d03f438cdb273aa1300f49604319e6
-  data.tar.gz: 8cc6ee4a4bb5fda653cfeccfed3e53c4f5459470
+  metadata.gz: a293a1d69fe4accf6d9e711d2cf87eea5fd71884
+  data.tar.gz: 63abf7e1a41a7cb12aed1979c322bd0d1458e44f
 SHA512:
-  metadata.gz: 63b56de0b976a48f57563fca617bc74e5ec0176458ee36cb4c7d02f26f0382b404965e0bfcd8935e3efc26907b89a0ef65782971599f6530e30e4d270b21a006
-  data.tar.gz: b7aaafc17b9ea01c96907cc0cc3a0e0015bdf096822e8ddf170d8af7b94e828546445a3d6e60f5568efeb2a9f013742b2fdaad4bd5bfea1ccfc65a29efd5965f
+  metadata.gz: 561a5a3a9761cd871fcee288043dfb35407189becaeb555397d55a6e159b4db1c1cde655f7f0a4440c3af75429897c1e253f16cdfd6e18593bbb71de2a24c3c6
+  data.tar.gz: 9e458574b493b93a411dbcac6662e9899744abf749e2c20f032a50e83bcd9acb4c64cb0f76c5bc00f28016f44e47d9abb7fb7837becabbee43aa65ae57bfb63d

data/.gitignore

@@ -24,3 +24,5 @@ Vagrantfile
 vendor/
 .DS_Store
 Gemfile.local
+upstream.sh
+

data/README.md

@@ -6,6 +6,16 @@ You can see the details of serverspec on [serverspec.org](http://serverspec.org/
 
 ----
 
+## Running the gem's tests
+
+Use
+
+```bundle exec rake```
+
+(Using ```rspec``` alone will not work).
+
+
+
 ## Maintenance policy of Serverspec/Specinfra
 
 * The person who found a bug should fix the bug by themself.

data/Rakefile

@@ -6,6 +6,7 @@ rescue LoadError
 end
 
 if defined?(RSpec)
+  task :default => 'spec:all'
   task :spec => 'spec:all'
 
   namespace :spec do

data/lib/serverspec/type/json_file.rb

@@ -1,9 +1,9 @@
-require 'json'
+require 'multi_json'
 
 module Serverspec::Type
   class JsonFile < File
     def content
-      JSON.parse(super)
+      MultiJson.load(super)
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.36.0"
+  VERSION = "2.36.1"
 end

data/spec/type/aix/file_spec.rb

@@ -15,11 +15,7 @@ describe file('/tmp') do
 end
 
 describe file('/etc/passwd') do
-  it 'be_mode is not implemented' do
-    expect {
-      should be_mode 644
-    }.to raise_exception
-  end
+  it { should be_mode 644 }
 end
 
 describe file('/etc/passwd') do

data/spec/type/base/file_spec.rb

@@ -413,6 +413,6 @@ describe file('/etc/passwd') do
   it 'be_immutable is not implemented in base class' do
     expect {
       should be_immutable
-    }.to raise_exception
+    }.to raise_error(/is not implemented in Specinfra/)
   end
 end

data/spec/type/base/service_spec.rb

@@ -27,7 +27,7 @@ describe service('sshd') do
   it {
     expect {
       should be_running.under('not implemented')
-    }.to raise_exception
+    }.to raise_error(/is not implemented in Specinfra/)
   }
 end
 
@@ -49,6 +49,6 @@ describe service('sshd') do
   it {
     expect {
       should be_monitored_by('not implemented')
-    }.to raise_exception
+    }.to raise_error(NotImplementedError)
   }
 end

data/spec/type/linux/docker_container_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
-require 'json'
+require 'multi_json'
 
 property[:os] = nil
 set :os, {:family => 'linux'}
@@ -21,7 +21,7 @@ end
 
 describe docker_container('restarting') do
   let(:stdout) do
-    attrs = JSON.parse(inspect_container)
+    attrs = MultiJson.load(inspect_container)
     attrs.first['State']['Restarting'] = true
     attrs.to_json
   end

data/spec/type/solaris10/file_spec.rb

@@ -308,6 +308,6 @@ describe file('/etc/passwd') do
   it 'be_immutable is not implemented in base class' do
     expect {
       should be_immutable
-    }.to raise_exception
+    }.to raise_error(/is not implemented in Specinfra/)
   end
 end

data/spec/type/windows/file_spec.rb

@@ -39,7 +39,7 @@ end
 describe file('/some/file') do
   it "should raise error if trying to check access by 'owner' or 'group' or 'others'" do
    ['owner', 'group', 'others'].each do |access|
-     expect { should be_readable.by(access) }.to raise_error
+     expect { should be_readable.by(access) }.to raise_error(RuntimeError)
    end
  end
 end
@@ -59,7 +59,7 @@ end
 describe file('/some/file') do
   it "should raise error if trying to check access by 'owner' or 'group' or 'others'" do
    ['owner', 'group', 'others'].each do |access|
-     expect { should be_writable.by(access) }.to raise_error
+     expect { should be_writable.by(access) }.to raise_error(RuntimeError)
    end
  end
 end
@@ -79,7 +79,7 @@ end
 describe file('/some/file') do
   it "should raise error if trying to check access by 'owner' or 'group' or 'others'" do
    ['owner', 'group', 'others'].each do |access|
-     expect { should be_executable.by(access) }.to raise_error
+     expect { should be_executable.by(access) }.to raise_error(RuntimeError)
    end
  end
 end
@@ -97,17 +97,24 @@ describe file('/some/file') do
 end
 
 describe file('/some/test/file') do
-  it "should raise error if command is not supported" do 
+  it "should raise error if command is not implemented" do
     {
       :be_socket => [],
       :be_mode => 644,
       :be_grouped_into => 'root',
       :be_linked_to => '/some/other/file',
-      :be_mounted => [],
+      :be_mounted => []
+    }.each do |method, args|
+      expect { should self.send(method, *args) }.to raise_error(NotImplementedError)
+    end
+  end
+
+  it "should raise error if command is not defined" do
+    {
       :match_md5checksum => '35435ea447c19f0ea5ef971837ab9ced',
       :match_sha256checksum => '0c3feee1353a8459f8c7d84885e6bc602ef853751ffdbce3e3b6dfa1d345fc7a'
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_exception
+      expect { should self.send(method, *args) }.to raise_error(NoMethodError)
     end
   end
 end

data/spec/type/windows/group_spec.rb

@@ -17,7 +17,7 @@ describe group('test.group') do
     {
       :have_gid => [nil],
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_exception
+      expect { should self.send(method, *args) }.to raise_error(NotImplementedError)
     end
   end
 end

data/spec/type/windows/service_spec.rb

@@ -22,9 +22,9 @@ end
 
 describe service('Test service') do
   it "should raise error if trying to check service process controller" do
-   expect { should be_running.under('supervisor') }.to raise_error
+   expect { should be_running.under('supervisor') }.to raise_error(NotImplementedError)
  end
   it "should raise error if trying to check service monitoring" do
-   expect { should_not be_monitored_by('monit') }.to raise_error
+   expect { should_not be_monitored_by('monit') }.to raise_error(NotImplementedError)
  end
 end

data/spec/type/windows/user_spec.rb

@@ -27,7 +27,7 @@ describe user('test.user') do
       :have_login_shell => [nil],
       :have_authorized_key => [nil],
     }.each do |method, args|
-      expect { should self.send(method, *args) }.to raise_exception
+      expect { should self.send(method, *args) }.to raise_error(NotImplementedError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.36.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec