boxgrinder-build 0.7.1 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,16 @@
+v0.8.0
+
+* [BGBUILD-138] enablerepo path is not escaped when calling repoquery
+* [BGBUILD-133] Support a consolidated configuration file
+* [BGBUILD-128] Allow to specify plugin configuration using CLI
+* [BGBUILD-134] Replace rubygem-commander with rubygem-thor
+* [BGBUILD-131] Check if OS is supported before executing the plugin
+* [BGBUILD-68] Global .boxgrinder/config or rc style file for config
+* [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-72] Add support for growing (not pre-allocated) disks for KVM/Xen
+* [BGBUILD-147] Allow to list installed plugins and version information
+
 v0.7.1
 
 * [BGBUILD-124] Guestfs fails while mounting multiple partitions with '_' prefix

data/Manifest

@@ -3,8 +3,9 @@ LICENSE
 Manifest
 README
 Rakefile
-bin/boxgrinder-build
+bin/boxgrinder
 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
@@ -13,6 +14,7 @@ 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/helpers/thor-helper.rb
 lib/boxgrinder-build/managers/plugin-manager.rb
 lib/boxgrinder-build/plugins/base-plugin.rb
 rubygem-boxgrinder-build.spec
@@ -27,5 +29,3 @@ 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
-spec/rspec/src/appliances/jeos-f13.ks

data/Rakefile

@@ -26,7 +26,7 @@ Echoe.new("boxgrinder-build") do |p|
   p.summary     = "A tool for creating appliances from simple plain text files for various virtual environments."
   p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
-  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.5"]
+  p.runtime_dependencies = ["thor >=0.13", "boxgrinder-core ~>0.2.0"]
 end
 
 desc "Run all tests"

data/bin/boxgrinder

