specinfra 2.34.5 → 2.34.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8054c5ab30dcfb9ac19f5bdd7cc59b9498740bc
-  data.tar.gz: 9a7fa2c786996cee9688d2b5a00f87c0b073ee75
+  metadata.gz: ee4f3c13b626174df2e3c5a1957cf483828a8e95
+  data.tar.gz: 1abaf57a1b99306ba08d29367570e58245f702fc
 SHA512:
-  metadata.gz: 8bf761b1651b9b7988a56fa9ecb56c441702260ef0133f1cfc0d04fd0f6ff1c3d9e9833d9aec84e02e24f683b5a5e37b12ea4f6b943313295b322096fcb51eb5
-  data.tar.gz: 43f76a008961233d893ff7c3c4b00b5d561fe304b1addd0dbe0259afb23beca80ba06233c5a7e9aab8eb36aba4de950f257738e8edae6891f023bc8e67b80005
+  metadata.gz: d22c7f491350c7345ddc21f3607fad810b808c150545bc78e0e5a454a47798f49d3cb5358a01ffeda394d8e62248531ac2d306908fa1261964c74a6e9bd3ca56
+  data.tar.gz: 4109ee75c6209359d67c19d8ecea80cdac452f08bb3f96d6e13d7ac4c56077bdaa0ba01848ba41ca8e01312a9dd91665b575b7eb867cbdb88584ab79844f7836

data/lib/specinfra/command/module/service/daemontools.rb

@@ -4,36 +4,41 @@ module Specinfra
       module Service
         module Daemontools
           def check_is_enabled_under_daemontools(service)
-            "test -L /service/#{escape(service)} && test -f /service/#{escape(service)}/run"
+            "test -L #{service_dir}/#{escape(service)} && test -f #{service_dir}/#{escape(service)}/run"
           end
 
           def check_is_running_under_daemontools(service)
-            "svstat /service/#{escape(service)} | grep -E 'up \\(pid [0-9]+\\)'"
+            "svstat #{service_dir}/#{escape(service)} | grep -E 'up \\(pid [0-9]+\\)'"
           end
 
           def enable_under_daemontools(service, directory)
-            "ln -snf #{escape(directory)} /service/#{escape(service)}"
+            "ln -snf #{escape(directory)} #{service_dir}/#{escape(service)}"
           end
 
           def disable_under_daemontools(service)
-            "( cd /service/#{escape(service)} && rm -f /service/#{escape(service)} && svc -dx . log )"
+            "( cd #{service_dir}/#{escape(service)} && rm -f #{service_dir}/#{escape(service)} && svc -dx . log )"
           end
 
           def start_under_daemontools(service)
-            "svc -u /service/#{escape(service)}"
+            "svc -u #{service_dir}/#{escape(service)}"
           end
 
           def stop_under_daemontools(service)
-            "svc -d /service/#{escape(service)}"
+            "svc -d #{service_dir}/#{escape(service)}"
           end
 
           def restart_under_daemontools(service)
-            "svc -t /service/#{escape(service)}"
+            "svc -t #{service_dir}/#{escape(service)}"
           end
 
           def reload_under_daemontools(service)
-            "svc -h /service/#{escape(service)}"
+            "svc -h #{service_dir}/#{escape(service)}"
           end
+
+	  private
+	  def service_dir
+	    '$([ -d /service ] && echo /service || echo /etc/service)'
+	  end
         end
       end
     end

data/lib/specinfra/command/windows/base/process.rb

@@ -5,5 +5,27 @@ class Specinfra::Command::Windows::Base::Process < Specinfra::Command::Windows::
         exec "(Get-Process '#{process}') -ne $null"
       end
     end
+
+    def get(process, opts)
+      column = opts[:format].chomp '='
+
+      case column
+      when 'pid'
+        # map 'pid' to its windows equivalent
+        get_process_property(process, 'processid')
+      when 'user'
+        %Q!gwmi win32_process -filter "name = '#{process}'" | select -first 1 | %{$_.getowner().user}!
+      when 'group'
+        # no concept of process group on Windows
+        raise NotImplementedError.new('Unable to get process group on Windows')
+      else
+        get_process_property(process, column)
+      end
+    end
+
+    private
+    def get_process_property(process, property)
+      %Q!Get-WmiObject Win32_Process -Filter "name = '#{process}'" | select -First 1 #{property} -ExpandProperty #{property}!
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.34.5"
+  VERSION = "2.34.6"
 end

data/spec/command/module/service/daemontools_spec.rb

@@ -5,14 +5,14 @@ describe Specinfra::Command::Module::Service::Daemontools do
     extend Specinfra::Command::Module::Service::Daemontools
   end
   let(:klass) { Specinfra::Command::Module::Service::Daemontools::Test }
-  it { expect(klass.check_is_enabled_under_daemontools('httpd')).to eq "test -L /service/httpd && test -f /service/httpd/run" }
-  it { expect(klass.check_is_running_under_daemontools('httpd')).to eq "svstat /service/httpd | grep -E 'up \\(pid [0-9]+\\)'" }
-  it { expect(klass.enable_under_daemontools('httpd', '/tmp/service/httpd')).to eq 'ln -snf /tmp/service/httpd /service/httpd' }
-  it { expect(klass.disable_under_daemontools('httpd')).to eq '( cd /service/httpd && rm -f /service/httpd && svc -dx . log )' }
-  it { expect(klass.start_under_daemontools('httpd')).to   eq 'svc -u /service/httpd' }
-  it { expect(klass.stop_under_daemontools('httpd')).to    eq 'svc -d /service/httpd' }
-  it { expect(klass.restart_under_daemontools('httpd')).to eq 'svc -t /service/httpd' }
-  it { expect(klass.reload_under_daemontools('httpd')).to  eq 'svc -h /service/httpd' }
+  it { expect(klass.check_is_enabled_under_daemontools('httpd')).to eq "test -L $([ -d /service ] && echo /service || echo /etc/service)/httpd && test -f $([ -d /service ] && echo /service || echo /etc/service)/httpd/run" }
+  it { expect(klass.check_is_running_under_daemontools('httpd')).to eq "svstat $([ -d /service ] && echo /service || echo /etc/service)/httpd | grep -E 'up \\(pid [0-9]+\\)'" }
+  it { expect(klass.enable_under_daemontools('httpd', '/tmp/service/httpd')).to eq 'ln -snf /tmp/service/httpd $([ -d /service ] && echo /service || echo /etc/service)/httpd' }
+  it { expect(klass.disable_under_daemontools('httpd')).to eq '( cd $([ -d /service ] && echo /service || echo /etc/service)/httpd && rm -f $([ -d /service ] && echo /service || echo /etc/service)/httpd && svc -dx . log )' }
+  it { expect(klass.start_under_daemontools('httpd')).to   eq 'svc -u $([ -d /service ] && echo /service || echo /etc/service)/httpd' }
+  it { expect(klass.stop_under_daemontools('httpd')).to    eq 'svc -d $([ -d /service ] && echo /service || echo /etc/service)/httpd' }
+  it { expect(klass.restart_under_daemontools('httpd')).to eq 'svc -t $([ -d /service ] && echo /service || echo /etc/service)/httpd' }
+  it { expect(klass.reload_under_daemontools('httpd')).to  eq 'svc -h $([ -d /service ] && echo /service || echo /etc/service)/httpd' }
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.34.5
+  version: 2.34.6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -495,4 +495,3 @@ test_files:
 - spec/helper/set_spec.rb
 - spec/host_inventory/cpu_spec.rb
 - spec/spec_helper.rb
-has_rdoc: