serverspec 2.0.0.beta8 → 2.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22d2a873870ecdddc00919f06be8c80c0a3d4f41
-  data.tar.gz: f2c1d92a9211eeda7a2f080dca4fc8a5eabf03c8
+  metadata.gz: 4eac2e10fe1f7646006a794380e458fa37b3c75c
+  data.tar.gz: dbcfb11112500d422ce06d4af91bb0b3f3e2b835
 SHA512:
-  metadata.gz: f4f893ae50ce59810c2f2ebde4a94f4a0d95e5d25601702b64b6d39b0511e5d85d751968a005d1f0e3c5608f1e60f0eccdee4fb744011b9ff87df36de451166c
-  data.tar.gz: d0698d14a569d5b855b5237ae41a8c8f307b066b13b907ba1f0f74c2af25d307e49ed6966c900ffb315ccc25a4b2e74094317cdd724ed6af928d548d5fc1da6c
+  metadata.gz: 3d7f1c6915b8afe45a6510118df3fd2c58709fc26029f8a554b2dcae41ccdb768ce99f4e1a0c802fffb2a942e1a4235bc8cf22782077514d395ebf3a3a96ada3
+  data.tar.gz: c03d276562f404f43670c76ffcb91941204cbf1631a45155c475fd394f755883eeb00ae328153f4776ef28b11298e0186772fadefdd44cbee3fe556aa42e5350

data/Rakefile

@@ -6,7 +6,29 @@ rescue LoadError
 end
 
 if defined?(RSpec)
-  RSpec::Core::RakeTask.new('spec') do |t|
-    t.pattern = 'spec/*/*_spec.rb'
+  task :spec => 'spec:all'
+
+  namespace :spec do
+    task :all => [ 'spec:type:all', 'spec:helper', 'spec:unit' ]
+
+    namespace :type do
+      oses = Dir.glob('spec/type/*').map {|d| File.basename(d)}
+
+      task :all => oses.map {|os| "spec:type:#{os}" }
+
+      oses.each do |os|
+        RSpec::Core::RakeTask.new(os.to_sym) do |t|
+          t.pattern = "spec/type/#{os}/*_spec.rb"
+        end
+      end
+    end
+
+    RSpec::Core::RakeTask.new(:helper) do |t|
+        t.pattern = "spec/helper/*_spec.rb"
+    end
+
+    RSpec::Core::RakeTask.new(:unit) do |t|
+        t.pattern = "spec/unit/*_spec.rb"
+    end
   end
 end

data/lib/serverspec/setup.rb

@@ -94,25 +94,25 @@ EOF
       content = <<-EOF
 require 'spec_helper'
 
-describe package('httpd'), :if => os[:family] == 'RedHat' do
+describe package('httpd'), :if => os[:family] == 'redhat' do
   it { should be_installed }
 end
 
-describe package('apache2'), :if => os[:family] == 'Ubuntu' do
+describe package('apache2'), :if => os[:family] == 'ubuntu' do
   it { should be_installed }
 end
 
-describe service('httpd'), :if => os[:family] == 'RedHat' do
+describe service('httpd'), :if => os[:family] == 'redhat' do
   it { should be_enabled }
   it { should be_running }
 end
 
-describe service('apache2'), :if => os[:family] == 'Ubuntu' do
+describe service('apache2'), :if => os[:family] == 'ubuntu' do
   it { should be_enabled }
   it { should be_running }
 end
 
-describe service('org.apache.httpd'), :if => os[:family] == 'Darwin' do
+describe service('org.apache.httpd'), :if => os[:family] == 'darwin' do
   it { should be_enabled }
   it { should be_running }
 end
@@ -251,9 +251,7 @@ require 'winrm'
 <% end -%>
 
 include Specinfra::Helper::<%= @backend_type %>
-<% if @os_type == 'UN*X' -%>
-include Specinfra::Helper::DetectOS
-<% else -%>
+<% if @os_type != 'UN*X' -%>
 include Specinfra::Helper::Windows
 <% end -%>
 

data/lib/serverspec/type/cgroup.rb

@@ -1,3 +1,4 @@
+:q
 module Serverspec
   module Type
     class Cgroup < Base

data/lib/serverspec/type/command.rb

@@ -36,7 +36,7 @@ module Serverspec
       private
 
       def command_result()
-	@command_result ||= @runner.run_command(@name)
+        @command_result ||= @runner.run_command(@name)
       end
     end
   end

data/lib/serverspec/type/cron.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Cron < Base
       def has_entry?(user, entry)
-        @runner.check_cron_entry(user, entry)
+        @runner.check_cron_has_entry(user, entry)
       end
       def to_s
         'Cron'

