lxd-common 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2791cb10e6c595bb0ea3674e9f717b64e2bde62a2ec2a6b6ea905d9976e4ff7
-  data.tar.gz: d2efd3d5654b988f06d69ec240d7cc004fe41e39a9b8148ddf24a9006ecdaa34
+  metadata.gz: 0990d505df86f297bad664ba623f35589b27e284ecd3081bd7a480aecf0a6ef7
+  data.tar.gz: 76b72c2361a6a6b6df857b579167a26a3b409e4619544b5bc06057e0c3701792
 SHA512:
-  metadata.gz: 63425cb87c277705710101783d7b5e586e3dd016ecf1d3f54852aeadac6ed6cbaef46c5134fc848d059b36c270deeb81209099f6e872389bdd997b5373bf56c4
-  data.tar.gz: 2fb79a8652b75e22f3fd3d4be59a41441b835da4744db2d1d6a349a1185317d94451377f1dc7868d9252ff575f0fe924a6c3718fc0db6cabcd40ef1af21ca156
+  metadata.gz: 1f33b89efc507c14f794d460fc36fbd0c62d1227257c36991d3279f9a51effa5311ec67a123a3eb37fa3e64899d05cebd1585d520b30e517b67df20581cb6507
+  data.tar.gz: 57f64e9e9c90402f8e682a5ee07d0545f537cddcfab049fb68b5a36de76110f9c75a5897dd73a30920221d0628bdc1a4d755b0d0b3e72adba5f026c76b4e4565

data/lib/nexussw/lxd/transport/mixins/local.rb

@@ -18,18 +18,29 @@ module NexusSW
           def execute_chunked(command, options, &block)
             NIO::WebSocket::Reactor.start
             LXD.with_timeout_and_retries options do
-              Open3.popen3(command) do |stdin, stdout, stderr, th|
-                if options[:capture] == :interactive
-                  # return immediately if interactive so that stdin may be used
-                  return Helpers::ExecuteMixin::InteractiveResult.new(command, options, stdin, th).tap do |active|
-                    chunk_callback(stdout, stderr) do |stdout_chunk, stderr_chunk|
-                      active.send_output stdout_chunk if stdout_chunk
-                      active.send_output stderr_chunk if stderr_chunk
+              if options[:capture] == :interactive
+                if options[:tty] == false
+                  Open3.popen2e(command) do |stdin, stdout, th|
+                    # return immediately if interactive so that stdin may be used
+                    return Helpers::ExecuteMixin::InteractiveResult.new(command, options, stdin, th).tap do |active|
+                      chunk_callback(stdout) do |stdout_chunk|
+                        active.send_output stdout_chunk if stdout_chunk
+                      end
+                      yield active
+                      active.exitstatus = th.value.exitstatus
                     end
-                    yield active
-                    active.exitstatus = th.value.exitstatus
                   end
                 else
+                  status = system command
+                  status = case status
+                           when nil then -1
+                           when true then 0
+                           when false then 1
+                           end
+                  return Helpers::ExecuteMixin::ExecuteResult.new(command, options, status)
+                end
+              else
+                Open3.popen3(command) do |_stdin, stdout, stderr, th|
                   chunk_callback(stdout, stderr, &block) if block_given?
                   th.join
                   loop do
@@ -65,21 +76,21 @@ module NexusSW
             return nil
           end
 
-          def chunk_callback(stdout, stderr)
+          def chunk_callback(stdout, stderr = nil)
             NIO::WebSocket::Reactor.queue_task do
               @mon_out = NIO::WebSocket::Reactor.selector.register(stdout, :r)
               @mon_out.value = proc do
                 data = read(@mon_out) # read regardless of block_given? so that we don't spin out on :r availability
                 yield(data) if data
               end
-            end
+            end if stdout
             NIO::WebSocket::Reactor.queue_task do
               @mon_err = NIO::WebSocket::Reactor.selector.register(stderr, :r)
               @mon_err.value = proc do
                 data = read(@mon_err) # read regardless of block_given? so that we don't spin out on :r availability
                 yield(nil, data) if data
               end
-            end
+            end if stderr
           end
         end
       end

data/lib/nexussw/lxd/version.rb

@@ -1,5 +1,5 @@
 module NexusSW
   module LXD
-    VERSION = '0.9.7'.freeze
+    VERSION = '0.9.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxd-common
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Sean Zachariasen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday