serverspec 2.0.0.beta19 → 2.0.0.beta20

data/lib/serverspec/type/iis_website.rb

@@ -1,43 +1,40 @@
-module Serverspec
-  module Type
-    class IisWebsite < Base
+module Serverspec::Type
+  class IisWebsite < Base
 
-      def exists?()
-        @runner.check_iis_website_is_installed(@name)
-      end
+    def exists?()
+      @runner.check_iis_website_is_installed(@name)
+    end
 
-      def enabled?()
-        @runner.check_iis_website_is_enabled(@name)
-      end
+    def enabled?()
+      @runner.check_iis_website_is_enabled(@name)
+    end
 
-      def running?()
-        @runner.check_iis_website_is_running(@name)
-      end
+    def running?()
+      @runner.check_iis_website_is_running(@name)
+    end
 
-      def in_app_pool?(app_pool)
-        @runner.check_iis_website_is_in_app_pool(@name, app_pool)
-      end
+    def in_app_pool?(app_pool)
+      @runner.check_iis_website_is_in_app_pool(@name, app_pool)
+    end
 
-      def has_physical_path?(path)
-        @runner.check_iis_website_has_physical_path(@name, path)
-      end
+    def has_physical_path?(path)
+      @runner.check_iis_website_has_physical_path(@name, path)
+    end
 
-      def has_site_bindings?(port, protocol, ipaddress, host_header)
-        @runner.check_iis_website_has_site_bindings(@name, port, protocol, ipaddress, host_header)
-      end
+    def has_site_bindings?(port, protocol, ipaddress, host_header)
+      @runner.check_iis_website_has_site_bindings(@name, port, protocol, ipaddress, host_header)
+    end
       
-      def has_virtual_dir?(vdir, path)
-        @runner.check_iis_website_has_virtual_dir(@name, vdir, path)
-      end
+    def has_virtual_dir?(vdir, path)
+      @runner.check_iis_website_has_virtual_dir(@name, vdir, path)
+    end
       
-      def has_site_application?(app, pool, physical_path)
-        @runner.check_iis_website_has_site_application(@name, app, pool, physical_path)
-      end
+    def has_site_application?(app, pool, physical_path)
+      @runner.check_iis_website_has_site_application(@name, app, pool, physical_path)
+    end
 
-      def to_s
-        %Q[IIS Website "#{@name}"]
-      end
+    def to_s
+      %Q[IIS Website "#{@name}"]
     end
   end
 end
-

data/lib/serverspec/type/interface.rb

@@ -1,16 +1,14 @@
-module Serverspec
-  module Type
-    class Interface < Base
-      def speed
-        ret = @runner.get_interface_speed_of(@name)
-        val = ret.stdout.strip
-        val = val.to_i if val.match(/^\d+$/)
-        val
-      end
+module Serverspec::Type
+  class Interface < Base
+    def speed
+      ret = @runner.get_interface_speed_of(@name)
+      val = ret.stdout.strip
+      val = val.to_i if val.match(/^\d+$/)
+      val
+    end
 
-      def has_ipv4_address?(ip_address)
-        @runner.check_interface_has_ipv4_address(@name, ip_address)
-      end
+    def has_ipv4_address?(ip_address)
+      @runner.check_interface_has_ipv4_address(@name, ip_address)
     end
   end
 end

data/lib/serverspec/type/ipfilter.rb

@@ -1,13 +1,11 @@
-module Serverspec
-  module Type
-    class Ipfilter < Base
-      def has_rule?(rule)
-        @runner.check_ipfilter_has_rule(rule)
-      end
+module Serverspec::Type
+  class Ipfilter < Base
+    def has_rule?(rule)
+      @runner.check_ipfilter_has_rule(rule)
+    end
 
-      def to_s
-        'ipfilter'
-      end
+    def to_s
+      'ipfilter'
     end
   end
 end

data/lib/serverspec/type/ipnat.rb

@@ -1,13 +1,11 @@
-module Serverspec
-  module Type
-    class Ipnat < Base
-      def has_rule?(rule)
-        @runner.check_ipnat_has_rule(rule)
-      end
+module Serverspec::Type
+  class Ipnat < Base
+    def has_rule?(rule)
+      @runner.check_ipnat_has_rule(rule)
+    end
 
