boxgrinder-build 0.5.1 → 0.6.0

data/CHANGELOG

@@ -1,4 +1,9 @@
 
+v0.6.0
+
+* [BGBUILD-52] Wrong post section inheritance
+* [BGBUILD-46] Allow building 32 bit images on 64 bit arch
+
 v0.5.1
 
 * [BGBUILD-40] Fix for running Augeas in Libguestfs

data/Manifest

@@ -1,26 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-Rakefile
-bin/boxgrinder-build
-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/linux-helper.rb
-lib/boxgrinder-build/helpers/package-helper.rb
-lib/boxgrinder-build/helpers/plugin-helper.rb
-lib/boxgrinder-build/managers/plugin-manager.rb
-lib/boxgrinder-build/plugins/base-plugin.rb
-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/linux-helper-spec.rb
-spec/helpers/package-helper-spec.rb
-spec/helpers/plugin-helper-spec.rb
-spec/managers/plugin-manager-spec.rb
-spec/plugins/base-plugin-spec.rb
-spec/rspec/src/appliances/jeos-f13.appl

data/Rakefile

@@ -4,8 +4,8 @@ Echoe.new("boxgrinder-build") do |p|
   p.project     = "BoxGrinder Build"
   p.author      = "Marek Goldmann"
   p.summary     = "A tool for creating appliances from simple plain text files for various virtual environments."
-  p.url         = "http://www.jboss.org/stormgrind/projects/boxgrinder.html"
+  p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
   p.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git|\.log/
-  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.0.22"]
-end
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.0"]
+end

data/bin/boxgrinder-build

@@ -21,14 +21,13 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'boxgrinder-core/helpers/log-helper'
-require 'boxgrinder-build/managers/plugin-manager'
-require 'boxgrinder-build/helpers/plugin-helper'
-require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.20'
+gem 'boxgrinder-core', '>= 0.1.0'
 gem 'commander', '>= 4.0.3'
 
+require 'boxgrinder-core/helpers/log-helper'
+require 'boxgrinder-build/appliance'
+
 #$stderr.reopen($stdout)
 
 if Process.uid != 0
@@ -39,9 +38,9 @@ end
 require 'commander/import'
 
 program :name, 'BoxGrinder Build'
-program :version, '0.5.1'
+program :version, '0.6.0'
 program :description, "A tool for building VM images from simple definition files."
-program :help, 'Hompepage', 'http://www.jboss.org/stormgrind/projects/boxgrinder/build.html'
+program :help, 'Homepage', 'http://www.jboss.org/boxgrinder/build.html'
 program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'
 program :help, 'Examples', "Run 'boxgrinder-build -h build' for more info about syntax."
 default_command :build
@@ -49,7 +48,7 @@ default_command :build
 $log_level = :info
 
 global_option('-V', '--verbose', TrueClass, "Prints debug information while building. Default: false.") { $log_level = :debug}
-global_option('-W', '--veryverbose', TrueClass, "Prints trace information while building. Default: false.") { $log_level = :trace}
+global_option('-W', '--very-verbose', TrueClass, "Prints trace information while building. Default: false.") { $log_level = :trace}
 
 module BoxGrinder
   command :build do |c|
@@ -77,15 +76,7 @@ module BoxGrinder
 
       raise "Appliance definition file '#{appliance_definition_file}' could not be found" unless File.exists?( appliance_definition_file )
 
-      log = LogHelper.new( :threshold => $log_level )
-
-      PluginHelper.new( :options => options, :log => log ).load_plugins
-      PluginManager.instance.log = log
-
-      raise "Not known platform: #{options.platform}. #{PluginManager.instance.plugins[:platform].empty? ? 'There are no platform plugins, please install one or more.' : "Available types: #{PluginManager.instance.plugin_types( :platform ).join(', ')}."}"  if PluginManager.instance.plugins[:platform][options.platform].nil? and options.platform != :none
-      raise "Not known delivery type: #{options.delivery}. #{PluginManager.instance.plugins[:delivery].empty? ? 'There are no delivery plugins, please install one or more.' : "Available types: #{PluginManager.instance.plugin_types( :delivery ).join(', ')}."}" if PluginManager.instance.plugin_types( :delivery ).include?(options.delivery).nil?  and options.delivery != :none
-
-      Appliance.new( appliance_definition_file, :options => options, :log => log ).create
+      Appliance.new( appliance_definition_file, :options => options, :log => LogHelper.new( :threshold => $log_level ) ).create
     end
   end
 end

data/boxgrinder-build.gemspec

