hookit 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be8d878c31cfb5843f20a99980f9f2fa7491c6b6
-  data.tar.gz: ce6373de03a2d8276e0b2409b080752d769dd08d
+  metadata.gz: 8ef6a1d03fe66b7dc858921b2c6f9b38c46dab67
+  data.tar.gz: 11ab5f5d41b157edbd05903ee92714bee86fae0a
 SHA512:
-  metadata.gz: 6bd3cd48a338e2c33b8dec7e3a8bc111ad48cc971bccef2b4e685391e1bbd9f53e6d7959dcc2951065a88e72f9fac1f551ae6d10aec1f65dc5884f974b6d190e
-  data.tar.gz: 9fdb4ddb415236a49171454b59eb9354bdf50579429c491112c3b3cebba0fc22614ab26285491926e179d72146f63ee85ffe69b8312807cf132db3b84647e156
+  metadata.gz: 695084242a78005016c86fbf9e26903e631bb2c1f6fe2a1094eac62a75a1f26cc077fc2f3a667ba3a048bfccc97c0b806d541f4091608c644acbaba2260c11bc
+  data.tar.gz: 177d445bc16ad1ec7fef87be550b105259a47f5b890f9923fac8e409ec56fece6a14e42f29356161716dc54e6dbff756550023ebb66477bc17d0045b2f9d960e

data/lib/hookit/platform.rb

@@ -1,5 +1,5 @@
 require 'hookit/platform/base'
-require 'hookit/plaftorm/docker'
+require 'hookit/platform/docker'
 require 'hookit/platform/smartos'
 require 'hookit/platform/ubuntu'
 

data/lib/hookit/resource/execute.rb

@@ -1,4 +1,5 @@
 require 'timeout'
+require 'open3'
 
 module Hookit
   module Resource
@@ -13,6 +14,8 @@ module Hookit
       field :timeout
       field :stream
       field :on_data
+      field :on_stdout
+      field :on_stderr
       field :on_exit
       field :validator
       field :ignore_exit
@@ -66,31 +69,55 @@ module Hookit
       end
 
       def stream!
+        exit_status = 0
         result = ""
 
         STDOUT.sync = STDERR.sync = true # don't buffer stdout/stderr
 
-        ::IO.popen(cmd, :err=>[:child, :out]) do |out|
-          eof = false
-          until eof do
-            begin
-              chunk = out.readpartial(4096)
-              if on_data and on_data.respond_to? :call
-                on_data.call(chunk)
+        Open3.popen3 cmd do |stdin, stdout, stderr, wait_thr|
+          stdout_eof = false
+          stderr_eof = false
+
+          until stdout_eof and stderr_eof do
+            (ready_pipes, dummy, dummy) = IO.select([stdout, stderr])
+            ready_pipes.each_with_index do |socket|
+              if socket == stdout
+                begin
+                  chunk = socket.readpartial(4096)
+                  if on_data and on_data.respond_to? :call
+                    on_data.call(chunk)
+                  end
+                  if on_stdout and on_stdout.respond_to? :call
+                    on_stdout.call(chunk)
+                  end
+                rescue EOFError
+                  stdout_eof = true
+                end
+                result << chunk.to_s
+              elsif socket == stderr
+                begin
+                  chunk = socket.readpartial(4096)
+                  if on_data and on_data.respond_to? :call
+                    on_data.call(chunk)
+                  end
+                  if on_stderr and on_stderr.respond_to? :call
+                    on_stderr.call(chunk)
+                  end
+                rescue EOFError
+                  stderr_eof = true
+                end
+                result << chunk.to_s
               end
-            rescue EOFError
-              eof = true
             end
-            result << chunk.to_s
           end
-        end
 
-        code = $?.exitstatus
+          exit_status = wait_thr.value.to_s.match(/exit (\d+)/)[1].to_i
+        end
 
         if on_exit and on_exit.respond_to? :call
-          on_exit.call(code)
+          on_exit.call(exit_status)
         else
-          unexpected_exit(code) unless code == returns
+          unexpected_exit(exit_status) unless exit_status == returns
         end
 
         validate! result

data/lib/hookit/resource/service.rb

@@ -49,11 +49,6 @@ module Hookit
         when :smf
           run_command! "svcadm enable -s #{"-r" if recursive} #{service_name}"
         when :runit
-          # fail fast if we don't have an runit run configuration
-          if not File.exist?("/etc/service/#{service_name}/run")
-            raise Hookit::Error::MissingConfiguration "Expecting service configuration file at: /etc/service/#{service_name}/run"
-          end
-
           # register and potentially start the service
           run_command! "sv start #{service_name}", false
 
@@ -119,4 +114,4 @@ module Hookit
 
     end
   end
-end
+end

data/lib/hookit/resource/socket.rb

@@ -17,11 +17,11 @@ module Hookit
 
         case platform.os
         when 'sun'
-          @active_com=`netstat -an | egrep '\*\.#{port}' | grep LISTEN`
-          @inactive_com=`netstat -an | grep 'ESTABLISHED' | awk '{ print $1 }' | grep "$(ifconfig #{interface} | grep inet | awk '{ print $2 }')\.#{port}"`
+          @active_com   = "netstat -an | egrep '\*\.#{port}' | grep LISTEN"
+          @inactive_com = "netstat -an | grep 'ESTABLISHED' | awk '{ print $1 }' | grep \"$(ifconfig #{interface} | grep inet | awk '{ print $2 }')\.#{port}\""
         else
-          @active_com=`netstat -an | egrep ':#{port}' | grep LISTEN`
-          @inactive_com=`netstat -an | grep 'ESTABLISHED' | awk '{ print $4 }' | grep "$(ifconfig #{interface} | awk '/inet addr/ { print $2}' | cut -f2 -d':' | tr -d '\n'):#{port}"`
+          @active_com   = "netstat -an | egrep ':#{port}' | grep LISTEN"
+          @inactive_com = "netstat -an | grep 'ESTABLISHED' | awk '{ print $4 }' | grep \"$(ifconfig #{interface} | awk '/inet addr/ { print $2}' | cut -f2 -d':' | tr -d '\n'):#{port}\""
         end
       end
 

data/lib/hookit/version.rb

@@ -1,3 +1,3 @@
 module Hookit
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hookit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Tyler Flint
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt