lxd-common 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 207168d0b580adc1cbba2bfb17dc584e062fca8bf6d761d1cbf740280a3bcc32
-  data.tar.gz: f42c295d6c2160db9f5a86bff3c124cca335036366d5c9e94e5a21e862beb323
+  metadata.gz: afe4071adead96b866c51c5bd13c52c9bad4723a81e7f3742485d5b827e63362
+  data.tar.gz: bb3c0d1b883bb758d0167cd035c0af204c388777798c6c8c08ccc41d7472f532
 SHA512:
-  metadata.gz: 118d3c3463d6db8c3546957b2d7e023e1280533fea23a5f3892bba8d101c2ce7ffa9d18c920d95c3b2b9036e4e9e7b3efd06783d314f92d54c4a1329ae4c4403
-  data.tar.gz: 66f906f901831fcf66cee1de6eb97c6035395dae65662cf54b4b282a3365bf0a43fd5671f0c1aaff234c4ecd135dafed3558062b5c958f5ee2dde0b21a8ccd04
+  metadata.gz: 86522829ce42054bd4f9e49009e7adaf42e45b41e5796c2fdff81904a55220deea19da22ebb5de4e8775a1ee31e9ca37ff4bd12c8a7b5c99fbca4520fcdab131
+  data.tar.gz: 9f1795bac5731f609e9fa670885736f7f1dc8fa3a0824f47447c45e582bccbf7e6ce10b883ffb9c4f99dcfa50cdd3b70a45fe59d2820709bd595735f007da490

data/lib/nexussw/lxd/driver/mixins/helpers/wait.rb

@@ -21,6 +21,8 @@ module NexusSW
                 loop do
                   retval = nil
                   case what
+                  when :cloud_init
+                    retval = !transport_for(container_name).execute('test -f /run/cloud-init/result.json').error?
                   when :ip
                     retval = check_for_ip(self, container_name)
                   else

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

@@ -76,10 +76,10 @@ module NexusSW
             inner_transport.execute("rm -rf #{tfile}", capture: false) if tfile
           end
 
-          def upload_folder(local_path, path, options = {})
+          def upload_folder(local_path, path)
             return super unless config[:info] && config[:info]['api_extensions'] && config[:info]['api_extensions'].include?('directory_manipulation')
 
-            execute("-r #{local_path} #{container_name}#{path}", subcommand: "file push", capture: false).error!
+            execute("-r #{local_path} #{container_name}#{path}", subcommand: 'file push', capture: false).error!
           end
 
           def download_folder(path, local_path, options = {})

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

@@ -7,20 +7,20 @@ module NexusSW
       module Mixins
         module Helpers
           module FolderTxfr
-            def upload_folder(local_path, path, options = {})
-              upload_using_tarball(local_path, path, options) || upload_files_individually(local_path, path, options)
+            def upload_folder(local_path, path)
+              upload_using_tarball(local_path, path) || upload_files_individually(local_path, path)
             end
 
             def download_folder(path, local_path, options = {})
               download_using_tarball(path, local_path, options) || download_files_individually(path, local_path)
             end
 
-            def upload_files_individually(local_path, path, options = {})
+            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|
-                upload_files_individually f, dest, options if File.directory? f
-                upload_file f, File.join(dest, File.basename(f)), options if File.file? f
+                upload_files_individually f, dest if File.directory? f
+                upload_file f, File.join(dest, File.basename(f)) if File.file? f
               end
             end
 
@@ -58,7 +58,7 @@ module NexusSW
               end
             end
 
-            def upload_using_tarball(local_path, path, options = {})
+            def upload_using_tarball(local_path, path)
               return false unless can_archive?
               begin
                 tfile = Tempfile.new(container_name)
@@ -70,7 +70,7 @@ module NexusSW
                 end
                 # `tar -c#{flag}f #{tfile.path} -C #{File.dirname local_path} ./#{File.basename local_path}`
                 fname = '/tmp/' + File.basename(tfile.path) + '.tgz'
-                upload_file tfile.path, fname, options
+                upload_file tfile.path, fname
 
                 execute("bash -c 'mkdir -p #{path} && cd #{path} && tar -xf #{fname} && rm -rf #{fname}'").error!
               ensure

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

@@ -7,11 +7,13 @@ module NexusSW
         module Helpers
           module UsersMixin
             def user(user_nameorid, options = {})
+              return unless user_nameorid
               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
               @username = user_nameorid.is_a?(String) ? user_nameorid : passwd[/^([^:]*):[^:]*:#{user_nameorid}:/, 1]
+              raise "User not found (#{user_nameorid}) while attempting to set transport identity" unless @uid && @username
 
               # gotcha: we're always setting the default group here, but it's changeable by the user, afterwards
               # so if `user` gets called again, and the caller wants an alternative gid, the caller will need to re-set the gid

data/lib/nexussw/lxd/version.rb

@@ -1,5 +1,5 @@
 module NexusSW
   module LXD
-    VERSION = '0.9.5'.freeze
+    VERSION = '0.9.6'.freeze
   end
 end

metadata

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