@@ -2,37 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-10-12}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}
   s.executables = ["boxgrinder-build"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder-build", "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/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "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/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "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/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/rspec/src/appliances/jeos-f13.appl", "boxgrinder-build.gemspec"]
-  s.homepage = %q{http://www.jboss.org/stormgrind/projects/boxgrinder.html}
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder-build", "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", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "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", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "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", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/rspec/src/appliances/jeos-f13.appl", "boxgrinder-build.gemspec"]
+  s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{BoxGrinder Build}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.0.22"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -22,6 +22,8 @@ require 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/appliance-helper'
 require 'boxgrinder-core/helpers/appliance-config-helper'
+require 'boxgrinder-build/helpers/plugin-helper'
+require 'boxgrinder-build/managers/plugin-manager'
 require 'boxgrinder-core/validators/appliance-config-validator'
 
 module BoxGrinder
@@ -38,19 +40,23 @@ module BoxGrinder
       @config.version.release = nil
     end
 
-    def create
+    def read_and_validate_definition
       appliance_configs, appliance_config = ApplianceHelper.new( :log => @log ).read_definitions( @appliance_definition_file )
       appliance_config_helper             = ApplianceConfigHelper.new( appliance_configs )
 
       @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
 
-      ApplianceConfigValidator.new( @appliance_config, :os_plugins => PluginManager.instance.plugins[:os] ).validate
+      ApplianceConfigValidator.new( @appliance_config ).validate
+    end
 
-      if @options.force
-        @log.info "Removing previous builds for #{@appliance_config.name} appliance..."
-        FileUtils.rm_rf( @appliance_config.path.build )
-        @log.debug "Previous builds removed."
-      end
+    def remove_old_builds
+      @log.info "Removing previous builds for #{@appliance_config.name} appliance..."
+      FileUtils.rm_rf( @appliance_config.path.build )
+      @log.debug "Previous builds removed."
+    end
+
+    def execute_plugin_chain
+      @log.info "Building '#{@appliance_config.name}' appliance for #{@appliance_config.hardware.arch} architecture."
 
       base_plugin_output       = execute_os_plugin
       platform_plugin_output   = execute_platform_plugin( base_plugin_output )
@@ -58,7 +64,17 @@ module BoxGrinder
       execute_delivery_plugin( platform_plugin_output )
     end
 
+    def create
+      PluginHelper.new( :options => @options, :log => @log ).load_plugins
+
+      read_and_validate_definition
+      remove_old_builds if @options.force
+      execute_plugin_chain
+    end
+
     def execute_os_plugin
+      raise "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" if PluginManager.instance.plugins[:os].empty?
+
       os_plugin, os_plugin_info = PluginManager.instance.initialize_plugin(:os, @appliance_config.os.name.to_sym )
       os_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => os_plugin_info )
 
@@ -80,6 +96,8 @@ module BoxGrinder
         return previous_plugin_output
       end
 
+      raise "No platform plugins installed. Install one or more platform plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info" if PluginManager.instance.plugins[:platform].empty?
+
       platform_plugin, platform_plugin_info = PluginManager.instance.initialize_plugin(:platform, @options.platform )
       platform_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => platform_plugin_info, :previous_plugin_info => previous_plugin_output[:plugin_info], :previous_deliverables => previous_plugin_output[:deliverables] )
 
@@ -101,6 +119,8 @@ module BoxGrinder
         return
       end
 
+      raise "No delivery plugins installed. Install one or more delivery plugin. See http://community.jboss.org/docs/DOC-15081 and http://community.jboss.org/docs/DOC-15214 for more info" if PluginManager.instance.plugins[:delivery].empty?
+
       delivery_plugin, delivery_plugin_info = PluginManager.instance.initialize_plugin(:delivery, @options.delivery )
       delivery_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => delivery_plugin_info, :previous_plugin_info => previous_plugin_output[:plugin_info], :previous_deliverables => previous_plugin_output[:deliverables] )
 

data/lib/boxgrinder-build/helpers/image-helper.rb

