boxgrinder-build 0.7.1 → 0.8.0

data/rubygem-boxgrinder-build.spec

@@ -5,23 +5,24 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.7.1
+Version: 0.8.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygem(commander)
-Requires: rubygem(boxgrinder-core) >= 0.1.5
+Requires: rubygem(thor)
+Requires: rubygem(boxgrinder-core) >= 0.2.0
 Requires: ruby-libguestfs
 Requires: parted
 Requires: e2fsprogs
 
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(boxgrinder-core) >= 0.1.5
+BuildRequires: rubygem(boxgrinder-core) >= 0.2.0
 BuildRequires: rubygem(echoe)
 BuildRequires: ruby-libguestfs
 
@@ -65,7 +66,7 @@ popd
 
 %files
 %defattr(-, root, root, -)
-%{_bindir}/boxgrinder-build
+%{_bindir}/boxgrinder
 %dir %{geminstdir}
 %{geminstdir}/bin
 %{geminstdir}/lib
@@ -85,6 +86,20 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Jan 04 2011  <mgoldman@redhat.com> - 0.8.0-1
+- Upstream release: 0.8.0
+- Added BuildRoot tag to build for EPEL 5
+- [BGBUILD-128] Allow to specify plugin configuration using CLI
+- [BGBUILD-134] Replace rubygem-commander with rubygem-thor
+- [BGBUILD-79] Allow to use BoxGrinder Build as a library
+- [BGBUILD-127] Use appliance definition object instead of a file when using BG as a library
+- [BGBUILD-68] Global .boxgrinder/config or rc style file for config
+- [BGBUILD-131] Check if OS is supported before executing the plugin
+- [BGBUILD-72] Add support for growing (not pre-allocated) disks for KVM/Xen
+- [BGBUILD-133] Support a consolidated configuration file
+- [BGBUILD-138] enablerepo path is not escaped when calling repoquery
+- [BGBUILD-147] Allow to list installed plugins and version information
+
 * Mon Dec 20 2010  <mgoldman@redhat.com> - 0.7.1-1
 - Upstream release: 0.7.1
 - [BGBUILD-123] Remove RPM database recreation code

data/spec/appliance-spec.rb

@@ -23,18 +23,16 @@ require 'logger'
 
 module BoxGrinder
   describe Appliance do