@@ -0,0 +1,121 @@
+#!/usr/bin/env ruby
+
+# 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-core/helpers/log-helper'
+require 'boxgrinder-build/appliance'
+require 'boxgrinder-build/helpers/thor-helper'
+
+#$stderr.reopen($stdout)
+
+if Process.uid != 0
+  puts "This program must be executed with root privileges. Try 'sudo boxgrinder-build'"
+  abort
+end
+
+module BoxGrinder
+  class App < ThorHelper
+    desc "build [appliance definition file] [options]", "Create an image from selected appliance definition for selected platform and deliver it using selected method"
+    method_option :platform, :type => :string, :default => :none, :aliases => '-p', :desc => "The name of platform you want to convert to."
+    method_option :delivery, :type => :string, :default => :none, :aliases => '-d', :desc => "The delivery method for selected appliance."
+    method_option :os_config, :type => :hash, :default => {}, :desc => "Operating system plugin options."
+    method_option :platform_config, :type => :hash, :default => {}, :desc => "Platform plugin options."
+    method_option :delivery_config, :type => :hash, :default => {}, :desc => "Delivery plugin options."
+    method_option :additional_plugins, :type => :array, :default => [], :banner => 'plugin1 plugin2', :aliases => '-l', :desc => "Space separated list of additional plugins. Default: empty."
+    method_option :force, :type => :boolean, :default => false, :aliases => '-f', :desc => "Force image creation - removes all previous builds for selected appliance. Default: false."
+    method_option :debug, :type => :boolean, :default => false, :desc => "Prints debug information while building. Default: false."
+    method_option :trace, :type => :boolean, :default => false, :desc => "Prints trace information while building. Default: false."
+
+    def build(appliance_definition_file)
+      log_level = :debug if options.debug?
+      log_level = :trace if options.trace?
+
+      config = Config.new(options.merge(:platform => options.platform.to_sym, :delivery => options.delivery.to_sym))
+      config.merge!(:log_level => log_level) unless log_level.nil?
+
+      log = LogHelper.new(:level => config.log_level)
+
+      unless File.exists?(appliance_definition_file)
+        log.fatal "Appliance definition file '#{appliance_definition_file}' could not be found."
+        abort
+      end
+
+      begin
+        Appliance.new(appliance_definition_file, config, :log => log).create
+      rescue Exception => e
+        log.fatal e
+      end
+    end
+
+    desc 'info', "Prints out the program details"
+    method_option :plugins, :type => :boolean, :default => false, :aliases => '-p', :desc => "List also available plugins. Default: false."
+
+    def info
+      PluginHelper.new(Config.new).load_plugins if options.plugins
+
+      shell.say
+      shell.say "BoxGrinder Build #{File.read("#{File.dirname(__FILE__)}/../CHANGELOG").match(/^v(.*)/)[1]}"
+
+      if options.plugins
+
+        shell.say
+        shell.say "Plugin summary:"
+
+        [:os, :platform, :delivery].each do |type|
+          shell.say
+
+          if PluginManager.instance.plugins[type].empty?
+            shell.say "No #{type} plugins available"
+          else
+            shell.say "Available #{type} plugins:"
+            PluginManager.instance.plugins[type].each do |name, plugin_info|
+              shell.say " - #{name} plugin for #{plugin_info[:full_name]}."
+            end
+          end
+        end
+      end
+
+      shell.say
+    end
+
+    class << self
+      def build_help(shell)
+        examples = {
+            "$ boxgrinder build jeos.appl" => "# Build KVM image for jeos.appl",
+            "$ boxgrinder build jeos.appl -f" => "# Build KVM image for jeos.appl with removing previous build for this image",
+            "$ boxgrinder build jeos.appl --os-config format:qcow2" => "# Build KVM image for jeos.appl with a qcow2 disk",
+            "$ boxgrinder build jeos.appl -p vmware --platform-config type:personal thin_disk:true" => "# Build VMware image for VMware Server, Player, Fusion using thin (growing) disk",
+            "$ boxgrinder build jeos.appl -p ec2 -d ami" => "# Build and register AMI for jeos.appl",
+            "$ boxgrinder build jeos.appl -p vmware -d local" => "# Build VMware image for jeos.appl and deliver it to local directory"
+        }.sort { |a, b| a[0] <=> b[0] }
+
+        shell.say "Examples:"
+        shell.print_table(examples, :ident => 2, :truncate => true)
+        shell.say
+      end
+    end
+  end
+end
+
+begin
+  BoxGrinder::App.start
+rescue Thor::Error => e
+  puts e.message
+end
+

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.7.1"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-01-03}
-  s.default_executable = %q{boxgrinder-build}
+  s.date = %q{2011-02-09}
+  s.default_executable = %q{boxgrinder}
   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/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", "boxgrinder-build.gemspec", "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", "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", "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", "spec/rspec/src/appliances/jeos-f13.ks"]