@@ -0,0 +1,123 @@
+# JBoss, Home of Professional Open Source
+# Copyright 2009, Red Hat Middleware LLC, and individual contributors
+# by the @authors tag. See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# 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 2.1 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 'fileutils'
+require 'boxgrinder-build/helpers/guestfs-helper'
+
+module BoxGrinder
+  class ImageHelper
+    def initialize(options = {})
+      @log          = options[:log] || Logger.new(STDOUT)
+      @exec_helper  = options[:exec_helper] || ExecHelper.new(:log => @log)
+    end
+
+    def mount_image(disk, mount_dir)
+      offsets      = calculate_disk_offsets(disk)
+
+      @log.debug "Mounting image #{File.basename(disk)} in #{mount_dir}..."
+      FileUtils.mkdir_p(mount_dir)
+
+      mounts       = {}
+
+      offsets.each do |offset|
+        loop_device   = get_loop_device
+        @exec_helper.execute("losetup -o #{offset.to_s} #{loop_device} #{disk}")
+        label         = @exec_helper.execute("e2label #{loop_device}").strip.chomp.gsub('_', '')
+        label = '/' if label == ''
+        mounts[label] = loop_device
+      end
+
+      @exec_helper.execute("mount #{mounts['/']} -t #{get_filesystem_type(mounts['/'])} #{mount_dir}")
+
+      mounts.reject { |key, value| key == '/' }.each do |mount_point, loop_device|
+        @exec_helper.execute("mount #{loop_device} -t #{get_filesystem_type(loop_device)} #{mount_dir}#{mount_point}")
+      end
+
+      @log.trace "Mounts:\n#{mounts}"
+
+      mounts
+    end
+
+    def get_filesystem_type(device, default_type = 'ext3')
+      fs_type = @exec_helper.execute("df -T #{device} | tail -1 | awk '{print $2}'")
+      return default_type if fs_type.empty? or fs_type == '-'
+      fs_type
+    end
+
+    def umount_image(disk, mount_dir, mounts)
+      @log.debug "Unmounting image '#{File.basename(disk)}'..."
+
+      mounts.each { |mount_point, loop_device| @exec_helper.execute("umount -d #{loop_device}") unless mount_point == '/' }
+
+      @exec_helper.execute("umount -d #{mounts['/']}")
+
+      FileUtils.rm_rf(mount_dir)
+    end
+
+    def get_loop_device
+      begin
+        loop_device = @exec_helper.execute("losetup -f 2>&1").strip
+      rescue
+        raise "No free loop devices available, please free at least one. See 'losetup -d' command."
+      end
+
+      loop_device
+    end
+
+    def calculate_disk_offsets(disk)
+      @log.debug "Calculating offsets for '#{File.basename(disk)}' disk..."
+      loop_device = get_loop_device
+
+      @exec_helper.execute("losetup #{loop_device} #{disk}")
+      offsets     = @exec_helper.execute("parted #{loop_device} 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").scan(/\d+/)
+      @exec_helper.execute("losetup -d #{loop_device}")
+
+      @log.trace "Offsets:\n#{offsets}"
+
+      offsets
+    end
+
+    def create_disk(disk, size)
+      @log.trace "Preparing disk..."
+      @exec_helper.execute "dd if=/dev/zero of=#{disk} bs=1 count=0 seek=#{size * 1024}M"
+      @log.trace "Disk prepared"
+    end
+
+    def create_filesystem(disk, options = {})
+      options = {:type => 'ext3', :label => '/'}.merge(options)
+
+      @log.trace "Creating filesystem..."
+      @exec_helper.execute "mke2fs -T #{options[:type]} -L '#{options[:label]}' -F #{disk}"
+      @log.trace "Filesystem created"
+    end
+
+    def sync_files(from_dir, to_dir)
+      @log.debug "Syncing files between #{from_dir} and #{to_dir}..."
+      @exec_helper.execute "rsync -u -r -a #{from_dir}/* #{to_dir}"
+      @log.debug "Sync finished."
+    end
+
+    def customize(disk_path)
+      GuestFSHelper.new(disk_path, :log => @log).customize do |guestfs, guestfs_helper|
+        yield guestfs, guestfs_helper
+      end
+    end
+  end
+end

data/lib/boxgrinder-build/helpers/plugin-helper.rb

@@ -54,7 +54,7 @@ module BoxGrinder
     end
 
     def read_and_require
-      plugins = %w(boxgrinder-build-fedora-os-plugin boxgrinder-build-rhel-os-plugin boxgrinder-build-centos-os-plugin boxgrinder-build-ec2-platform-plugin boxgrinder-build-vmware-platform-plugin boxgrinder-build-s3-delivery-plugin boxgrinder-build-sftp-delivery-plugin boxgrinder-build-local-delivery-plugin) + parse_plugin_list
+      plugins = %w(boxgrinder-build-fedora-os-plugin boxgrinder-build-rhel-os-plugin boxgrinder-build-centos-os-plugin boxgrinder-build-ec2-platform-plugin boxgrinder-build-vmware-platform-plugin boxgrinder-build-s3-delivery-plugin boxgrinder-build-sftp-delivery-plugin boxgrinder-build-local-delivery-plugin boxgrinder-build-ebs-delivery-plugin) + parse_plugin_list
 
       plugins.flatten.each do |plugin|
         @log.trace "Requiring plugin '#{plugin}'..."

data/lib/boxgrinder-build/managers/plugin-manager.rb

@@ -93,6 +93,5 @@ module BoxGrinder
     end
 
     attr_reader :plugins
-    attr_accessor :log
   end
 end

data/lib/boxgrinder-build/plugins/base-plugin.rb

@@ -19,7 +19,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/helpers/exec-helper'
-require 'boxgrinder-build/helpers/guestfs-helper'
+require 'boxgrinder-build/helpers/image-helper'
 require 'ostruct'
 require 'openhash/openhash'
 require 'fileutils'
@@ -34,6 +34,7 @@ module BoxGrinder
 
       @log              = options[:log]           || Logger.new(STDOUT)
       @exec_helper      = options[:exec_helper]   || ExecHelper.new( :log => @log )
+      @image_helper     = options[:image_helper]  || ImageHelper.new( :log => @log )
 
       @plugin_info            = options[:plugin_info]
       @previous_plugin_info   = options[:previous_plugin_info]
@@ -42,6 +43,7 @@ module BoxGrinder
       @plugin_config          = {}
 
       @deliverables           = OpenHash.new
+      @supported_oses         = OpenHash.new
       @target_deliverables    = OpenHash.new
       @dir                    = OpenHash.new
 
@@ -69,6 +71,29 @@ module BoxGrinder
       end
     end
 