-      def to_s
-        'ipnat'
-      end
+    def to_s
+      'ipnat'
     end
   end
 end

data/lib/serverspec/type/iptables.rb

@@ -1,13 +1,11 @@
-module Serverspec
-  module Type
-    class Iptables < Base
-      def has_rule?(rule, table, chain)
-        @runner.check_iptables_has_rule(rule, table, chain)
-      end
+module Serverspec::Type
+  class Iptables < Base
+    def has_rule?(rule, table, chain)
+      @runner.check_iptables_has_rule(rule, table, chain)
+    end
 
-      def to_s
-        'iptables'
-      end
+    def to_s
+      'iptables'
     end
   end
 end

data/lib/serverspec/type/kernel_module.rb

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

data/lib/serverspec/type/linux_kernel_parameter.rb

@@ -1,12 +1,10 @@
-module Serverspec
-  module Type
-    class LinuxKernelParameter < Base
-      def value
-        ret = @runner.run_command("/sbin/sysctl -q -n #{@name}")
-        val = ret.stdout.strip
-        val = val.to_i if val.match(/^\d+$/)
-        val
-      end
+module Serverspec::Type
+  class LinuxKernelParameter < Base
+    def value
+      ret = @runner.run_command("/sbin/sysctl -q -n #{@name}")
+      val = ret.stdout.strip
+      val = val.to_i if val.match(/^\d+$/)
+      val
     end
   end
 end

data/lib/serverspec/type/lxc.rb

@@ -1,17 +1,15 @@
-module Serverspec
-  module Type
-    class Lxc < Base
-      def exists?
-        @runner.check_lxc_container_exists(@name)
-      end
+module Serverspec::Type
+  class Lxc < Base
+    def exists?
+      @runner.check_lxc_container_exists(@name)
+    end
 
-      def running?
-        @runner.check_lxc_container_is_running(@name)
-      end
+    def running?
+      @runner.check_lxc_container_is_running(@name)
+    end
 
-      def to_s
-        'LXC'
-      end
+    def to_s
+      'LXC'
     end
   end
 end

data/lib/serverspec/type/mail_alias.rb

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

data/lib/serverspec/type/package.rb

@@ -1,66 +1,64 @@
-module Serverspec
-  module Type
-    class Package < Base
-      def installed?(provider, version)
-        if provider.nil?
-          @runner.check_package_is_installed(@name, version)
-        else
-          check_method = "check_package_is_installed_by_#{provider}".to_sym
-          @runner.send(check_method, @name, version)
-        end
+module Serverspec::Type
+  class Package < Base
+    def installed?(provider, version)
+      if provider.nil?
+        @runner.check_package_is_installed(@name, version)
+      else
+        check_method = "check_package_is_installed_by_#{provider}".to_sym
+        @runner.send(check_method, @name, version)
       end
+    end
 
-      def version
-        ret = @runner.get_package_version(@name).stdout.strip
-        if ret.empty?
-          nil
-        else
-          Version.new(ret)
-        end
+    def version
+      ret = @runner.get_package_version(@name).stdout.strip
+      if ret.empty?
+        nil
+      else
+        Version.new(ret)
       end
+    end
 
-      class Version
-        include Comparable
+    class Version
+      include Comparable
 
-        attr_reader :epoch, :version
+      attr_reader :epoch, :version
 
-        def initialize(val)
-          matches = val.match(/^(?:(\d+):)?(\d[0-9a-zA-Z.+:~-]*)$/)
-          if matches.nil?
-            raise ArgumentError, "Malformed version number string #{val}"
-          end
-          @epoch   = matches[1].to_i
-          @version = matches[2].to_s
+      def initialize(val)
+        matches = val.match(/^(?:(\d+):)?(\d[0-9a-zA-Z.+:~-]*)$/)
+        if matches.nil?
+          raise ArgumentError, "Malformed version number string #{val}"
         end
+        @epoch   = matches[1].to_i
+        @version = matches[2].to_s
+      end
 
-        def <=>(other)
-          other = Version.new(other) if other.is_a?(String)
-          rv    = @epoch <=> other.epoch
-          return rv if rv != 0
+      def <=>(other)
+        other = Version.new(other) if other.is_a?(String)
+        rv    = @epoch <=> other.epoch
+        return rv if rv != 0
 
