boxgrinder-build 0.9.0 → 0.9.1

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin'
 require 'hashery/opencascade'
 
@@ -27,21 +28,24 @@ module BoxGrinder
       plugins = mock('Plugins')
       plugins.stub!(:[]).with('rpm_based').and_return({})
       @config.stub!(:[]).with(:plugins).and_return(plugins)
+      @config.stub!(:dir).and_return(OpenCascade.new(:tmp => 'tmpdir', :cache => 'cachedir'))
 
-      @appliance_config.stub!(:path).and_return(OpenCascade.new({:build => 'build/path'}))
       @appliance_config.stub!(:name).and_return('full')
       @appliance_config.stub!(:version).and_return(1)
       @appliance_config.stub!(:release).and_return(0)
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
+      @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:cpus => 1, :memory => 512, :partitions => {'/' => nil, '/home' => nil}))
+      @appliance_config.stub!(:path).and_return(OpenCascade.new(:build => 'build/path', :main => 'mainpath'))
 
       @plugin = RPMBasedOSPlugin.new
 
       @plugin.stub!(:merge_plugin_config)
 
-      @plugin.init(@config, @appliance_config, :log => Logger.new('/dev/null'), :plugin_info => {:name => :rpm_based})
+      @plugin.init(@config, @appliance_config, :log => LogHelper.new(:level => :trace, :type => :stdout), :plugin_info => {:name => :rpm_based})
 
       @config = @plugin.instance_variable_get(:@config)
       @appliance_config = @plugin.instance_variable_get(:@appliance_config)
+      @image_helper = @plugin.instance_variable_get(:@image_helper)
       @exec_helper = @plugin.instance_variable_get(:@exec_helper)
       @log = @plugin.instance_variable_get(:@log)
     end
@@ -104,19 +108,6 @@ module BoxGrinder
       end
     end
 
-    it "should fix partition labels" do
-      guestfs = mock("guestfs")
-
-      guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
-      guestfs.should_receive(:vfs_label).with('/dev/vda1').and_return('_/')
-      guestfs.should_receive(:vfs_label).with('/dev/vda2').and_return('_/boot')
-
-      guestfs.should_receive(:sh).with('/sbin/e2label /dev/vda1 /')
-      guestfs.should_receive(:sh).with('/sbin/e2label /dev/vda2 /boot')
-
-      @plugin.fix_partition_labels(guestfs)
-    end
-
     describe ".use_labels_for_partitions" do
       it "should use labels for partitions instead of paths" do
         guestfs = mock("guestfs")
@@ -157,6 +148,75 @@ module BoxGrinder
 
       @plugin.disable_firewall(guestfs)
     end