+    def register_supported_os( name, versions )
+      raise "You can register supported operating system only after the plugin is initialized, please initialize the plugin using init method." if @initialized.nil?
+
+      @supported_oses[name] = OpenHash.new if @supported_oses[name].nil?
+      @supported_oses[name] = versions
+    end
+
+    def is_supported_os?
+      return false unless !@supported_oses[@appliance_config.os.name].nil? and @supported_oses[@appliance_config.os.name].include?(@appliance_config.os.version)
+      true
+    end
+
+    def supported_oses
+      supported = ""
+
+      @supported_oses.each do |name, versions|
+        supported << ", " unless supported.empty?
+        supported << "#{name} (versions: #{versions.join(", ")})"
+      end
+
+      supported
+    end
+
     def validate_plugin_config(fields = [], doc = nil)
       more_info = doc.nil? ? '' : "See #{doc} for more info"
 
@@ -135,16 +160,7 @@ module BoxGrinder
       begin
         @plugin_config = YAML.load_file(@config_file)
       rescue
-        raise "An error occurred while reading configuration file #{@config_file} for #{self.class.name}. Is it a valid YAML file?"
-      end
-    end
-
-    # TODO consider removing this from BasePlugin and moving to another base class
-    def customize( disk_path )
-      raise "Customizing cannot be started until the plugin isn't initialized" if @initialized.nil?
-
-      GuestFSHelper.new( disk_path, :log => @log ).customize  do |guestfs, guestfs_helper|
-        yield guestfs, guestfs_helper
+        raise "An error occurred while reading configuration file '#{@config_file}' for #{self.class.name}. Is it a valid YAML file?"
       end
     end
   end

data/spec/appliance-spec.rb

@@ -1,6 +1,5 @@
 require 'boxgrinder-build/appliance'
 require 'rspec/rspec-config-helper'
-require 'rbconfig'
 require 'ostruct'
 
 module BoxGrinder
@@ -8,188 +7,185 @@ module BoxGrinder
     include RSpecConfigHelper
 
     before(:all) do
-      @arch = RbConfig::CONFIG['host_cpu']
+      @arch = `uname -m`.chomp.strip
     end
 
     def prepare_appliance( options = OpenStruct.new )
       options.name      = 'boxgrinder'
       options.version   = '1.0'
 
-      @appliance = Appliance.new( "#{File.dirname( __FILE__ )}/rspec/src/appliances/jeos-f13.appl", :log => Logger.new('/dev/null'), :options => options )
+      @options = options
+      @log = Logger.new('/dev/null')
+
+      @plugin_manager = mock( PluginManager )
+
+      PluginManager.stub!(:instance).and_return( @plugin_manager )
+
+      @appliance = Appliance.new( "#{File.dirname( __FILE__ )}/rspec/src/appliances/jeos-f13.appl", :log => @log, :options => @options )
     end
 
     before(:each) do
       prepare_appliance
     end
 
-    it "should create only base image" do
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
-
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
-
-      plugin_manager_first_call = mock('PluginManagerOne')
-      plugin_manager_first_call.should_receive(:plugins).and_return({})
+    it "should prepare appliance to build" do
+      plugin_helper = mock(PluginHelper)
+      plugin_helper.should_receive(:load_plugins)
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_first_call)
-
-      os_plugin = mock('OS Plugin')
-      os_plugin.should_receive(:init)
-      os_plugin.should_receive(:deliverables_exists?).and_return(false)
-      os_plugin.should_receive(:run)
-      os_plugin.should_receive(:deliverables).and_return({ :disk => 'abc'})
+      PluginHelper.should_receive( :new ).with( :options => @options, :log => @log ).and_return( plugin_helper )
 
-      plugin_manager_second_call = mock('PluginManagerTwo')
-      plugin_manager_second_call.should_receive(:initialize_plugin).with(:os, :fedora).and_return([ os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"] } ] )
-
-      PluginManager.should_receive(:instance).and_return(plugin_manager_second_call)
+      @appliance.should_receive(:read_and_validate_definition)
+      @appliance.should_not_receive(:remove_old_builds)
+      @appliance.should_receive(:execute_plugin_chain)
 
       @appliance.create
     end
 
-    it "should build appliance and convert it to VMware format" do
-      prepare_appliance( OpenStruct.new({ :platform => :vmware }) )
-
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
-
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
-
-      os_plugin_output = {}
-
-      @appliance.should_receive(:execute_os_plugin).and_return(os_plugin_output)
-
-      plugin_manager_first_call = mock('PluginManagerOne')
-      plugin_manager_first_call.should_receive(:plugins).and_return({})
-
-      PluginManager.should_receive(:instance).and_return(plugin_manager_first_call)
+    it "should prepare appliance to build with removing old files" do
+      prepare_appliance( OpenStruct.new( :force => true ) )
 
-      platform_plugin = mock('VMware Plugin')
-      platform_plugin.should_receive(:init)
-      platform_plugin.should_receive(:deliverables_exists?).and_return(false)
-      platform_plugin.should_receive(:run)
-      platform_plugin.should_receive(:deliverables).and_return({ :disk => 'abc'})
+      plugin_helper = mock(PluginHelper)
+      plugin_helper.should_receive(:load_plugins)
 
-      plugin_manager_second_call = mock('PluginManagerTwo')
-      plugin_manager_second_call.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([ platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"} ] )
+      PluginHelper.should_receive( :new ).with( :options => @options, :log => @log ).and_return( plugin_helper )
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_second_call)
+      @appliance.should_receive(:read_and_validate_definition)
+      @appliance.should_receive(:remove_old_builds)
+      @appliance.should_receive(:execute_plugin_chain)
 
       @appliance.create
     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 }) )
