octopus-serverspec-extensions 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b85ebb89de46927bcf19421067b6d2a74af9ea
-  data.tar.gz: 786336c95248dca1781f032515f6eb46960feff6
+  metadata.gz: 7dbc48a5c489dff646f6dbc6845e7c69f47c2be3
+  data.tar.gz: 3f94def24c10181b8ed01aa8262be9a2069d5731
 SHA512:
-  metadata.gz: 49b87538be60bfde894fdb74fbc63a5ef64e72786da5332be07256dda8d57387326862878887e4187ac4c4a25b65fef38a07456ab61529ec9e4ec674d606d0da
-  data.tar.gz: 95ba2a495a9726de01b62259888319f151eaae50c03236c22394d3d819778b5f4e54517569e550e34a24cb021eb6a1ab2053e2e3afa23800350361d02ef9c62a
+  metadata.gz: 033b213fe6aa55bec6aae70ba520fc40443b42866bcc66efd4f7633b19e2b06d914d70413793448cdab36ae74bdb9d0839b25ec1b911de395a2537e761acf9a8
+  data.tar.gz: f73f2ffaa21d835f6a1fadfd86031ae699bdf9e15a4ae993ac3fef71b9dbc19fdee824eb91494bb2fc15edbd979a870672c3b99b3df121a21dc56184e20c4223

data/lib/octopus_serverspec_extensions/matcher/have_linux_line_endings.rb

@@ -2,4 +2,12 @@ RSpec::Matchers.define :have_linux_line_endings do
   match do |file|
     !file.content.include?("\r\n")
   end
+
+  failure_message do |file|
+    "Expected file '#{file.name}' to have linux line endings, but it didn't"
+  end
+
+  failure_message_when_negated do |file|
+    "Expected file '#{file.name}' to not have linux line endings, but it did"
+  end
 end

data/lib/octopus_serverspec_extensions/matcher/have_version.rb

@@ -1,5 +1,18 @@
 RSpec::Matchers.define :have_version do |version|
   match do |file|
+    get_version(file) == version
+  end
+
+  failure_message do |file|
+    "Expected file '#{file.name}' to have version '#{version}' but it had version '#{get_version}' instead"
+  end
+
+  failure_message_when_negated do |file|
+    "Expected file '#{file.name}' to not have version '#{version}' but it did"
+  end
+
+  private
+  def get_version(file)
     version_dll = Fiddle.dlopen('version.dll')
 
     s=''
@@ -18,6 +31,6 @@ RSpec::Matchers.define :have_version do |version|
     rstring = result.unpack('v*').map{|s| s.chr if s<256}*''
     r = /FileVersion..(.*?)\000/.match(rstring)
 
-    r[1] == version
+    r[1]
   end
 end

data/lib/octopus_serverspec_extensions/matcher/have_windows_line_endings.rb

@@ -2,4 +2,12 @@ RSpec::Matchers.define :have_windows_line_endings do
   match do |file|
     file.content.include?("\r\n")
   end
+
+  failure_message do |file|
+    "Expected file '#{file.name}' to have windows line endings, but it didn't"
+  end
+
+  failure_message_when_negated do |file|
+    "Expected file '#{file.name}' to not have windows line endings, but it did"
+  end
 end

data/lib/octopus_serverspec_extensions/matcher/run_under_account.rb

@@ -1,7 +1,17 @@
 RSpec::Matchers.define :run_under_account do |account_name|
   match do |service|
-    Backend::PowerShell::Command.new do
-      exec "(Get-WmiObject win32_service | where-object { $_.Name -eq '#{service.name}' }).StartName -eq '#{account_name}"
-    end
+    @runner = Specinfra::Runner
+    command_result = @runner.run_command("$ProgressPreference = 'SilentlyContinue'; (Get-WmiObject Win32_Service | Where-Object {$_.Name -eq '#{service.name}'}).StartName -eq '#{account_name}'")
+    command_result.stdout.strip == 'True'
+  end
+
+  failure_message do |service|
+    command_result = @runner.run_command("$ProgressPreference = 'SilentlyContinue'; (Get-WmiObject Win32_Service | Where-Object {$_.Name -eq '#{service.name}'}).StartName")
+    "Expected service '#{service.name}' to be running under '#{account_name}' but was running under '#{command_result.stdout.strip}'"
+  end
+
+  failure_message_when_negated do |service|
+    command_result = @runner.run_command("$ProgressPreference = 'SilentlyContinue'; (Get-WmiObject Win32_Service | Where-Object {$_.Name -eq '#{service.name}'}).StartName")
+    "Expected service '#{service.name}' to not be running under '#{account_name}' but was running under '#{command_result.stdout.strip}'"
   end
 end

data/lib/octopus_serverspec_extensions/version.rb

@@ -1,3 +1,3 @@
 module OctopusServerSpecExtensions
-  VERSION = "0.13.2"
+  VERSION = "0.13.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopus-serverspec-extensions
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Matt Richardson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec