serverspec 2.0.0.beta19 → 2.0.0.beta20

data/lib/serverspec/type/user.rb

@@ -1,39 +1,31 @@
-module Serverspec
-  module Type
-    class User < Base
-      def exists?
-        @runner.check_user_exists(@name)
-      end
+module Serverspec::Type
+  class User < Base
+    def exists?
+      @runner.check_user_exists(@name)
+    end
 
-      def belongs_to_group?(group)
-        @runner.check_user_belongs_to_group(@name, group)
-      end
+    def belongs_to_group?(group)
+      @runner.check_user_belongs_to_group(@name, group)
+    end
 
-      def belongs_to_primary_group?(group)
-        @runner.check_user_belongs_to_primary_group(@name, group)
-      end
+    def belongs_to_primary_group?(group)
+      @runner.check_user_belongs_to_primary_group(@name, group)
+    end
 
-      def has_uid?(uid)
-        @runner.check_user_has_uid(@name, uid)
-      end
+    def has_uid?(uid)
+      @runner.check_user_has_uid(@name, uid)
+    end
 
-      def has_home_directory?(path)
-        @runner.check_user_has_home_directory(@name, path)
-      end
+    def has_home_directory?(path)
+      @runner.check_user_has_home_directory(@name, path)
+    end
 
-      def has_login_shell?(shell)
-        @runner.check_user_has_login_shell(@name, shell)
-      end
+    def has_login_shell?(shell)
+      @runner.check_user_has_login_shell(@name, shell)
+    end
 
-      def has_authorized_key?(key)
-        @runner.check_user_has_authorized_key(@name, key)
-      end
+    def has_authorized_key?(key)
+      @runner.check_user_has_authorized_key(@name, key)
     end
   end
 end
-
-
-
-
-
-

data/lib/serverspec/type/windows_feature.rb

@@ -1,9 +1,7 @@
-module Serverspec
-  module Type
-    class WindowsFeature < Base
-      def installed?(provider, version)
-        @runner.check_feature_is_enabled(@name, provider)
-      end
+module Serverspec::Type
+  class WindowsFeature < Base
+    def installed?(provider, version)
+      @runner.check_feature_is_enabled(@name, provider)
     end
   end
 end

data/lib/serverspec/type/windows_hot_fix.rb

@@ -1,9 +1,7 @@
-module Serverspec
-  module Type
-    class WindowsHotFix < Base
-      def installed?(provider, version)
-        @runner.check_hot_fix_is_installed(@name, version)
-      end
+module Serverspec::Type
+  class WindowsHotFix < Base
+    def installed?(provider, version)
+      @runner.check_hot_fix_is_installed(@name, version)
     end
   end
 end

data/lib/serverspec/type/windows_registry_key.rb

@@ -1,21 +1,19 @@
-module Serverspec
-  module Type
-    class WindowsRegistryKey < Base
-      def exists?
-        @runner.check_registry_key_exists(@name)
-      end
+module Serverspec::Type
+  class WindowsRegistryKey < Base
+    def exists?
+      @runner.check_registry_key_exists(@name)
+    end
 
-      def has_property?(property_name, property_type = :type_string)
-        @runner.check_registry_key_has_property(@name, {:name => property_name, :type => property_type})
-      end
+    def has_property?(property_name, property_type = :type_string)
+      @runner.check_registry_key_has_property(@name, {:name => property_name, :type => property_type})
+    end
 
-      def has_value?(value)
-        @runner.check_registry_key_has_value(@name, {:name => '', :type => :type_string, :value => value})
-      end
+    def has_value?(value)
+      @runner.check_registry_key_has_value(@name, {:name => '', :type => :type_string, :value => value})
+    end
 
-      def has_property_value?(property_name, property_type, value)
-        @runner.check_registry_key_has_value(@name, {:name => property_name, :type => property_type, :value => value})
-      end
+    def has_property_value?(property_name, property_type, value)
+      @runner.check_registry_key_has_value(@name, {:name => property_name, :type => property_type, :value => value})
     end
   end
 end

data/lib/serverspec/type/windows_scheduled_task.rb

@@ -1,9 +1,7 @@
-module Serverspec
-  module Type
-    class WindowsScheduledTask < Base
-      def exists?
-        @runner.check_scheduled_task_exists(@name)
-      end
+module Serverspec::Type
+  class WindowsScheduledTask < Base
+    def exists?
+      @runner.check_scheduled_task_exists(@name)
     end
   end
 end

data/lib/serverspec/type/yumrepo.rb

@@ -1,13 +1,11 @@
-module Serverspec
-  module Type
-    class Yumrepo < Base
-      def exists?
-        @runner.check_yumrepo_exists(@name)
-      end
+module Serverspec::Type
+  class Yumrepo < Base
+    def exists?
+      @runner.check_yumrepo_exists(@name)
+    end
 
