kitchen-qemu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1029f7e678c666e950af682e6efa5ef223f2fc21
-  data.tar.gz: 3bb85ec743a685a5a4e9adf9b166b21117a1caf5
+  metadata.gz: ae36680bcd2808d461d0d57e9be6d0c55a919c43
+  data.tar.gz: 05b1439ddc31ba48f31b607e2bb96607c428d5ab
 SHA512:
-  metadata.gz: 28214283a12ec0d94a6b59551a438de3eaa4804dbdd2fe5c53d0be3fa33b70eaf054184e43f44d324e24eeaeef9b80565168a6273d42d652596cb31a0c013797
-  data.tar.gz: cee503538175132530f22439bf3259556fbbcbb0af878a0444199b5cbb35e9f400abb8d45bc8e87913e0780d6f0458767f085c5f9345a1fe0502f8ba97c74433
+  metadata.gz: e4013ca5ceba2813668ea367f656baa9bb6d9d7886d885c93ddf4112a32863f3796a43e0d1425735d43406203900e34c9b1b88c1f2d832f01f42b90273dd6b32
+  data.tar.gz: 029c25cec633dcd7ba9d2a7fc3ca4b5ec9a6a8be80c82691ec43bfb40a1e76fa245a2d93a60ca2e898c5af687d967f342992549dc858563ec81c627d76e9d9c3

data/lib/kitchen/driver/qemu.rb

@@ -41,7 +41,7 @@ module Kitchen
       default_config :memory,    '512'
       default_config :nic_model, 'virtio'
 
-      required_config :image do |attr, value, subject|
+      required_config :image do |_attr, value, _subject|
         raise UserError, 'Must specify image file' unless value
       end
 
@@ -57,7 +57,7 @@ module Kitchen
       def finalize_config!(instance)
         super
         if not config[:binary]
-          config[:binary] = @@archbinary[config[:arch]] or
+          config[:binary] = @@ARCHBINARY[config[:arch]] or
             raise UserError, "Unknown architecture '#{config[:arch]}'"
         end
         config[:vga] = 'qxl' if config[:spice] && !config[:vga]
@@ -69,7 +69,7 @@ module Kitchen
       # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
       def create(state)
-        monitor = monitor_path
+        monitor = monitor_qmp_path
         if File.exist?(monitor)
           begin
             mon = UNIXSocket.new(monitor)
