svcdeps_tasks 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389eec8a9b2950defc3f874df209d27791a0a429
-  data.tar.gz: '09f8bc57702f78fc4c8a42ed085068062c4648bc'
+  metadata.gz: 189a17aee33cca4ac7d2a52861f80587818d1620
+  data.tar.gz: cb3474712b034c272dd5f335cd9f84eeefdaa0b2
 SHA512:
-  metadata.gz: fd9929599470f5b0d1f11edb2e42da7a4590e7941e79d7372995d137d76881d782fdd435a1556c8f34a166a34d831de065b65e2ede2a57ef9d43d196254b8149
-  data.tar.gz: 401e7c1d0d10085407af16bdf13b6914e83c3aa2689c00a3300d9c324f97ef340ea41979a4a814d2d1c700c2430d0c0f62b53638b0ba17a47bd4197c2acca33a
+  metadata.gz: 986c58d3346e894254b56b08392ea2684b714b718f5cdfa87db36127ff55ce85a7092f28d9ef905d09b86766bdd8930849c18940b39aba5a7781122af6a5a473
+  data.tar.gz: b3911923d3ae6c5e67eaac0a2ae5cb7673da1f2ba3ccc56a50236d4a3b24957ad26a61f2c01886cfdce11250e756bca0cede3cdc1989feb827658b04f820aa57

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    svcdeps_tasks (0.1.5)
+    svcdeps_tasks (0.1.6)
       deep_merge (~> 1.2)
       rspec (~> 3.7)
 

data/lib/probe.rb

@@ -40,8 +40,8 @@ class Probe
       run_as = nil unless Process.uid.zero? 
     end 
 
-    Timeout::timeout(@timeout) do 
-      user = Etc.getpwnam(run_as)
+    Timeout::timeout(@timeout) do
+      user = Etc.getpwnam(run_as) if run_as
       pid = Process.fork do
         STDOUT.reopen('/dev/null')
         STDERR.reopen('/dev/null')
@@ -100,16 +100,26 @@ class Probe
     end
   end
 
+  def error_wrapper(&block) 
+    begin 
+      instance_eval(&block) if block_given?
+      raise 'block should be passed to error_wrapper' unless block_given?
+    rescue => e 
+      return "#{e.class} => #{e.message}"
+    end
+    "SUCCESS"
+  end
+
   def run 
     case @type 
       when 'tcp'
-        tcp_probe 
+        error_wrapper { tcp_probe }
       when 'udp'
-        udp_probe
+        error_wrapper { udp_probe }
       when 'command'
-        command_probe
+        error_wrapper { command_probe }
       when 'http'
-        http_probe
+        error_wrapper { http_probe }
       else 
         raise "Type '#{@type}' not supported"
     end

data/lib/specfile.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+
 set :backend, :exec
 
 dir = File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
@@ -30,7 +31,7 @@ describe 'Service Dependencies' do
     dep = symbolize_keys(dep)
     it "#{dep[:desc]}" do 
       p = Probe.new( dep ) 
-      expect { p.run }.to_not raise_error
+      expect(p.run)  == 'SUCCESS'
     end
   end if deps['deps']
 end

data/lib/svcdeps_tasks/version.rb

@@ -1,3 +1,3 @@
 module SvcdepsTasks
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svcdeps_tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tiago Lopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec