serverspec 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d359e8d4e9b0d68239d0c3a3ffee9f98254d91c8
-  data.tar.gz: 4b12b546c2b2e348481fcc9a89c9dfca40d49713
+  metadata.gz: 2e129075cf8dab2aa89c0d5b0c2995a301c3e032
+  data.tar.gz: 410f4266d33bcbb3ac5df1c2ad2162cb5f9c8954
 SHA512:
-  metadata.gz: 6b0e43c81e0edff3580386ef2f2681fde7df403b1573a4d5db7907a5b3cd7d80e27c91812fa2471518fa2e9bb68d1e6f561e72793bc742879e19a379acdd18c0
-  data.tar.gz: d01f69272592f65d492c5fb8fd5e9e5fba6c0ad8b458d30fd7796c7f4a43dd531957207c8a07feb6836296212bdd3326d3a57c5e371b35e154ff4cfc91a32786
+  metadata.gz: b62a181c674d1cdb217fb48af4749f1e8bba0c90aefcd21c6639d2a92b9f7ab64574f1dd5fd405ec7b646ffeb2ec21788b55e748e1d3721b69c8e4157b6c4bda
+  data.tar.gz: 5c631ed3134c89c3617c96d765c53849ab5d006d5c682a395f82c8b0d708e819b1d7f5df69896b07aac598c4e493205d78d9e25cde1c86d56866f3e5c030d5f0

data/lib/serverspec/backend/powershell/support/find_service.ps1

@@ -1,5 +1,5 @@
 function FindService
 {
   param($name)
-  Get-WmiObject Win32_Service | Where-Object {$_.serviceName -eq $name -or $_.displayName -eq $name}
+  Get-WmiObject Win32_Service | Where-Object {$_.Name -eq $name -or $_.DisplayName -eq $name}
 }

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/backend/cmd/configuration_spec.rb

@@ -4,6 +4,10 @@ require 'support/powershell_command_runner'
 include Serverspec::Helper::Cmd
 include Serverspec::Helper::Windows
 
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
+
 describe "Cmd" do
   it_behaves_like "a powershell command runner"
 end

data/spec/backend/winrm/configuration_spec.rb

@@ -4,6 +4,10 @@ require 'support/powershell_command_runner'
 include Serverspec::Helper::WinRM
 include Serverspec::Helper::Windows
 
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
+
 describe "WinRM" do
   it_behaves_like "a powershell command runner"
 end

data/spec/spec_helper.rb

@@ -35,26 +35,19 @@ module Serverspec
         end
       end
     end
-    [Exec, Ssh].each do |clz|
+    [Exec, Ssh, Cmd, WinRM].each do |clz|
       clz.class_eval do
         include TestCommandRunner
         def run_command(cmd)
+          if RSpec.configuration.os =~ /Windows/
+            cmd = cmd.script
+          end
           cmd = build_command(cmd)
           cmd = add_pre_command(cmd)
           do_run cmd
         end
       end
     end
-    [Cmd, WinRM].each do |clz|
-      clz.class_eval do
-        include TestCommandRunner
-        def run_command(cmd)
-          cmd = build_command(cmd.script)
-          cmd = add_pre_command(cmd)
-          do_run cmd
-        end
-      end
-    end
   end
 
   module Type

data/spec/windows/file_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
 
 describe file('/some/valid/file') do
   it { should be_file }

data/spec/windows/group_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
 
 describe group('test.group') do
   it { should exist }

data/spec/windows/port_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
 
 describe port(80) do
   it { should be_listening }

data/spec/windows/service_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+include Serverspec::Helper::Cmd
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
+
+describe service('Test Service') do
+  it { should be_enabled }
+  its(:command) { should eq "(FindService -name 'Test Service').StartMode -eq 'Auto'" }
+end
+
+describe service('invalid-service') do
+  it { should_not be_enabled }
+end
+
+describe service('Test Service') do
+  it { should be_running }
+  its(:command) { should eq "(FindService -name 'Test Service').State -eq 'Running'" }
+end
+
+describe service('invalid-daemon') do
+  it { should_not be_running }
+end

data/spec/windows/user_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 include Serverspec::Helper::Cmd
+RSpec.configure do |c|
+  c.os = 'Windows'
+end
 
 describe user('test.user') do
   it { should exist }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -369,6 +369,7 @@ files:
 - spec/windows/file_spec.rb
 - spec/windows/group_spec.rb
 - spec/windows/port_spec.rb
+- spec/windows/service_spec.rb
 - spec/windows/user_spec.rb
 homepage: http://serverspec.org/
 licenses:
@@ -563,4 +564,5 @@ test_files:
 - spec/windows/file_spec.rb
 - spec/windows/group_spec.rb
 - spec/windows/port_spec.rb
+- spec/windows/service_spec.rb
 - spec/windows/user_spec.rb