boxgrinder-build 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.6.4
+
+* [BGBUILD-98] Use hashery gem
+* [BGBUILD-99] Timeout exception is not catched on non-EC2 platfrom in GuestFSHelper
+* [BGBUILD-92] Enable --trace switch by default
+* [BGBUILD-91] Log exceptions to log file
 
 v0.6.3
 
@@ -14,7 +20,7 @@ v0.6.1
 v0.6.0
 
 * [BGBUILD-52] Wrong post section inheritance
-* [BGBUILD-46] Allow building 32 bit images on 64 bit arch
+* [BGBUILD-46] Allow building 32 bit image  s on 64 bit arch
 
 v0.5.1
 

data/Manifest

@@ -1,30 +0,0 @@
-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

data/Rakefile

@@ -19,6 +19,7 @@
 require 'rubygems'
 require 'spec/rake/spectask'
 require 'echoe'
+require 'rbconfig'
 
 Echoe.new("boxgrinder-build") do |p|
   p.project     = "BoxGrinder Build"
@@ -26,7 +27,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.2"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.3"]
 end
 
 desc "Run all tests"
@@ -48,32 +49,23 @@ Spec::Rake::SpecTask.new('spec:coverage') do |t|
   t.verbose = true
 end
 
-topdir = "#{Dir.pwd}/pkg/rpmbuild"
-directory "#{topdir}/SOURCES"
-
-task 'gem:copy' => [:clean, :manifest, :gem, 'rpm:topdir'] do
-  Dir["**/pkg/*.gem"].each { |gem| FileUtils.cp(gem, "#{topdir}/SOURCES", :verbose => true) }
-end
-
-task 'rpm:topdir' do
-  FileUtils.mkdir_p(["#{topdir}/SOURCES", "#{topdir}/RPMS", "#{topdir}/BUILD", "#{topdir}/SPECS", "#{topdir}/SRPMS"], :verbose => true)
-end
-
 desc "Create RPM"
-task 'rpm' => ['gem:copy'] do
+task :rpm, :target, :version, :arch, :needs => ['clean', 'gem'] do |t, args|
+  target  = args[:target] || 'fedora'
+  version = args[:version] || 'rawhide'
+  arch    = args[:arch] || RbConfig::CONFIG['host_cpu']
+
   Dir["**/rubygem-*.spec"].each do |spec|
-    `rpmbuild --define '_topdir #{topdir}' -ba #{spec}`
+    `mock -v -r #{target}-#{version}-#{arch} --buildsrpm --sources pkg/*.gem --spec #{spec} --resultdir pkg/`
+    exit 1 unless $? == 0
+    `mock -v -r #{target}-#{version}-#{arch} --rebuild pkg/*.rpm --resultdir pkg/`
     exit 1 unless $? == 0
   end
 end
 
 desc "Install RPM"
-task 'rpm:install' => ['rpm'] do
-  puts "sudo yum -y remove rubygem-boxgrinder-build"
+task 'rpm:install' => [:rpm] do
   system "sudo yum -y remove rubygem-boxgrinder-build"
+  system "sudo yum -y localinstall --nogpgcheck pkg/*.rpm"
   exit 1 unless $? == 0
-
-  puts "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.rpm"
-  system "sudo yum -y --nogpgcheck localinstall #{topdir}/RPMS/noarch/*.rpm"
-  exit 1 unless $? == 0
-end
+end

data/bin/boxgrinder-build

@@ -30,8 +30,23 @@ end
 
 require 'commander/import'
 
+module Commander
+  class Runner
+    def run!
+      require_program :version, :description
+      trap('INT') { abort program(:int_message) } if program(:int_message)
+      trap('INT') { program(:int_block).call } if program(:int_block)
+      global_option('-h', '--help', 'Display help documentation') { command(:help).run *@args[1..-1]; return }
+      global_option('-v', '--version', 'Display version information') { say version; return }
+      parse_global_options
+      remove_global_options options, @args
+      run_active_command
+    end
+  end
+end
+
 program :name, 'BoxGrinder Build'
-program :version, '0.6.3'
+program :version, '0.6.4'
 program :description, "A tool for building VM images from simple definition files."
 program :help, 'Homepage', 'http://www.jboss.org/boxgrinder/build.html'
 program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'
@@ -40,8 +55,8 @@ default_command :build
 
 $log_level = :info
 
