qemu 0.0.2 → 0.3

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *~
+.ruby-version

data/lib/qemu/command.rb

@@ -9,6 +9,12 @@ module QEMU
 
     attr_accessor :memory
 
+    attr_accessor :architecture
+
+    def architecture
+      @architecture ||= :i386
+    end
+
     attr_reader :disks
     def disks
       @disks ||= Disks.new
@@ -74,6 +80,8 @@ module QEMU
 
     def command_arguments
       [].tap do |args|
+        args << "-enable-kvm"
+
         args << "-m" << "#{memory}m" if memory
         disks.each_with_index do |disk, index|
           args << "-drive" << disk.qemu_drive(index)
@@ -100,8 +108,13 @@ module QEMU
       end
     end
 
+    @@command_system_aliases = {
+      "amd64" => "x86_64"
+    }
+
     def command
-      "/usr/bin/kvm"
+      system = @@command_system_aliases.fetch(architecture.to_s, architecture.to_s)
+      "/usr/bin/qemu-system-#{system}"
     end
 
     def run
@@ -110,7 +123,11 @@ module QEMU
     end
 
     def daemon
-      @daemon ||= Daemon.new :command => command, :name => name, :arguments => command_arguments, :env => command_env
+      @daemon ||=
+        begin
+          QEMU.logger.debug "Prepare daemon with '#{command_arguments}'"
+          Daemon.new :command => command, :name => name, :arguments => command_arguments, :env => command_env
+        end
     end
 
   end

data/lib/qemu/version.rb

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

data/spec/qemu/command_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe QEMU::Command do
-  
+
+  let(:command) { QEMU::Command.new }
+  subject { command }
+
   describe "#name" do
-    
+
     it "should be 'qemu' by default" do
       subject.name.should == "qemu"
     end
@@ -15,4 +18,21 @@ describe QEMU::Command do
 
   end
 
+  describe "#command" do
+
+    subject { command.command }
+
+    context "when architecture is i386" do
+      before { command.architecture = :i386 }
+
+      it { should == "/usr/bin/qemu-system-i386" }
+    end
+
+    context "when architecture is amd64" do
+      before { command.architecture = :amd64 }
+
+      it { should == "/usr/bin/qemu-system-x86_64" }
+    end
+
+  end
 end

metadata

@@ -1,147 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: qemu
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: '0.3'
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Alban Peignier
 - Florent Peyraud
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-02-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2014-04-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  name: bundler
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: simplecov
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rspec
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: guard
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: guard-rspec
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   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: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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
 - florent@tryphon.eu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -159,38 +166,36 @@ files:
 - spec/spec_helper.rb
 - tasks/rspec.rake
 homepage: http://projects.tryphon.eu/projects/ruby-qemu
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4342732654127264106
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4342732654127264106
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Manage QEMU from Ruby
-test_files: 
+test_files:
 - spec/qemu/command_spec.rb
 - spec/spec_helper.rb