wait_for_it 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0f834a28065f71917777d4683074b39c94a23da
-  data.tar.gz: 6d9c2443ce1c46e603da9d8e7a34bbaea979a06a
+  metadata.gz: 1aa914a00bde5498f75359ef60be2a0fd753e02a
+  data.tar.gz: 3caea633a9fb12579741134d22f6480befc590a2
 SHA512:
-  metadata.gz: abfdd59d18cb4747bb284c5edd0342fc59ccdb623ab61d6bc0920e1259adfa5ba86bf7324848836170f3f27bfc729dfe2648daa2b82d054cb17483aeedf96ee7
-  data.tar.gz: 5d8f53f05f3ff7f186089c3260c29445bfc012cace2195cc3566092c85ba2e34915d9d58f1c826983847fc41769870aca7c216a4cf4a1c69150313adee77bd6f
+  metadata.gz: 060c24f2de3a404f149e9b8427e09c4258d8af54f35d5031fe073c2e56967432401c2d2319d28e10f8f6226868e9f10d469734fa291181713a953dc70eda7c60
+  data.tar.gz: 65e0e622acbab6de54cc33a460ec538043b8b2f240142eaa7cdf0b4e8da9d0abaac58c5cc78e1ba01588679b408af1a1a0d0100b4430a04e9c13c34cd8dfe39c

data/lib/wait_for_it.rb

@@ -94,6 +94,10 @@ class WaitForIt
         cleanup
       end
     end
+
+  rescue WaitForItTimeoutError => e
+    cleanup
+    raise e
   end
 
   attr_reader :timeout, :log
@@ -140,11 +144,23 @@ class WaitForIt
   # Kills the process and removes temporary files
   def cleanup
     shutdown
-    @tmp_file.close
-    @log.unlink
+    close_log
+    unlink_log
   end
 
 private
+
+  def close_log
+    @tmp_file.close if @tmp_file
+  end
+
+  def unlink_log
+    @log.unlink if @log
+  rescue Errno::ENOENT
+    # File already unlinked
+  end
+
+
   def set_log
     @tmp_file  = Tempfile.new(["wait_for_it", ".log"])
     log_file   = Pathname.new(@tmp_file)
@@ -153,9 +169,11 @@ private
   end
 
   def spawn(command, redirection, env_hash = {})
-    env     = env_hash.map {|key, value| "#{ key.to_s.shellescape }=#{ value.to_s.shellescape }" }.join(" ")
-    command = "/usr/bin/env #{ env } bash -c #{ command.shellescape } #{ redirection } #{ log }"
-    @pid = Process.spawn("#{ command }")
+    env = {}
+    env_hash.each {|k, v| env[k.to_s] = v.to_s }
+
+    # Must exec so when we kill the PID it kills the child process
+    @pid = Process.spawn(env, "exec #{ command } #{ redirection } #{ log }")
   end
 
   def convert_to_regex(input)

data/lib/wait_for_it/version.rb

@@ -1,3 +1,3 @@
 class WaitForIt
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wait_for_it
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - schneems