@@ -95,8 +95,10 @@ module Kitchen
         cmd = [
           config[:binary], '-daemonize',
           '-display', config[:display].to_s,
-          '-chardev', "socket,id=monitor,path=#{monitor},server,nowait",
-          '-mon', 'chardev=monitor,mode=control,default',
+          '-chardev', "socket,id=mon-qmp,path=#{monitor},server,nowait",
+          '-mon', 'chardev=mon-qmp,mode=control,default',
+          '-chardev', "socket,id=mon-rdl,path=#{monitor_readline_path},server,nowait",
+          '-mon', 'chardev=mon-rdl,mode=readline',
           '-m', config[:memory].to_s,
           '-net', "nic,model=#{config[:nic_model]}",
           '-net', "user,net=192.168.1.0/24,hostname=#{hostname},hostfwd=tcp::#{state[:port]}-:22",
@@ -150,9 +152,9 @@ module Kitchen
         info 'Waiting for SSH..'
         conn = instance.transport.connection(state)
         conn.wait_until_ready
-        conn.execute("sudo sh -c 'echo 127.0.0.1 #{names} >> /etc/hosts' 2>/dev/null")
+        conn.execute("sudo sh -c 'echo 127.0.0.1 #{names} >> /etc/hosts; hostnamectl set-hostname #{hostname} || hostname #{hostname} || true' 2>/dev/null")
         conn.execute('install -dm700 "$HOME/.ssh"')
-        conn.execute("echo '#{@@pubkey}' > \"$HOME/.ssh/authorized_keys\"")
+        conn.execute("echo '#{@@PUBKEY}' > \"$HOME/.ssh/authorized_keys\"")
         conn.close
         state[:ssh_key] = privkey_path
       end
@@ -162,7 +164,7 @@ module Kitchen
       # @param state [Hash] mutable instance state
       # @raise [ActionFailed] if the action could not be completed
       def destroy(state)
-        monitor = monitor_path
+        monitor = monitor_qmp_path
         return unless File.exist?(monitor)
 
         instance.transport.connection(state).close
@@ -185,7 +187,7 @@ module Kitchen
 
       private
 
-      @@privkey = %{-----BEGIN RSA PRIVATE KEY-----
+      @@PRIVKEY = %{-----BEGIN RSA PRIVATE KEY-----
 MIIEowIBAAKCAQEAyG6ASL3bWS67rsA5LDvKnfdCBagK61B5LIr+NvdjK3oRKhCq
 qRs7aNSPOqMu2NbKot4/BtD0hWipF7CAsMqK+241coMUwxRTlqvoe/L7xZ24Ktaj
 rm1kk/xNUGP5vWyK8sYfYnDUuLSypRaZ/ZfWuKZgQLDdOw2FWqHFVLoJDsXgsa/y
@@ -214,9 +216,9 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
 -----END RSA PRIVATE KEY-----
 }.freeze
 
-      @@pubkey = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIboBIvdtZLruuwDksO8qd90IFqArrUHksiv4292MrehEqEKqpGzto1I86oy7Y1sqi3j8G0PSFaKkXsICwyor7bjVygxTDFFOWq+h78vvFnbgq1qOubWST/E1QY/m9bIryxh9icNS4tLKlFpn9l9a4pmBAsN07DYVaocVUugkOxeCxr/KLUXdvmXj4Xfq837ultL1ggyaN2YqeDwn+GxM8RNm51rIRa4DL6Y1rPgztm3FL+A9MglzEjELbs8s6EDVewAG6do1HwS3LqCGxlfZgRieelzIHkyaqLRU4mzqbkhmfaR/U/fHQppRDYWb3CoCSBilJxxYfjLK1VDyXOWkH kitchen-qemu'.freeze
+      @@PUBKEY = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIboBIvdtZLruuwDksO8qd90IFqArrUHksiv4292MrehEqEKqpGzto1I86oy7Y1sqi3j8G0PSFaKkXsICwyor7bjVygxTDFFOWq+h78vvFnbgq1qOubWST/E1QY/m9bIryxh9icNS4tLKlFpn9l9a4pmBAsN07DYVaocVUugkOxeCxr/KLUXdvmXj4Xfq837ultL1ggyaN2YqeDwn+GxM8RNm51rIRa4DL6Y1rPgztm3FL+A9MglzEjELbs8s6EDVewAG6do1HwS3LqCGxlfZgRieelzIHkyaqLRU4mzqbkhmfaR/U/fHQppRDYWb3CoCSBilJxxYfjLK1VDyXOWkH kitchen-qemu'.freeze
 
-      @@archbinary = {
+      @@ARCHBINARY = {
         'i386'   => 'qemu-system-i386',
         'amd64'  => 'qemu-system-x86_64',
         'x86'    => 'qemu-system-i386',
@@ -229,19 +231,28 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         File.join(config[:kitchen_root], '.kitchen', 'kitchen-qemu.key')
       end
 
-      def monitor_path
+      def monitor_qmp_path
+        File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.qmp")
+      end
+
+      def monitor_readline_path
         File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.mon")
       end
 
       def create_privkey
         path = privkey_path
         return true if File.file?(path)
-        File.open(path, File::CREAT|File::TRUNC|File::RDWR, 0600) { |f| f.write(@@privkey) }
+        File.open(path, File::CREAT|File::TRUNC|File::RDWR, 0600) { |f| f.write(@@PRIVKEY) }
       end
 
       def cleanup!
         begin
-          File.delete(monitor_path)
+          File.delete(monitor_qmp_path)
+        rescue Errno::ENOENT
+          # do nothing
+        end
+        begin
+          File.delete(monitor_readline_path)
         rescue Errno::ENOENT
           # do nothing
         end

data/lib/kitchen/driver/qemu_version.rb

@@ -17,6 +17,6 @@
 module Kitchen
   module Driver
     # Version string for the QEMU Kitchen driver
-    QEMU_VERSION = '0.1.2'
+    QEMU_VERSION = '0.1.3'
   end
 end

data/lib/kitchen/driver/qmpclient.rb

@@ -46,13 +46,13 @@ module Kitchen
       def wait_for_eof(timeout = @timeout)
         while IO.select(@ioa, nil, nil, timeout)
           begin
-            @io.read_nonblock(4096)
+            loop { @io.read_nonblock(4096) }
           rescue EOFError
             return
           rescue Errno::ECONNRESET
             return
           rescue IO::WaitReadable
-            # do notheng
+            # do nothing
           end
         end
         raise Timeout
@@ -84,7 +84,7 @@ module Kitchen
             begin
               @buf.push(@io.read_nonblock(4096))
             rescue IO::WaitReadable
-              # do notheng
+              # do nothing
             else
               break
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Emil Renner Berthing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen