qb 0.1.70 → 0.1.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a96dba86d6f78961f1b98a546a2c322344b2e16f
-  data.tar.gz: c1ce84a3f5d8d5864c6f0a72e30eb119188803da
+  metadata.gz: 5ee98f039ed77e7af8f0c9e7dc85f09871d64b59
+  data.tar.gz: 477881c79f14fc8d3b126e60383929e31829936d
 SHA512:
-  metadata.gz: 986b7bf9fdea777e0d32bf5c7cad71d1842917c6c98ca58423121eb3e1a076024f949ce339025a24580afd97da005faa11b7646ffc6f9413d9d2537b8dfba8c9
-  data.tar.gz: 2e378c83dc28305371a331d889302a93206920422907fea50e067d1a2d813af67a1d7c277bfefe222a5e90865435c83111321549f15f02b127c1034e3d26aac3
+  metadata.gz: 8bf2d7c0430cc0a1b4d49275ba5a35725aef97bad9403dded8774fe94d33ca1c47d57c02279f4cbca306550f042867e1e215ce2f48fcca79186788f3a1feaa66
+  data.tar.gz: fc53d954a26b30dba0cbebcec50fe1ed0f7c2c9782f57b45d3e37be6c3049bfa842f15f752287e6aa134a2c3241f0d20a1bc47912bf2c3bcab9b761d72d2294b

data/lib/qb/ansible_module.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'pp'
 
 module QB
   class AnsibleModule
@@ -35,23 +36,30 @@ module QB
       @qb_stdio_err = nil
       @qb_stdio_in = nil
       
+      debug "HERE!"
+      debug ENV
+      
       # if QB_STDIO_ env vars are set send stdout and stderr
       # to those sockets to print in the parent process
       
-      if ENV['QB_STDIO_OUT']
-        @qb_stdio_out = $stdout = UNIXSocket.new ENV['QB_STDIO_OUT']
-      end
-      
       if ENV['QB_STDIO_ERR']
         @qb_stdio_err = $stderr = UNIXSocket.new ENV['QB_STDIO_ERR']
+        
+        debug "Connected to QB stderr stream at #{ ENV['QB_STDIO_ERR'] } #{ @qb_stdio_err.path }."
+      end
+      
+      if ENV['QB_STDIO_OUT']
+        @qb_stdio_out = $stdout = UNIXSocket.new ENV['QB_STDIO_OUT']
+        
+        debug "Connected to QB stdout stream at #{ ENV['QB_STDIO_OUT'] }."
       end
       
       if ENV['QB_STDIO_IN']
         @qb_stdio_in = UNIXSocket.new ENV['QB_STDIO_IN']
+        
+        debug "Connected to QB stdin stream at #{ ENV['QB_STDIO_IN'] }."
       end
       
-      debug "HERE!"
-      
       @@arg_types.each {|key, type|
         var_name = "@#{ key.to_s }"
         
@@ -97,6 +105,20 @@ module QB
       # print JSON response to process' actual STDOUT (instead of $stdout,
       # which may be pointing to the qb parent process)
       STDOUT.print JSON.dump(self.class.stringify_keys(hash))
+      
+      [
+        [:stdin, @qb_stdio_in],
+        [:stdout, @qb_stdio_out],
+        [:stderr, @qb_stdio_err],
+      ].each do |name, socket|
+        if socket
+          debug "Flushing socket #{ name }."
+          socket.flush
+          debug "Closing #{ name } socket at #{ socket.path.to_s }."
+          socket.close
+        end
+      end
+      
       exit 0
     end
     

data/lib/qb/util/stdio.rb

@@ -51,9 +51,12 @@ module QB::Util::STDIO
         debug "thread started."
         
         @server = UNIXServer.new @path.to_s
-        @socket = @server.accept
         
-        work_in_thread
+        while true do
+          @socket = @server.accept
+          
+          work_in_thread
+        end
       end
       
       # set the env key so children can find the socket path
@@ -91,6 +94,7 @@ module QB::Util::STDIO
     
     def work_in_thread
       while (line = @socket.gets) do
+        debug "#{ @name } received: #{ line.inspect }"
         @dest.puts line
       end
     end

data/lib/qb/version.rb

@@ -4,7 +4,7 @@ module QB
   
   GEM_NAME = 'qb'
   
-  VERSION = "0.1.70"
+  VERSION = "0.1.71"
   
   MIN_ANSIBLE_VERSION = Gem::Version.new '2.1.2'
   

data/library/path_facts

@@ -64,7 +64,7 @@ class PathFacts < QB::AnsibleModule
     dir = @path.expand_path.ascend.find {|p| p.directory? }
     
     Dir.chdir(dir) do
-      root_result = Cmds.new "git rev-parse --show-toplevel"
+      root_result = Cmds.capture "git rev-parse --show-toplevel"
       
       unless root_result.ok?
         @result.in_git_repo = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.71
 platform: ruby
 authors:
 - nrser