boxgrinder-build 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.6.3
+
+* [BGBUILD-94] Check if set_network call is avaialbe in libguestfs
+
 v0.6.2
 
 * [BGBUILD-84] Don't use in libguestfs qemu-kvm where hardware accleration isn't available

data/Manifest

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

@@ -1,3 +1,23 @@
+#
+# 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 'spec/rake/spectask'
 require 'echoe'
 
 Echoe.new("boxgrinder-build") do |p|
@@ -6,6 +26,54 @@ 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.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git|\.log/
-  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.1"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.2"]
+end
+
+desc "Run all tests"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.libs.unshift "../boxgrinder-core/lib"
+  t.rcov = false
+  t.spec_files = FileList["spec/**/*-spec.rb"]
+  t.spec_opts = ['--colour', '--format', 'specdoc', '-b']
+  t.verbose = true
+end
+
+desc "Run all tests and generate code coverage report"
+Spec::Rake::SpecTask.new('spec:coverage') do |t|
+  t.libs.unshift "../boxgrinder-core/lib"
+  t.spec_files = FileList["spec/**/*-spec.rb"]
+  t.spec_opts = ['--colour', '--format', 'html:pkg/rspec_report.html', '-b']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec,teamcity/*,/usr/lib/ruby/,.gem/ruby,/boxgrinder-core/,/gems/']
+  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
+  Dir["**/rubygem-*.spec"].each do |spec|
+    `rpmbuild --define '_topdir #{topdir}' -ba #{spec}`
+    exit 1 unless $? == 0
+  end
+end
+
+desc "Install RPM"
+task 'rpm:install' => ['rpm'] do
+  puts "sudo yum -y remove rubygem-boxgrinder-build"
+  system "sudo yum -y remove rubygem-boxgrinder-build"
+  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

data/bin/boxgrinder-build

@@ -18,10 +18,6 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-
-gem 'boxgrinder-core', '>= 0.1.1'
-gem 'commander', '>= 4.0.3'
-
 require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/appliance'
 
@@ -35,7 +31,7 @@ end
 require 'commander/import'
 
 program :name, 'BoxGrinder Build'
-program :version, '0.6.1'
+program :version, '0.6.3'
 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'

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   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-04}
+  s.date = %q{2010-11-11}
   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/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", "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", "boxgrinder-build.gemspec"]
+  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"]
   s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
   s.require_paths = ["lib"]
@@ -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.1"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.2"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.1"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.2"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.1"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.2"])
   end
 end

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

@@ -20,7 +20,7 @@ require 'logger'
 
 module BoxGrinder
   class AugeasHelper
-    def initialize( guestfs, guestfs_helper, options = {})
+    def initialize(guestfs, guestfs_helper, options = {})
       @guestfs        = guestfs
       @guestfs_helper = guestfs_helper
       @log            = options[:log] || Logger.new(STDOUT)
@@ -28,7 +28,7 @@ module BoxGrinder
       @files = {}
     end
 
-    def edit( &block )
+    def edit(&block)
       @log.debug "Changing configuration files using augeas..."
 
       instance_eval &block if block
@@ -38,10 +38,12 @@ module BoxGrinder
         return
       end
 
-      @log.trace "Enabling coredump catching for augeas..."
-      @guestfs.debug( "core_pattern", [ "/sysroot/core" ] )
+      if @guestfs.debug("help", []).include?('core_pattern')
+        @log.trace "Enabling coredump catching for augeas..."
+        @guestfs.debug("core_pattern", ["/sysroot/core"])
+      end
 
-      @guestfs.aug_init( "/", 32 )
+      @guestfs.aug_init("/", 32)
 
       unload = []
 
@@ -49,7 +51,7 @@ module BoxGrinder
         unload << ". != '#{file_name}'"
       end
 
-      @guestfs.aug_rm( "/augeas/load//incl[#{unload.join(' and ')}]" )
+      @guestfs.aug_rm("/augeas/load//incl[#{unload.join(' and ')}]")
       @guestfs.aug_load
 
       @files.each do |file, changes|
@@ -64,13 +66,13 @@ module BoxGrinder
       @log.debug "Augeas changes saved."
     end
 