+  s.executables = ["boxgrinder"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder", "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", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/thor-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", "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", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/thor-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "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", "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"]
   s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
   s.require_paths = ["lib"]
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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.1.5"])
+      s.add_runtime_dependency(%q<thor>, [">= 0.13"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
     else
-      s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.5"])
+      s.add_dependency(%q<thor>, [">= 0.13"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
     end
   else
-    s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.5"])
+    s.add_dependency(%q<thor>, [">= 0.13"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.2.0"])
   end
 end

data/lib/boxgrinder-build.rb

@@ -0,0 +1,19 @@
+#
+# 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/appliance'

data/lib/boxgrinder-build/appliance.rb

@@ -17,6 +17,8 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
+require 'hashery/opencascade'
+require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-core/models/appliance-config'
 require 'boxgrinder-core/models/config'
 require 'boxgrinder-core/helpers/appliance-helper'
@@ -27,47 +29,41 @@ require 'boxgrinder-core/validators/appliance-config-validator'
 
 module BoxGrinder
   class Appliance
-
-    def initialize(appliance_definition_file, options = {})
-      @config                    = Config.new
-      @appliance_definition_file = appliance_definition_file
-      @log                       = options[:log] || Logger.new(STDOUT)
-      @options                   = options[:options]
-
-      @config.name               = @options.name
-      @config.version.version    = @options.version
-      @config.version.release    = nil
+    def initialize(appliance_definition, config = Config.new, options = {})
+      @appliance_definition = appliance_definition
+      @config = config
+      @log = options[:log] || LogHelper.new(:level => @config.log_level)
     end
 
     def read_definition
       begin
         # first try to read as appliance definition file
-        appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition_file)
+        appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition)
       rescue
         # then try to read OS plugin specific format
         PluginManager.instance.plugins[:os].each_value do |info|
           plugin = info[:class].new
-          appliance_config = plugin.read_file(@appliance_definition_file) if plugin.respond_to?(:read_file)
+          appliance_config = plugin.read_file(@appliance_definition) if plugin.respond_to?(:read_file)
           break unless appliance_config.nil?
         end
         appliance_configs = [appliance_config]
       end
 
-      raise "Couldn't read appliance definition file: #{File.basename(@appliance_definition_file)}" if appliance_config.nil?
+      raise "Couldn't read appliance definition file: #{File.basename(@appliance_definition)}" if appliance_config.nil?
 
       appliance_config_helper = ApplianceConfigHelper.new(appliance_configs)
-      @appliance_config       = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
+      @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
     end
 
     def validate_definition
       ApplianceConfigValidator.new(@appliance_config).validate
 
-      abort "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?
+      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 = PluginManager.instance.plugins[:os][@appliance_config.os.name.to_sym]
 
-      abort "Not supported operating system selected: #{@appliance_config.os.name}. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: #{PluginManager.instance.plugins[:os].keys.join(", ")}" if os_plugin.nil?
-      abort "Not supported operating system version selected: #{@appliance_config.os.version}. Supported versions are: #{os_plugin[:versions].join(", ")}" unless @appliance_config.os.version.nil? or os_plugin[:versions].include?(@appliance_config.os.version)
+      raise "Not supported operating system selected: #{@appliance_config.os.name}. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: #{PluginManager.instance.plugins[:os].keys.join(", ")}" if os_plugin.nil?
+      raise "Not supported operating system version selected: #{@appliance_config.os.version}. Supported versions are: #{os_plugin[:versions].join(", ")}" unless @appliance_config.os.version.nil? or os_plugin[:versions].include?(@appliance_config.os.version)
     end
 
     def remove_old_builds
@@ -83,19 +79,18 @@ module BoxGrinder
     end
 
     def create
-      begin
-        PluginHelper.new(:options => @options, :log => @log).load_plugins
-        read_definition
-        validate_definition
-        remove_old_builds if @options.force
-        execute_plugin_chain
-      rescue
-        @log.fatal $!
-      end
+      @log.debug "Launching new BoxGrinder build..."
+      @log.trace "Used configuration: #{@config.to_yaml}"
+
+      PluginHelper.new(@config, :log => @log).load_plugins
+      read_definition
+      validate_definition
+      remove_old_builds if @config.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?
+      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)
@@ -106,21 +101,21 @@ module BoxGrinder
       end
 
       @log.debug "Executing operating system plugin for #{@appliance_config.os.name}..."
-      os_plugin.run(@appliance_definition_file)
+      os_plugin.run(@appliance_definition)
       @log.debug "Operating system plugin executed."
 
       {:deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info}
     end
 
     def execute_platform_plugin(previous_plugin_output)
-      if @options.platform == :none or @options.platform == nil
+      if @config.platform == :none or @config.platform.to_s.empty? == nil
         @log.debug "No platform selected, skipping platform conversion."
         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?
+      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, platform_plugin_info = PluginManager.instance.initialize_plugin(:platform, @config.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])
 
       if platform_plugin.deliverables_exists?
@@ -128,7 +123,7 @@ module BoxGrinder
         return {:deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info}
       end
 
-      @log.debug "Executing platform plugin for #{@options.platform}..."
+      @log.debug "Executing platform plugin for #{@config.platform}..."
       platform_plugin.run
       @log.debug "Platform plugin executed."
 
@@ -136,16 +131,16 @@ module BoxGrinder
     end
 
     def execute_delivery_plugin(previous_plugin_output)
-      if @options.delivery == :none or @options.delivery == nil
+      if @config.delivery == :none or @config.delivery.to_s.empty? == nil
         @log.debug "No delivery method selected, skipping delivering."
         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, delivery_plugin_info = PluginManager.instance.initialize_plugin(:delivery, @config.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])
-      delivery_plugin.run(@options.delivery)
+      delivery_plugin.run(@config.delivery)
     end
   end
 end

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

@@ -19,7 +19,7 @@
 require 'rubygems'
 require 'boxgrinder-build/helpers/guestfs-helper'
 require 'boxgrinder-core/helpers/exec-helper'
-require 'logger'
+require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder
   class ApplianceCustomizeHelper
@@ -29,7 +29,7 @@ module BoxGrinder
       @appliance_config = appliance_config
       @disk             = disk
 
-      @log          = options[:log]         || Logger.new(STDOUT)
+      @log          = options[:log]         || LogHelper.new
       @exec_helper  = options[:exec_helper] || ExecHelper.new( { :log => @log } )
     end
 

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

@@ -16,14 +16,14 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'logger'
+require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder
   class AugeasHelper
     def initialize(guestfs, guestfs_helper, options = {})
       @guestfs        = guestfs
       @guestfs_helper = guestfs_helper
-      @log            = options[:log] || Logger.new(STDOUT)
+      @log            = options[:log] || LogHelper.new
 
       @files = {}
     end

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

@@ -17,9 +17,10 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/helpers/augeas-helper'
+require 'boxgrinder-core/helpers/log-helper'
 require 'guestfs'
-require 'logger'
 require 'open-uri'
+require 'timeout'
 require 'rbconfig'
 
 module BoxGrinder
@@ -82,7 +83,7 @@ module BoxGrinder
   class GuestFSHelper
     def initialize(raw_disk, options = {})
       @raw_disk = raw_disk
-      @log = options[:log] || Logger.new(STDOUT)
+      @log = options[:log] || LogHelper.new
 
       @partitions = {}
     end
@@ -93,7 +94,8 @@ module BoxGrinder
       @log.trace "Checking if HW virtualization is available..."
 
       begin
-        open('http://169.254.169.254/1.0/meta-data/local-ipv4')
+        Timeout::timeout(2) { open('http://169.254.169.254/1.0/meta-data/local-ipv4') }
+
         ec2 = true
       rescue Exception
         ec2 = false
@@ -109,7 +111,7 @@ module BoxGrinder
       false
     end
 
-    def customize
+    def customize(options = {})
       read_pipe, write_pipe = IO.pipe
 
       fork do
@@ -122,7 +124,7 @@ module BoxGrinder
         end
       end
 
-      helper = execute(write_pipe)
+      helper = execute(write_pipe, options)
 
       yield @guestfs, helper
 
@@ -133,7 +135,9 @@ module BoxGrinder
       Process.wait
     end
 
-    def execute(pipe = nil)
+    def execute(pipe = nil, options = {})
+      options = {:ide_disk => false}.merge(options)
+
       @log.debug "Preparing guestfs..."
 
       @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect(pipe)
@@ -149,6 +153,7 @@ module BoxGrinder
       @guestfs.set_selinux(1)
 
       unless hw_virtualization_available?
+        # This wrapper is required especially for EC2 where running qemu-kvm crashes libguestfs
         qemu_wrapper = (RbConfig::CONFIG['host_cpu'].eql?('x86_64') ? "/usr/bin/qemu-system-x86_64" : "/usr/bin/qemu")
 
         if File.exists?(qemu_wrapper)
@@ -159,7 +164,11 @@ module BoxGrinder
       end
 
       @log.trace "Adding drive '#{@raw_disk}'..."
-      @guestfs.add_drive(@raw_disk)
+      if options[:ide_disk]
+        @guestfs.add_drive_with_if(@raw_disk, 'ide')
+      else
+        @guestfs.add_drive(@raw_disk)
+      end
       @log.trace "Drive added."
 
       if @guestfs.respond_to?('set_network')