-          self.ver_array <=> other.ver_array
-        end
+        self.ver_array <=> other.ver_array
+      end
 
-        def ver_array
-          val = @version
-          re  = /^(?:(\d+)|(\D+))(.*)$/
-          res = []
-          until val.empty?
-            matches = val.match(re)
-            if matches[1].nil?
-              # String
-              matches[2].to_s.each_byte do |b|
-                code_point = defined?("~".ord) ? "~".ord : ?~
-                res << ((b == code_point) ? -2 : b)
-              end
-            else
-              # Digits
-              res << matches[1].to_i
+      def ver_array
+        val = @version
+        re  = /^(?:(\d+)|(\D+))(.*)$/
+        res = []
+        until val.empty?
+          matches = val.match(re)
+          if matches[1].nil?
+            # String
+            matches[2].to_s.each_byte do |b|
+              code_point = defined?("~".ord) ? "~".ord : ?~
+              res << ((b == code_point) ? -2 : b)
             end
-            val = matches[3].to_s
+          else
+            # Digits
+            res << matches[1].to_i
           end
-          res << -1
+          val = matches[3].to_s
         end
+        res << -1
       end
     end
   end

data/lib/serverspec/type/php_config.rb

@@ -1,12 +1,10 @@
-module Serverspec
-  module Type
-    class PhpConfig < Base
-      def value
-        ret = @runner.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
-        val = ret.stdout
-        val = val.to_i if val.match(/^\d+$/)
-        val
-      end
+module Serverspec::Type
+  class PhpConfig < Base
+    def value
+      ret = @runner.run_command("php -r 'echo get_cfg_var( \"#{@name}\" );'")
+      val = ret.stdout
+      val = val.to_i if val.match(/^\d+$/)
+      val
     end
   end
 end

data/lib/serverspec/type/port.rb

@@ -1,42 +1,40 @@
 require 'resolv'
 
-module Serverspec
-  module Type
-    class Port < Base
-      def protocols
-        %w(udp tcp tcp6 udp6)
-      end
+module Serverspec::Type
+  class Port < Base
+    def protocols
+      %w(udp tcp tcp6 udp6)
+    end
 
-      def options
-        @options ||= {}
-      end
+    def options
+      @options ||= {}
+    end
 
-      def protocol_matcher(protocol)
-        protocol = protocol.to_s.downcase
-        if protocols.include?(protocol)
-          options[:protocol] = protocol
-        else
-          raise ArgumentError.new("`be_listening` matcher doesn't support #{protocol}")
-        end
+    def protocol_matcher(protocol)
+      protocol = protocol.to_s.downcase
+      if protocols.include?(protocol)
+        options[:protocol] = protocol
+      else
+        raise ArgumentError.new("`be_listening` matcher doesn't support #{protocol}")
       end
+    end
 
-      def local_address_matcher(local_address)
-        if valid_ip_address?(local_address)
-          options[:local_address] = local_address
-        else
-          raise ArgumentError.new("`be_listening` matcher requires valid IPv4 or IPv6 address")
-        end
+    def local_address_matcher(local_address)
+      if valid_ip_address?(local_address)
+        options[:local_address] = local_address
+      else
+        raise ArgumentError.new("`be_listening` matcher requires valid IPv4 or IPv6 address")
       end
+    end
 
-      def listening?(protocol, local_address)
-        protocol_matcher(protocol) if protocol
-        local_address_matcher(local_address) if local_address
-        @runner.check_port_is_listening(@name, options)
-      end
+    def listening?(protocol, local_address)
+      protocol_matcher(protocol) if protocol
+      local_address_matcher(local_address) if local_address
+      @runner.check_port_is_listening(@name, options)
+    end
 
-      def valid_ip_address?(ip_address)
-        !!(ip_address =~ Resolv::IPv4::Regex) || !!(ip_address =~ Resolv::IPv6::Regex)
-      end
+    def valid_ip_address?(ip_address)
+      !!(ip_address =~ Resolv::IPv4::Regex) || !!(ip_address =~ Resolv::IPv6::Regex)
     end
   end
 end

data/lib/serverspec/type/ppa.rb

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

data/lib/serverspec/type/process.rb

@@ -1,29 +1,27 @@
-module Serverspec
-  module Type
-    class Process < Base
-      def running?
-        pid = @runner.get_process(@name, :format => "pid=").stdout
-        not pid.empty?
-      end
+module Serverspec::Type
+  class Process < Base
+    def running?
+      pid = @runner.get_process(@name, :format => "pid=").stdout
+      not pid.empty?
+    end
 
-      def user
-        get_column("user")
-      end
+    def user
+      get_column("user")
+    end
 
-      def group
-        get_column("group")
-      end
+    def group
+      get_column("group")
+    end
 
-      def method_missing(meth)
-        get_column(meth.to_s)
-      end
+    def method_missing(meth)
+      get_column(meth.to_s)
+    end
 
-      def get_column(keyword)
-        ret = @runner.get_process(@name, :format => "#{keyword}=")
-        val = ret.stdout.strip
-        val = val.to_i if val.match(/^\d+$/)
-        val
-      end
+    def get_column(keyword)
+      ret = @runner.get_process(@name, :format => "#{keyword}=")
+      val = ret.stdout.strip
+      val = val.to_i if val.match(/^\d+$/)
+      val
     end
   end
 end

data/lib/serverspec/type/routing_table.rb

@@ -1,13 +1,11 @@
-module Serverspec
-  module Type
-    class RoutingTable < Base
-      def has_entry?(entry)
-        @runner.check_routing_table_has_entry(entry)
-      end
+module Serverspec::Type
+  class RoutingTable < Base
+    def has_entry?(entry)
+      @runner.check_routing_table_has_entry(entry)
+    end
 
-      def to_s
-        'Routing Table'
-      end
+    def to_s
+      'Routing Table'
     end
   end
 end

data/lib/serverspec/type/selinux.rb

@@ -1,23 +1,19 @@
-module Serverspec
-  module Type
-    class Selinux < Base
-      def disabled?
-        @runner.check_selinux_has_mode('disabled')
-      end
+module Serverspec::Type
+  class Selinux < Base
+    def disabled?
+      @runner.check_selinux_has_mode('disabled')
+    end
 
-      def enforcing?
-        @runner.check_selinux_has_mode('enforcing')
-      end
+    def enforcing?
+      @runner.check_selinux_has_mode('enforcing')
+    end
 
-      def permissive?
-        @runner.check_selinux_has_mode('permissive')
-      end
+    def permissive?
+      @runner.check_selinux_has_mode('permissive')
+    end
 
-      def to_s
-        'SELinux'
-      end
+    def to_s
+      'SELinux'
     end
   end
 end
-
-

data/lib/serverspec/type/service.rb

@@ -1,35 +1,33 @@
-module Serverspec
-  module Type
-    class Service < Base
-      def enabled?(level=3)
-        @runner.check_service_is_enabled(@name, level)
-      end
+module Serverspec::Type
+  class Service < Base
+    def enabled?(level=3)
+      @runner.check_service_is_enabled(@name, level)
+    end
 
-      def installed?(name, version)
-        @runner.check_service_is_installed(@name)
-      end
+    def installed?(name, version)
+      @runner.check_service_is_installed(@name)
+    end
 
-      def has_start_mode?(mode)
-        @runner.check_service_has_start_mode(@name, mode)
-      end
+    def has_start_mode?(mode)
+      @runner.check_service_has_start_mode(@name, mode)
+    end
 
-      def running?(under)
-        if under
-          check_method = "check_service_is_running_under_#{under}".to_sym
-          @runner.send(check_method, @name)
-        else
-          @runner.check_service_is_running(@name)
-        end
+    def running?(under)
+      if under
+        check_method = "check_service_is_running_under_#{under}".to_sym
+        @runner.send(check_method, @name)
+      else
+        @runner.check_service_is_running(@name)
       end
+    end
 
-      def monitored_by?(monitor)
-        check_method = "check_service_is_monitored_by_#{monitor}".to_sym
-        res = @runner.send(check_method, @name)
-      end
+    def monitored_by?(monitor)
+      check_method = "check_service_is_monitored_by_#{monitor}".to_sym
+      res = @runner.send(check_method, @name)
+    end
 
-      def has_property?(property)
-        @runner.check_service_has_property(@name, property)
-      end
+    def has_property?(property)
+      @runner.check_service_has_property(@name, property)
     end
   end
 end