-      def enabled?
-        @runner.check_yumrepo_is_enabled(@name)
-      end
+    def enabled?
+      @runner.check_yumrepo_is_enabled(@name)
     end
   end
 end

data/lib/serverspec/type/zfs.rb

@@ -1,17 +1,15 @@
-module Serverspec
-  module Type
-    class Zfs < Base
-      def exists?
-        @runner.check_zfs_exists(@name)
-      end
+module Serverspec::Type
+  class Zfs < Base
+    def exists?
+      @runner.check_zfs_exists(@name)
+    end
 
-      def has_property?(property)
-        @runner.check_zfs_has_property(@name, property)
-      end
+    def has_property?(property)
+      @runner.check_zfs_has_property(@name, property)
+    end
 
-      def to_s
-        'ZFS'
-      end
+    def to_s
+      'ZFS'
     end
   end
 end

data/lib/serverspec/version.rb

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

data/lib/serverspec.rb

@@ -13,9 +13,10 @@ require 'rspec/core/formatters/base_formatter'
 module RSpec::Core::Notifications
   class FailedExampleNotification < ExampleNotification
     def failure_lines
+      host = ENV['TARGET_HOST'] || Specinfra.configuration.host
       @failure_lines ||=
         begin
-          lines = ["On host `#{Specinfra.configuration.host}`"]
+          lines = ["On host `#{host}`"]
           lines << "Failure/Error: #{read_failed_line.strip}"
           lines << "#{exception_class_name}:" unless exception_class_name =~ /RSpec/
           exception.message.to_s.split("\n").each do |line|

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ module Specinfra
         CommandResult.new({
           :stdout      => ::Specinfra.configuration.stdout,
           :stderr      => ::Specinfra.configuration.stderr,
-          :exit_status => cmd =~ /invalid/ ? 1 : 0,
+          :exit_status => 0,
           :exit_signal => nil,
         })
       end
@@ -23,11 +23,10 @@ module Specinfra
         CommandResult.new({
           :stdout      => ::Specinfra.configuration.stdout,
           :stderr      => ::Specinfra.configuration.stderr,
-          :exit_status => cmd.to_s =~ /invalid/ ? 1 : 0,
+          :exit_status => 0,
           :exit_signal => nil,
         })
       end
     end
   end
 end
-

data/spec/type/aix/group_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'aix'
 describe group('root') do
   it { should have_gid 0 }
 end
-
-describe group('root') do
-  it { should_not have_gid 'invalid-gid' }
-end

data/spec/type/aix/package_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'aix'
 describe package('httpd') do
   it { should be_installed }
 end
-
-describe package('invalid-package') do
-  it { should_not be_installed }
-end

data/spec/type/aix/port_spec.rb

@@ -2,32 +2,19 @@ require 'spec_helper'
 
 set :os, :family => 'aix'
 
-describe Serverspec::Type::Port do
-  describe port(80) do
-    it { should be_listening }
-
-    it('protocol: tcp') { should be_listening.with('tcp') }
-
-    it 'invalid protocol raises error' do
-      expect {
-        should be_listening.with('not implemented')
-      }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
-    end
-
-    it('on: 127.0.0.1') do
-      should be_listening.on('127.0.0.1')
-    end
+describe port(80) do
+  it { should be_listening }
+end
 
-    it 'invalid local address raises error' do
-      expect{ should be_listening.on('') }.to raise_error(ArgumentError)
-    end
-  end
+describe port(80) do
+  it { should be_listening.with('tcp') }
+end
 
-  describe port('invalid') do
-    it { should_not be_listening }
-  end
+describe port(80) do
+  it { should be_listening.on('127.0.0.1') }
+end
 
-  describe port(123) do
-    it { should be_listening.with("udp") }
-  end
+describe port(53) do
+  it { should be_listening.with('udp') }
 end
+

data/spec/type/aix/service_spec.rb

@@ -6,14 +6,7 @@ describe service('sshd') do
   it { should be_enabled }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled }
-end
-
 describe service('sshd') do
   it { should be_enabled.with_level(4) }
 end
 
-describe service('invalid-service') do
-  it { should_not be_enabled.with_level(4) }
-end

data/spec/type/aix/user_spec.rb

@@ -6,23 +6,11 @@ describe user('root') do
   it { should belong_to_group 'root' }
 end
 
-describe user('root') do
-  it { should_not belong_to_group 'invalid-group' }
-end
-
 describe user('root') do
   it { should have_login_shell '/bin/bash' }
 end
 
-describe user('root') do
-  it { should_not have_login_shell 'invalid-login-shell' }
-end
-
 describe user('root') do
   it { should have_home_directory '/root' }
 end
 