-global_option('-V', '--verbose', TrueClass, "Prints debug information while building. Default: false.") { $log_level = :debug}
-global_option('-W', '--very-verbose', TrueClass, "Prints trace information while building. Default: false.") { $log_level = :trace}
+global_option('-V', '--verbose', TrueClass, "Prints debug information while building. Default: false.") { $log_level = :debug }
+global_option('-W', '--very-verbose', TrueClass, "Prints trace information while building. Default: false.") { $log_level = :trace }
 
 module BoxGrinder
   command :build do |c|
@@ -49,27 +64,28 @@ module BoxGrinder
     c.description = 'Creates an image from selected appliance definition for selected platform.'
     c.examples    = "boxgrinder-build test.appl -p vmware\nboxgrinder-build test.appl -p ec2 -d ami\nboxgrinder-build test.appl -d sftp"
 
+    force = false
+
     c.option '-p STRING', '--platform STRING', String, "The type of platform. Default: none." # Valid types are: #{PlatformPluginManager.instance.plugins.keys.join(', ')}. Default: none."
     c.option '-d STRING', '--delivery STRING', String, "The delivery type for selected image. Default: none." # Valid types are: #{DeliveryPluginManager.instance.types.keys.join(', ')}. Default: none."
-    c.option '-f STRING', '--force', TrueClass, "Force image creation - removes all previous builds for selected appliance. Default: false."
+    c.option('-f', '--force', "Force image creation - removes all previous builds for selected appliance.") { force = true }
     c.option '-l STRING', '--plugins STRING', String, "Comma separated list of plugins. Default: default plugins will be available."
 
     c.action do |args, options|
       options.default :platform => :none
       options.default :delivery => :none
-      options.default :force    => false
 
+      options.force     = force
       options.name      = program(:name)
       options.version   = program(:version)
-
       options.platform  = options.platform.to_s.downcase.to_sym
       options.delivery  = options.delivery.to_s.downcase.to_sym
 
       appliance_definition_file = args.shift or raise("You need to specify appliance definition file. Run 'boxgrinder-build -h' for more info")
 
-      raise "Appliance definition file '#{appliance_definition_file}' could not be found" unless File.exists?( appliance_definition_file )
+      raise "Appliance definition file '#{appliance_definition_file}' could not be found" unless File.exists?(appliance_definition_file)
 
-      Appliance.new( appliance_definition_file, :options => options, :log => LogHelper.new( :threshold => $log_level ) ).create
+      Appliance.new(appliance_definition_file, :options => options, :log => LogHelper.new(:threshold => $log_level)).create
     end
   end
 end

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-11-11}
+  s.date = %q{2010-11-23}
   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}
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     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.2"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.2"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.2"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.3"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -27,7 +27,7 @@ require 'boxgrinder-core/validators/appliance-config-validator'
 module BoxGrinder
   class Appliance
 
-    def initialize( appliance_definition_file, options = {} )
+    def initialize(appliance_definition_file, options = {})
       @config                     = Config.new
       @appliance_definition_file  = appliance_definition_file
       @log                        = options[:log] || Logger.new(STDOUT)
@@ -39,17 +39,17 @@ module BoxGrinder
     end
 
     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_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 ).validate
+      ApplianceConfigValidator.new(@appliance_config).validate
     end
 
     def remove_old_builds
       @log.info "Removing previous builds for #{@appliance_config.name} appliance..."
-      FileUtils.rm_rf( @appliance_config.path.build )
+      FileUtils.rm_rf(@appliance_config.path.build)
       @log.debug "Previous builds removed."
     end
 
@@ -57,38 +57,41 @@ module BoxGrinder
       @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 )
+      platform_plugin_output   = execute_platform_plugin(base_plugin_output)
 
-      execute_delivery_plugin( platform_plugin_output )
+      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
+      begin
+        PluginHelper.new(:options => @options, :log => @log).load_plugins
+        read_and_validate_definition
+        remove_old_builds if @options.force
+        execute_plugin_chain
+      rescue
+        @log.fatal $!
+      end
     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 )
+      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)
 
       if os_plugin.deliverables_exists?
         @log.info "Deliverables for #{os_plugin_info[:name]} operating system plugin exists, skipping."
-        return { :deliverables => os_plugin.deliverables }
+        return {:deliverables => os_plugin.deliverables}
       end
 
       @log.debug "Executing operating system plugin for #{@appliance_config.os.name}..."
       os_plugin.run
       @log.debug "Operating system plugin executed."
 
-      { :deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info }
+      {:deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info}
     end
 