-    def set( name, key, value )
-      unless @guestfs.exists( name ) != 0
+    def set(name, key, value)
+      unless @guestfs.exists(name) != 0
         @log.debug "File '#{name}' doesn't exists, skipping augeas changes..."
         return
       end
 
-      @files[name] = {} unless @files.has_key?( name )
+      @files[name] = {} unless @files.has_key?(name)
       @files[name][key] = value
     end
   end

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

@@ -159,8 +159,10 @@ module BoxGrinder
       @guestfs.add_drive(@raw_disk)
       @log.trace "Drive added."
 
-      @log.debug "Enabling networking for GuestFS..."
-      @guestfs.set_network(1)
+      if @guestfs.respond_to?('set_network')
+        @log.debug "Enabling networking for GuestFS..."
+        @guestfs.set_network(1)
+      end
 
       @log.debug "Launching guestfs..."
       @guestfs.launch

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

@@ -21,7 +21,10 @@ require 'boxgrinder-build/helpers/guestfs-helper'
 
 module BoxGrinder
   class ImageHelper
-    def initialize(options = {})
+    def initialize(config, appliance_config, options = {})
+      @config                 = config
+      @appliance_config       = appliance_config
+
       @log          = options[:log] || Logger.new(STDOUT)
       @exec_helper  = options[:exec_helper] || ExecHelper.new(:log => @log)
     end
@@ -42,10 +45,10 @@ module BoxGrinder
         mounts[label] = loop_device
       end
 
-      @exec_helper.execute("mount #{mounts['/']} -t #{get_filesystem_type(mounts['/'])} #{mount_dir}")
+      @exec_helper.execute("mount #{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}")
+        @exec_helper.execute("mount #{loop_device} #{mount_dir}#{mount_point}")
       end
 
       @log.trace "Mounts:\n#{mounts}"
@@ -53,12 +56,6 @@ module BoxGrinder
       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)}'..."
 
@@ -85,6 +82,8 @@ module BoxGrinder
 
       @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+/)
+      # wait one secont before freeing loop device
+      sleep 1
       @exec_helper.execute("losetup -d #{loop_device}")
 
       @log.trace "Offsets:\n#{offsets}"
@@ -99,10 +98,20 @@ module BoxGrinder
     end
 
     def create_filesystem(disk, options = {})
-      options = {:type => 'ext3', :label => '/'}.merge(options)
+      options = {
+          :type   => @appliance_config.hardware.partitions['/']['type'],
+          :label  => '/'
+      }.merge(options)
 
       @log.trace "Creating filesystem..."
-      @exec_helper.execute "mke2fs -T #{options[:type]} -L '#{options[:label]}' -F #{disk}"
+
+      case options[:type]
+        when 'ext3', 'ext4'
+          @exec_helper.execute "mke2fs -T #{options[:type]} -L '#{options[:label]}' -F #{disk}"
+        else
+          raise "Unsupported filesystem specified: #{options[:type]}"
+      end
+
       @log.trace "Filesystem created"
     end
 

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

@@ -17,6 +17,7 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/helpers/exec-helper'
+require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/image-helper'
 require 'ostruct'
 require 'openhash/openhash'
@@ -32,7 +33,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)
+      @image_helper           = options[:image_helper] || ImageHelper.new(@config, @appliance_config, :log => @log)
 
       @plugin_info            = options[:plugin_info]
       @previous_plugin_info   = options[:previous_plugin_info]
@@ -84,7 +85,7 @@ module BoxGrinder
     def supported_oses
       supported = ""
 
-      @supported_oses.each do |name, versions|
+      @supported_oses.sort.each do |name, versions|
         supported << ", " unless supported.empty?
         supported << "#{name} (versions: #{versions.join(", ")})"
       end

data/rubygem-boxgrinder-build.spec

@@ -5,12 +5,13 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.6.2
+Version: 0.6.3
 Release: 1%{?dist}
 Group: Development/Languages