-describe user('root') do
-  it { should_not have_home_directory 'invalid-home-directory' }
-end
-

data/spec/type/arch/file_spec.rb

@@ -6,23 +6,10 @@ describe file('/tmp') do
   it { should be_readable.by_user('mail') }
 end
 
-describe file('/tmp') do
-  it { should_not be_readable.by_user('invalid-user') }
-end
-
 describe file('/tmp') do
   it { should be_writable.by_user('mail') }
 end
 
-describe file('/tmp') do
-  it { should_not be_writable.by_user('invalid-user') }
-end
-
-
 describe file('/tmp') do
   it { should be_executable.by_user('mail') }
 end
-
-describe file('/tmp') do
-  it { should_not be_executable.by_user('invalid-user') }
-end

data/spec/type/arch/package_spec.rb

@@ -2,24 +2,14 @@ require 'spec_helper'
 
 set :os, :family => 'arch'
 
-=begin
 describe package('httpd') do
   it { should be_installed }
 end
 
-describe package('invalid-package') do
-  it { should_not be_installed }
-end
-
 describe package('httpd') do
   it { should be_installed.with_version('2.2.15-28.el6') }
 end
 
-describe package('httpd') do
-  it { should_not be_installed.with_version('invalid-version') }
-end
-=end
-
 describe package('httpd') do
   let(:stdout) { "2.2.15\n" }
   its(:version) { should eq '2.2.15' }

data/spec/type/base/cron_spec.rb

@@ -6,14 +6,6 @@ describe cron do
   it { should have_entry '* * * * * /usr/local/bin/batch.sh' }
 end
 
-describe cron do
-  it { should_not have_entry 'invalid entry' }
-end
-
 describe cron do
   it { should have_entry('* * * * * /usr/local/bin/batch.sh').with_user('root') }
 end
-
-describe cron do
-  it { should_not have_entry('* * * * * /usr/local/bin/batch.sh').with_user('invalid-user') }
-end

data/spec/type/base/file_spec.rb

@@ -6,26 +6,14 @@ describe file('/etc/ssh/sshd_config') do
   it { should be_file }
 end
 
-describe file('/etc/invalid_file') do
-  it { should_not be_file }
-end
-
 describe file('/etc/ssh') do
   it { should be_directory }
 end
 
-describe file('/etc/invalid_directory') do
-  it { should_not be_directory }
-end
-
 describe file('/var/run/unicorn.sock') do
   it { should be_socket }
 end
 
-describe file('/etc/invalid_socket') do
-  it { should_not be_socket }
-end
-
 describe file('/etc/ssh/sshd_config') do
   it { should contain 'This is the sshd server system-wide configuration file' }
 end
@@ -34,66 +22,34 @@ describe file('/etc/ssh/sshd_config') do
   it { should contain /^This is the sshd server system-wide configuration file/ }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain 'This is invalid text!!' }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').from(/^group :test do/).to(/^end/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').from(/^group :test do/).to(/^end/) }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').after(/^group :test do/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').after(/^group :test do/) }
-end
-
 describe file('Gemfile') do
   it { should contain('rspec').before(/^end/) }
 end
 
-describe file('/etc/ssh/sshd_config') do
-  it { should_not contain('This is invalid text!!').before(/^end/) }
-end
-
 describe file('/etc/passwd') do
   it { should be_mode 644 }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_mode 'invalid' }
-end
-
 describe file('/etc/passwd') do
   it { should be_owned_by 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_owned_by 'invalid-owner' }
-end
-
 describe file('/etc/passwd') do
   it { should be_grouped_into 'root' }
 end
 
-describe file('/etc/passwd') do
-  it { should_not be_grouped_into 'invalid-group' }
-end
-
 describe file('/etc/pam.d/system-auth') do
   it { should be_linked_to '/etc/pam.d/system-auth-ac' }
 end
 
-describe file('dummy-link') do
-  it { should_not be_linked_to '/invalid/target' }
-end
-
 describe file('/dev') do
   let(:stdout) { "755\r\n" }
   it { should be_readable }
@@ -219,10 +175,6 @@ describe file('/') do
   it { should be_mounted }
 end
 
-describe file('/etc/invalid-mount') do
-  it { should_not be_mounted }
-end
-
 describe file('/') do
   let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
   it { should be_mounted.with( :type => 'ext4' ) }
@@ -268,11 +220,6 @@ describe file('/') do
   it { should_not be_mounted.with( :type => 'ext4', :device => '/dev/mapper/VolGroup-lv_r00t' ) }
 end
 
-describe file('/etc/invalid-mount') do
-  let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
-  it { should_not be_mounted.with( :type => 'ext4' ) }
-end
-
 describe file('/') do
   let(:stdout) { "/dev/mapper/VolGroup-lv_root on / type ext4 (rw,mode=620)\r\n" }
   it do