data/lib/serverspec/type/default_gateway.rb

@@ -2,13 +2,13 @@ module Serverspec
   module Type
     class DefaultGateway < Base
       def ipaddress
-        ret = @runner.run_command(commands.check_routing_table('default'))
+        ret = @runner.run_command(commands.check_routing_table_has_entry('default'))
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $2 ? $2 : $4
       end
 
       def interface
-        ret = @runner.run_command(commands.check_routing_table('default'))
+        ret = @runner.run_command(commands.check_routing_table_has_entry('default'))
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $3
       end

data/lib/serverspec/type/file.rb

@@ -6,15 +6,15 @@ module Serverspec
       attr_accessor :content
 
       def file?
-        @runner.check_file(@name)
+        @runner.check_file_is_file(@name)
       end
 
       def socket?
-        @runner.check_socket(@name)
+        @runner.check_file_is_socket(@name)
       end
 
       def directory?
-        @runner.check_directory(@name)
+        @runner.check_file_is_directory(@name)
       end
 
       def contain(pattern, from, to)
@@ -30,59 +30,63 @@ module Serverspec
       end
 
       def mode?(mode)
-        @runner.check_mode(@name, mode)
+        @runner.check_file_mode(@name, mode)
       end
 
       def owned_by?(owner)
-        @runner.check_owner(@name, owner)
+        @runner.check_file_is_owned_by(@name, owner)
       end
 
       def grouped_into?(group)
-        @runner.check_grouped(@name, group)
+        @runner.check_file_is_grouped(@name, group)
       end
 
       def linked_to?(target)
-        @runner.check_link(@name, target)
+        @runner.check_file_is_linked_to(@name, target)
       end
 
       def readable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_access_by_user(@name, by_user, 'r')
+          @runner.check_file_access_by_user(@name, by_user, 'r')
         else
-          @runner.check_readable(@name, by_whom)
+          @runner.check_file_is_readable(@name, by_whom)
         end
       end
 
       def writable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_access_by_user(@name, by_user, 'w')
+          @runner.check_file_access_by_user(@name, by_user, 'w')
         else
-          @runner.check_writable(@name, by_whom)
+          @runner.check_file_is_writable(@name, by_whom)
         end
       end
 
       def executable?(by_whom, by_user)
         if by_user != nil
-          @runner.check_access_by_user(@name, by_user, 'x')
+          @runner.check_file_access_by_user(@name, by_user, 'x')
         else
-          @runner.check_executable(@name, by_whom)
+          @runner.check_file_is_executable(@name, by_whom)
         end
       end
 
       def mounted?(attr, only_with)
-        @runner.check_mounted(@name, attr, only_with)
+        @runner.check_file_is_mounted(@name, attr, only_with)
+      end
+
+      def immutable?
+        backend.check_file_is_immutable(@name)
       end
 
       def match_checksum(checksum)
-        @runner.check_file_checksum(@name, checksum)
+        @runner.check_file_has_checksum(@name, checksum)
       end
 
       def match_md5checksum(md5sum)
-        @runner.check_file_md5checksum(@name, md5sum)
+        @runner.check_file_has_md5checksum(@name, md5sum)
       end
 
       def match_sha256checksum(sha256sum)
-        @runner.check_file_sha256checksum(@name, sha256sum)
+        @runner.check_file_has_sha256checksum(@name, sha256sum)
       end
 
       def content

data/lib/serverspec/type/group.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Group < Base
       def exists?
-        @runner.check_group(@name)
+        @runner.check_group_exists(@name)
       end
 
       def has_gid?(gid)
-        @runner.check_gid(@name, gid)
+        @runner.check_group_has_gid(@name, gid)
       end
     end
   end

data/lib/serverspec/type/host.rb

@@ -2,15 +2,15 @@ module Serverspec
   module Type
     class Host < Base
       def resolvable?(type)
-        @runner.check_resolvable(@name, type)
+        @runner.check_host_is_resolvable(@name, type)
       end
 
       def reachable?(port, proto, timeout)
-        @runner.check_reachable(@name, port, proto, timeout)
+        @runner.check_host_is_reachable(@name, port, proto, timeout)
       end
 
       def ipaddress
-        @runner.get_ipaddress_of_host(@name).stdout.strip
+        @runner.get_host_ipaddress(@name).stdout.strip
       end
     end
   end

data/lib/serverspec/type/iis_app_pool.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class IisAppPool < Base
       def exists?()
-        @runner.check_iis_app_pool(@name)
+        @runner.check_iis_app_pool_exists(@name)
       end
 
       def has_dotnet_version?(dotnet)