-    def prepare_appliance(options = OpenStruct.new, definition_file = "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
-      options.name    = 'boxgrinder'
-      options.version = '1.0'
-
-      @options        = options
-      @log            = Logger.new('/dev/null')
+    def prepare_appliance(options = {}, definition_file = "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
+      @log = LogHelper.new(:level => :trace, :type => :stdout)
+      @config = OpenCascade.new(:platform => :none, :delivery => :none, :force => false).merge(options)
 
       @plugin_manager = mock(PluginManager)
 
       PluginManager.stub!(:instance).and_return(@plugin_manager)
 
-      @appliance = Appliance.new(definition_file, :log => @log, :options => @options)
+      @appliance = Appliance.new(definition_file, @config, :log => @log)
+      @config = @appliance.instance_variable_get(:@config)
     end
 
     def prepare_appliance_config
@@ -51,53 +49,69 @@ module BoxGrinder
           OpenCascade.new({
                               :partitions =>
                                   {
-                                      '/'     => {'size' => 2},
+                                      '/' => {'size' => 2},
                                       '/home' => {'size' => 3},
                                   },
-                              :arch       => 'i686',
-                              :base_arch  => 'i386',
-                              :cpus       => 1,
-                              :memory     => 256,
+                              :arch => 'i686',
+                              :base_arch => 'i386',
+                              :cpus => 1,
+                              :memory => 256,
                           })
       )
 
       @appliance_config
     end
 
-#    before(:each) do
-#      prepare_appliance
-#    end
+    it "should create @config object without log" do
+      config = Appliance.new("file", OpenCascade.new(:platform => :ec2), :log => "ALOG").instance_variable_get(:@config)
 
-    it "should prepare appliance to build" do
-      prepare_appliance
+      config.size.should == 1
+      config[:log].should == nil
+    end
 
-      plugin_helper = mock(PluginHelper)
-      plugin_helper.should_receive(:load_plugins)
+    describe ".create" do
 
-      PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
+      it "should prepare appliance to build" do
+        prepare_appliance
 
-      @appliance.should_receive(:read_definition)
-      @appliance.should_receive(:validate_definition)
-      @appliance.should_not_receive(:remove_old_builds)
-      @appliance.should_receive(:execute_plugin_chain)
+        plugin_helper = mock(PluginHelper)
+        plugin_helper.should_receive(:load_plugins)
 
-      @appliance.create
-    end
+        PluginHelper.should_receive(:new).with(@config, :log => @log).and_return(plugin_helper)
+
+        @appliance.should_receive(:read_definition)
+        @appliance.should_receive(:validate_definition)
+        @appliance.should_not_receive(:remove_old_builds)
+        @appliance.should_receive(:execute_plugin_chain)
+
+        @appliance.create
+      end
+
+      it "should prepare appliance to build with removing old files" do
+        prepare_appliance(:force => true)
 
-    it "should prepare appliance to build with removing old files" do
-      prepare_appliance(OpenStruct.new(:force => true))
+        plugin_helper = mock(PluginHelper)
+        plugin_helper.should_receive(:load_plugins)
 
-      plugin_helper = mock(PluginHelper)
-      plugin_helper.should_receive(:load_plugins)
+        PluginHelper.should_receive(:new).with(@config, :log => @log).and_return(plugin_helper)
 
-      PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
+        @appliance.should_receive(:read_definition)
+        @appliance.should_receive(:validate_definition)
+        @appliance.should_receive(:remove_old_builds)
+        @appliance.should_receive(:execute_plugin_chain)
+
+        @appliance.create
+      end
 
-      @appliance.should_receive(:read_definition)
-      @appliance.should_receive(:validate_definition)
-      @appliance.should_receive(:remove_old_builds)
-      @appliance.should_receive(:execute_plugin_chain)
+      it "should not catch exceptions while building appliance" do
+        prepare_appliance(:force => true)
 
-      @appliance.create
+        PluginHelper.should_receive(:new).with(@config, :log => @log).and_raise('something')
+
+        lambda {
+          @appliance.create
+        }.should raise_error(RuntimeError, 'something')
+      end
     end
 
     describe ".validate_definition" do
@@ -125,14 +139,14 @@ module BoxGrinder
       end
 
       it "should read definition with kickstart appliance definition file" do
-        prepare_appliance(OpenStruct.new, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
+        prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
         appliance_config = ApplianceConfig.new
 
         appliance_helper = mock(ApplianceHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
 
-        clazz          = mock('PluginClass')
+        clazz = mock('PluginClass')
 
         plugin_manager = mock(PluginManager)
         plugin_manager.should_receive(:plugins).and_return({:os => {:fedora => {:class => clazz, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}}})
@@ -161,7 +175,7 @@ module BoxGrinder
       end
 
       it "should read definition with kickstart appliance definition file and fail because there was no plugin able to read .ks" do
-        prepare_appliance(OpenStruct.new, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
+        prepare_appliance({}, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
         appliance_helper = mock(ApplianceHelper)
         appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
@@ -214,7 +228,7 @@ module BoxGrinder
 
         lambda {
           @appliance.validate_definition
-        }.should raise_error(SystemExit, "No operating system plugins installed. Install one or more operating system plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info")
+        }.should raise_error(RuntimeError, "No operating system plugins installed. Install one or more operating system plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info.")
       end
 
       it "should validate definition and fail because no supported operating system plugins is installed" do
@@ -233,7 +247,7 @@ module BoxGrinder
 
         lambda {
           @appliance.validate_definition
-        }.should raise_error(SystemExit, "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: rhel")
+        }.should raise_error(RuntimeError, "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: rhel")
       end
 
       it "should validate definition and fail because no supported operating system version plugins is installed" do
@@ -252,7 +266,7 @@ module BoxGrinder
 
         lambda {
           @appliance.validate_definition
-        }.should raise_error(SystemExit, "Not supported operating system version selected: 11. Supported versions are: xyz")
+        }.should raise_error(RuntimeError, "Not supported operating system version selected: 11. Supported versions are: xyz")
       end
     end
 
@@ -299,7 +313,7 @@ module BoxGrinder
     end
 
     it "should build appliance and convert it to VMware format" do
-      prepare_appliance(OpenStruct.new({:platform => :vmware}))
+      prepare_appliance(:platform => :vmware)
 
       @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
       @appliance.should_receive(:execute_os_plugin).and_return({})
@@ -317,7 +331,7 @@ module BoxGrinder
     end
 
     it "should build appliance and convert it to VMware format because deliverable already exists" do
-      prepare_appliance(OpenStruct.new({:platform => :vmware}))
+      prepare_appliance(:platform => :vmware)
 
       @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
       @appliance.should_receive(:execute_os_plugin).and_return({})
@@ -335,7 +349,7 @@ module BoxGrinder
     end
 
     it "should build appliance, convert it to EC2 format and deliver it using S3 ami type" do
-      prepare_appliance(OpenStruct.new({:platform => :ec2, :delivery => :ami}))
+      prepare_appliance(:platform => :ec2, :delivery => :ami)
 
       @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
       @appliance.should_receive(:execute_os_plugin).and_return({:abc => 'def'})
@@ -352,7 +366,7 @@ module BoxGrinder
     end
 
     it "should build appliance, convert it to EC2 format and deliver it using delivery plugin with only one delivery type" do
-      prepare_appliance(OpenStruct.new({:platform => :ec2, :delivery => :same}))
+      prepare_appliance(:platform => :ec2, :delivery => :same)
 
       @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
       @appliance.should_receive(:execute_os_plugin).and_return({:abc => 'def'})

data/spec/helpers/guestfs-helper-spec.rb

@@ -20,61 +20,147 @@ require 'boxgrinder-build/helpers/guestfs-helper'
 
 module BoxGrinder
   describe GuestFSHelper do
-
-    before(:all) do
-      @arch = `uname -m`.chomp.strip
-    end
-
     before(:each) do
       @log = Logger.new('/dev/null')
       @helper = GuestFSHelper.new('a/raw/disk', :log => @log)
     end
 
-    def prepare_and_launch(partitions, wrapper = nil)
-      guetfs = mock('Guestfs')
-      guetfs.should_receive(:set_append).with('noapic')
-      guetfs.should_receive(:set_verbose)
-      guetfs.should_receive(:set_trace)
-      guetfs.should_receive(:set_selinux).with(1)
+    describe ".execute" do
+      it "should prepare and run guestfs" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
 
-      @helper.should_receive(:hw_virtualization_available?).and_return(true)
-      @helper.should_receive(:load_selinux_policy)
+        @helper.should_receive(:hw_virtualization_available?).and_return(true)
+        @helper.should_receive(:load_selinux_policy)
 
-      guetfs.should_receive(:set_qemu).with(wrapper) unless wrapper.nil?
-      guetfs.should_receive(:add_drive).with('a/raw/disk')
-      guetfs.should_receive(:set_network).with(1)
-      guetfs.should_receive(:launch)
-      guetfs.should_receive(:list_partitions).and_return(partitions)
+        guestfs.should_receive(:add_drive).with('a/raw/disk')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
 
-      Guestfs.should_receive(:create).and_return(guetfs)
+        Guestfs.should_receive(:create).and_return(guestfs)
 
-      guetfs
-    end
+        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.execute.should == @helper
+      end
 
-    it "should prepare and run guestfs" do
-      prepare_and_launch(['/', '/boot'])
+      it "should prepare and run guestfs wid IDE disk" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
 
-      @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.should_receive(:hw_virtualization_available?).and_return(true)
+        @helper.should_receive(:load_selinux_policy)
 
-      @helper.execute.should == @helper
-    end
+        guestfs.should_receive(:add_drive_with_if).with('a/raw/disk', 'ide')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
 
-    it "should prepare and run guestfs with one partition" do
-      guestfs = prepare_and_launch(['/'])
+        Guestfs.should_receive(:create).and_return(guestfs)
 
-      guestfs.should_receive(:list_partitions).and_return(['/'])
-      @helper.should_receive(:mount_partition).with("/", "/")
+        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.execute(nil, :ide_disk => true).should == @helper
+      end
 
-      @helper.execute.should == @helper
-    end
+      it "should prepare and run guestfs without HW accelerarion enabled for 64 bit host" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
+
+        @helper.should_receive(:hw_virtualization_available?).and_return(false)
+        @helper.should_receive(:load_selinux_policy)
+
+        RbConfig::CONFIG.should_receive(:[]).with('host_cpu').and_return('x86_64')
+
+        guestfs.should_receive(:set_qemu).with('/usr/bin/qemu-system-x86_64')
+        guestfs.should_receive(:add_drive).with('a/raw/disk')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+
+        Guestfs.should_receive(:create).and_return(guestfs)
+
+        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.execute.should == @helper
+      end
+
+      it "should prepare and run guestfs without HW accelerarion enabled for 32 bit host" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
 
-    it "should prepare and run guestfs with no partitions" do
-      guestfs = prepare_and_launch([])
+        @helper.should_receive(:hw_virtualization_available?).and_return(false)
+        @helper.should_receive(:load_selinux_policy)
 
-      guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
-      @helper.should_receive(:mount_partition).with("/dev/sda", "/")
+        RbConfig::CONFIG.should_receive(:[]).with('host_cpu').and_return('i386')
 
-      @helper.execute.should == @helper
+        guestfs.should_receive(:set_qemu).with('/usr/bin/qemu')
+        guestfs.should_receive(:add_drive).with('a/raw/disk')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return(['/', '/boot'])
+
+        Guestfs.should_receive(:create).and_return(guestfs)
+
+        @helper.should_receive(:mount_partitions).with(no_args)
+        @helper.execute.should == @helper
+      end
+
+      it "should prepare and run guestfs with one partition" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
+
+        @helper.should_receive(:hw_virtualization_available?).and_return(true)
+        @helper.should_receive(:load_selinux_policy)
+
+        guestfs.should_receive(:add_drive).with('a/raw/disk')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return(['/'])
+
+        Guestfs.should_receive(:create).and_return(guestfs)
+
+        guestfs.should_receive(:list_partitions).and_return(['/'])
+        @helper.should_receive(:mount_partition).with("/", "/")
+
+        @helper.execute.should == @helper
+      end
+
+      it "should prepare and run guestfs with no partitions" do
+        guestfs = mock('Guestfs')
+        guestfs.should_receive(:set_append).with('noapic')
+        guestfs.should_receive(:set_verbose)
+        guestfs.should_receive(:set_trace)
+        guestfs.should_receive(:set_selinux).with(1)
+
+        @helper.should_receive(:hw_virtualization_available?).and_return(true)
+        @helper.should_receive(:load_selinux_policy)
+
+        guestfs.should_receive(:add_drive).with('a/raw/disk')
+        guestfs.should_receive(:set_network).with(1)
+        guestfs.should_receive(:launch)
+        guestfs.should_receive(:list_partitions).and_return([])
+
+        Guestfs.should_receive(:create).and_return(guestfs)
+
+        guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
+        @helper.should_receive(:mount_partition).with("/dev/sda", "/")
+
+        @helper.execute.should == @helper
+      end
     end
 
     it "should close guestfs in clean way" do

data/spec/helpers/image-helper-spec.rb

@@ -27,23 +27,24 @@ module BoxGrinder
       @appliance_config = mock('ApplianceConfig')
 
       @appliance_config.stub!(:name).and_return('full')
+      @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '14'}))
       @appliance_config.stub!(:hardware).and_return(
           OpenCascade.new({
-                           :partitions =>
-                               {
-                                   '/' => {'size' => 2, 'type' => 'ext4'},
-                                   '/home' => {'size' => 3, 'type' => 'ext3'},
-                               },
-                           :arch => 'i686',
-                           :base_arch => 'i386',
-                           :cpus => 1,
-                           :memory => 256,
-                       })
+                              :partitions =>
+                                  {
+                                      '/' => {'size' => 2, 'type' => 'ext4'},
+                                      '/home' => {'size' => 3, 'type' => 'ext3'},
+                                  },
+                              :arch => 'i686',
+                              :base_arch => 'i386',
+                              :cpus => 1,
+                              :memory => 256,
+                          })
       )
 
-      @helper      = ImageHelper.new(@config, @appliance_config, :log => Logger.new('/dev/null'))
+      @helper = ImageHelper.new(@config, @appliance_config, :log => Logger.new('/dev/null'))
 
-      @log         = @helper.instance_variable_get(:@log)
+      @log = @helper.instance_variable_get(:@log)
       @exec_helper = @helper.instance_variable_get(:@exec_helper)
     end
 
@@ -51,9 +52,9 @@ module BoxGrinder
       @helper.should_receive(:calculate_disk_offsets).with('disk.raw').and_return(['0'])
       FileUtils.should_receive(:mkdir_p).with('mount_dir')
       @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).with('losetup -o 0 /dev/loop0 disk.raw')
+      @exec_helper.should_receive(:execute).with("losetup -o 0 /dev/loop0 'disk.raw'")
       @exec_helper.should_receive(:execute).with('e2label /dev/loop0').and_return('/')
-      @exec_helper.should_receive(:execute).with('mount /dev/loop0 mount_dir')
+      @exec_helper.should_receive(:execute).with("mount /dev/loop0 'mount_dir'")
 
       @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop0"}
     end
@@ -62,14 +63,14 @@ module BoxGrinder
       @helper.should_receive(:calculate_disk_offsets).with('disk.raw').and_return(['322', '562'])
       FileUtils.should_receive(:mkdir_p).with('mount_dir')
       @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).with('losetup -o 322 /dev/loop0 disk.raw')