+
+    describe ".build_with_appliance_creator" do
+      it "should build appliance" do
+        kickstart = mock(Kickstart)
+        kickstart.should_receive(:create).and_return('kickstart.ks')
+
+        validator = mock(RPMDependencyValidator)
+        validator.should_receive(:resolve_packages)
+
+        Kickstart.should_receive(:new).with(@config, @appliance_config, {}, {:tmp=>"build/path/rpm_based-plugin/tmp", :base=>"build/path/rpm_based-plugin"}, :log => @log).and_return(kickstart)
+        RPMDependencyValidator.should_receive(:new).and_return(validator)
+
+        @exec_helper.should_receive(:execute).with("appliance-creator -d -v -t 'build/path/rpm_based-plugin/tmp' --cache=cachedir/rpms-cache/mainpath --config 'kickstart.ks' -o 'build/path/rpm_based-plugin/tmp' --name 'full' --vmem 512 --vcpu 1 --format raw")
+
+        FileUtils.should_receive(:mv)
+        FileUtils.should_receive(:rm_rf)
+
+        @image_helper.should_receive(:customize).with(["build/path/rpm_based-plugin/tmp/full-sda.raw"])
+
+        @plugin.build_with_appliance_creator('jeos.appl')
+      end
+    end
+
+    describe ".execute_appliance_creator" do
+      it "should execute appliance creator successfuly" do
+        @exec_helper.should_receive(:execute).with("appliance-creator -d -v -t 'build/path/rpm_based-plugin/tmp' --cache=cachedir/rpms-cache/mainpath --config 'kickstart.ks' -o 'build/path/rpm_based-plugin/tmp' --name 'full' --vmem 512 --vcpu 1 --format raw")
+        @plugin.execute_appliance_creator('kickstart.ks')
+      end
+
+      it "should catch the interrupt and unmount the appliance-creator mounts" do
+        @exec_helper.should_receive(:execute).with("appliance-creator -d -v -t 'build/path/rpm_based-plugin/tmp' --cache=cachedir/rpms-cache/mainpath --config 'kickstart.ks' -o 'build/path/rpm_based-plugin/tmp' --name 'full' --vmem 512 --vcpu 1 --format raw").and_raise(InterruptionError.new(12345))
+        @plugin.should_receive(:cleanup_after_appliance_creator).with(12345)
+        @plugin.should_receive(:abort)
+        @plugin.execute_appliance_creator('kickstart.ks')
+      end
+    end
+
+    describe ".cleanup_after_appliance_creator" do
+      it "should cleanup after appliance creator (surprisngly!)" do
+        Process.should_receive(:kill).with("TERM", 12345)
+        Process.should_receive(:wait).with(12345)
+
+        Dir.should_receive(:[]).with('build/path/rpm_based-plugin/tmp/imgcreate-*').and_return(['adir'])
+
+        @exec_helper.should_receive(:execute).ordered.with("mount | grep adir | awk '{print $1}'").and_return("/dev/mapper/loop0p1
+/dev/mapper/loop0p2
+/sys
+/proc
+/dev/pts
+/dev/shm
+/var/cache/boxgrinder/rpms-cache/x86_64/fedora/14")
+
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/var/cache/yum')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/dev/shm')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/dev/pts')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/proc')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/sys')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/home')
+        @exec_helper.should_receive(:execute).ordered.with('umount -d adir/install_root/')
+
+        @exec_helper.should_receive(:execute).ordered.with("/sbin/kpartx -d /dev/loop0")
+        @exec_helper.should_receive(:execute).ordered.with("losetup -d /dev/loop0")
+
+        @exec_helper.should_receive(:execute).ordered.with("rm /dev/loop01")
+        @exec_helper.should_receive(:execute).ordered.with("rm /dev/loop02")
+
+        @plugin.cleanup_after_appliance_creator(12345)
+      end
+    end
   end
 end
 

data/spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator'
 require 'hashery/opencascade'
 

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/platform/ec2/ec2-plugin'
 require 'boxgrinder-core/helpers/log-helper'
 require 'hashery/opencascade'
@@ -144,7 +145,7 @@ module BoxGrinder
       @plugin.instance_variable_set(:@linux_helper, linux_helper)
 
       tempfile = mock(Tempfile)
-      tempfile.should_receive(:<<).with("default=0\ntimeout=0\ntitle full\n        root (hd0)\n        kernel /boot/vmlinuz-2.6.18 ro root=LABEL=/ rd_NO_PLYMOUTH\n        initrd /boot/vmlinuz-2.6.18.img")
+      tempfile.should_receive(:<<).with("default=0\ntimeout=0\ntitle full\n        root (hd0)\n        kernel /boot/vmlinuz-2.6.18 ro root=LABEL=79d3d2d4 rd_NO_PLYMOUTH\n        initrd /boot/vmlinuz-2.6.18.img\n")
       tempfile.should_receive(:flush)
       tempfile.should_receive(:path).and_return('path/menu.lst')
       tempfile.should_receive(:close)
@@ -196,24 +197,17 @@ module BoxGrinder
 
         LinuxHelper.should_receive(:new).with(:log => @log).and_return(linux_helper)
 
-        @image_helper.should_receive(:convert_disk).with("a/disk.raw").with("a/disk.raw", "raw", "build/path/ec2-plugin/tmp/full.raw")
-
-        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10)
-        @image_helper.should_receive(:create_filesystem).with("build/path/ec2-plugin/tmp/full.ec2")
-        @image_helper.should_receive(:mount_image).twice
-        @image_helper.should_receive(:sync_files)
-        @image_helper.should_receive(:umount_image).twice
-
         guestfs = mock("guestfs")
         guestfs_helper = mock("guestfsHelper")
 
-        @image_helper.should_receive(:customize).with("build/path/ec2-plugin/tmp/full.ec2").and_yield(guestfs, guestfs_helper)
+        @image_helper.should_receive(:customize).with(["a/disk.raw", "build/path/ec2-plugin/tmp/full.ec2"], :automount => false).and_yield(guestfs, guestfs_helper)
+        @image_helper.should_receive(:sync_filesystem).with(guestfs, guestfs_helper)
+        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10)
 
         guestfs.should_receive(:upload).with("/etc/resolv.conf", "/etc/resolv.conf")
         @plugin.should_receive(:create_devices).with(guestfs)
         @plugin.should_receive(:upload_fstab).with(guestfs)
 
-
         @plugin.should_receive(:enable_networking).with(guestfs)
         @plugin.should_receive(:upload_rc_local).with(guestfs)
         @plugin.should_receive(:enable_nosegneg_flag).with(guestfs)
@@ -235,18 +229,12 @@ module BoxGrinder
 
         LinuxHelper.should_receive(:new).with(:log => @log).and_return(linux_helper)
 
-        @image_helper.should_receive(:convert_disk).with("a/disk.raw").with("a/disk.raw", "raw", "build/path/ec2-plugin/tmp/full.raw")
-
-        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10)
-        @image_helper.should_receive(:create_filesystem).with("build/path/ec2-plugin/tmp/full.ec2")
-        @image_helper.should_receive(:mount_image).twice
-        @image_helper.should_receive(:sync_files)
-        @image_helper.should_receive(:umount_image).twice
-
         guestfs = mock("guestfs")
         guestfs_helper = mock("guestfsHelper")
 
-        @image_helper.should_receive(:customize).with("build/path/ec2-plugin/tmp/full.ec2").and_yield(guestfs, guestfs_helper)
+        @image_helper.should_receive(:customize).with(["a/disk.raw", "build/path/ec2-plugin/tmp/full.ec2"], :automount => false).and_yield(guestfs, guestfs_helper)
+        @image_helper.should_receive(:sync_filesystem).with(guestfs, guestfs_helper)
+        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10)
 
         guestfs.should_receive(:upload).with("/etc/resolv.conf", "/etc/resolv.conf")
         guestfs.should_receive(:mkdir).with("/data")
@@ -276,33 +264,12 @@ module BoxGrinder
 
         LinuxHelper.should_receive(:new).with(:log => @log).and_return(linux_helper)
 
-        @image_helper.should_receive(:create_disk).and_raise("This error is expected!")
-        @image_helper.should_not_receive(:create_filesystem)
-        @image_helper.should_not_receive(:mount_image)
-
-        @image_helper.should_not_receive(:customize)
-
-        lambda {
-          @plugin.execute
-        }.should raise_error(RuntimeError, "Error while preparing EC2 disk image. See logs for more info.")
-      end
-
-      it "should fail because mounting or unmounting failed" do
-        linux_helper = mock(LinuxHelper)
-
-        LinuxHelper.should_receive(:new).with(:log => @log).and_return(linux_helper)
-
-        @image_helper.should_receive(:convert_disk).with("a/disk.raw").with("a/disk.raw", "raw", "build/path/ec2-plugin/tmp/full.raw")
-
-        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10)
-        @image_helper.should_receive(:create_filesystem).with("build/path/ec2-plugin/tmp/full.ec2")
-        @image_helper.should_receive(:mount_image).and_raise("This error is expected!")
-
+        @image_helper.should_receive(:create_disk).with("build/path/ec2-plugin/tmp/full.ec2", 10).and_raise("Boom")
         @image_helper.should_not_receive(:customize)
 
         lambda {
           @plugin.execute
-        }.should raise_error(RuntimeError, "Error while mounting image. See logs for more info.")
+        }.should raise_error(RuntimeError, "Boom")
       end
     end
 

data/spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin'
 require 'hashery/opencascade'
 
@@ -59,6 +60,7 @@ module BoxGrinder
 
       @exec_helper = @plugin.instance_variable_get(:@exec_helper)
       @image_helper = @plugin.instance_variable_get(:@image_helper)
+      @log = @plugin.instance_variable_get(:@log)
     end
 
     describe ".build_virtualbox" do
@@ -79,40 +81,117 @@ module BoxGrinder
       end
     end
 
+    describe ".is_os_old?" do
+      it "should return false for fedora 14" do
+        prepare_image
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '14'}))
+        @plugin.is_os_old?.should == false
+      end
+
+      it "should return false for rhel 6" do
+        prepare_image
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'rhel', :version => '6'}))
+        @plugin.is_os_old?.should == false
+      end
+
+      it "should return true for centos 5" do
+        prepare_image
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'centos', :version => '5'}))
+        @plugin.is_os_old?.should == true
+      end
+    end
+
     describe ".customize" do
       it "should customize the image" do
         prepare_image
 
         @appliance_config.post['virtualbox'] = ["one", "two", "three"]
 
-        guestfs_mock = mock("GuestFS")
         guestfs_helper_mock = mock("GuestFSHelper")
 
-        @image_helper.should_receive(:customize).with("build/path/virtualbox-plugin/tmp/full.vmdk").and_yield(guestfs_mock, guestfs_helper_mock)
+#        @image_helper.should_receive(:customize).with("build/path/virtualbox-plugin/tmp/full.vmdk").and_yield(guestfs_mock, guestfs_helper_mock)
 
         guestfs_helper_mock.should_receive(:sh).once.ordered.with("one", :arch => 'i686')
         guestfs_helper_mock.should_receive(:sh).once.ordered.with("two", :arch => 'i686')
         guestfs_helper_mock.should_receive(:sh).once.ordered.with("three", :arch => 'i686')
 
-        @plugin.customize
+        @plugin.customize(guestfs_helper_mock)
       end
+    end
 
-      it "should not customize the image if no commands are specified" do
+    describe ".execute" do
+      it "should execute the conversion" do
         prepare_image
 
+        @plugin.should_receive(:build_virtualbox)
+
         @image_helper.should_not_receive(:customize)
+        @plugin.should_not_receive(:recreate_kernel)
+        @plugin.should_not_receive(:customize)
 
-        @plugin.customize
+        @plugin.execute
+      end
+
+      it "should execute the conversion with post operations" do
+        prepare_image
+
+        @appliance_config.post['virtualbox'] = ["one", "two", "three"]
+
+        @plugin.should_receive(:build_virtualbox)
+
+        guestfs_mock = mock("GuestFS")
+        guestfs_helper_mock = mock("GuestFSHelper")
+
+        @image_helper.should_receive(:customize).with(["build/path/virtualbox-plugin/tmp/full.vmdk"]).and_yield(guestfs_mock, guestfs_helper_mock)
+
+        @plugin.should_not_receive(:recreate_kernel)
+        @plugin.should_receive(:customize).with(guestfs_helper_mock)
+
+        @plugin.execute
+      end
+
+      it "should execute the conversion with post operations for rhel 5" do
+        prepare_image
+
+        @appliance_config.post['virtualbox'] = ["one", "two", "three"]
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'rhel', :version => '5'}))
+
+        @plugin.should_receive(:build_virtualbox)
+
+        guestfs_mock = mock("GuestFS")
+        guestfs_helper_mock = mock("GuestFSHelper")
+
+        @image_helper.should_receive(:customize).with(["build/path/virtualbox-plugin/tmp/full.vmdk"]).and_yield(guestfs_mock, guestfs_helper_mock)
+
+        @plugin.should_receive(:recreate_kernel).with(guestfs_mock)
+        @plugin.should_receive(:customize).with(guestfs_helper_mock)
+
+        @plugin.execute
+      end
+
+      it "should not customize the image if no commands are specified and the appliance os version is old" do
+        prepare_image
+
+        @plugin.should_receive(:build_virtualbox)
+        @plugin.should_receive(:is_os_old?).and_return(false)
+        @image_helper.should_not_receive(:customize)
+
+        @plugin.execute
       end
     end
 
-    it "should execute the conversion" do
-      prepare_image
+    describe ".recreate_kernel" do
+      it "should recreate the kernel" do
+        prepare_image
 
-      @plugin.should_receive(:build_virtualbox)
-      @plugin.should_receive(:customize)
+        guestfs_mock = mock("GuestFS")
+        linux_helper_mock = mock(LinuxHelper)
+        linux_helper_mock.should_receive(:recreate_kernel_image).with(guestfs_mock, ['ahci'])
 
-      @plugin.execute
+        LinuxHelper.should_receive(:new).with(:log => @log).and_return(linux_helper_mock)
+
+        @plugin.recreate_kernel(guestfs_mock)
+      end
     end
   end
 end

data/spec/plugins/platform/vmware/vmware-plugin-spec.rb

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/platform/vmware/vmware-plugin'
 require 'hashery/opencascade'
 
@@ -168,9 +169,9 @@ module BoxGrinder
 
       vmx_file.scan(/^guestOS = "(.*)"\s?$/).to_s.should == "linux"
       vmx_file.scan(/^displayName = "(.*)"\s?$/).to_s.should == "full"
-      vmx_file.scan(/^annotation = "(.*)"\s?$/).to_s.scan(/^A full appliance definition | Version: 1\.0 | Built by: BoxGrinder 1\.0\.0/).should_not == nil
+      vmx_file.scan(/^annotation = "(.*)"\s?$/).to_s.scan(/^full | Version: 1\.0 | Built by: BoxGrinder 1\.0\.0/).should_not == nil
       vmx_file.scan(/^guestinfo.vmware.product.long = "(.*)"\s?$/).to_s.should == "full"
-      vmx_file.scan(/^guestinfo.vmware.product.url = "(.*)"\s?$/).to_s.should == "http://www.jboss.org/boxgrinder"
+      vmx_file.scan(/^guestinfo.vmware.product.url = "(.*)"\s?$/).to_s.should == "http://boxgrinder.org"
       vmx_file.scan(/^numvcpus = "(.*)"\s?$/).to_s.should == "1"
       vmx_file.scan(/^memsize = "(.*)"\s?$/).to_s.should == "256"
       vmx_file.scan(/^log.fileName = "(.*)"\s?$/).to_s.should == "full.log"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 +01:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,6 +104,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: A tool for creating appliances from simple plain text files for various virtual environments.
 email: info@boxgrinder.org
 executables: 
@@ -117,7 +131,6 @@ extra_rdoc_files:
 - bin/boxgrinder-build
 - lib/boxgrinder-build.rb
 - lib/boxgrinder-build/appliance.rb
-- lib/boxgrinder-build/helpers/appliance-customize-helper.rb
 - lib/boxgrinder-build/helpers/augeas-helper.rb
 - lib/boxgrinder-build/helpers/guestfs-helper.rb
 - lib/boxgrinder-build/helpers/image-helper.rb
@@ -127,6 +140,7 @@ extra_rdoc_files:
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
+- lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem
@@ -163,7 +177,6 @@ files:
 - boxgrinder-build.gemspec
 - lib/boxgrinder-build.rb
 - lib/boxgrinder-build/appliance.rb
-- lib/boxgrinder-build/helpers/appliance-customize-helper.rb
 - lib/boxgrinder-build/helpers/augeas-helper.rb
 - lib/boxgrinder-build/helpers/guestfs-helper.rb
 - lib/boxgrinder-build/helpers/image-helper.rb
@@ -173,6 +186,7 @@ files:
 - lib/boxgrinder-build/managers/plugin-manager.rb
 - lib/boxgrinder-build/plugins/base-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb
+- lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb
 - lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem
@@ -202,7 +216,6 @@ files:
 - rubygem-boxgrinder-build.spec
 - spec/Rakefile
 - spec/appliance-spec.rb
