serverspec 2.0.0.beta19 → 2.0.0.beta20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34bfc818daa6085b0fa154fe2228c9b5cd51b7ce
-  data.tar.gz: dbf6210c50fd26d4d9131114eb3784952c2f4cbf
+  metadata.gz: 9f5c21f68d3a593ac38c66936009b9b391d05981
+  data.tar.gz: b56991bd56276db1d0bfedc54117f8ad7edc12e2
 SHA512:
-  metadata.gz: 7a30443127f10a9c7c340380ea636be0c6faff0ed8d67e230292c6f64ce85ca84c633dbaa3a2f833792900929c278b177415abb8618aa780fd6c9b7b81910e01
-  data.tar.gz: 149c7b4759356c918a0abcc9943f3af70c743e25e370b63072ed988fc60e5c515255f87736df15ae787cd3fd163b1ad0d7d84832e07679b5759b9256ed7296c0
+  metadata.gz: a2d6724aa264a39827d3533c71f79aa3f5c90ff67ecbffd7dcc79d57e54951a41a0fd0df6e2fce7a6c12cd9f88002c997ff58443dda6e07b5ca7ca6d180e550e
+  data.tar.gz: 8c74196779ee1f396a9ae8c215aa4cdf2b6d56ab276460ccb08ace4a03f2a932d730465c41a77644b66b55af202a3389b3ef77ff00db3908c92cddde29700eee

data/WINDOWS_SUPPORT.md

@@ -9,9 +9,7 @@ For local testing (equivalent to the Exec option in Linux/Unix systems) simply d
 ```ruby
 require 'serverspec'
 
-include Serverspec::Helper::Cmd
-include Serverspec::Helper::Windows
-
+set :backend, :cmd
 ```
 
 For remote testing you have to configure Windows Remote Management in order to communicate to the target host:
@@ -20,17 +18,15 @@ For remote testing you have to configure Windows Remote Management in order to c
 require 'serverspec'
 require 'winrm'
 
-include Serverspec::Helper::WinRM
-include Serverspec::Helper::Windows
+set :backend, :winrm
 