-License: LGPL
+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
@@ -19,8 +20,9 @@ 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: rubygems >= 1.2
-BuildRequires: ruby >= 0
+
+BuildRequires: rubygem(boxgrinder-core) => 0.1.1
+BuildRequires: rubygem(boxgrinder-core) < 0.2
 
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
@@ -29,6 +31,14 @@ Provides: rubygem(%{gemname}) = %{version}
 A tool for creating appliances from simple plain text files for various
 virtual environments
 
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires:%{name} = %{version}-%{release}
+
+%description doc
+Documentation for %{name}
+
 %prep
 
 %build
@@ -43,6 +53,12 @@ mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 rmdir %{buildroot}%{gemdir}/bin
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
+%check
+pushd %{buildroot}/%{geminstdir}
+rake spec
+rm -rf log
+popd
+
 %clean
 rm -rf %{buildroot}
 
@@ -52,19 +68,26 @@ rm -rf %{buildroot}
 %dir %{geminstdir}
 %{geminstdir}/bin
 %{geminstdir}/lib
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/%{gemname}.gemspec
-%doc %{geminstdir}/rubygem-%{gemname}.spec
 %doc %{geminstdir}/CHANGELOG
 %doc %{geminstdir}/LICENSE
 %doc %{geminstdir}/README
 %doc %{geminstdir}/Manifest
-%doc %{geminstdir}/Rakefile
-%doc %{geminstdir}/spec
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
+%files doc
+%defattr(-, root, root, -)
+%{geminstdir}/spec
+%{geminstdir}/Rakefile
+%{geminstdir}/rubygem-%{gemname}.spec
+%{geminstdir}/%{gemname}.gemspec
+%{gemdir}/doc/%{gemname}-%{version}
+
 %changelog
+* 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
+
 * Wed Nov 03 2010  <mgoldman@redhat.com> - 0.6.2-1
 - [BGBUILD-84] Don't use in libguestfs qemu-kvm where hardware accleration isn't available
 

data/spec/Rakefile

@@ -16,6 +16,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'rake'
 require 'spec/rake/spectask'
 

data/spec/appliance-spec.rb

@@ -16,41 +16,66 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/appliance'
-require 'rspec/rspec-config-helper'
+#require 'rspec/rspec-config-helper'
 require 'ostruct'
+require 'logger'
 
 module BoxGrinder
   describe Appliance do
-    include RSpecConfigHelper
-
-    before(:all) do
-      @arch = `uname -m`.chomp.strip
-    end
-
-    def prepare_appliance( options = OpenStruct.new )
+    def prepare_appliance(options = OpenStruct.new)
       options.name      = 'boxgrinder'
       options.version   = '1.0'
 
       @options = options
       @log = Logger.new('/dev/null')
 
-      @plugin_manager = mock( PluginManager )
+      @plugin_manager = mock(PluginManager)
 
-      PluginManager.stub!(:instance).and_return( @plugin_manager )
+      PluginManager.stub!(:instance).and_return(@plugin_manager)
 
-      @appliance = Appliance.new( "#{File.dirname( __FILE__ )}/rspec/src/appliances/jeos-f13.appl", :log => @log, :options => @options )
+      @appliance = Appliance.new("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl", :log => @log, :options => @options)
     end
 