-- spec/helpers/appliance-customize-helper-spec.rb
 - spec/helpers/augeas-helper-spec.rb
 - spec/helpers/guestfs-helper-spec.rb
 - spec/helpers/image-helper-spec.rb
@@ -213,6 +226,7 @@ files:
 - spec/plugins/base-plugin-spec.rb
 - spec/plugins/delivery/ebs/ebs-plugin-spec.rb
 - spec/plugins/delivery/ebs/ebs.yaml
+- spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb
 - spec/plugins/delivery/local/local-plugin-spec.rb
 - spec/plugins/delivery/s3/s3-plugin-spec.rb
 - spec/plugins/delivery/sftp/sftp-plugin-spec.rb

data/lib/boxgrinder-build/helpers/appliance-customize-helper.rb

@@ -1,45 +0,0 @@
-#
-# Copyright 2010 Red Hat, Inc.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require 'rubygems'
-require 'boxgrinder-build/helpers/guestfs-helper'
-require 'boxgrinder-core/helpers/exec-helper'
-require 'boxgrinder-core/helpers/log-helper'
-
-module BoxGrinder
-  class ApplianceCustomizeHelper
-
-    def initialize( config, appliance_config, disk, options = {} )
-      @config           = config
-      @appliance_config = appliance_config
-      @disk             = disk
-
-      @log          = options[:log]         || LogHelper.new
-      @exec_helper  = options[:exec_helper] || ExecHelper.new( { :log => @log } )
-    end
-
-    def customize
-      @guestfs_helper = GuestFSHelper.new( @disk, :log => @log ).run
-      @guestfs = @guestfs_helper.guestfs
-
-      yield @guestfs, @guestfs_helper
-
-      @guestfs_helper.clean_close
-    end
-  end
-end

data/spec/helpers/appliance-customize-helper-spec.rb

@@ -1,74 +0,0 @@
-#
-# Copyright 2010 Red Hat, Inc.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require 'boxgrinder-build/helpers/appliance-customize-helper'
-
-module BoxGrinder
-  describe ApplianceCustomizeHelper do
-
-    before(:each) do
-      @config = mock('Config')
-      @config.stub!(:name).and_return('BoxGrinder')
-      @config.stub!(:version_with_release).and_return('0.1.2')
-
-      @appliance_config = mock('ApplianceConfig')
-
-      @appliance_config.stub!(:path).and_return(OpenCascade.new({:build => 'build/path'}))
-      @appliance_config.stub!(:name).and_return('full')
-      @appliance_config.stub!(:summary).and_return('asd')
-      @appliance_config.stub!(:version).and_return(1)
-      @appliance_config.stub!(:release).and_return(0)
-      @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
-      @appliance_config.stub!(:post).and_return(OpenCascade.new({:vmware => []}))
-
-      @appliance_config.stub!(:hardware).and_return(
-          OpenCascade.new({
-                           :partitions =>
-                               {
-                                   '/' => {'size' => 2},
-                                   '/home' => {'size' => 3},
-                               },
-                           :arch => 'i686',
-                           :base_arch => 'i386',
-                           :cpus => 1,
-                           :memory => 256,
-                       })
-      )
-
-      @helper = ApplianceCustomizeHelper.new(@config, @appliance_config, 'a/disk', :log => Logger.new('/dev/null'))
-
-      @log = @helper.instance_variable_get(:@log)
-    end
-
-    it "should properly prepare guestfs for customization" do
-
-      guestfs_helper = mock('guestfs_helper')
-      guestfs = mock('guestfs')
-      guestfs_helper.should_receive(:run).and_return(guestfs_helper)
-      guestfs_helper.should_receive(:guestfs).and_return(guestfs)
-      guestfs_helper.should_receive(:clean_close)
-
-      GuestFSHelper.should_receive(:new).with('a/disk', :log =>  @log).and_return(guestfs_helper)
-
-      @helper.customize do |gf, gf_helper|
-        gf_helper.should == guestfs_helper
-        gf.should == guestfs
-      end
-    end
-  end
-end