data/spec/type/base/group_spec.rb

@@ -6,14 +6,6 @@ describe group('root') do
   it { should exist }
 end
 
-describe group('invalid-group') do
-  it { should_not exist }
-end
-
 describe group('root') do
   it { should have_gid 0 }
 end
-
-describe group('root') do
-  it { should_not have_gid 'invalid-gid' }
-end

data/spec/type/base/host_spec.rb

@@ -6,34 +6,18 @@ describe host('127.0.0.1') do
   it { should be_resolvable }
 end
 
-describe host('invalid-name') do
-  it { should_not be_resolvable }
-end
-
 describe host('127.0.0.1') do
   it { should be_resolvable.by('hosts') }
 end
 
-describe host('invalid-name') do
-  it { should_not be_resolvable.by('hosts') }
-end
-
 describe host('127.0.0.1') do
   it { should be_resolvable.by('dns') }
 end
 
-describe host('invalid-name') do
-  it { should_not be_resolvable.by('dns') }
-end
-
 describe host('127.0.0.1') do
   it { should be_reachable }
 end
 
-describe host('invalid-host') do
-  it { should_not be_reachable }
-end
-
 describe host('127.0.0.1') do
   it { should be_reachable.with(:proto => "icmp", :timeout=> 1) }
 end
@@ -46,10 +30,6 @@ describe host('127.0.0.1') do
   it { should be_reachable.with(:proto => "udp", :port => 53, :timeout=> 1) }
 end
 
-describe host('invalid-host') do
-  it { should_not be_reachable.with(:proto => "udp", :port => 53, :timeout=> 1) }
-end
-
 describe host('example.jp') do
   let(:stdout) { "1.2.3.4\r\n" }
   its(:ipaddress) { should eq '1.2.3.4' }

data/spec/type/base/mail_alias_spec.rb

@@ -5,7 +5,3 @@ set :os, :family => 'base'
 describe mail_alias('daemon') do
   it { should be_aliased_to "root" }
 end
-
-describe mail_alias('invalid-recipient') do
-  it { should_not be_aliased_to "foo" }
-end

data/spec/type/base/package_spec.rb

@@ -3,69 +3,41 @@ require 'spec_helper'
 set :os, :family => 'base'
 
 describe package('jekyll') do
-  it { should be_installed.by('gem') }
-end
-
-describe package('invalid-gem') do
-  it { should_not be_installed.by('gem') }
-end
-
-describe package('jekyll') do
-  it { should be_installed.by('gem').with_version('1.1.1') }
+  it { should be_installed.by(:gem) }
 end
 
 describe package('jekyll') do
-  it { should_not be_installed.by('gem').with_version('invalid-version') }
+  it { should be_installed.by(:gem).with_version('1.1.1') }
 end
 
 describe package('bower') do
-  it { should be_installed.by('npm') }
-end
-
-describe package('invalid-npm-package') do
-  it { should_not be_installed.by('npm') }
+  it { should be_installed.by(:npm) }
 end
 
 describe package('bower') do
-  it { should be_installed.by('npm').with_version('0.9.2') }
-end
-
-describe package('bower') do
-  it { should_not be_installed.by('npm').with_version('invalid-version') }
-end
-
-describe package('mongo') do
-  it { should be_installed.by('pecl') }
-end
-
-describe package('invalid-pecl') do
-  it { should_not be_installed.by('pecl') }
+  it { should be_installed.by(:npm).with_version('0.9.2') }
 end
 
 describe package('mongo') do
-  it { should be_installed.by('pecl').with_version('1.4.1') }
+  it { should be_installed.by(:pecl) }
 end
 
 describe package('mongo') do
-  it { should_not be_installed.by('pecl').with_version('invalid-version') }
+  it { should be_installed.by(:pecl).with_version('1.4.1') }
 end
 
 describe package('XML_Util') do
-  it { should be_installed.by('pear').with_version('1.2.1') }
+  it { should be_installed.by(:pear).with_version('1.2.1') }
 end
 
 describe package('supervisor') do
-  it { should be_installed.by('pip').with_version('3.0') }
-end
-
-describe package('invalid-pip') do
-  it { should_not be_installed.by('pip').with_version('invalid-version') }
+  it { should be_installed.by(:pip).with_version('3.0') }
 end
 
 describe package('App::Ack') do
-  it { should be_installed.by('cpan') }
+  it { should be_installed.by(:cpan) }
 end
 
 describe package('App::Ack') do
-  it { should be_installed.by('cpan').with_version('2.04') }
+  it { should be_installed.by(:cpan).with_version('2.04') }
 end