+      @exec_helper.should_receive(:execute).with("losetup -o 322 /dev/loop0 'disk.raw'")
       @exec_helper.should_receive(:execute).with('e2label /dev/loop0').and_return('_/home')
       @helper.should_receive(:get_loop_device).and_return('/dev/loop1')
-      @exec_helper.should_receive(:execute).with('losetup -o 562 /dev/loop1 disk.raw')
+      @exec_helper.should_receive(:execute).with("losetup -o 562 /dev/loop1 'disk.raw'")
       @exec_helper.should_receive(:execute).with('e2label /dev/loop1').and_return('_/')
 
-      @exec_helper.should_receive(:execute).with('mount /dev/loop1 mount_dir')
-      @exec_helper.should_receive(:execute).with('mount /dev/loop0 mount_dir/home')
+      @exec_helper.should_receive(:execute).with("mount /dev/loop1 'mount_dir'")
+      @exec_helper.should_receive(:execute).with("mount /dev/loop0 'mount_dir/home'")
 
       @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"}
     end
@@ -101,7 +102,7 @@ module BoxGrinder
 
     it "should calculate disks offsets" do
       @helper.should_receive(:get_loop_device).and_return('/dev/loop0')
-      @exec_helper.should_receive(:execute).ordered.with('losetup /dev/loop0 disk.raw')
+      @exec_helper.should_receive(:execute).ordered.with("losetup /dev/loop0 'disk.raw'")
       @exec_helper.should_receive(:execute).ordered.with("parted /dev/loop0 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").and_return("0B\n1234B\n")
       @exec_helper.should_receive(:execute).ordered.with('losetup -d /dev/loop0')
       @helper.should_receive(:sleep).with(1)
