kitchen-lxd_sling 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea89cf9dc3306dadfda25d5501485df92a9715a9781927a6c2eb1c17e5e5516
-  data.tar.gz: d2769558a5223ad8a5083054cadbdb0e203a8e7bc854a81e6dc2c3c14a4683f1
+  metadata.gz: 2092e1ad91f7772e18e432a0003511e51e2e453dbe5d29eea414d3f022a4b63e
+  data.tar.gz: 20194530a2e8ca27a4fee5be42db55ebb92602f301d3f7376b06a733134657f3
 SHA512:
-  metadata.gz: 9fa05e50bbe43ba85b55be5bbdd522345a6ec362bbce6a293d8c3a81e3a0df28a9cc292e8a26ff7f48754d203b4b7800fdac5b3e4f8089b93ffc78681c6af374
-  data.tar.gz: 8e876f78e83895efeade4ce7d2ef7cc78fdc7bffd6ceb8a6849fbd00dad037bb4562301b7867bb52fd0d80be488b1f25b0299e896582812feb4d29777f16500c
+  metadata.gz: fc130261a4f70af5d873eb7da7f15b7080cd73be947d5cb519db1d2d3d4c761a9aff8f771d93c6ca5e7ad185c41392e70dc5406d7f3d0e5c59b227574820e30c
+  data.tar.gz: 91cde3d57650a1d328b71eca65d623feb3d9ef0edf5d5a9acbc3c43d12fee35eb05b1ac938b13bab77c9ebd4a5d217933b6985a85eac2278a220dea8a126d42a

data/bin/lxc-shell

@@ -16,6 +16,8 @@ require 'kitchen'
 require 'kitchen/driver/lxd/host_locator'
 require 'tty/reader'
 require 'tty/screen'
+require 'io/wait'
+require 'io/console'
 
 class NxHost
   include Kitchen::Driver::Lxd::HostLocator
@@ -27,18 +29,15 @@ end
 
 driver = NxHost.new state[:config]
 transport = driver.nx_transport state
-tty = TTY::Reader.new
+tty = TTY::Reader.new interrupt: :signal
 win_keymap = {}
 if Gem.win_platform?
   win_keymap = TTY::Reader::Keys.keys.invert
   win_keymap[:clear] = win_keymap[:delete]
 end
 
-# ruby bin/lxc-shell .kitchen/kitchen-lxd-cloud-ubuntu-1604.yml
+# ruby bin/lxc-shell .kitchen/kitchen-lxd-native-ubuntu-1604.yml
 
-# TODO: (someday - if found useful) the TTY subsystem doesn't capture stdin, so you can't pipe commands to this script
-#   we'd have to interleave the code for both input types (ignoring tty if stdin is not a tty)
-#   TTY gems must stay due to them handling windows input for us
 term = ENV['TERM'] || 'dumb'
 user = transport.username
 if user
@@ -47,7 +46,9 @@ if user
 end
 transport.execute "env TERM=#{term} su#{user}", capture: :interactive do |active|
   active.capture_output do |stdout|
-    print stdout
+    $stdout.cooked do
+      print stdout
+    end
   end
   tty.on :keypress do |event|
     active.stdin.write win_keymap[event.key.name] || event.value
@@ -59,14 +60,20 @@ transport.execute "env TERM=#{term} su#{user}", capture: :interactive do |active
   # tty-reader doesn't have its own thread - it's pumped by a 'read_xxxx' call
   #   and its inner wait loop blocks VERY HARD unless you nonblock (even a main Thread.kill won't unblock it - windows issue?)
   #     yes windows issue...  test code can kill read_keypress when running on linux
-  begin
-    loop do
-      break unless active.thread.alive?
-      sleep 0.01 unless tty.read_keypress nonblock: true
+  kp_opts = { nonblock: true }
+  kp_opts = { echo: true, raw: false } unless Gem.win_platform? # counter-options designed to stop io/console calls
+  $stdin.noecho do
+    $stdin.raw do
+      begin
+        loop do
+          break unless active.thread.alive?
+          sleep 0.01 unless (Gem.win_platform? || $stdin.ready?) && tty.read_keypress(kp_opts)
+        end
+      rescue Interrupt
+        # active.thread.signal 2
+        active.stdin.write "\x3"
+        retry
+      end
     end
-  rescue Interrupt
-    # active.thread.signal 2
-    active.stdin.write "\x3"
-    retry
   end
 end.error!

data/lib/kitchen/driver/lxd/host_locator.rb

@@ -21,7 +21,7 @@ class Kitchen::Driver::Lxd < Kitchen::Driver::Base
     end
 
     def can_rest?
-      !config[:server].nil?
+      config[:server] && !config[:server].empty?
     end
 
     def host_address

data/lib/kitchen/driver/lxd_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Driver
-    LXD_VERSION = '0.4.4'.freeze
+    LXD_VERSION = '0.4.5'.freeze
   end
 end

metadata

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