serverspec 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 465a1c6497f6fcbfbd8aca4dc535bbf3890c19c5
-  data.tar.gz: 70ee36b9d8c6c1480eb3fcf52ed6a088fee2b653
+  metadata.gz: 9498cdcc8009438a0e2ea00b06d9b02cf295eb0c
+  data.tar.gz: a41a66337d3929e1f940a1b7be962a375d3de319
 SHA512:
-  metadata.gz: c6a57a9ad0210c1d1b727455d01b9505c5d1ca94679e6bffce72b8061fc55ab1d4e068ff2eefec46e7c8f3d1d59074ec66ca932b9e1f7e7422da26410a93b88a
-  data.tar.gz: a2454dc1bed38660a0ac84812383b83586e9accd1572260cc31bac85cbdd415ed0d3a2bc867a37b1f5c91dbe23bd6b105ff7e45ebb9a9a2066134292c50eeb1e
+  metadata.gz: 5304cf1b1c87ed692e75976840c85ee83df258d31293ab73dbee915b8cde0f539497c5b2fd8f2af3d2710194e7cd4b309b818c2d713c314007ff9ecf03675b0c
+  data.tar.gz: 142748c3e19538fee987c0c1ba6c2afd1cc4640ac1732cf7a60d13f49f5df9c3ee1fc91169fc867277cb7147e2e6588e7a3ef7f2762017f578b88dd372729765

data/README.md

@@ -130,12 +130,13 @@ end
 
 You can select from:
 
-* Specinfra::Helper::RedHat
-* Specinfra::Helper::Debian
-* Specinfra::Helper::Gentoo
-* Specinfra::Helper::Solaris
-* Specinfra::Helper::Darwin
-* Specinfra::Helper::Arch
+* SpecInfra::Helper::RedHat
+* SpecInfra::Helper::Debian
+* SpecInfra::Helper::Fedora
+* SpecInfra::Helper::Gentoo
+* SpecInfra::Helper::Solaris
+* SpecInfra::Helper::Darwin
+* SpecInfra::Helper::Arch
 
 ## Vagrant support
 

data/Rakefile

@@ -2,31 +2,6 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "octorelease"
 
-task :spec => 'spec:all'
-
-namespace :spec do
-  oses = %w( darwin debian gentoo plamo redhat aix solaris solaris10 solaris11 smartos windows freebsd freebsd10 arch)
-  backends = %w( exec ssh cmd winrm powershell )
-
-  task :all => [ oses.map {|os| "spec:#{os}" }, backends, :helper, :unit ].flatten
-
-  oses.each do |os|
-    RSpec::Core::RakeTask.new(os.to_sym) do |t|
-      t.pattern = "spec/#{os}/*_spec.rb"
-    end
-  end
-
-  backends.each do |backend|
-    RSpec::Core::RakeTask.new(backend) do |t|
-      t.pattern = "spec/backend/#{backend.to_s}/*_spec.rb"
-    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
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = 'spec/*/*_spec.rb'
 end

data/lib/serverspec/helper.rb

@@ -1,5 +1,4 @@
 require 'serverspec/helper/os'
-require 'serverspec/helper/backend'
 
 # Subject type helper
 require 'serverspec/helper/type'

data/lib/serverspec/helper/os.rb

@@ -6,11 +6,13 @@ module Serverspec
       'Arch',
       'Darwin',
       'Debian',
+      'Fedora',
       'FreeBSD',
       'FreeBSD10',
       'Gentoo',
       'Plamo',
       'RedHat',
+      'RedHat7',
       'SmartOS',
       'Solaris',
       'Solaris10',

data/lib/serverspec/helper/type.rb

@@ -5,7 +5,7 @@ module Serverspec
         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 process routing_table selinux service user yumrepo
-        windows_feature windows_hot_fix windows_registry_key zfs
+        windows_feature windows_hot_fix windows_registry_key windows_scheduled_task zfs
       )
 
       types.each {|type| require "serverspec/type/#{type}" }

data/lib/serverspec/setup.rb

@@ -14,11 +14,11 @@ module Serverspec
       end
 
       if @backend_type == 'Ssh'
-        print "Vagrant instance y/n: "
+        print 'Vagrant instance y/n: '
         @vagrant = $stdin.gets.chomp
         if @vagrant =~ (/(true|t|yes|y|1)$/i)
           @vagrant = true
-          print "Auto-configure Vagrant from Vagrantfile? y/n: "
+          print 'Auto-configure Vagrant from Vagrantfile? y/n: '
           auto_config = $stdin.gets.chomp
           if auto_config =~ (/(true|t|yes|y|1)$/i)
             auto_vagrant_configuration
@@ -35,7 +35,7 @@ module Serverspec
         @hostname = 'localhost'
       end
 
-      [ 'spec', "spec/#{@hostname}" ].each { |dir| safe_mkdir(dir) }
+      ['spec', "spec/#{@hostname}"].each { |dir| safe_mkdir(dir) }
       safe_create_spec
       safe_create_spec_helper
       safe_create_rakefile
@@ -55,7 +55,7 @@ EOF
       num = $stdin.gets.to_i - 1
       puts
 
-      @os_type = [ 'UN*X', 'Windows' ][num] || 'UN*X'
+      @os_type = ['UN*X', 'Windows'][num] || 'UN*X'
     end
 
     def self.ask_unix_backend
@@ -71,7 +71,7 @@ EOF
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = [ 'Ssh', 'Exec' ][num] || 'Exec'
+      @backend_type = ['Ssh', 'Exec'][num] || 'Exec'
     end
 
     def self.ask_windows_backend
@@ -87,7 +87,7 @@ EOF
       num = $stdin.gets.to_i - 1
       puts
 
-      @backend_type = [ 'WinRM', 'Cmd' ][num] || 'Exec'
+      @backend_type = ['WinRM', 'Cmd'][num] || 'Exec'
     end
 
     def self.safe_create_spec
@@ -138,7 +138,6 @@ EOF
     end
 
     def self.safe_create_spec_helper
-      requirements = []
       content = ERB.new(spec_helper_template, nil, '-').result(binding)
       if File.exists? 'spec/spec_helper.rb'
         old_content = File.read('spec/spec_helper.rb')
@@ -167,7 +166,7 @@ task :default => :spec
       if File.exists? 'Rakefile'
         old_content = File.read('Rakefile')
         if old_content != content
-          $stderr.puts "!! Rakefile already exists and differs from template"
+          $stderr.puts '!! Rakefile already exists and differs from template'
         end
       else
         File.open('Rakefile', 'w') do |f|
@@ -179,7 +178,7 @@ task :default => :spec
 
     def self.find_vagrantfile
       Pathname.new(Dir.pwd).ascend do |dir|
-        path = File.expand_path("Vagrantfile", dir)
+        path = File.expand_path('Vagrantfile', dir)
         return path if File.exists?(path)
       end
       nil
@@ -199,16 +198,16 @@ task :default => :spec
             @hostname = list_of_vms[0]
           else
             list_of_vms.each_with_index { |vm, index | puts "#{index}) #{vm}\n" }
-            print "Choose a VM from the Vagrantfile: "
+            print 'Choose a VM from the Vagrantfile: '
             chosen_vm = $stdin.gets.chomp
             @hostname = list_of_vms[chosen_vm.to_i]
           end
         else
-          $stderr.puts "Vagrant status error - Check your Vagrantfile or .vagrant"
+          $stderr.puts 'Vagrant status error - Check your Vagrantfile or .vagrant'
           exit 1
         end
       else
-        $stderr.puts "Vagrantfile not found in directory!"
+        $stderr.puts 'Vagrantfile not found in directory!'
         exit 1
       end
     end

data/lib/serverspec/type/base.rb

@@ -2,7 +2,8 @@ module Serverspec
   module Type
     class Base
       def initialize(name=nil)
-        @name = name
+        @name   = name
+        @runner = Specinfra::Runner.instance
       end
 
       def to_s

data/lib/serverspec/type/cgroup.rb

@@ -8,7 +8,7 @@ module Serverspec
           self
         else
           param = "#{@subsystem}.#{meth.to_s}"
-          ret = backend.run_command("cgget -n -r #{param} #{@name} | awk '{print $2}'")
+          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

data/lib/serverspec/type/command.rb

@@ -36,7 +36,7 @@ module Serverspec
       private
 
       def command_result()
-	@command_result ||= backend.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)
-        backend.check_cron_entry(user, entry)
+        @runner.check_cron_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 = backend.run_command(commands.check_routing_table('default'))
+        ret = @runner.run_command(commands.check_routing_table('default'))
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $2 ? $2 : $4
       end
 
       def interface
-        ret = backend.run_command(commands.check_routing_table('default'))
+        ret = @runner.run_command(commands.check_routing_table('default'))
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+(?:\r)?\n(?:default via (\S+))?/
         $3
       end

