qemu 0.0.1 → 0.0.2

data/lib/qemu.rb

@@ -1,8 +1,13 @@
-module QEMU
 
+module QEMU
+  def self.sh!(command)
+    logger.debug "Execute '#{command}'"
+    system command or raise "Command failed: '#{command}'"
+  end
 end
 
 require 'qemu/version'
+require 'qemu/logger'
 
 require 'qemu/image'
 require 'qemu/daemon'

data/lib/qemu/command.rb

@@ -25,7 +25,7 @@ module QEMU
     end
 
     class Disk
-      
+
       attr_accessor :file, :options
 
       def initialize(file, options = {})
@@ -34,9 +34,10 @@ module QEMU
       end
 
       def qemu_drive(index)
-        { 
+        {
           :file => File.expand_path(file),
           :index => index,
+          :if => "virtio"
         }.merge(options).map { |k,v| "#{k}=#{v}" }.join(',')
       end
 
@@ -48,7 +49,7 @@ module QEMU
     def vde_options
       @vde_options ||= { :sock => "/var/run/vde2/tap0.ctl" }
     end
-   
+
     attr_accessor :vnc
 
     attr_accessor :monitor
@@ -93,7 +94,7 @@ module QEMU
 
     def command_env
       {}.tap do |env|
-        env["QEMU_AUDIO_DRV"] = audio_driver 
+        env["QEMU_AUDIO_DRV"] = audio_driver
         env["QEMU_ALSA_DAC_DEV"] = alsa_dac_dev if alsa_dac_dev
         env["QEMU_ALSA_ADC_DEV"] = alsa_adc_dev if alsa_adc_dev
       end

data/lib/qemu/image.rb

@@ -1,21 +1,51 @@
 module QEMU
   class Image
 
-    attr_accessor :file, :size, :format
+    attr_accessor :file, :size, :format, :options
 
     def initialize(file, options = {})
       self.file = file
-      options = options.merge :format => "raw"
+      options = { :format => self.class.file_format(file) }.merge options
       options.each { |k,v| send "#{k}=", v }
     end
 
+    def self.file_format(file)
+      case `file #{file}`
+      when /qcow/
+        "qcow2"
+      when /x86 boot sector/
+        "raw"
+      else
+        QEMU.logger.info "Unknown file format : #{file}"
+        "raw"
+      end
+    end
+
+    def options_arguments
+      if options
+        options_value = options.map { |k,v| "#{k}=#{v}" }.join(",")
+        "-o #{options_value}"
+      end
+    end
+
     def create
-      system "qemu-img create -f #{format} #{file} #{size}"
+      QEMU.sh! "qemu-img create -f #{format} #{options_arguments} #{file} #{size}"
+    end
+
+    def self.output_file(file, format)
+      unless file.to_s.end_with? ".#{format}"
+        "#{file}.#{format}"
+      else
+        file
+      end
     end
 
     def convert(format, output_file = nil)
-      output_file ||= "#{file}.#{format}"
-      system "qemu-img convert -O #{format} #{file} #{output_file}" and output_file
+      output_file ||= self.class.output_file file, format
+      unless self.format.to_s == format.to_s
+        QEMU.sh! "qemu-img convert -O #{format} #{file} #{output_file}"
+      end
+      output_file
     end
 
   end

data/lib/qemu/logger.rb

@@ -0,0 +1,28 @@
+require "logger"
+require "singleton"
+
+class NullLogger
+  include Singleton
+
+  # To get the Logger API you can run this:
+  #   (Logger.instance_methods.sort - Logger.methods).sort
+  [ :<<, :add, :close, :datetime_format,
+    :datetime_format=, :debug, :debug?, :error, :error?, :fatal,
+    :fatal?, :formatter, :formatter=, :info, :info?, :level, :level=,
+    :log, :progname, :progname=, :sev_threshold, :sev_threshold=,
+    :unknown, :warn, :warn? ].each do |method_name|
+    define_method method_name do |*args| end
+  end
+end
+
+module QEMU
+
+  @@logger = NullLogger.instance
+  def self.logger
+    @@logger
+  end
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
+end

data/lib/qemu/monitor.rb

@@ -6,18 +6,21 @@ module QEMU
     attr_accessor :host, :port, :timeout
 
     def initialize(attributes = {})
-      attributes = { :host => "localhost", :timeout => 5 }.merge(attributes)
+      attributes = { :host => "localhost", :timeout => 30 }.merge(attributes)
       attributes.each { |k,v| send "#{k}=", v }
     end
 
     def telnet
-      @telnet ||= Net::Telnet::new "Host" => host, "Port" => port, "Timeout" => timeout, "Prompt" => /\(qemu\) /
+      Net::Telnet::new "Host" => host, "Port" => port, "Timeout" => timeout, "Prompt" => /\(qemu\) /
     end
 
     def command(command)
-      telnet.cmd command
+      telnet.tap do |telnet|
+        telnet.cmd command
+        telnet.close
+      end
     end
-   
+
     def reset
       command "system_reset"
     end

data/lib/qemu/version.rb

@@ -1,3 +1,3 @@
 module QEMU
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qemu
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alban Peignier
@@ -16,11 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-19 00:00:00 Z
+date: 2014-02-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +31,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  requirement: *id001
-  prerelease: false
   name: bundler
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   name: rake
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   name: simplecov
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
   name: rspec
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -86,12 +87,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   name: guard
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,12 +101,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  prerelease: false
   name: guard-rspec
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -114,12 +115,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  prerelease: false
   name: rdoc
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -128,9 +129,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-  prerelease: false
   name: daemons
+  version_requirements: *id008
 description: Create QEMU command lines, start and stop daemon, send monitor commands to a qemu instances, create or convert QEMU disks, etc .. in Ruby
 email: 
 - alban@tryphon.eu
@@ -151,6 +151,7 @@ files:
 - lib/qemu/command.rb
 - lib/qemu/daemon.rb
 - lib/qemu/image.rb
+- lib/qemu/logger.rb
 - lib/qemu/monitor.rb
 - lib/qemu/version.rb
 - qemu.gemspec