kitchen-lxd 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b4b8d0c6bdd0c29cd0017f24ced51347c69e47
-  data.tar.gz: 51fc54f38b95e6dc5134c819d6fee81f8e336e5c
+  metadata.gz: 7b5f6f350edea90a709ffead687670c907a9c633
+  data.tar.gz: bf6eb5e0662a9192eaab03da7bff0e76365e0594
 SHA512:
-  metadata.gz: 45825e97e2ab9c3290a4d231099a73ebff730ab1fd3a9f0019c12cf244d7a816272b47949ec02ee16f2883f5c2fade9c29880f8211d863db996eeb86bd69889d
-  data.tar.gz: 82f62bb46aec07952acd8e5872db76fc0a03b17198421dcb42bcf2768f31b61780eb9014c4a5742b82dfc5cf73dff75988cd29465776a36a2c8e50b04aa2cfd0
+  metadata.gz: d666a0dcce090ba13431e6a52841ea8713068785d9efb85051bd785edb56401f1fc5b442e374e5a27219390f75846effd190fddcab291f8b30bc452fb17f42a3
+  data.tar.gz: c8b7037a3a11d3317c688e81f117fa8f2d8397a388e16c1faf555a0e698e2d2d5d8d007b3133642a36e557ba197655aabe79b913b9154f9f250235e25737a508

data/CHANGELOG.md

@@ -1,8 +1,12 @@
-## 0.2.1 (2017-10-13)
+## 0.2.2 (January 30, 2018)
+
+- Fix upload bug.
+
+## 0.2.1 (October 13, 2017)
 
 - Add workaround to Ubuntu hostnamectl bug in LXD (https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1575779)
 
-## 0.2.0 (2017-10-11)
+## 0.2.0 (October 11, 2017)
 
 - Add LXD transport.
 - Remove ssh transport support.
@@ -10,10 +14,10 @@
 - Allow specifying path to lxc executable.
 - Support downloading image from remote, if it's not available locally.
 
-## 0.1.1 (2017-02-08)
+## 0.1.1 (February 08, 2017)
 
 - Support Lxd version 2.8.
 
-## 0.1.0 (2017-02-07)
+## 0.1.0 (February 07, 2017)
 
 - Initial release.

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

@@ -62,11 +62,11 @@ module Kitchen
 					info 'Wait for network to become ready.'
 					9.times do
 						s = fetch_state[:state].nil? ? @state[:State] : @state[:state]
-						inet = s[:network][:eth0][:addresses].detect do |i|
+						inet = s.dig(:network, :eth0, :addresses)&.detect do |i|
 							i[:family] == 'inet'
 						end
 						return inet[:address] if inet
-						sleep 1 unless defined?( Minitest )
+						sleep 1 unless defined?( Kitchen::Driver::UnitTest )
 					end
 					nil
 				end
@@ -76,18 +76,17 @@ module Kitchen
 				end
 
 				def execute( command )
-					return if command.nil?
+					return if command.nil? or command.empty?
 					run_command "#@binary exec #@name -- #{command}"
 				end
 
 				def login_command
-					LoginCommand.new( "#@binary exec #@name -- bash", {} )
+					LoginCommand.new( "#@binary exec #@name -- sh", {} )
 				end
 
 				def upload( locals, remote )
-					locals.each do |local|
-						run_command "#@binary file push -rp #{local} #@name/#{remote}"
-					end
+					# Mixlib::ShellOut.new("#@binary file push --verbose --debug -r #{locals.join(' ')} #@name#{remote}" ).run_command
+					run_command "#@binary file push -r #{locals.join(' ')} #@name#{remote}"
 				end
 
 				def fix_chef_install( platform )
@@ -105,7 +104,7 @@ module Kitchen
 					execute 'ln -s /usr/bin/true /usr/bin/hostnamectl'
 				end
 
-				private
+#				private
 
 				def image_exists?
 					!JSON.parse(
@@ -128,7 +127,7 @@ module Kitchen
 				end
 
 				def device_attached?( network )
-					fetch_state[:devices] and @state[:devices][network.to_sym]
+					fetch_state.dig(:devices, network.to_sym) ? true : false
 				end
 			end
 		end

data/lib/kitchen/driver/version.rb

@@ -20,7 +20,7 @@ module Kitchen
 	module Driver
 		class Lxd
 			# Version string for Lxd Kitchen driver
-			VERSION = '0.2.1'
+			VERSION = '0.2.2'
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Juri Timošin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-description: Kitchen::Driver::Lxd - an Lxd driver for Test Kitchen.
+description: Kitchen::Driver::Lxd - an Lxd driver (and transport) for Test Kitchen.
 email:
 - draco.ater@gmail.com
 executables: []
@@ -120,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="