-    before(:each) do
-      prepare_appliance
+    def prepare_appliance_config
+      @appliance_config = mock('ApplianceConfig')
+
+      @appliance_config.stub!(:path).and_return(OpenHash.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!(:hardware).and_return(
+          OpenHash.new({
+                           :partitions =>
+                               {
+                                   '/' => {'size' => 2},
+                                   '/home' => {'size' => 3},
+                               },
+                           :arch => 'i686',
+                           :base_arch => 'i386',
+                           :cpus => 1,
+                           :memory => 256,
+                       })
+      )
+
+      @appliance_config
     end
 
+#    before(:each) do
+#      prepare_appliance
+#    end
+
     it "should prepare appliance to build" do
+      prepare_appliance
+
       plugin_helper = mock(PluginHelper)
       plugin_helper.should_receive(:load_plugins)
 
-      PluginHelper.should_receive( :new ).with( :options => @options, :log => @log ).and_return( plugin_helper )
+      PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
 
       @appliance.should_receive(:read_and_validate_definition)
       @appliance.should_not_receive(:remove_old_builds)
@@ -60,12 +85,12 @@ module BoxGrinder
     end
 
     it "should prepare appliance to build with removing old files" do
-      prepare_appliance( OpenStruct.new( :force => true ) )
+      prepare_appliance(OpenStruct.new(:force => true))
 
       plugin_helper = mock(PluginHelper)
       plugin_helper.should_receive(:load_plugins)
 
-      PluginHelper.should_receive( :new ).with( :options => @options, :log => @log ).and_return( plugin_helper )
+      PluginHelper.should_receive(:new).with(:options => @options, :log => @log).and_return(plugin_helper)
 
       @appliance.should_receive(:read_and_validate_definition)
       @appliance.should_receive(:remove_old_builds)
@@ -75,12 +100,14 @@ module BoxGrinder
     end
 
     it "should read and validate definition" do
+      prepare_appliance
+
       appliance_config = ApplianceConfig.new
 
       appliance_helper = mock(ApplianceHelper)
-      appliance_helper.should_receive(:read_definitions).with( "#{File.dirname( __FILE__ )}/rspec/src/appliances/jeos-f13.appl" ).and_return([{}, appliance_config])
+      appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl").and_return([{}, appliance_config])
 
-      ApplianceHelper.should_receive(:new).with( :log => @log ).and_return(appliance_helper)
+      ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
       appliance_config_helper = mock(ApplianceConfigHelper)
 
@@ -88,120 +115,126 @@ module BoxGrinder
       appliance_config.should_receive(:init_arch).and_return(appliance_config)
       appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
 
-      appliance_config_helper.should_receive(:merge).with( appliance_config ).and_return( appliance_config )
+      appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
 
-      ApplianceConfigHelper.should_receive(:new).with( {} ).and_return( appliance_config_helper )
+      ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
 
       appliance_config_validator = mock(ApplianceConfigValidator)
       appliance_config_validator.should_receive(:validate)
 
-      ApplianceConfigValidator.should_receive(:new).with( appliance_config ).and_return(appliance_config_validator)
+      ApplianceConfigValidator.should_receive(:new).with(appliance_config).and_return(appliance_config_validator)
 
       @appliance.read_and_validate_definition
     end
 
     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")
+      prepare_appliance
+
+      @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+      FileUtils.should_receive(:rm_rf).with("build/path")
       @appliance.remove_old_builds
     end
 
     it "should build base appliance" do
-      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      prepare_appliance
+
+      @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
 
       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'})
+      os_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
-      @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"] } ] )
+      @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.execute_plugin_chain
     end
 
     it "should not build base appliance because deliverable already exists" do
-      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
+      prepare_appliance
+
+      @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
 
       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'})
+      os_plugin.should_receive(:deliverables).and_return({:disk => 'abc'})
 
-      @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"] } ] )
+      @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.execute_plugin_chain
     end
 
     it "should build appliance and convert it to VMware format" do
-      prepare_appliance( OpenStruct.new({ :platform => :vmware }) )
+      prepare_appliance(OpenStruct.new({:platform => :vmware}))
 
-      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
-      @appliance.should_receive( :execute_os_plugin ).and_return( {} )
+      @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+      @appliance.should_receive(:execute_os_plugin).and_return({})
 
       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' })
+      platform_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"} ]  )
+      @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 and convert it to VMware format because deliverable already exists" do
-      prepare_appliance( OpenStruct.new({ :platform => :vmware }) )
+      prepare_appliance(OpenStruct.new({:platform => :vmware}))
 
-      @appliance.instance_variable_set(:@appliance_config, generate_appliance_config )
-      @appliance.should_receive( :execute_os_plugin ).and_return( {} )
+      @appliance.instance_variable_set(:@appliance_config, prepare_appliance_config)
+      @appliance.should_receive(:execute_os_plugin).and_return({})
 
       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' })
+      platform_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"} ]  )
+      @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 }) )
+      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'} )
+      @appliance.instance_variable_set(:@appliance_config, prepare_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'})
 
       delivery_plugin = mock('S3 Plugin')
       delivery_plugin.should_receive(:init)
       delivery_plugin.should_receive(:run).with(:ami)
 
-      @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.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]}])
 
       @appliance.execute_plugin_chain
     end
 
     it "should build appliance, convert it to EC2 format and deliver it using delivery plugin with only one delivery type" do
