susi-qemu 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dea990fdc410fb49ca174ec0a224c6a9561b557c334d8878ce09e044bafe810
-  data.tar.gz: 65fc4f31010e7a2da46e68bb1b9704c6a44209ab993e167e850322c317a15799
+  metadata.gz: '040378a35425ae9289a4cfef45818da3001a1a8dc199ad5ef1725dfc809bb239'
+  data.tar.gz: 386be63f2c3a50fc99bd1c2d4e2850e605b04c1cfe50f86677bf6f1272896c00
 SHA512:
-  metadata.gz: 91b8c72497b3b8c88cb8508bcb409d65850f0c489507c0f4e3f74c0a25da40cb0a23fc1928f408fbbb63fa25787e878474269f8d9942299f5b43a63d794d2523
-  data.tar.gz: 6d9d80553774e38b5a812c7c58f04d120b62f12e3a06ad5a150b53d5003a59466e0883948f61ff9028a3ed12ec1faec07ec3e603810681e3ca3a39b9698c3f18
+  metadata.gz: b0a6449ff120efabb18c973cb1e487820c3a24201588893f4539c77c4be95259bfcce544a757a6309868f8bd56d7d474947bd595108f1011781a7a2ade8908fe
+  data.tar.gz: 0bbb251ecc0a459c197f55a57f16ba9fcd07e8d35393ee6f1882bb1dd7c1677cc48befd394949baaa8d8f7f7a0332d6d2078e3650a256acba3a553038cef1322

data/bin/susi

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'susi'
+require 'version'
 
 if ARGV[0] == 'init'
   Susi::init

data/lib/susi.rb

@@ -10,7 +10,6 @@ require 'yaml'
 require 'securerandom'
 
 module Susi
-  VERSION = '0.0.1'
   CONFIG_FILE = ".susi.yml"
   SUSI_DIR = "#{ENV['HOME']}/.susi"
   TEMPLATE_DIR = "#{SUSI_DIR}/templates"

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Susi
+  VERSION = '0.0.3'
+end

data/lib/vm.rb

@@ -48,11 +48,11 @@ module Susi
     end
 
     def vnc_www_port
-      vnc_port - 5900 + 5800
+      vnc_port - 100
     end
 
     def vnc_websocket_port
-      vnc_port - 5900 + 5700
+      vnc_port - 200
     end
 
     def ssh_port
@@ -106,18 +106,12 @@ module Susi
       qmp_port = self.get_free_port(4000, 4099)
       ssh_port = self.get_free_port(2000, 2099)
       vnc_port = self.get_free_port(5900, 5999)
-      vnc_www_port = 5800 + vnc_port - 5900
-      vnc_websocket_port = 5700 + vnc_port - 5900
-
-      puts "QMP Port: #{qmp_port}"
-      puts "SSH Port: #{ssh_port}"
-      puts "VNC Port: #{vnc_port}"
-      puts "VNC WWW Port: #{vnc_www_port}"
-      puts "VNC WebSocket Port: #{vnc_websocket_port}"
+      vnc_www_port = vnc_port - 100
+      vnc_websocket_port = vnc_port - 200
 
       cmd = []
 
-      cmd << "~/susi/docs/qemu/build/qemu-system-x86_64"
+      cmd << "qemu-system-x86_64"
 
       # general setup
       cmd << "-name #{name}"
@@ -138,8 +132,9 @@ module Susi
         cmd << "-cdrom #{cdrom}"
       end
 
-      puts cmd.join(" ")
-      system(cmd.join(" "))
+      cmd = cmd.join(" ")
+      puts cmd
+      system(cmd)
 
       QMP.new(qmp_port).close
     end
@@ -155,15 +150,15 @@ module Susi
         vm = VM.new(n)
 
         # get local device name or IP
-        ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
+        ip = vm.ip
 
         puts <<-EOF
 VM: #{n}
   - Disk: #{vm.disk}
   - QMP: #{vm.qmp_port}
-  - VNC: vnc://#{ip.ip_address}:#{vm.vnc_port}
-  - Screen: http://#{ip.ip_address}:#{vm.vnc_www_port}/
-  - SSH: ssh -p #{vm.ssh_port} dabo@#{ip.ip_address}
+  - VNC: vnc://#{ip}:#{vm.vnc_port}
+  - Screen: http://#{ip}:#{vm.vnc_www_port}/
+  - SSH: ssh -p #{vm.ssh_port} dabo@#{ip}
 EOF
       end
     end

data/lib/vnc.rb

@@ -6,9 +6,8 @@ module Susi
     def self.open(name)
       vm = VM.new(name)
       port = vm.vnc_www_port
-      ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }
       token = (0...8).map { (65 + rand(26)).chr }.join
-      url = "http://#{ip.ip_address}:#{port}/#{token}.html"
+      url = "http://#{vm.ip}:#{port}/#{token}.html"
 
       # prepare paths and files
       path = File.expand_path(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susi-qemu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Bovensiepen
@@ -36,6 +36,7 @@ files:
 - lib/qmp.rb
 - lib/ssh.rb
 - lib/susi.rb
+- lib/version.rb
 - lib/vm.rb
 - lib/vnc.rb
 homepage: https://github.com/bovi/susi