lib/mspec/helpers/environment.rb in mspec-1.5.14 vs lib/mspec/helpers/environment.rb in mspec-1.5.15
- old
+ new
@@ -1,11 +1,11 @@
require 'mspec/guards/guard'
class Object
def env
env = ""
- if SpecGuard.windows?
+ if PlatformGuard.windows?
env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
else
env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
end
env
@@ -15,18 +15,18 @@
`cmd.exe /C ECHO %#{var}%`.strip
end
def username
user = ""
- if SpecGuard.windows?
+ if PlatformGuard.windows?
user = windows_env_echo('USERNAME')
else
user = `whoami`.strip
end
user
end
def home_directory
- return ENV['HOME'] unless SpecGuard.windows?
+ return ENV['HOME'] unless PlatformGuard.windows?
windows_env_echo('HOMEDRIVE') + windows_env_echo('HOMEPATH')
end
end