@@ -110,63 +111,132 @@ module BoxGrinder
     end
 
     it "should create a new empty disk image" do
-      @exec_helper.should_receive(:execute).with('dd if=/dev/zero of=disk.raw bs=1 count=0 seek=10240M')
+      @exec_helper.should_receive(:execute).with("dd if=/dev/zero of='disk.raw' bs=1 count=0 seek=10240M")
 
       @helper.create_disk('disk.raw', 10)
     end
 
-    it "should create default filesystem on selected device" do
-      @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/' -F /dev/loop0")
+    describe ".create_filesystem" do
 
-      @helper.create_filesystem('/dev/loop0')
-    end
+      it "should create default filesystem on selected device" do
+        @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/' -F /dev/loop0")
 
-    it "should create ext4 filesystem on selected device" do
-      @appliance_config.should_receive(:hardware).and_return(
-          OpenCascade.new({
-                           :partitions =>
-                               {
-                                   '/' => {'size' => 2, 'type' => 'ext3'},
-                                   '/home' => {'size' => 3, 'type' => 'ext3'},
-                               },
-                           :arch => 'i686',
-                           :base_arch => 'i386',
-                           :cpus => 1,
-                           :memory => 256,
-                       })
-      )
+        @helper.create_filesystem('/dev/loop0')
+      end
 
-      @exec_helper.should_receive(:execute).with("mke2fs -T ext3 -L '/' -F /dev/loop0")
+      it "should create ext4 filesystem on selected device" do
+        @appliance_config.should_receive(:hardware).and_return(
+            OpenCascade.new({
+                                :partitions =>
+                                    {
+                                        '/' => {'size' => 2, 'type' => 'ext3'},
+                                        '/home' => {'size' => 3, 'type' => 'ext3'},
+                                    },
+                                :arch => 'i686',
+                                :base_arch => 'i386',
+                                :cpus => 1,
+                                :memory => 256,
+                            })
+        )
+
+        @exec_helper.should_receive(:execute).with("mke2fs -T ext3 -L '/' -F /dev/loop0")
+
+        @helper.create_filesystem('/dev/loop0')
+      end
+
+      it "should create ext4 filesystem on selected device with a label" do
+        @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/home' -F /dev/loop0")
 
-      @helper.create_filesystem('/dev/loop0')
+        @helper.create_filesystem('/dev/loop0', :type => 'ext4', :label => '/home')
+      end
+
+      it "should create ext4 filesystem on selected device with a label" do
+        lambda {
+          @helper.create_filesystem('/dev/loop0', :type => 'ext256', :label => '/home')
+        }.should raise_error(RuntimeError, "Unsupported filesystem specified: ext256")
+      end
     end
 
-    it "should create ext4 filesystem on selected device with a label" do
-      @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/home' -F /dev/loop0")
+    describe ".sync_files" do
+      it "should sync files" do
+        @exec_helper.should_receive(:execute).with("rsync -Xura from_dir/* 'to_dir'")
+        @helper.sync_files('from_dir', 'to_dir')
+      end
 
-      @helper.create_filesystem('/dev/loop0', :type => 'ext4', :label => '/home')
+      it "should sync files with a space in path" do
+        @exec_helper.should_receive(:execute).with("rsync -Xura from\\ /dir/* 'to_dir'")
+        @helper.sync_files('from /dir', 'to_dir')
+      end
     end
 
+    describe ".customize" do
+      it "should customize the disk image using GuestFS" do
+        guestfs = mock('GuestFS')
+        guestfs.should_receive(:abc)
+
+        guestfs_helper = mock(GuestFSHelper)
+        guestfs_helper.should_receive(:customize).with(:ide_disk => false).ordered.and_yield(guestfs, guestfs_helper)
+        guestfs_helper.should_receive(:def)
+
+        GuestFSHelper.should_receive(:new).with('disk.raw', :log => @log).and_return(guestfs_helper)
 
-    it "should sync files" do
-      @exec_helper.should_receive(:execute).with("rsync -Xura from_dir/* to_dir")
+        @helper.customize('disk.raw') do |guestfs, guestfs_helper|
+          guestfs.abc
+          guestfs_helper.def
+        end
+      end
+
+      it "should customize the disk image using GuestFS and selectind ide_disk option for RHEL/CentOS 5" do
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'rhel', :version => '5'}))
+
+        guestfs = mock('GuestFS')
+        guestfs.should_receive(:abc)
+
+        guestfs_helper = mock(GuestFSHelper)
+        guestfs_helper.should_receive(:customize).with(:ide_disk => true).ordered.and_yield(guestfs, guestfs_helper)
+        guestfs_helper.should_receive(:def)
 