-    def execute_platform_plugin( previous_plugin_output )
+    def execute_platform_plugin(previous_plugin_output)
       if @options.platform == :none or @options.platform == nil
         @log.debug "No platform selected, skipping platform conversion."
         return previous_plugin_output
@@ -96,22 +99,22 @@ module BoxGrinder
 
       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] )
+      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])
 
       if platform_plugin.deliverables_exists?
         @log.info "Deliverables for #{platform_plugin_info[:name]} platform plugin exists, skipping."
-        return { :deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info }
+        return {:deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info}
       end
 
       @log.debug "Executing platform plugin for #{@options.platform}..."
       platform_plugin.run
       @log.debug "Platform plugin executed."
 
-      { :deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info }
+      {:deliverables => platform_plugin.deliverables, :plugin_info => platform_plugin_info}
     end
 
-    def execute_delivery_plugin( previous_plugin_output )
+    def execute_delivery_plugin(previous_plugin_output)
       if @options.delivery == :none or @options.delivery == nil
         @log.debug "No delivery method selected, skipping delivering."
         return
@@ -119,9 +122,9 @@ module BoxGrinder
 
       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] )
-      delivery_plugin.run( @options.delivery )
+      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])
+      delivery_plugin.run(@options.delivery)
     end
   end
 end

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

@@ -95,7 +95,7 @@ module BoxGrinder
       begin
         open('http://169.254.169.254/1.0/meta-data/local-ipv4')
         ec2 = true
-      rescue
+      rescue Exception
         ec2 = false
       end
 

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

@@ -16,11 +16,12 @@
 # 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/exec-helper'
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/image-helper'
 require 'ostruct'
-require 'openhash/openhash'
+require 'hashery/opencascade'
 require 'fileutils'
 require 'logger'
 
@@ -41,10 +42,10 @@ module BoxGrinder
       @previous_deliverables  = options[:previous_deliverables] || {}
       @plugin_config          = {}
 
-      @deliverables           = OpenHash.new
-      @supported_oses         = OpenHash.new
-      @target_deliverables    = OpenHash.new
-      @dir                    = OpenHash.new
+      @deliverables           = OpenCascade.new
+      @supported_oses         = OpenCascade.new
+      @target_deliverables    = OpenCascade.new
+      @dir                    = OpenCascade.new
 
       @dir.base               = "#{@appliance_config.path.build}/#{@plugin_info[:name]}-plugin"
       @dir.tmp                = "#{@dir.base}/tmp"
@@ -73,7 +74,7 @@ module BoxGrinder
     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] = OpenCascade.new if @supported_oses[name].nil?
       @supported_oses[name] = versions
     end
 

data/rubygem-boxgrinder-build.spec