-        @runner.check_iis_app_pool_dotnet(@name, dotnet)
+        @runner.check_iis_app_pool_has_dotnet_version(@name, dotnet)
       end
 
       def to_s

data/lib/serverspec/type/iis_website.rb

@@ -3,23 +3,23 @@ module Serverspec
     class IisWebsite < Base
 
       def exists?()
-        @runner.check_iis_website_installed(@name)
+        @runner.check_iis_website_is_installed(@name)
       end
 
       def enabled?()
-        @runner.check_iis_website_enabled(@name)
+        @runner.check_iis_website_is_enabled(@name)
       end
 
       def running?()
-        @runner.check_iis_website_running(@name)
+        @runner.check_iis_website_is_running(@name)
       end
 
       def in_app_pool?(app_pool)
-        @runner.check_iis_website_app_pool(@name, app_pool)
+        @runner.check_iis_website_is_in_app_pool(@name, app_pool)
       end
 
       def has_physical_path?(path)
-        @runner.check_iis_website_path(@name, path)
+        @runner.check_iis_website_has_physical_path(@name, path)
       end
 
       def to_s

data/lib/serverspec/type/interface.rb

@@ -9,7 +9,7 @@ module Serverspec
       end
 
       def has_ipv4_address?(ip_address)
-        @runner.check_ipv4_address(@name, ip_address)
+        @runner.check_interface_ipv4_address(@name, ip_address)
       end
     end
   end

data/lib/serverspec/type/ipfilter.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Ipfilter < Base
       def has_rule?(rule)
-        @runner.check_ipfilter_rule(rule)
+        @runner.check_ipfilter_has_rule(rule)
       end
 
       def to_s

data/lib/serverspec/type/ipnat.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Ipnat < Base
       def has_rule?(rule)
-        @runner.check_ipnat_rule(rule)
+        @runner.check_ipnat_has_rule(rule)
       end
 
       def to_s

data/lib/serverspec/type/iptables.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class Iptables < Base
       def has_rule?(rule, table, chain)
-        @runner.check_iptables_rule(rule, table, chain)
+        @runner.check_iptables_has_rule(rule, table, chain)
       end
 
       def to_s

data/lib/serverspec/type/kernel_module.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class KernelModule < Base
       def loaded?
-        @runner.check_kernel_module_loaded(@name)
+        @runner.check_kernel_module_is_loaded(@name)
       end
     end
   end

data/lib/serverspec/type/lxc.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Lxc < Base
       def exists?
-        @runner.check_container(@name)
+        @runner.check_lxc_container_exists(@name)
       end
 
       def running?
-        @runner.check_container_running(@name)
+        @runner.check_lxc_container_is_running(@name)
       end
 
       def to_s

data/lib/serverspec/type/mail_alias.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class MailAlias < Base
       def aliased_to?(target)
-        @runner.check_mail_alias(@name, target)
+        @runner.check_mail_alias_is_aliased_to(@name, target)
       end
     end
   end

data/lib/serverspec/type/package.rb

@@ -3,14 +3,9 @@ module Serverspec
     class Package < Base
       def installed?(provider, version)
         if provider.nil?
-          @runner.check_installed(@name, version)
+          @runner.check_package_is_installed(@name, version)
         else
-          check_method = "check_installed_by_#{provider}".to_sym
-
-          unless @runner.respond_to?(check_method) || commands.respond_to?(check_method)
-            raise ArgumentError.new("`be_installed` matcher doesn't support #{provider}")
-          end
-
+          check_method = "check_package_is_installed_by_#{provider}".to_sym
           @runner.send(check_method, @name, version)
         end
       end

data/lib/serverspec/type/port.rb

@@ -31,7 +31,7 @@ module Serverspec
       def listening?(protocol, local_address)
         protocol_matcher(protocol) if protocol
         local_address_matcher(local_address) if local_address
-        @runner.check_listening(@name, options)
+        @runner.check_port_is_listening(@name, options)
       end
 
       def valid_ip_address?(ip_address)

data/lib/serverspec/type/ppa.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Ppa < Base
       def exists?
-        backend.check_ppa(@name)
+        backend.check_ppa_exists(@name)
       end
 
       def enabled?
-        backend.check_ppa_enabled(@name)
+        backend.check_ppa_is_enabled(@name)
       end
     end
   end

data/lib/serverspec/type/routing_table.rb

@@ -2,7 +2,7 @@ module Serverspec
   module Type
     class RoutingTable < Base
       def has_entry?(entry)
-        @runner.check_routing_table(entry)
+        @runner.check_routing_table_has_entry(entry)
       end
 
       def to_s

