lxd-common 0.9.8 → 0.9.9

data/lib/nexussw/lxd/transport/mixins/helpers/execute.rb

@@ -1,4 +1,4 @@
-require 'nexussw/lxd/rest_api/errors'
+require "nexussw/lxd/rest_api/errors"
 
 module NexusSW
   module LXD
@@ -42,7 +42,7 @@ module NexusSW
               options ||= {}
               return execute_chunked(command, options) if options[:capture] == false && !block_given?
 
-              capture_options = { stdout: '', stderr: '' }
+              capture_options = { stdout: "", stderr: "" }
               capture_options[:capture] = block if block_given?
               capture_options[:capture] ||= options[:capture] if options[:capture].respond_to? :call
               # capture_options[:capture] ||= options[:stream] if options[:stream].respond_to? :call

data/lib/nexussw/lxd/transport/mixins/helpers/folder_txfr.rb

@@ -1,5 +1,5 @@
-require 'zlib'
-require 'archive/tar/minitar'
+require "zlib"
+require "archive/tar/minitar"
 
 module NexusSW
   module LXD
@@ -17,8 +17,8 @@ module NexusSW
 
             def upload_files_individually(local_path, path)
               dest = File.join(path, File.basename(local_path))
-              execute('mkdir -p ' + dest).error! # for parity with tarball extract
-              Dir.entries(local_path).map { |f| (f == '.' || f == '..') ? nil : File.join(local_path, f) }.compact.each do |f|
+              execute("mkdir -p " + dest).error! # for parity with tarball extract
+              Dir.entries(local_path).map { |f| (f == "." || f == "..") ? nil : File.join(local_path, f) }.compact.each do |f|
                 upload_files_individually f, dest if File.directory? f
                 upload_file f, File.join(dest, File.basename(f)) if File.file? f
               end
@@ -44,13 +44,13 @@ module NexusSW
 
               return false unless can_archive?
               tfile = Transport.remote_tempname(container_name)
-              tarball_name = File.join Transport.local_tempdir, File.basename(tfile) + '.tgz'
+              tarball_name = File.join Transport.local_tempdir, File.basename(tfile) + ".tgz"
               execute("tar -czf #{tfile} -C #{File.dirname path} #{File.basename path}").error!
 
               download_file tfile, tarball_name
 
-              Archive::Tar::Minitar.unpack Zlib::GzipReader.new(File.open(tarball_name, 'rb')), local_path
-              return true
+              Archive::Tar::Minitar.unpack Zlib::GzipReader.new(File.open(tarball_name, "rb")), local_path
+              true
             ensure
               if tarball_name
                 File.delete tarball_name if File.exist? tarball_name
@@ -65,11 +65,11 @@ module NexusSW
                 tfile.close
                 Transport.chdir_mutex.synchronize do
                   Dir.chdir File.dirname(local_path) do
-                    Archive::Tar::Minitar.pack File.basename(local_path), Zlib::GzipWriter.new(File.open(tfile.path, 'wb'))
+                    Archive::Tar::Minitar.pack File.basename(local_path), Zlib::GzipWriter.new(File.open(tfile.path, "wb"))
                   end
                 end
                 # `tar -c#{flag}f #{tfile.path} -C #{File.dirname local_path} ./#{File.basename local_path}`
-                fname = '/tmp/' + File.basename(tfile.path) + '.tgz'
+                fname = "/tmp/" + File.basename(tfile.path) + ".tgz"
                 upload_file tfile.path, fname
 
                 execute("bash -c 'mkdir -p #{path} && cd #{path} && tar -xf #{fname} && rm -rf #{fname}'").error!

data/lib/nexussw/lxd/transport/mixins/helpers/users.rb

@@ -1,4 +1,4 @@
-require 'shellwords'
+require "shellwords"
 
 module NexusSW
   module LXD
@@ -8,7 +8,7 @@ module NexusSW
           module UsersMixin
             def user(user_nameorid, options = {})
               return unless user_nameorid
-              passwd = read_file options[:passwd_file] || '/etc/passwd'
+              passwd = read_file options[:passwd_file] || "/etc/passwd"
 
               # rework into .split(':') if this gets more complicated
               @uid = user_nameorid.is_a?(String) ? passwd[/^#{user_nameorid}:[^:]*:([^:]*):/, 1] : user_nameorid
@@ -33,7 +33,7 @@ module NexusSW
               uname = options[:runas] || username
               return command unless uname
               command = command.shelljoin if command.is_a? Array
-              ['su', uname, '-c', command]
+              ["su", uname, "-c", command]
             end
           end
         end

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

@@ -1,6 +1,6 @@
-require 'nexussw/lxd/transport/mixins/helpers/execute'
-require 'open3'
-require 'nio/websocket'
+require "nexussw/lxd/transport/mixins/helpers/execute"
+require "open3"
+require "nio/websocket"
 
 module NexusSW
   module LXD
@@ -58,7 +58,7 @@ module NexusSW
           end
 
           def write_file(path, content)
-            File.open path, 'w' do |f|
+            File.open path, "w" do |f|
               f.write content
             end
           end
@@ -70,27 +70,31 @@ module NexusSW
           def read(monitor)
             monitor.io.read_nonblock(16384)
           rescue IO::WaitReadable # rubocop:disable Lint/ShadowedException
-            return nil
+            nil
           rescue Errno::ECONNRESET, EOFError, IOError
             monitor.close
-            return nil
+            nil
           end
 
           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
+            if stdout
+              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
+            if stderr
+              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
       end

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

@@ -1,10 +1,10 @@
-require 'nexussw/lxd/transport/mixins/helpers/execute'
-require 'nexussw/lxd/transport/mixins/helpers/users'
-require 'nexussw/lxd/transport/mixins/helpers/folder_txfr'
-require 'nio/websocket'
-require 'tempfile'
-require 'json'
-require 'shellwords'
+require "nexussw/lxd/transport/mixins/helpers/execute"
+require "nexussw/lxd/transport/mixins/helpers/users"
+require "nexussw/lxd/transport/mixins/helpers/folder_txfr"
+require "nio/websocket"
+require "tempfile"
+require "json"
+require "shellwords"
 
 module NexusSW
   module LXD
@@ -17,7 +17,7 @@ module NexusSW
             @rest_endpoint = config[:rest_endpoint]
             @driver_options = config[:driver_options]
             @api = config[:connection]
-            raise 'The rest transport requires the following keys: { :connection, :driver_options, :rest_endpoint }' unless @rest_endpoint && @api && @driver_options
+            raise "The rest transport requires the following keys: { :connection, :driver_options, :rest_endpoint }" unless @rest_endpoint && @api && @driver_options
           end
 
           attr_reader :api, :rest_endpoint, :container_name, :config
@@ -54,10 +54,10 @@ module NexusSW
             def self.read(monitor)
               monitor.io.read_nonblock(16384)
             rescue IO::WaitReadable # rubocop:disable Lint/ShadowedException
-              return nil
+              nil
             rescue Errno::ECONNRESET, EOFError, IOError
               monitor.close
-              return nil
+              nil
             end
           end
 
@@ -66,26 +66,28 @@ module NexusSW
             backchannel = nil
             getlogs = false
             command = runas_command(command, options)
-            if block_given? && (options[:capture] || !config[:info][:api_extensions].include?('container_exec_recording'))
-              apiopts = { :'wait-for-websocket' => true, interactive: false, sync: false }
+            if block_given? && (options[:capture] || !config[:info][:api_extensions].include?("container_exec_recording"))
+              apiopts = { 'wait-for-websocket': true, interactive: false, sync: false }
               apiopts[:interactive] = true if options[:capture] == :interactive
               retval = api.execute_command(container_name, command, apiopts)[:metadata]
               opid = retval[:id]
               backchannel = options[:capture] == :interactive ? ws_connect(opid, retval[:metadata][:fds]) : ws_connect(opid, retval[:metadata][:fds], &block)
 
               # patch for interactive session
-              return Helpers::ExecuteMixin::InteractiveResult.new(command, options, StdinStub.pipe(backchannel.waitlist[:'0']), backchannel).tap do |active|
-                backchannel.callback = proc do |stdout|
-                  active.send_output stdout
+              if options[:capture] == :interactive
+                return Helpers::ExecuteMixin::InteractiveResult.new(command, options, StdinStub.pipe(backchannel.waitlist[:'0']), backchannel).tap do |active|
+                  backchannel.callback = proc do |stdout|
+                    active.send_output stdout
+                  end
+                  yield active
+                  backchannel.exit if backchannel.respond_to? :exit
+                  retval = api.wait_for_operation opid
+                  active.exitstatus = retval[:metadata][:return].to_i
                 end
-                yield active
-                backchannel.exit if backchannel.respond_to? :exit
-                retval = api.wait_for_operation opid
-                active.exitstatus = retval[:metadata][:return].to_i
-              end if options[:capture] == :interactive
-            elsif block_given? && config[:info][:api_extensions].include?('container_exec_recording')
+              end
+            elsif block_given? && config[:info][:api_extensions].include?("container_exec_recording")
               getlogs = true
-              retval = api.execute_command(container_name, command, :'record-output' => true, interactive: false, sync: false)
+              retval = api.execute_command(container_name, command, 'record-output': true, interactive: false, sync: false)
               opid = retval[:metadata][:id]
             else
               opid = api.execute_command(container_name, command, sync: false)[:metadata][:id]
@@ -96,8 +98,8 @@ module NexusSW
                 backchannel.join if backchannel.respond_to? :join
                 if getlogs
                   begin
-                    stdout_log = retval[:metadata][:output][:'1'].split('/').last
-                    stderr_log = retval[:metadata][:output][:'2'].split('/').last
+                    stdout_log = retval[:metadata][:output][:'1'].split("/").last
+                    stderr_log = retval[:metadata][:output][:'2'].split("/").last
                     stdout = api.log container_name, stdout_log
                     stderr = api.log container_name, stderr_log
                     yield stdout, stderr
@@ -144,28 +146,34 @@ module NexusSW
               waitlist[:control] = NIO::WebSocket.connect(baseurl + endpoints[:control], ws_options) do |driver|
                 driver.on :io_error do # usually I get an EOF
                   @closed = true
-                  waitlist.each { |_, v| v.close if v.respond_to? :close }
+                  # waitlist.each { |_, v| v.close if v.respond_to? :close }
+                  waitlist[:'0'].close
                 end
                 driver.on :close do # but on occasion I get a legit close
                   @closed = true
-                  waitlist.each { |_, v| v.close if v.respond_to? :close }
+                  # waitlist.each { |_, v| v.close if v.respond_to? :close }
+                  waitlist[:'0'].close
                 end
               end
-              waitlist[:'2'] = NIO::WebSocket.connect(baseurl + endpoints[:'2'], ws_options) do |driver|
-                driver.on :message do |ev|
-                  data = ev.data.is_a?(String) ? ev.data : ev.data.pack('U*')
-                  callback.call nil, data
+              if endpoints[:'2']
+                waitlist[:'2'] = NIO::WebSocket.connect(baseurl + endpoints[:'2'], ws_options) do |driver|
+                  driver.on :message do |ev|
+                    data = ev.data.is_a?(String) ? ev.data : ev.data.pack("U*")
+                    callback.call nil, data
+                  end
                 end
-              end if endpoints[:'2']
-              waitlist[:'1'] = NIO::WebSocket.connect(baseurl + endpoints[:'1'], ws_options) do |driver|
-                driver.on :message do |ev|
-                  data = ev.data.is_a?(String) ? ev.data : ev.data.pack('U*')
-                  callback.call data
+              end
+              if endpoints[:'1']
+                waitlist[:'1'] = NIO::WebSocket.connect(baseurl + endpoints[:'1'], ws_options) do |driver|
+                  driver.on :message do |ev|
+                    data = ev.data.is_a?(String) ? ev.data : ev.data.pack("U*")
+                    callback.call data
+                  end
                 end
-              end if endpoints[:'1']
+              end
               waitlist[:'0'] = NIO::WebSocket.connect(baseurl + endpoints[:'0'], ws_options) do |driver|
                 driver.on :message do |ev|
-                  data = ev.data.is_a?(String) ? ev.data : ev.data.pack('U*')
+                  data = ev.data.is_a?(String) ? ev.data : ev.data.pack("U*")
                   callback.call data
                 end
               end
@@ -198,21 +206,21 @@ module NexusSW
             end
 
             def window_resize(width, height)
-              send_control_msg 'window-resize', width: width.to_s, height: height.to_s
+              send_control_msg "window-resize", width: width.to_s, height: height.to_s
             end
 
             def signal(signum)
-              send_control_msg 'signal', signum
+              send_control_msg "signal", signum
             end
 
             private
 
             def send_control_msg(message, val)
               msg = {}.tap do |retval|
-                retval['command'] = message
+                retval["command"] = message
                 case message
-                when 'window-resize' then retval['args'] = val
-                when 'signal' then retval['signal'] = val.to_i
+                when "window-resize" then retval["args"] = val
+                when "signal" then retval["signal"] = val.to_i
                 end
               end.to_json
 
@@ -226,7 +234,7 @@ module NexusSW
             ws_options = { ssl_context: { verify_mode: verify_ssl } } unless verify_ssl.nil?
             ws_options ||= {}
             baseurl = rest_endpoint.sub(%r{^http([s]?://)}, 'ws\1')
-            baseurl += '/' unless baseurl.end_with? '/'
+            baseurl += "/" unless baseurl.end_with? "/"
             baseurl += "1.0/operations/#{opid}/websocket?secret="
 
             WSController.new ws_options, baseurl, endpoints, &block

data/lib/nexussw/lxd/transport/rest.rb

@@ -1,5 +1,5 @@
-require 'nexussw/lxd/transport'
-require 'nexussw/lxd/transport/mixins/rest'
+require "nexussw/lxd/transport"
+require "nexussw/lxd/transport/mixins/rest"
 
 module NexusSW
   module LXD

data/lib/nexussw/lxd/version.rb

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

data/lxd-common.gemspec

@@ -1,30 +1,30 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'nexussw/lxd/version'
+require "nexussw/lxd/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'lxd-common'
+  spec.name          = "lxd-common"
   spec.version       = NexusSW::LXD::VERSION
-  spec.authors       = ['Sean Zachariasen']
-  spec.email         = ['thewyzard@hotmail.com']
-  spec.license       = 'Apache-2.0'
-  spec.summary       = 'Shared LXD Container Access Library'
-  spec.homepage      = 'http://github.com/NexusSW/lxd-common'
+  spec.authors       = ["Sean Zachariasen"]
+  spec.email         = ["thewyzard@hotmail.com"]
+  spec.license       = "Apache-2.0"
+  spec.summary       = "Shared LXD Container Access Library"
+  spec.homepage      = "http://github.com/NexusSW/lxd-common"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday', '~> 0.13'
-  spec.add_dependency 'nio4r-websocket', '~> 0.6'
-  spec.add_dependency 'minitar', '~> 0.5'
+  spec.add_dependency "faraday", "~> 0.12"
+  spec.add_dependency "nio4r-websocket", "~> 0.6"
+  spec.add_dependency "minitar", "~> 0.6"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lxd-common
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Sean Zachariasen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: nio4r-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -167,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Shared LXD Container Access Library