-RSpec.configure do |c|
-  user = <username>
-  pass = <password>
-  endpoint = "http://<hostname>:5985/wsman"
-  
-  c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-  c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
-end
+user = <username>
+pass = <password>
+endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
+
+winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+winrm.set_timeout 300 # 5 minutes max timeout for any operation
+Specinfra.configuration.winrm = winrm
 ```
 
 For how to configure the guest to accept WinRM connections and the different authentication mechanisms check the Microsoft WinRM documentation and verify the ones that are supported by [WinRb/WinRM](https://github.com/WinRb/WinRM).

data/lib/serverspec/helper/type.rb

@@ -2,10 +2,12 @@ module Serverspec
   module Helper
     module Type
       types = %w(
-        base cgroup command cron default_gateway file group host iis_website iis_app_pool interface
-        ipfilter ipnat iptables kernel_module linux_kernel_parameter lxc mail_alias
-        package php_config port ppa process routing_table selinux service user yumrepo
-        windows_feature windows_hot_fix windows_registry_key windows_scheduled_task zfs
+        base cgroup command cron default_gateway file group host
+        iis_website iis_app_pool interface ipfilter ipnat iptables
+        kernel_module linux_kernel_parameter lxc mail_alias package
+        php_config port ppa process routing_table selinux service user
+        yumrepo windows_feature windows_hot_fix windows_registry_key
+        windows_scheduled_task zfs
       )
 
       types.each {|type| require "serverspec/type/#{type}" }
@@ -13,13 +15,9 @@ module Serverspec
       types.each do |type|
         define_method type do |*args|
           name = args.first
-          self.class.const_get('Serverspec').const_get('Type').const_get(camelize(type)).new(name)
+          eval "Serverspec::Type::#{type.to_camel_case}.new(name)"
         end
       end
-
-      def camelize(string)
-        string.split("_").each {|s| s.capitalize! }.join("")
-      end
     end
   end
 end

data/lib/serverspec/helper.rb

@@ -6,5 +6,3 @@ class RSpec::Core::ExampleGroup
   include Serverspec::Helper::Type
 end
 
-require 'serverspec/helper/properties'
-

data/lib/serverspec/setup.rb

@@ -23,14 +23,17 @@ module Serverspec
           if auto_config =~ (/(true|t|yes|y|1)$/i)
             auto_vagrant_configuration
           else
-            print("Input vagrant instance name: ")
+            print('Input vagrant instance name: ')
             @hostname = $stdin.gets.chomp
           end
         else
           @vagrant = false
-          print("Input target host name: ")
+          print('Input target host name: ')
           @hostname = $stdin.gets.chomp
         end
+      elsif @backend_type == 'winrm'
+        print('Input target host name: ')
+        @hostname = $stdin.gets.chomp
       else
         @hostname = 'localhost'
       end
@@ -287,21 +290,22 @@ set :ssh_options, options
 # Disable sudo
 # set :disable_sudo, true
 <%- end -%>
-<%- end -%>
+
 
 # Set environment variables
 # set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
 
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'
-
+<%- end -%>
 <% if @backend_type == 'winrm'-%>
 user = <username>
 pass = <password>
-endpoint = "http://<hostname>:5985/wsman"
+endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
 
-c.winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-c.winrm.set_timeout 300 # 5 minutes max timeout for any operation
+winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+winrm.set_timeout 300 # 5 minutes max timeout for any operation
+Specinfra.configuration.winrm = winrm
 <% end -%>
 EOF
       template

data/lib/serverspec/type/base.rb

@@ -1,23 +1,21 @@
-module Serverspec
-  module Type
-    class Base
-      def initialize(name=nil)
-        @name   = name
-        @runner = Specinfra::Runner
-      end
+module Serverspec::Type
+  class Base
+    def initialize(name=nil)
+      @name   = name
+      @runner = Specinfra::Runner
+    end
 
-      def to_s
-        type = self.class.name.split(':')[-1]
-        type.gsub!(/([a-z\d])([A-Z])/, '\1 \2')
-        type.capitalize!
-        %Q!#{type} "#{@name}"!
-      end
+    def to_s
+      type = self.class.name.split(':')[-1]
+      type.gsub!(/([a-z\d])([A-Z])/, '\1 \2')
+      type.capitalize!
+      %Q!#{type} "#{@name}"!
+    end
 
-      alias_method :inspect, :to_s
+    alias_method :inspect, :to_s
 
-      def to_ary
-        to_s.split(" ")
-      end
+    def to_ary
+      to_s.split(" ")
     end
   end
 end

data/lib/serverspec/type/cgroup.rb

@@ -1,19 +1,16 @@
-:q
-module Serverspec
-  module Type
-    class Cgroup < Base
-      attr_accessor :subsystem
-      def method_missing(meth)
-        if @subsystem.nil?
-          @subsystem = meth.to_s
-          self
-        else
-          param = "#{@subsystem}.#{meth.to_s}"
-          ret = @runner.run_command("cgget -n -r #{param} #{@name} | awk '{print $2}'")
-          val = ret.stdout.strip
-          val = val.to_i if val.match(/^\d+$/)
-          val
-        end
+module Serverspec::Type
+  class Cgroup < Base
+    attr_accessor :subsystem
+    def method_missing(meth)
+      if @subsystem.nil?
+        @subsystem = meth.to_s
+        self
+      else
+        param = "#{@subsystem}.#{meth.to_s}"
+        ret = @runner.run_command("cgget -n -r #{param} #{@name} | awk '{print $2}'")
+        val = ret.stdout.strip
+        val = val.to_i if val.match(/^\d+$/)
+        val
       end
     end
   end

data/lib/serverspec/type/command.rb

@@ -1,23 +1,20 @@
-module Serverspec
-  module Type
-    class Command < Base
-      def stdout
-        command_result.stdout
-      end
-
-      def stderr
-        command_result.stderr
-      end
+module Serverspec::Type
+  class Command < Base
+    def stdout
+      command_result.stdout
+    end
 
-      def exit_status
-        command_result.exit_status.to_i
-      end
+    def stderr
+      command_result.stderr
+    end
 
-      private
+    def exit_status
+      command_result.exit_status.to_i
+    end
 
-      def command_result()
-        @command_result ||= @runner.run_command(@name)
-      end
+    private
+    def command_result()
+      @command_result ||= @runner.run_command(@name)
     end
   end
 end

data/lib/serverspec/type/cron.rb

@@ -1,12 +1,11 @@
-module Serverspec
-  module Type
-    class Cron < Base
-      def has_entry?(user, entry)
-        @runner.check_cron_has_entry(user, entry)
-      end
-      def to_s
-        'Cron'
-      end
+module Serverspec::Type
+  class Cron < Base
+    def has_entry?(user, entry)
+      @runner.check_cron_has_entry(user, entry)
+    end
+
+    def to_s
+      'Cron'
     end
   end
 end

data/lib/serverspec/type/default_gateway.rb

@@ -1,21 +1,19 @@
-module Serverspec
-  module Type
-    class DefaultGateway < Base
-      def ipaddress
-        ret = @runner.get_routing_table_entry(:destination => 'default')
-        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
-        $2 ? $2 : $4
-      end
+module Serverspec::Type
+  class DefaultGateway < Base
+    def ipaddress
+      ret = @runner.get_routing_table_entry(:destination => 'default')
+      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
+      $2 ? $2 : $4
+    end
 
-      def interface
-        ret = @runner.get_routing_table_entry(:destination => 'default')
-        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
-        $3
-      end
+    def interface
+      ret = @runner.get_routing_table_entry(:destination => 'default')
+      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
+      $3
+    end
 
-      def to_s
-        'Default Gateway'
-      end
+    def to_s
+      'Default Gateway'
     end
   end
 end

data/lib/serverspec/type/file.rb

@@ -1,109 +1,107 @@
 require 'date'
 
-module Serverspec
-  module Type
-    class File < Base
-      attr_accessor :content
+module Serverspec::Type
+  class File < Base
+    attr_accessor :content
 
-      def file?
-        @runner.check_file_is_file(@name)
-      end
+    def file?
+      @runner.check_file_is_file(@name)
+    end
 
-      def socket?
-        @runner.check_file_is_socket(@name)
-      end
+    def socket?
+      @runner.check_file_is_socket(@name)
+    end
 
-      def directory?
-        @runner.check_file_is_directory(@name)
-      end
+    def directory?
+      @runner.check_file_is_directory(@name)
+    end
 
-      def contain(pattern, from, to)
-        if pattern.is_a?(Array)
-          @runner.check_file_contains_lines(@name, pattern, from, to)
+    def contain(pattern, from, to)
+      if pattern.is_a?(Array)
+        @runner.check_file_contains_lines(@name, pattern, from, to)
+      else
+        if (from || to).nil?
+          @runner.check_file_contains(@name, pattern)
         else
-          if (from || to).nil?
-            @runner.check_file_contains(@name, pattern)
-          else
-            @runner.check_file_contains_within(@name, pattern, from, to)
-          end
+          @runner.check_file_contains_within(@name, pattern, from, to)
         end
       end
+    end
 
-      def mode?(mode)
-        @runner.check_file_has_mode(@name, mode)
-      end
+    def mode?(mode)
+      @runner.check_file_has_mode(@name, mode)
+    end
 
-      def owned_by?(owner)
-        @runner.check_file_is_owned_by(@name, owner)
-      end
+    def owned_by?(owner)
+      @runner.check_file_is_owned_by(@name, owner)
+    end
 
-      def grouped_into?(group)
-        @runner.check_file_is_grouped(@name, group)
-      end
+    def grouped_into?(group)
+      @runner.check_file_is_grouped(@name, group)
+    end
 
-      def linked_to?(target)
-        @runner.check_file_is_linked_to(@name, target)
-      end
+    def linked_to?(target)
+      @runner.check_file_is_linked_to(@name, target)
+    end
 
-      def readable?(by_whom, by_user)
-        if by_user != nil
-          @runner.check_file_is_accessible_by_user(@name, by_user, 'r')
-        else
-          @runner.check_file_is_readable(@name, by_whom)
-        end
+    def readable?(by_whom, by_user)
+      if by_user != nil
+        @runner.check_file_is_accessible_by_user(@name, by_user, 'r')
+      else
+        @runner.check_file_is_readable(@name, by_whom)
       end
+    end
 
-      def writable?(by_whom, by_user)
-        if by_user != nil
-          @runner.check_file_is_accessible_by_user(@name, by_user, 'w')
-        else
-          @runner.check_file_is_writable(@name, by_whom)
-        end
+    def writable?(by_whom, by_user)
+      if by_user != nil
+        @runner.check_file_is_accessible_by_user(@name, by_user, 'w')
+      else
+        @runner.check_file_is_writable(@name, by_whom)
       end
+    end
 
-      def executable?(by_whom, by_user)
-        if by_user != nil
-          @runner.check_file_is_accessible_by_user(@name, by_user, 'x')
-        else
-          @runner.check_file_is_executable(@name, by_whom)
-        end
+    def executable?(by_whom, by_user)
+      if by_user != nil
+        @runner.check_file_is_accessible_by_user(@name, by_user, 'x')
+      else
+        @runner.check_file_is_executable(@name, by_whom)
       end
+    end
 
-      def mounted?(attr, only_with)
-        @runner.check_file_is_mounted(@name, attr, only_with)
-      end
+    def mounted?(attr, only_with)
+      @runner.check_file_is_mounted(@name, attr, only_with)
+    end
 
-      def immutable?
-        @runner.check_file_is_immutable(@name)
-      end
+    def immutable?
+      @runner.check_file_is_immutable(@name)
+    end
 
-      def md5sum
-        @runner.get_file_md5sum(@name).stdout.strip
-      end
+    def md5sum
+      @runner.get_file_md5sum(@name).stdout.strip
+    end
 
-      def sha256sum
-        @runner.get_file_sha256sum(@name).stdout.strip
-      end
+    def sha256sum
+      @runner.get_file_sha256sum(@name).stdout.strip
+    end
 
-      def content
-        if @content.nil?
-          @content = @runner.get_file_content(@name).stdout
-        end
-        @content
+    def content
+      if @content.nil?
+        @content = @runner.get_file_content(@name).stdout
       end
+      @content
+    end
 
-      def version?(version)
-        @runner.check_file_has_version(@name, version)
-      end
+    def version?(version)
+      @runner.check_file_has_version(@name, version)
+    end
 
-      def mtime
-        d = @runner.get_file_mtime(@name).stdout.strip
-        DateTime.strptime(d, '%s').new_offset(DateTime.now.offset)
-      end
+    def mtime
+      d = @runner.get_file_mtime(@name).stdout.strip
+      DateTime.strptime(d, '%s').new_offset(DateTime.now.offset)
+    end
 
-      def size
-        @runner.get_file_size(@name).stdout.strip.to_i
-      end
+    def size
+      @runner.get_file_size(@name).stdout.strip.to_i
     end
   end
 end

data/lib/serverspec/type/group.rb

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

data/lib/serverspec/type/host.rb

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

data/lib/serverspec/type/iis_app_pool.rb

@@ -1,45 +1,43 @@
-module Serverspec
-  module Type
-    class IisAppPool < Base
-      def exists?()
-        @runner.check_iis_app_pool_exists(@name)
-      end
-
-      def has_dotnet_version?(dotnet)
-        @runner.check_iis_app_pool_has_dotnet_version(@name, dotnet)
-      end
-
-      def has_32bit_enabled?()
-        @runner.check_iis_app_pool_has_32bit_enabled(@name)
-      end
-
-      def has_idle_timeout?(minutes)
-        @runner.check_iis_app_pool_has_idle_timeout(@name, minutes)
-      end
-
-      def has_identity_type?(identity_type)
-        @runner.check_iis_app_pool_has_identity_type(@name, identity_type)
-      end
-
-      def has_periodic_restart?(minutes)
-        @runner.check_iis_app_pool_has_periodic_restart(@name, minutes)
-      end
-
-      def has_user_profile_enabled?()
-        @runner.check_iis_app_pool_has_user_profile(@name)
-      end
-
-      def has_username?(username)
-        @runner.check_iis_app_pool_has_username(@name, username)
-      end
-
-      def has_managed_pipeline_mode?(mode)
-        @runner.check_iis_app_pool_has_managed_pipeline_mode(@name, mode)
-      end
-
-      def to_s
-        %Q[IIS Application Pool "#{@name}"]
-      end
+module Serverspec::Type
+  class IisAppPool < Base
+    def exists?()
+      @runner.check_iis_app_pool_exists(@name)
+    end
+
+    def has_dotnet_version?(dotnet)
+      @runner.check_iis_app_pool_has_dotnet_version(@name, dotnet)
+    end
+
+    def has_32bit_enabled?()
+      @runner.check_iis_app_pool_has_32bit_enabled(@name)
+    end
+
+    def has_idle_timeout?(minutes)
+      @runner.check_iis_app_pool_has_idle_timeout(@name, minutes)
+    end
+
+    def has_identity_type?(identity_type)
+      @runner.check_iis_app_pool_has_identity_type(@name, identity_type)
+    end
+
+    def has_periodic_restart?(minutes)
+      @runner.check_iis_app_pool_has_periodic_restart(@name, minutes)
+    end
+
+    def has_user_profile_enabled?()
+      @runner.check_iis_app_pool_has_user_profile(@name)
+    end
+
+    def has_username?(username)
+      @runner.check_iis_app_pool_has_username(@name, username)
+    end
+
+    def has_managed_pipeline_mode?(mode)
+      @runner.check_iis_app_pool_has_managed_pipeline_mode(@name, mode)
+    end
+
+    def to_s
+      %Q[IIS Application Pool "#{@name}"]
     end
   end
 end