data/lib/serverspec/type/selinux.rb

@@ -2,15 +2,15 @@ module Serverspec
   module Type
     class Selinux < Base
       def disabled?
-        @runner.check_selinux('disabled')
+        @runner.check_selinux_mode('disabled')
       end
 
       def enforcing?
-        @runner.check_selinux('enforcing')
+        @runner.check_selinux_mode('enforcing')
       end
 
       def permissive?
-        @runner.check_selinux('permissive')
+        @runner.check_selinux_mode('permissive')
       end
 
       def to_s

data/lib/serverspec/type/service.rb

@@ -2,41 +2,33 @@ module Serverspec
   module Type
     class Service < Base
       def enabled?(level=3)
-        @runner.check_enabled(@name, level)
+        @runner.check_service_is_enabled(@name, level)
       end
 
       def installed?(name, version)
-        @runner.check_service_installed(@name)
+        @runner.check_service_is_installed(@name)
       end
 
       def has_start_mode?(mode)
-        @runner.check_service_start_mode(@name, mode)
+        @runner.check_service_has_start_mode(@name, mode)
       end
 
       def running?(under)
         if under
-          check_method = "check_running_under_#{under}".to_sym
-
-          unless commands.respond_to?(check_method)
-            raise ArgumentError.new("`be_running` matcher doesn't support #{under}")
-          end
-
+          check_method = "check_service_is_running_under_#{under}".to_sym
           @runner.send(check_method, @name)
         else
-          @runner.check_running(@name)
+          @runner.check_service_is_running(@name)
         end
       end
 
       def monitored_by?(monitor)
-        check_method = "check_monitored_by_#{monitor}".to_sym
-        unless monitor && commands.respond_to?(check_method)
-          raise ArgumentError.new("`be_monitored_by` matcher doesn't support #{monitor}")
-        end
+        check_method = "check_service_is_monitored_by_#{monitor}".to_sym
         res = @runner.send(check_method, @name)
       end
 
       def has_property?(property)
-        @runner.check_svcprops(@name, property)
+        @runner.check_service_has_property(@name, property)
       end
     end
   end

data/lib/serverspec/type/user.rb

@@ -2,28 +2,34 @@ module Serverspec
   module Type
     class User < Base
       def exists?
-        @runner.check_user(@name)
+        @runner.check_user_exists(@name)
       end
 
       def belongs_to_group?(group)
-        @runner.check_belonging_group(@name, group)
+        @runner.check_user_is_belonging_to_group(@name, group)
       end
 
       def has_uid?(uid)
-        @runner.check_uid(@name, uid)
+        @runner.check_user_has_uid(@name, uid)
       end
 
       def has_home_directory?(path)
-        @runner.check_home_directory(@name, path)
+        @runner.check_user_has_home_directory(@name, path)
       end
 
       def has_login_shell?(shell)
-        @runner.check_login_shell(@name, shell)
+        @runner.check_user_has_login_shell(@name, shell)
       end
 
       def has_authorized_key?(key)
-        @runner.check_authorized_key(@name, key)
+        @runner.check_user_has_authorized_key(@name, key)
       end
     end
   end
 end
+
+
+
+
+
+

data/lib/serverspec/type/windows_feature.rb

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

data/lib/serverspec/type/windows_hot_fix.rb

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

data/lib/serverspec/type/windows_registry_key.rb

@@ -2,19 +2,19 @@ module Serverspec
   module Type
     class WindowsRegistryKey < Base
       def exists?
-        @runner.check_registry_key(@name)
+        @runner.check_registry_key_exists(@name)
       end
 
       def has_property?(property_name, property_type = :type_string)
-        @runner.check_registry_key(@name, {:name => property_name, :type => property_type})
+        @runner.check_registry_key_has_property(@name, {:name => property_name, :type => property_type})
       end
 
       def has_value?(value)
-        @runner.check_registry_key(@name, {:name => '', :type => :type_string, :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(@name, {:name => property_name, :type => property_type, :value => 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

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

data/lib/serverspec/type/yumrepo.rb

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

data/lib/serverspec/type/zfs.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Zfs < Base
       def exists?
-        @runner.check_zfs(@name)
+        @runner.check_zfs_exists(@name)
       end
 
       def has_property?(property)
-        @runner.check_zfs(@name, property)
+        @runner.check_zfs_has_property(@name, property)
       end
 
       def to_s

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta8"
+  VERSION = "2.0.0.beta9"
 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.beta6"
+  spec.add_runtime_dependency "specinfra", "~> 2.0.0.beta7"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
 end