@@ -5,24 +5,25 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.6.3
-Release: 1%{?dist}
+Version: 0.6.4
+Release: 3%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygems >= 1.2
-Requires: ruby >= 0
-Requires: rubygem(commander) => 4.0.3
-Requires: rubygem(commander) < 4.1
-Requires: rubygem(boxgrinder-core) => 0.1.1
-Requires: rubygem(boxgrinder-core) < 0.2
-
-BuildRequires: rubygem(boxgrinder-core) => 0.1.1
-BuildRequires: rubygem(boxgrinder-core) < 0.2
+Requires: rubygem(commander)
+Requires: rubygem(boxgrinder-core)
+Requires: ruby-libguestfs
+Requires: parted
+Requires: e2fsprogs
+
+BuildRequires: rubygem(rake)
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(boxgrinder-core)
+BuildRequires: rubygem(echoe)
+BuildRequires: ruby-libguestfs
 
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -45,23 +46,23 @@ Documentation for %{name}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+rm -rf %{_builddir}%{gemdir}
+
+mkdir -p %{_builddir}%{gemdir}
 mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gemdir}/bin
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+mkdir -p %{buildroot}/%{gemdir}
+
+gem install --local --install-dir %{_builddir}%{gemdir} \
+            --force --rdoc %{SOURCE0}
+mv %{_builddir}%{gemdir}/bin/* %{buildroot}/%{_bindir}
+find %{_builddir}%{geminstdir}/bin -type f | xargs chmod a+x
+cp -r %{_builddir}%{gemdir}/* %{buildroot}/%{gemdir}
 
 %check
-pushd %{buildroot}/%{geminstdir}
+pushd %{_builddir}/%{geminstdir}
 rake spec
-rm -rf log
 popd
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root, -)
 %{_bindir}/boxgrinder-build
@@ -84,6 +85,23 @@ rm -rf %{buildroot}
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Mon Nov 22 2010  <mgoldman@redhat.com> - 0.6.4-3
+- Changelog rewritten
+- Added Require: parted and e2fsprogs
+
+* Sat Nov 20 2010  <mgoldman@redhat.com> - 0.6.4-2
+- Small set of spec file adjustments
+
+* Mon Nov 15 2010  <mgoldman@redhat.com> - 0.6.4-1
+- Updated to new upstream release: 0.6.4
+- Removed BuildRoot tag
+- Adjusted Requires and BuildRequires
+- Different approach for testing
+- [BGBUILD-98] Use hashery gem
+- [BGBUILD-99] Timeout exception is not catched on non-EC2 platfrom in GuestFSHelper
+- [BGBUILD-92] Enable --trace switch by default
+- [BGBUILD-91] Log exceptions to log file
+
 * Tue Nov 09 2010  <mgoldman@redhat.com> - 0.6.3-1
 - [BGBUILD-94] Check if set_network call is avaialbe in libguestfs
 - Added 'check' section that executes tests

data/spec/appliance-spec.rb

@@ -41,15 +41,15 @@ module BoxGrinder
     def prepare_appliance_config
       @appliance_config = mock('ApplianceConfig')
 
-      @appliance_config.stub!(:path).and_return(OpenHash.new({:build => 'build/path'}))
+      @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(OpenHash.new({:name => 'fedora', :version => '11'}))
+      @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
 
       @appliance_config.stub!(:hardware).and_return(
-          OpenHash.new({
+          OpenCascade.new({
                            :partitions =>
                                {
                                    '/' => {'size' => 2},

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

@@ -28,16 +28,16 @@ module BoxGrinder
 
       @appliance_config = mock('ApplianceConfig')
 
-      @appliance_config.stub!(:path).and_return(OpenHash.new({:build => 'build/path'}))
+      @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(OpenHash.new({:name => 'fedora', :version => '11'}))
-      @appliance_config.stub!(:post).and_return(OpenHash.new({:vmware => []}))
+      @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(
-          OpenHash.new({
+          OpenCascade.new({
                            :partitions =>
                                {
                                    '/' => {'size' => 2},

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

@@ -183,6 +183,12 @@ module BoxGrinder
         @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_return("IP")
         @helper.hw_virtualization_available?.should == false
       end
+
+      it "should return false if timeout exception is thrown" do
+        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise(Timeout::Error.new('something'))
+        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("0")
+        @helper.hw_virtualization_available?.should == false
+      end
     end
   end
 end

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

@@ -28,7 +28,7 @@ module BoxGrinder
 
       @appliance_config.stub!(:name).and_return('full')
       @appliance_config.stub!(:hardware).and_return(
-          OpenHash.new({
+          OpenCascade.new({
                            :partitions =>
                                {
                                    '/' => {'size' => 2, 'type' => 'ext4'},
@@ -104,6 +104,7 @@ module BoxGrinder
       @exec_helper.should_receive(:execute).ordered.with('losetup /dev/loop0 disk.raw')
       @exec_helper.should_receive(:execute).ordered.with("parted /dev/loop0 'unit B print' | grep -e '^ [0-9]' | awk '{ print $2 }'").and_return("0B\n1234B\n")
       @exec_helper.should_receive(:execute).ordered.with('losetup -d /dev/loop0')
+      @helper.should_receive(:sleep).with(1)
 
       @helper.calculate_disk_offsets('disk.raw').should == ["0", "1234"]
     end
@@ -122,7 +123,7 @@ module BoxGrinder
 
     it "should create ext4 filesystem on selected device" do
       @appliance_config.should_receive(:hardware).and_return(
-          OpenHash.new({
+          OpenCascade.new({
                            :partitions =>
                                {
                                    '/' => {'size' => 2, 'type' => 'ext3'},

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

@@ -29,8 +29,8 @@ module BoxGrinder
 
       @appliance_config = mock('ApplianceConfig')
 
-      @appliance_config.stub!(:path).and_return(OpenHash.new({:build => 'build/path'}))
-      @appliance_config.stub!(:os).and_return(OpenHash.new({:name => 'fedora', :version => '11'}))
+      @appliance_config.stub!(:path).and_return(OpenCascade.new({:build => 'build/path'}))
+      @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
 
       @plugin = BasePlugin.new
       @plugin.init(@config, @appliance_config, :plugin_info => {:name => :plugin_name}, :log => Logger.new('/dev/null'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.