-      @helper.sync_files('from_dir', 'to_dir')
+        GuestFSHelper.should_receive(:new).with('disk.raw', :log => @log).and_return(guestfs_helper)
+
+        @helper.customize('disk.raw') do |guestfs, guestfs_helper|
+          guestfs.abc
+          guestfs_helper.def
+        end
+      end
     end
 
-    it "should customize the disk image suing GuestFS" do
-      guestfs        = mock('GuestFS')
-      guestfs.should_receive(:abc)
+    describe ".convert_disk" do
+      it "should not convert the disk because it's in RAW format already" do
+        @exec_helper.should_receive(:execute).with("qemu-img info 'a/disk'").and_return("image: build/appliances/x86_64/fedora/13/f13-basic/fedora-plugin/f13-basic-sda.qcow2\nfile format: raw\nvirtual size: 2.0G (2147483648 bytes)\ndisk size: 531M\ncluster_size: 65536")
+        @exec_helper.should_receive(:execute).with("cp 'a/disk' 'destination'")
+        @helper.convert_disk('a/disk', :raw, 'destination')
+      end
 
-      guestfs_helper = mock(GuestFSHelper)
-      guestfs_helper.should_receive(:customize).ordered.and_yield(guestfs, guestfs_helper)
-      guestfs_helper.should_receive(:def)
+      it "should convert disk from vmdk to RAW format" do
+        @exec_helper.should_receive(:execute).with("qemu-img info 'a/disk'").and_return("image: build/appliances/x86_64/fedora/13/f13-basic/fedora-plugin/f13-basic-sda.vmdk\nfile format: vmdk\nvirtual size: 2.0G (2147483648 bytes)\ndisk size: 531M\ncluster_size: 65536")
+        @exec_helper.should_receive(:execute).with("qemu-img convert -f vmdk -O raw 'a/disk' 'destination'")
+        @helper.convert_disk('a/disk', :raw, 'destination')
+      end
+
+      it "should convert disk from raw to vmdk format using old qemu-img" do
+        @exec_helper.should_receive(:execute).with("qemu-img info 'a/disk'").and_return("image: build/appliances/x86_64/fedora/13/f13-basic/fedora-plugin/f13-basic-sda.vmdk\nfile format: raw\nvirtual size: 2.0G (2147483648 bytes)\ndisk size: 531M\ncluster_size: 65536")
+        @helper.should_receive(:`).with("qemu-img --help | grep '\\-6'").and_return('something')
+
+        @exec_helper.should_receive(:execute).with("qemu-img convert -f raw -O vmdk -6 'a/disk' 'destination'")
+        @helper.convert_disk('a/disk', :vmdk, 'destination')
+      end
+
+      it "should convert disk from raw to vmdk format using new qemu-img" do
+        @exec_helper.should_receive(:execute).with("qemu-img info 'a/disk'").and_return("image: build/appliances/x86_64/fedora/13/f13-basic/fedora-plugin/f13-basic-sda.vmdk\nfile format: raw\nvirtual size: 2.0G (2147483648 bytes)\ndisk size: 531M\ncluster_size: 65536")
+        @helper.should_receive(:`).with("qemu-img --help | grep '\\-6'").and_return('')
 
-      GuestFSHelper.should_receive(:new).with('disk.raw', :log => @log).and_return(guestfs_helper)
+        @exec_helper.should_receive(:execute).with("qemu-img convert -f raw -O vmdk -o compat6 'a/disk' 'destination'")
+        @helper.convert_disk('a/disk', :vmdk, 'destination')
+      end
 
-      @helper.customize('disk.raw') do |guestfs, guestfs_helper|
-        guestfs.abc
-        guestfs_helper.def
+      it "should do nothing because destination already exists" do
+        File.should_receive(:exists?).with('destination').and_return(true)
+        @helper.convert_disk('a/disk', :vmdk, 'destination')
       end
     end
   end