-      prepare_appliance( OpenStruct.new({ :platform => :ec2, :delivery => :same }) )
+      prepare_appliance(OpenStruct.new({:platform => :ec2, :delivery => :same}))
 
-      @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'} )
+      @appliance.instance_variable_set(:@appliance_config, prepare_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'})
 
       delivery_plugin = mock('S3 Plugin')
       delivery_plugin.should_receive(:init)
-      delivery_plugin.should_receive(:run).with( :same )
+      delivery_plugin.should_receive(:run).with(:same)
 
-      @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"} ] )
+      @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.execute_plugin_chain
     end

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

@@ -17,14 +17,40 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/helpers/appliance-customize-helper'
-require 'rspec/rspec-config-helper'
 
 module BoxGrinder
   describe ApplianceCustomizeHelper do
-    include RSpecConfigHelper
 
     before(:each) do
-      @helper = ApplianceCustomizeHelper.new(generate_config, generate_appliance_config, 'a/disk', :log => Logger.new('/dev/null'))
+      @config = mock('Config')
+      @config.stub!(:name).and_return('BoxGrinder')
+      @config.stub!(:version_with_release).and_return('0.1.2')
+
+      @appliance_config = mock('ApplianceConfig')
+
+      @appliance_config.stub!(:path).and_return(OpenHash.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!(:hardware).and_return(
+          OpenHash.new({
+                           :partitions =>
+                               {
+                                   '/' => {'size' => 2},
+                                   '/home' => {'size' => 3},
+                               },
+                           :arch => 'i686',
+                           :base_arch => 'i386',
+                           :cpus => 1,
+                           :memory => 256,
+                       })
+      )
+
+      @helper = ApplianceCustomizeHelper.new(@config, @appliance_config, 'a/disk', :log => Logger.new('/dev/null'))
 
       @log = @helper.instance_variable_get(:@log)
     end
@@ -37,11 +63,11 @@ module BoxGrinder
       guestfs_helper.should_receive(:guestfs).and_return(guestfs)
       guestfs_helper.should_receive(:clean_close)
 
-      GuestFSHelper.should_receive(:new).with('a/disk', :log =>  @log ).and_return(guestfs_helper)
+      GuestFSHelper.should_receive(:new).with('a/disk', :log =>  @log).and_return(guestfs_helper)
 
       @helper.customize do |gf, gf_helper|
-        gf_helper.should  == guestfs_helper
-        gf.should         == guestfs
+        gf_helper.should == guestfs_helper
+        gf.should == guestfs
       end
     end
   end

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

@@ -27,7 +27,7 @@ module BoxGrinder
       @guestfs = mock('GuestFS')
       @guestfs_helper = mock('GuestFSHelper')
 
-      @helper = AugeasHelper.new( @guestfs, @guestfs_helper, :log => @log)
+      @helper = AugeasHelper.new(@guestfs, @guestfs_helper, :log => @log)
     end
 
     it "should not execute augeas commands if there a no files to change" do
@@ -36,6 +36,7 @@ module BoxGrinder
     end
 
     it "should change configuration for one file" do
+      @guestfs.should_receive(:debug).with("help", []).and_return("core_pattern")
       @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:aug_init).with('/', 32)
@@ -45,11 +46,12 @@ module BoxGrinder
       @guestfs.should_receive(:aug_save)
 
       @helper.edit do
-        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
+        set('/etc/ssh/sshd_config', 'UseDNS', 'no')
       end
     end
 
     it "should change configuration for two files" do
+      @guestfs.should_receive(:debug).with("help", []).and_return("core_pattern")
       @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(1)
@@ -61,12 +63,13 @@ module BoxGrinder
       @guestfs.should_receive(:aug_save)
 
       @helper.edit do
-        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
-        set( '/etc/sysconfig/selinux', 'SELINUX', 'permissive')
+        set('/etc/ssh/sshd_config', 'UseDNS', 'no')
+        set('/etc/sysconfig/selinux', 'SELINUX', 'permissive')
       end
     end
 
     it "should change one configuration for two files because one file doesn't exists" do
+      @guestfs.should_receive(:debug).with("help", []).and_return("core_pattern")
       @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(0)
@@ -77,8 +80,23 @@ module BoxGrinder
       @guestfs.should_receive(:aug_save)
 
       @helper.edit do
-        set( '/etc/ssh/sshd_config', 'UseDNS', 'no')
-        set( '/etc/sysconfig/selinux', 'SELINUX', 'permissive')
+        set('/etc/ssh/sshd_config', 'UseDNS', 'no')
+        set('/etc/sysconfig/selinux', 'SELINUX', 'permissive')
+      end
+    end
+
+    it "should not set core_patter debug method because it's not supported" do
+      @guestfs.should_receive(:debug).with("help", []).and_return("something")
+      @guestfs.should_not_receive(:debug).with("core_pattern", ["/sysroot/core"])
+      @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
+      @guestfs.should_receive(:aug_init).with('/', 32)
+      @guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/ssh/sshd_config']")
+      @guestfs.should_receive(:aug_load)
+      @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
+      @guestfs.should_receive(:aug_save)
+
+      @helper.edit do
+        set('/etc/ssh/sshd_config', 'UseDNS', 'no')
       end
     end
   end

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

@@ -22,7 +22,26 @@ module BoxGrinder
   describe ImageHelper do
 
     before(:each) do
-      @helper      = ImageHelper.new(:log => Logger.new('/dev/null'))
+      @config = mock('Config')
+
+      @appliance_config = mock('ApplianceConfig')
+
+      @appliance_config.stub!(:name).and_return('full')
+      @appliance_config.stub!(:hardware).and_return(
+          OpenHash.new({
+                           :partitions =>
+                               {
+                                   '/' => {'size' => 2, 'type' => 'ext4'},
+                                   '/home' => {'size' => 3, 'type' => 'ext3'},
+                               },
+                           :arch => 'i686',
+                           :base_arch => 'i386',
+                           :cpus => 1,
+                           :memory => 256,
+                       })
+      )
+
+      @helper      = ImageHelper.new(@config, @appliance_config, :log => Logger.new('/dev/null'))
 
       @log         = @helper.instance_variable_get(:@log)
       @exec_helper = @helper.instance_variable_get(:@exec_helper)
@@ -34,8 +53,7 @@ module BoxGrinder
       @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')
+      @exec_helper.should_receive(:execute).with('mount /dev/loop0 mount_dir')
 
       @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop0"}
     end
@@ -50,11 +68,8 @@ module BoxGrinder
       @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')
+      @exec_helper.should_receive(:execute).with('mount /dev/loop1 mount_dir')
+      @exec_helper.should_receive(:execute).with('mount /dev/loop0 mount_dir/home')
 
       @helper.mount_image('disk.raw', 'mount_dir').should == {"/"=>"/dev/loop1", "/home"=>"/dev/loop0"}
     end
@@ -100,15 +115,29 @@ module BoxGrinder
     end
 
     it "should create default filesystem on selected device" do
-      @exec_helper.should_receive(:execute).with("mke2fs -T ext3 -L '/' -F /dev/loop0")
+      @exec_helper.should_receive(:execute).with("mke2fs -T ext4 -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")
+      @appliance_config.should_receive(:hardware).and_return(
+          OpenHash.new({
+                           :partitions =>
+                               {
+                                   '/' => {'size' => 2, 'type' => 'ext3'},
+                                   '/home' => {'size' => 3, 'type' => 'ext3'},
+                               },
+                           :arch => 'i686',
+                           :base_arch => 'i386',
+                           :cpus => 1,
+                           :memory => 256,
+                       })
+      )
 
-      @helper.create_filesystem('/dev/loop0', :type => 'ext4')
+      @exec_helper.should_receive(:execute).with("mke2fs -T ext3 -L '/' -F /dev/loop0")
+
+      @helper.create_filesystem('/dev/loop0')
     end
 
     it "should create ext4 filesystem on selected device with a label" do

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

@@ -17,13 +17,10 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/helpers/plugin-helper'
-require 'rspec/rspec-config-helper'
 require 'ostruct'
 
 module BoxGrinder
   describe PluginHelper do
-    include RSpecConfigHelper
-
     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 boxgrinder-build-ebs-delivery-plugin)

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

@@ -16,20 +16,24 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'rubygems'
 require 'boxgrinder-build/plugins/base-plugin'
-require 'rspec/rspec-config-helper'
+require 'yaml'
 
 module BoxGrinder
   describe BasePlugin do
-    include RSpecConfigHelper
+    before(:each) do
+      @config = mock('Config')
+      @config.stub!(:name).and_return('BoxGrinder')
+      @config.stub!(:version_with_release).and_return('0.1.2')
 
-    before(:all) do
-      @arch = `uname -m`.chomp.strip
-    end
+      @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'}))
 
-    before(:each) do
       @plugin = BasePlugin.new
-      @plugin.init(generate_config, generate_appliance_config, :plugin_info => {:name => :plugin_name}, :log => Logger.new('/dev/null'))
+      @plugin.init(@config, @appliance_config, :plugin_info => {:name => :plugin_name}, :log => Logger.new('/dev/null'))
     end
 
     it "should be initialized after running init method" do
@@ -41,7 +45,7 @@ module BoxGrinder
 
       deliverables = @plugin.instance_variable_get(:@deliverables)
 
-      deliverables.disk.should == "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp/name"
+      deliverables.disk.should == "build/path/plugin_name-plugin/tmp/name"
     end
 
     it "should register a metadata deliverable" do
@@ -50,7 +54,7 @@ module BoxGrinder
       deliverables = @plugin.instance_variable_get(:@deliverables)
 
       deliverables.size.should == 1
-      deliverables.a_name.should == "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp/a_path"
+      deliverables.a_name.should == "build/path/plugin_name-plugin/tmp/a_path"
     end
 
     it "should register multiple other deliverables" do
@@ -59,12 +63,12 @@ module BoxGrinder
       deliverables = @plugin.instance_variable_get(:@deliverables)
 
       deliverables.size.should == 2
-      deliverables.a_name.should == "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp/a_path"
-      deliverables.a_second_name.should == "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp/a_path_too"
+      deliverables.a_name.should == "build/path/plugin_name-plugin/tmp/a_path"
+      deliverables.a_second_name.should == "build/path/plugin_name-plugin/tmp/a_path_too"
     end
 
     it "should have a valid path to tmp directory" do
-      @plugin.instance_variable_get(:@dir).tmp.should == "build/appliances/#{@arch}/fedora/11/full/plugin_name-plugin/tmp"
+      @plugin.instance_variable_get(:@dir).tmp.should == "build/path/plugin_name-plugin/tmp"
     end
 
     it "should check if deliverables exists and return true" do
@@ -92,13 +96,13 @@ module BoxGrinder
     it "should run the plugin" do
       @plugin.register_deliverable(:disk => "disk")
 
-      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")
+      FileUtils.should_receive(:rm_rf).with("build/path/plugin_name-plugin/tmp")
+      FileUtils.should_receive(:mkdir_p).with("build/path/plugin_name-plugin/tmp")
 
       @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")
+      FileUtils.should_receive(:mv).with("build/path/plugin_name-plugin/tmp/disk", "build/path/plugin_name-plugin/disk")
+      FileUtils.should_receive(:rm_rf).with("build/path/plugin_name-plugin/tmp")
 
       @plugin.run('a', 3)
     end
@@ -135,7 +139,7 @@ module BoxGrinder
       @plugin.register_supported_os('fedora', ['12', '13'])
       @plugin.register_supported_os('centos', ['5'])
 
-      @plugin.supported_oses.should == "fedora (versions: 12, 13), centos (versions: 5)"
+      @plugin.supported_oses.should == "centos (versions: 5), fedora (versions: 12, 13)"
     end
 
     it "should set default config value" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +01:00
+date: 2010-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.
@@ -78,6 +78,7 @@ files:
 - 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
@@ -101,7 +102,6 @@ files:
 - spec/managers/plugin-manager-spec.rb
 - spec/plugins/base-plugin-spec.rb
 - spec/rspec/src/appliances/jeos-f13.appl
-- boxgrinder-build.gemspec
 has_rdoc: true
 homepage: http://www.jboss.org/boxgrinder
 licenses: []