data/lib/serverspec/type/file.rb

@@ -4,94 +4,94 @@ module Serverspec
       attr_accessor :content
 
       def file?
-        backend.check_file(@name)
+        @runner.check_file(@name)
       end
 
       def socket?
-        backend.check_socket(@name)
+        @runner.check_socket(@name)
       end
 
       def directory?
-        backend.check_directory(@name)
+        @runner.check_directory(@name)
       end
 
       def contain(pattern, from, to)
         if pattern.is_a?(Array)
-          backend.check_file_contain_lines(@name, pattern, from, to)
+          @runner.check_file_contain_lines(@name, pattern, from, to)
         else
           if (from || to).nil?
-            backend.check_file_contain(@name, pattern)
+            @runner.check_file_contain(@name, pattern)
           else
-            backend.check_file_contain_within(@name, pattern, from, to)
+            @runner.check_file_contain_within(@name, pattern, from, to)
           end
         end
       end
 
       def mode?(mode)
-        backend.check_mode(@name, mode)
+        @runner.check_mode(@name, mode)
       end
 
       def owned_by?(owner)
-        backend.check_owner(@name, owner)
+        @runner.check_owner(@name, owner)
       end
 
       def grouped_into?(group)
-        backend.check_grouped(@name, group)
+        @runner.check_grouped(@name, group)
       end
 
       def linked_to?(target)
-        backend.check_link(@name, target)
+        @runner.check_link(@name, target)
       end
 
       def readable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(@name, by_user, 'r')
+          @runner.check_access_by_user(@name, by_user, 'r')
         else
-          backend.check_readable(@name, by_whom)
+          @runner.check_readable(@name, by_whom)
         end
       end
 
       def writable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(@name, by_user, 'w')
+          @runner.check_access_by_user(@name, by_user, 'w')
         else
-          backend.check_writable(@name, by_whom)
+          @runner.check_writable(@name, by_whom)
         end
       end
 
       def executable?(by_whom, by_user)
         if by_user != nil
-          backend.check_access_by_user(@name, by_user, 'x')
+          @runner.check_access_by_user(@name, by_user, 'x')
         else
-          backend.check_executable(@name, by_whom)
+          @runner.check_executable(@name, by_whom)
         end
       end
 
       def mounted?(attr, only_with)
-        backend.check_mounted(@name, attr, only_with)
+        @runner.check_mounted(@name, attr, only_with)
       end
 
       def match_checksum(checksum)
-        backend.check_file_checksum(@name, checksum)
+        @runner.check_file_checksum(@name, checksum)
       end
 
       def match_md5checksum(md5sum)
-        backend.check_file_md5checksum(@name, md5sum)
+        @runner.check_file_md5checksum(@name, md5sum)
       end
 
       def match_sha256checksum(sha256sum)
-        backend.check_file_sha256checksum(@name, sha256sum)
+        @runner.check_file_sha256checksum(@name, sha256sum)
       end
 
       def content
         if @content.nil?
-          @content = backend.run_command(commands.get_file_content(@name)).stdout
+          @content = @runner.run_command(commands.get_file_content(@name)).stdout
         end
         @content
       end
 
       def version?(version)
-        backend.check_file_version(@name, version)
+        @runner.check_file_version(@name, version)
       end
     end
   end

data/lib/serverspec/type/group.rb

@@ -2,11 +2,11 @@ module Serverspec
   module Type
     class Group < Base
       def exists?
-        backend.check_group(@name)
+        @runner.check_group(@name)
       end
 
       def has_gid?(gid)
-        backend.check_gid(@name, gid)
+        @runner.check_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)
-        backend.check_resolvable(@name, type)
+        @runner.check_resolvable(@name, type)
       end
 
       def reachable?(port, proto, timeout)
-        backend.check_reachable(@name, port, proto, timeout)
+        @runner.check_reachable(@name, port, proto, timeout)
       end
 
       def ipaddress
-        backend.get_ipaddress_of_host(@name).stdout.strip
+        @runner.get_ipaddress_of_host(@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?()
-        backend.check_iis_app_pool(@name)
+        @runner.check_iis_app_pool(@name)
       end
 
       def has_dotnet_version?(dotnet)
-        backend.check_iis_app_pool_dotnet(@name, dotnet)
+        @runner.check_iis_app_pool_dotnet(@name, dotnet)
       end
 
       def to_s

data/lib/serverspec/type/iis_website.rb

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