+    it "should read and validate definition" do
+      appliance_config = ApplianceConfig.new
 
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
+      appliance_helper = mock(ApplianceHelper)
+      appliance_helper.should_receive(:read_definitions).with( "#{File.dirname( __FILE__ )}/rspec/src/appliances/jeos-f13.appl" ).and_return([{}, appliance_config])
 
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
+      ApplianceHelper.should_receive(:new).with( :log => @log ).and_return(appliance_helper)
 
-      os_plugin_output = { :abc => 'def'}
-      platform_plugin_output = { :abc => 'def'}
+      appliance_config_helper = mock(ApplianceConfigHelper)
 
-      @appliance.should_receive(:execute_os_plugin).and_return(os_plugin_output)
-      @appliance.should_receive(:execute_platform_plugin).and_return(platform_plugin_output)
+      appliance_config.should_receive(:clone).and_return(appliance_config)
+      appliance_config.should_receive(:init_arch).and_return(appliance_config)
+      appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
 
-      plugin_manager_first_call = mock('PluginManagerOne')
-      plugin_manager_first_call.should_receive(:plugins).and_return({})
+      appliance_config_helper.should_receive(:merge).with( appliance_config ).and_return( appliance_config )
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_first_call)
-
-      delivery_plugin = mock('S3 Plugin')
-      delivery_plugin.should_receive(:init)
-      delivery_plugin.should_receive(:run).with(:ami)
+      ApplianceConfigHelper.should_receive(:new).with( {} ).and_return( appliance_config_helper )
 
-      plugin_manager_second_call = mock('PluginManagerTwo')
-      plugin_manager_second_call.should_receive(:initialize_plugin).with(:delivery, :ami).and_return([ delivery_plugin, {:class => Appliance, :type => :delivery, :name => :s3, :full_name  => "Amazon Simple Storage Service (Amazon S3)", :types => [:s3, :cloudfront, :ami]} ] )
+      appliance_config_validator = mock(ApplianceConfigValidator)
+      appliance_config_validator.should_receive(:validate)
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_second_call)
+      ApplianceConfigValidator.should_receive(:new).with( appliance_config ).and_return(appliance_config_validator)
 
-      @appliance.create
+      @appliance.read_and_validate_definition
     end
-    it "should build appliance, convert it to vmware format and deliver it using sftp ami type" do
-      prepare_appliance( OpenStruct.new({ :platform => :vmware, :delivery => :sftp }) )
 
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
-
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
+    it "should remove old builds" do
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      FileUtils.should_receive(:rm_rf).with("build/appliances/#{@arch}/fedora/11/full")
+      @appliance.remove_old_builds
+    end
 
-      os_plugin_output = { :abc => 'def'}
-      platform_plugin_output = { :abc => 'def'}
+    it "should build base appliance" do
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
 
-      @appliance.should_receive(:execute_os_plugin).and_return(os_plugin_output)
-      @appliance.should_receive(:execute_platform_plugin).and_return(platform_plugin_output)
+      os_plugin = mock('FedoraPlugin')
+      os_plugin.should_receive(:init)
+      os_plugin.should_receive(:deliverables_exists?).and_return(false)
+      os_plugin.should_receive(:run)
+      os_plugin.should_receive(:deliverables).and_return({ :disk => 'abc'})
 
-      plugin_manager_first_call = mock('PluginManagerOne')
-      plugin_manager_first_call.should_receive(:plugins).and_return({})
+      @plugin_manager.should_receive(:plugins).and_return( { :os => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([ os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"] } ] )
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_first_call)
+      @appliance.execute_plugin_chain
+    end
 
-      delivery_plugin = mock('S3 Plugin')
-      delivery_plugin.should_receive(:init)
-      delivery_plugin.should_receive(:run).with(no_args)
+    it "should not build base appliance because deliverable already exists" do
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
 
-      plugin_manager_second_call = mock('PluginManagerTwo')
-      plugin_manager_second_call.should_receive(:initialize_plugin).with(:delivery, :sftp).and_return([ delivery_plugin, {:class => Appliance, :type => :delivery, :name => :sftp, :full_name  => "SSH File Transfer Protocol"} ] )
+      os_plugin = mock('FedoraPlugin')
+      os_plugin.should_receive(:init)
+      os_plugin.should_receive(:deliverables_exists?).and_return(true)
+      os_plugin.should_not_receive(:run)
+      os_plugin.should_receive(:deliverables).and_return({ :disk => 'abc'})
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_second_call)
+      @plugin_manager.should_receive(:plugins).and_return( { :os => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:os, :fedora).and_return([ os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"] } ] )
 
-      @appliance.create
+      @appliance.execute_plugin_chain
     end
 
-    it "should remove previous build when force is specified" do
-      prepare_appliance( OpenStruct.new( :force => true ) )
-
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
+    it "should build appliance and convert it to VMware format" do
+      prepare_appliance( OpenStruct.new({ :platform => :vmware }) )
 
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      @appliance.should_receive( :execute_os_plugin ).and_return( {} )
 
-      @appliance.should_receive(:execute_os_plugin).and_return(nil)
-      @appliance.should_receive(:execute_platform_plugin).and_return(nil)
-      @appliance.should_receive(:execute_delivery_plugin).and_return(nil)
+      platform_plugin = mock('VMware Plugin')
+      platform_plugin.should_receive(:init)
+      platform_plugin.should_receive(:deliverables_exists?).and_return(false)
+      platform_plugin.should_receive(:run)
+      platform_plugin.should_receive(:deliverables).and_return({ :disk => 'abc' })
 
-      FileUtils.should_receive(:rm_rf).with("build/appliances/#{@arch}/fedora/13/jeos-f13")
+      @plugin_manager.should_receive(:plugins).and_return( { :platform => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([ platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"} ]  )
 
-      @appliance.create
+      @appliance.execute_plugin_chain
     end
 
-    it "should not execute plugins when deliverables exists" do
+    it "should build appliance and convert it to VMware format because deliverable already exists" do
       prepare_appliance( OpenStruct.new({ :platform => :vmware }) )
 
-      validator = mock(ApplianceConfigValidator)
-      validator.should_receive(:validate)
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      @appliance.should_receive( :execute_os_plugin ).and_return( {} )
 
-      ApplianceConfigValidator.should_receive(:new).with(any_args).and_return(validator)
+      platform_plugin = mock('VMware Plugin')
+      platform_plugin.should_receive(:init)
+      platform_plugin.should_receive(:deliverables_exists?).and_return(true)
+      platform_plugin.should_not_receive(:run)
+      platform_plugin.should_receive(:deliverables).and_return({ :disk => 'abc' })
 
-      os_plugin = mock('OS Plugin')
-      os_plugin.should_receive(:init)
-      os_plugin.should_receive(:deliverables_exists?).and_return(true)
-      os_plugin.should_receive(:deliverables).and_return({ :disk => 'abc'})
+      @plugin_manager.should_receive(:plugins).and_return( { :platform => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).once.with(:platform, :vmware).and_return([ platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"} ]  )
+
+      @appliance.execute_plugin_chain
+    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 }) )
+
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      @appliance.should_receive( :execute_os_plugin ).and_return( { :abc => 'def'} )
+      @appliance.should_receive( :execute_platform_plugin ).with( { :abc => 'def'} ).and_return( { :def => 'ghi'} )
 
-      plugin_manager_first_call = mock('PluginManagerOne')
-      plugin_manager_first_call.should_receive(:plugins).and_return({})
+      delivery_plugin = mock('S3 Plugin')
+      delivery_plugin.should_receive(:init)
+      delivery_plugin.should_receive(:run).with(:ami)
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_first_call)
+      @plugin_manager.should_receive(:plugins).and_return( { :delivery => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :ami).and_return([ delivery_plugin, {:class => Appliance, :type => :delivery, :name => :s3, :full_name  => "Amazon Simple Storage Service (Amazon S3)", :types => [:s3, :cloudfront, :ami]} ] )
 
-      plugin_manager_second_call = mock('PluginManagerTwo')
-      plugin_manager_second_call.should_receive(:initialize_plugin).with(:os, :fedora).and_return([ os_plugin, {:class => Appliance, :type => :os, :name => :fedora, :full_name  => "Fedora", :versions   => ["11", "12", "13", "rawhide"] } ] )
+      @appliance.execute_plugin_chain
+    end
 
-      PluginManager.should_receive(:instance).and_return(plugin_manager_second_call)
+    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 }) )
 
-      platform_plugin = mock('Platform Plugin')
-      platform_plugin.should_receive(:init)
-      platform_plugin.should_receive(:deliverables_exists?).and_return(true)
-      platform_plugin.should_receive(:deliverables).and_return({ :disk => 'def'})
+      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      @appliance.should_receive( :execute_os_plugin ).and_return( { :abc => 'def'} )
+      @appliance.should_receive( :execute_platform_plugin ).with( { :abc => 'def'} ).and_return( { :def => 'ghi'} )
 
-      platform_plugin_manager_second_call = mock('PlatformPluginManagerOne')
-      platform_plugin_manager_second_call.should_receive(:initialize_plugin).with(:platform, :vmware).and_return([ platform_plugin, {:class => Appliance, :type => :platform, :name => :vmware, :full_name  => "VMware"} ] )
+      delivery_plugin = mock('S3 Plugin')
+      delivery_plugin.should_receive(:init)
+      delivery_plugin.should_receive(:run).with(no_args())
 
-      PluginManager.should_receive(:instance).and_return(platform_plugin_manager_second_call)
+      @plugin_manager.should_receive(:plugins).and_return( { :delivery => "something" } )
+      @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :same).and_return([ delivery_plugin, {:class => Appliance, :type => :delivery, :name => :same, :full_name  => "A plugin"} ] )
 
-      @appliance.create
+      @appliance.execute_plugin_chain
     end
   end
 end

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

@@ -0,0 +1,144 @@
+#
+# 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/image-helper'
+
+module BoxGrinder
+  describe ImageHelper do
+
+    before(:each) do
+      @helper      = ImageHelper.new(:log => Logger.new('/dev/null'))
+
+      @log         = @helper.instance_variable_get(:@log)
+      @exec_helper = @helper.instance_variable_get(:@exec_helper)
+    end
+
+    it "should mount image with one root partition" do
+      @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('e2label /dev/loop0').and_return('/')
+      @exec_helper.should_receive(:execute).with("df -T /dev/loop0 | tail -1 | awk '{print $2}'").and_return('ext3')
+      @exec_helper.should_receive(:execute).with('mount /dev/loop0 -t ext3 mount_dir')
+
+      @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop0"}
+    end
+
+    it "should mount image with two partitions with support for new livecd-tools partitions labels starting with '_'" do
+      @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('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('e2label /dev/loop1').and_return('_/')
+
+      @exec_helper.should_receive(:execute).with("df -T /dev/loop1 | tail -1 | awk '{print $2}'").and_return('ext3')
+      @exec_helper.should_receive(:execute).with("df -T /dev/loop0 | tail -1 | awk '{print $2}'").and_return('ext4')
+
+      @exec_helper.should_receive(:execute).with('mount /dev/loop1 -t ext3 mount_dir')
+      @exec_helper.should_receive(:execute).with('mount /dev/loop0 -t ext4 mount_dir/home')
+
+      @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"}
+    end
+
+    it "should umount the image" do
+      @exec_helper.should_receive(:execute).ordered.with('umount -d /dev/loop0')
+      @exec_helper.should_receive(:execute).ordered.with('umount -d /dev/loop1')
+      FileUtils.should_receive(:rm_rf).with('mount_dir')
+
+      @helper.umount_image('disk.raw', 'mount_dir', {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"})
+    end
+
+    it "should get free loop device" do
+      @exec_helper.should_receive(:execute).with('losetup -f 2>&1').and_return("/dev/loop0\n")
+
+      @helper.get_loop_device.should == '/dev/loop0'
+    end
+
+    it "shouldn't get free loop device because there are no free loop devices left" do
+      @exec_helper.should_receive(:execute).with('losetup -f 2>&1').and_raise('boom')
+
+      begin
+        @helper.get_loop_device
+        raise "Shouldn't raise"
+      rescue => e
+        e.message.should == "No free loop devices available, please free at least one. See 'losetup -d' command."
+      end
+    end
+
+    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("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.calculate_disk_offsets('disk.raw').should == ["0", "1234"]
+    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')
+
+      @helper.create_disk('disk.raw', 10)
+    end
+
+    it "should create default filesystem on selected device" do
+      @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" do
+      @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -L '/' -F /dev/loop0")
+
+      @helper.create_filesystem('/dev/loop0', :type => 'ext4')
+    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', :type => 'ext4', :label => '/home')
+    end
+
+
+    it "should sync files" do
+      @exec_helper.should_receive(:execute).with("rsync -u -r -a from_dir/* to_dir")
+
+      @helper.sync_files('from_dir', 'to_dir')
+    end
+
+    it "should customize the disk image suing GuestFS" do
+      guestfs        = mock('GuestFS')
+      guestfs.should_receive(:abc)
+
+      guestfs_helper = mock(GuestFSHelper)
+      guestfs_helper.should_receive(:customize).ordered.and_yield(guestfs, guestfs_helper)
+      guestfs_helper.should_receive(:def)
+
+      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
+end
+

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

@@ -8,7 +8,7 @@ module BoxGrinder
 
     before(:all) do
       @current_arch = (-1.size) == 8 ? "x86_64" : "i386"
-      @plugin_array = %w(boxgrinder-build-fedora-os-plugin boxgrinder-build-rhel-os-plugin boxgrinder-build-centos-os-plugin boxgrinder-build-ec2-platform-plugin boxgrinder-build-vmware-platform-plugin boxgrinder-build-s3-delivery-plugin boxgrinder-build-sftp-delivery-plugin boxgrinder-build-local-delivery-plugin)
+      @plugin_array = %w(boxgrinder-build-fedora-os-plugin boxgrinder-build-rhel-os-plugin boxgrinder-build-centos-os-plugin boxgrinder-build-ec2-platform-plugin boxgrinder-build-vmware-platform-plugin boxgrinder-build-s3-delivery-plugin boxgrinder-build-sftp-delivery-plugin boxgrinder-build-local-delivery-plugin boxgrinder-build-ebs-delivery-plugin)
     end
 
     before(:each) do

data/spec/plugins/base-plugin-spec.rb

@@ -1,18 +1,17 @@
 require 'boxgrinder-build/plugins/base-plugin'
 require 'rspec/rspec-config-helper'
-require 'rbconfig'
 
 module BoxGrinder
   describe BasePlugin do
     include RSpecConfigHelper
 
     before(:all) do
-      @arch = RbConfig::CONFIG['host_cpu']
+      @arch = `uname -m`.chomp.strip
     end
 
     before(:each) do
       @plugin = BasePlugin.new
-      @plugin.init( generate_config, generate_appliance_config, :plugin_info => { :name => :plugin_name })
+      @plugin.init(generate_config, generate_appliance_config, :plugin_info => {:name => :plugin_name}, :log => Logger.new('/dev/null'))
     end
 
     it "should be initialized after running init method" do
@@ -78,12 +77,78 @@ module BoxGrinder
       FileUtils.should_receive(:rm_rf).with("build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp")
       FileUtils.should_receive(:mkdir_p).with("build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp")
 
-      @plugin.should_receive( :execute ).with('a', 3)
+      @plugin.should_receive(:execute).with('a', 3)
 
       FileUtils.should_receive(:mv).with("build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp/disk", "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/disk")
       FileUtils.should_receive(:rm_rf).with("build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp")
 
       @plugin.run('a', 3)
     end
+
+    it "should register a supported os" do
+      @plugin.register_supported_os('fedora', ['12', '13'])
+
+      oses = @plugin.instance_variable_get(:@supported_oses)
+
+      oses.size.should == 1
+      oses['fedora'].size.should == 2
+      oses['fedora'].should == ['12', '13']
+    end
+
+    it "should return that the OS is supported" do
+      @plugin.register_supported_os('fedora', ['12', '13'])
+
+      @plugin.instance_variable_get(:@appliance_config).os.name    = 'fedora'
+      @plugin.instance_variable_get(:@appliance_config).os.version = '12'
+
+      @plugin.is_supported_os?.should == true
+    end
+
+    it "should return that the OS is not supported" do
+      @plugin.register_supported_os('fedora', ['1223'])
+
+      @plugin.instance_variable_get(:@appliance_config).os.name    = 'fedora'
+      @plugin.instance_variable_get(:@appliance_config).os.version = '12'
+
+      @plugin.is_supported_os?.should == false
+    end
+
+    it "should return supported os string" do
+      @plugin.register_supported_os('fedora', ['12', '13'])
+      @plugin.register_supported_os('centos', ['5'])
+
+      @plugin.supported_oses.should == "fedora (versions: 12, 13), centos (versions: 5)"
+    end
+
+    it "should set default config value" do
+      @plugin.set_default_config_value('key', 'avalue')
+
+      @plugin.instance_variable_get(:@plugin_config)['key'].should == 'avalue'
+    end
+
+    it "should read plugin config" do
+      @plugin.instance_variable_set(:@config_file, "configfile")
+
+      File.should_receive(:exists?).with('configfile').and_return(true)
+      YAML.should_receive(:load_file).with('configfile').and_return('abcdef')
+
+      @plugin.read_plugin_config
+
+      @plugin.instance_variable_get(:@plugin_config).should == 'abcdef'
+    end
+
+    it "should read plugin config and raise an exception" do
+      @plugin.instance_variable_set(:@config_file, "configfile")
+
+      File.should_receive(:exists?).with('configfile').and_return(true)
+      YAML.should_receive(:load_file).with('configfile').and_raise('something')
+
+      begin
+        @plugin.read_plugin_config
+        raise "Should raise"
+      rescue => e
+        e.message.should == "An error occurred while reading configuration file 'configfile' for BoxGrinder::BasePlugin. Is it a valid YAML file?"
+      end
+    end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: commander
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 4
         - 0
@@ -35,14 +38,16 @@ dependencies:
   name: boxgrinder-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
+        - 1
         - 0
-        - 22
-        version: 0.0.22
+        version: 0.1.0
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.
@@ -60,6 +65,7 @@ extra_rdoc_files:
 - 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
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
 - lib/boxgrinder-build/helpers/plugin-helper.rb
@@ -76,6 +82,7 @@ files:
 - 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
 - lib/boxgrinder-build/helpers/linux-helper.rb
 - lib/boxgrinder-build/helpers/package-helper.rb
 - lib/boxgrinder-build/helpers/plugin-helper.rb
@@ -86,6 +93,7 @@ files:
 - 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
 - spec/helpers/linux-helper-spec.rb
 - spec/helpers/package-helper-spec.rb
 - spec/helpers/plugin-helper-spec.rb
@@ -94,7 +102,7 @@ files:
 - spec/rspec/src/appliances/jeos-f13.appl
 - boxgrinder-build.gemspec
 has_rdoc: true
-homepage: http://www.jboss.org/stormgrind/projects/boxgrinder.html
+homepage: http://www.jboss.org/boxgrinder
 licenses: []
 
 post_install_message: 
@@ -108,16 +116,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -125,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: BoxGrinder Build
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tool for creating appliances from simple plain text files for various virtual environments.