summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-08-26 08:58:03 -0700
committerJay Mundrawala <jdmundrawala@gmail.com>2015-08-26 12:56:33 -0700
commit85311d5df03e104dc9118956b0833da89530c652 (patch)
tree80edfc1f56f356f694555c691a81cedbf63827ca
parentef897f804c57ffde6206daa0625f3d10fa9fbfed (diff)
downloadmixlib-shellout-85311d5df03e104dc9118956b0833da89530c652.tar.gz
Remove dependency on windows-prjdm/no-windows-pr
windows-pr includes everything under the sun. This is means it does not work no nanoserver
-rw-r--r--lib/mixlib/shellout/windows.rb9
-rw-r--r--lib/mixlib/shellout/windows/core_ext.rb8
-rw-r--r--mixlib-shellout-windows.gemspec1
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb
index 1612b09..bcda96a 100644
--- a/lib/mixlib/shellout/windows.rb
+++ b/lib/mixlib/shellout/windows.rb
@@ -19,19 +19,14 @@
#
require 'win32/process'
-require 'windows/handle'
-require 'windows/process'
-require 'windows/synchronize'
-
require 'mixlib/shellout/windows/core_ext'
module Mixlib
class ShellOut
module Windows
- include ::Windows::Handle
- include ::Windows::Process
- include ::Windows::Synchronize
+ include Process::Functions
+ include Process::Constants
TIME_SLICE = 0.05
diff --git a/lib/mixlib/shellout/windows/core_ext.rb b/lib/mixlib/shellout/windows/core_ext.rb
index 73b848f..6dfed2f 100644
--- a/lib/mixlib/shellout/windows/core_ext.rb
+++ b/lib/mixlib/shellout/windows/core_ext.rb
@@ -24,7 +24,13 @@ module Process::Constants
LOGON32_LOGON_INTERACTIVE = 0x00000002
LOGON32_PROVIDER_DEFAULT = 0x00000000
UOI_NAME = 0x00000002
-end
+
+ WAIT_OBJECT_0 = 0
+ WAIT_TIMEOUT = 0x102
+ WAIT_ABANDONED = 128
+ WAIT_ABANDONED_0 = WAIT_ABANDONED
+ WAIT_FAILED = 0xFFFFFFFF
+end
# Define the functions needed to check with Service windows station
module Process::Functions
diff --git a/mixlib-shellout-windows.gemspec b/mixlib-shellout-windows.gemspec
index 20c8164..8e178de 100644
--- a/mixlib-shellout-windows.gemspec
+++ b/mixlib-shellout-windows.gemspec
@@ -3,6 +3,5 @@ gemspec = eval(File.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__
gemspec.platform = Gem::Platform.new(["universal", "mingw32"])
gemspec.add_dependency "win32-process", "~> 0.7.5"
-gemspec.add_dependency "windows-pr", "~> 1.2.4"
gemspec