boxgrinder-build 0.6.5 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,12 @@
+
+v0.7.0
+
+* [BGBUILD-119] Fix SElinux issues on EC2 appliances
+* [BGBUILD-118] Enable SElinux in guestfs
+* [BGBUILD-80] VMware .tgz Bundle Should Expand Into Subdirectory, Not Current Directory
+* [BGBUILD-113] Allow to specify supported file formats for operating system plugin
+* [BGBUILD-73] Add support for kickstart files
+
 v0.6.5
 
 * Release bump required for plugins

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.4"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.5"]
 end
 
 desc "Run all tests"

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.5"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-17}
   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", "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.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.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.4"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.5"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.4"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.5"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.4"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.5"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -29,32 +29,45 @@ module BoxGrinder
   class Appliance
 
     def initialize(appliance_definition_file, options = {})
-      @config = Config.new
+      @config                    = Config.new
       @appliance_definition_file = appliance_definition_file
-      @log = options[:log] || Logger.new(STDOUT)
-      @options = options[:options]
+      @log                       = options[:log] || Logger.new(STDOUT)
+      @options                   = options[:options]
 
-      @config.name = @options.name
-      @config.version.version = @options.version
-      @config.version.release = nil
+      @config.name               = @options.name
+      @config.version.version    = @options.version
+      @config.version.release    = nil
     end
 
     def read_definition
-      appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition_file)
-      appliance_config_helper = ApplianceConfigHelper.new(appliance_configs)
+      begin
+        # first try to read as appliance definition file
+        appliance_configs, appliance_config = ApplianceHelper.new(:log => @log).read_definitions(@appliance_definition_file)
+      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)
+          break unless appliance_config.nil?
+        end
+        appliance_configs = [appliance_config]
+      end
 
-      @appliance_config = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
+      raise "Couldn't read appliance definition file: #{File.basename(@appliance_definition_file)}" if appliance_config.nil?
+
+      appliance_config_helper = ApplianceConfigHelper.new(appliance_configs)
+      @appliance_config       = appliance_config_helper.merge(appliance_config.clone.init_arch).initialize_paths
     end
 
     def validate_definition
       ApplianceConfigValidator.new(@appliance_config).validate
 
-      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?
+      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?
 
       os_plugin = PluginManager.instance.plugins[:os][@appliance_config.os.name.to_sym]
 
-      raise ApplianceValidationError, "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 ApplianceValidationError, "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)
+      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)
     end
 
     def remove_old_builds
@@ -66,10 +79,7 @@ module BoxGrinder
     def execute_plugin_chain
       @log.info "Building '#{@appliance_config.name}' appliance for #{@appliance_config.hardware.arch} architecture."
 
-      base_plugin_output = execute_os_plugin
-      platform_plugin_output = execute_platform_plugin(base_plugin_output)
-
-      execute_delivery_plugin(platform_plugin_output)
+      execute_delivery_plugin(execute_platform_plugin(execute_os_plugin))
     end
 
     def create
@@ -96,7 +106,7 @@ module BoxGrinder
       end
 
       @log.debug "Executing operating system plugin for #{@appliance_config.os.name}..."
-      os_plugin.run
+      os_plugin.run(@appliance_definition_file)
       @log.debug "Operating system plugin executed."
 
       {:deliverables => os_plugin.deliverables, :plugin_info => os_plugin_info}

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

@@ -62,6 +62,7 @@ module BoxGrinder
       end
 
       @guestfs.aug_save
+      @guestfs.aug_close
 
       @log.debug "Augeas changes saved."
     end

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

@@ -25,8 +25,8 @@ require 'rbconfig'
 module BoxGrinder
   class SilencerProxy
     def initialize(o, destination)
-      @o            = o
-      @destination  = destination
+      @o = o
+      @destination = destination
     end
 
     def method_missing(m, *args, &block)
@@ -82,7 +82,7 @@ module BoxGrinder
   class GuestFSHelper
     def initialize(raw_disk, options = {})
       @raw_disk = raw_disk
-      @log      = options[:log] || Logger.new(STDOUT)
+      @log = options[:log] || Logger.new(STDOUT)
 
       @partitions = {}
     end
@@ -145,8 +145,11 @@ module BoxGrinder
       @guestfs.set_verbose(1)
       @guestfs.set_trace(1)
 
+      @log.trace "Enabling SElinux support in guestfs..."
+      @guestfs.set_selinux(1)
+
       unless hw_virtualization_available?
-        qemu_wrapper =  (RbConfig::CONFIG['host_cpu'].eql?('x86_64') ? "/usr/bin/qemu-system-x86_64" : "/usr/bin/qemu")
+        qemu_wrapper = (RbConfig::CONFIG['host_cpu'].eql?('x86_64') ? "/usr/bin/qemu-system-x86_64" : "/usr/bin/qemu")
 
         if File.exists?(qemu_wrapper)
           @log.trace "Setting QEMU wrapper to #{qemu_wrapper}..."
@@ -176,11 +179,30 @@ module BoxGrinder
           mount_partitions
       end
 
+      load_selinux_policy
+
       @log.trace "Guestfs launched."
 
       self
     end
 
+    def load_selinux_policy
+      return unless @guestfs.exists('/etc/sysconfig/selinux') != 0
+
+      @log.trace "Loading SElinux policy..."
+
+      @guestfs.aug_init("/", 32)
+      @guestfs.aug_rm("/augeas/load//incl[. != '/etc/sysconfig/selinux']")
+      @guestfs.aug_load
+
+      selinux = @guestfs.aug_get("/files/etc/sysconfig/selinux/SELINUX")
+
+      @guestfs.sh("/usr/sbin/load_policy") if !selinux.nil? and !selinux.eql?('disabled')
+      @guestfs.aug_close
+
+      @log.trace "SElinux policy loaded."
+    end
+
     def clean_close
       @log.trace "Closing guestfs..."
 

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

@@ -117,7 +117,7 @@ module BoxGrinder
 
     def sync_files(from_dir, to_dir)
       @log.debug "Syncing files between #{from_dir} and #{to_dir}..."
-      @exec_helper.execute "rsync -u -r -a #{from_dir}/* #{to_dir}"
+      @exec_helper.execute "rsync -Xura #{from_dir}/* #{to_dir}"
       @log.debug "Sync finished."
     end
 

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

@@ -27,25 +27,26 @@ module BoxGrinder
       @exec_helper      = options[:exec_helper] || ExecHelper.new({:log => @log})
     end
 
-    def package(deliverables, package, type = :tar)
-      files = []
-
-      deliverables.each_value do |file|
-        files << File.basename(file)
-      end
-
+    def package(dir, package, type = :tar)
       if File.exists?(package)
         @log.info "Package of #{type} type for #{@appliance_config.name} appliance already exists, skipping."
         return package
       end
 
-      FileUtils.mkdir_p(File.dirname(package))
-
       @log.info "Packaging #{@appliance_config.name} appliance to #{type}..."
 
       case type
         when :tar
-          @exec_helper.execute "tar -C #{File.dirname(deliverables[:disk])} -cvzf '#{package}' #{files.join(' ')}"
+          package_name = File.basename(package, '.tgz')
+          symlink      = "#{File.dirname(package)}/#{package_name}"
+
+          FileUtils.ln_s(File.expand_path(dir), symlink)
+
+          Dir.chdir(File.dirname(package)) do
+            @exec_helper.execute "tar -hcvzf #{package_name}.tgz #{package_name}"
+          end
+
+          FileUtils.rm(symlink)
         else
           raise "Only tar format is currently supported."
       end

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

@@ -58,9 +58,8 @@ module BoxGrinder
         @log.trace "Requiring plugin '#{plugin}'..."
 
         begin
-          gem plugin
           require plugin
-        rescue Gem::LoadError
+        rescue LoadError
           @log.warn "Specified gem: '#{plugin}' wasn't found. Make sure its name is correct, skipping..." unless plugin.match(/^boxgrinder-build-(.*)-plugin/)
         end
       end

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

@@ -27,34 +27,35 @@ require 'logger'
 
 module BoxGrinder
   class BasePlugin
-    def init(config, appliance_config, options = {})
-      @config                 = config
-      @appliance_config       = appliance_config
-      @options                = options
-
-      @log                    = options[:log] || Logger.new(STDOUT)
-      @exec_helper            = options[:exec_helper] || ExecHelper.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]
+    def initialize
+      @plugin_config       = {}
 
-      @previous_deliverables  = options[:previous_deliverables] || {}
-      @plugin_config          = {}
+      @deliverables        = OpenCascade.new
+      @supported_oses      = OpenCascade.new
+      @target_deliverables = OpenCascade.new
+      @dir                 = OpenCascade.new
+    end
 
-      @deliverables           = OpenCascade.new
-      @supported_oses         = OpenCascade.new
-      @target_deliverables    = OpenCascade.new
-      @dir                    = OpenCascade.new
+    def init(config, appliance_config, options = {})
+      @config                = config
+      @appliance_config      = appliance_config
+      @options               = options
+      @log                   = options[:log] || Logger.new(STDOUT)
+      @exec_helper           = options[:exec_helper] || ExecHelper.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]
+      @previous_deliverables = options[:previous_deliverables] || {}
 
-      @dir.base               = "#{@appliance_config.path.build}/#{@plugin_info[:name]}-plugin"
-      @dir.tmp                = "#{@dir.base}/tmp"
+      @dir.base              = "#{@appliance_config.path.build}/#{@plugin_info[:name]}-plugin"
+      @dir.tmp               = "#{@dir.base}/tmp"
 
-      @config_file            = "#{ENV['HOME']}/.boxgrinder/plugins/#{@plugin_info[:name]}"
+      @config_file           = "#{ENV['HOME']}/.boxgrinder/plugins/#{@plugin_info[:name]}"
 
       read_plugin_config
 
-      @initialized            = true
+      @move_deliverables = true
+      @initialized = true
 
       after_init
 
@@ -66,8 +67,8 @@ module BoxGrinder
       raise "Please specify deliverables as Hash, not #{deliverable.class}." unless deliverable.is_a?(Hash)
 
       deliverable.each do |name, path|
-        @deliverables[name]          = "#{@dir.tmp}/#{path}"
-        @target_deliverables[name]   = "#{@dir.base}/#{path}"
+        @deliverables[name]        = "#{@dir.tmp}/#{path}"
+        @target_deliverables[name] = "#{@dir.base}/#{path}"
       end
     end
 
@@ -134,7 +135,7 @@ module BoxGrinder
       @deliverables.each do |name, path|
         @log.trace "Moving '#{path}' deliverable to target destination '#{@target_deliverables[name]}'..."
         FileUtils.mv(path, @target_deliverables[name])
-      end
+      end if @move_deliverables
 
       FileUtils.rm_rf @dir.tmp
     end

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.6.5
+Version: 0.7.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -14,14 +14,14 @@ Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(commander)
-Requires: rubygem(boxgrinder-core)
+Requires: rubygem(boxgrinder-core) >= 0.1.5
 Requires: ruby-libguestfs
 Requires: parted
 Requires: e2fsprogs
 
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(rspec)
-BuildRequires: rubygem(boxgrinder-core)
+BuildRequires: rubygem(boxgrinder-core) >= 0.1.5
 BuildRequires: rubygem(echoe)
 BuildRequires: ruby-libguestfs
 
@@ -85,6 +85,14 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Fri Dec 17 2010  <mgoldman@redhat.com> - 0.7.0-1
+- Updated to upstream version: 0.7.0
+- [BGBUILD-113] Allow to specify supported file formats for operating system plugin
+- [BGBUILD-73] Add support for kickstart files
+- [BGBUILD-80] VMware .tgz Bundle Should Expand Into Subdirectory, Not Current Directory
+- [BGBUILD-118] Enable SElinux in guestfs
+- [BGBUILD-119] Fix SElinux issues on EC2 appliances
+
 * Thu Dec 02 2010  <mgoldman@redhat.com> - 0.6.5-1
 - Updated to new upstream release: 0.6.5
 

data/spec/appliance-spec.rb

@@ -23,18 +23,18 @@ require 'logger'
 
 module BoxGrinder
   describe Appliance do
-    def prepare_appliance(options = OpenStruct.new)
-      options.name = 'boxgrinder'
+    def prepare_appliance(options = OpenStruct.new, definition_file = "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl")
+      options.name    = 'boxgrinder'
       options.version = '1.0'
 
-      @options = options
-      @log = Logger.new('/dev/null')
+      @options        = options
+      @log            = Logger.new('/dev/null')
 
       @plugin_manager = mock(PluginManager)
 
       PluginManager.stub!(:instance).and_return(@plugin_manager)
 
-      @appliance = Appliance.new("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl", :log => @log, :options => @options)
+      @appliance = Appliance.new(definition_file, :log => @log, :options => @options)
     end
 
     def prepare_appliance_config
@@ -51,13 +51,13 @@ module BoxGrinder
           OpenCascade.new({
                               :partitions =>
                                   {
-                                      '/' => {'size' => 2},
+                                      '/'     => {'size' => 2},
                                       '/home' => {'size' => 3},
                                   },
-                              :arch => 'i686',
-                              :base_arch => 'i386',
-                              :cpus => 1,
-                              :memory => 256,
+                              :arch       => 'i686',
+                              :base_arch  => 'i386',
+                              :cpus       => 1,
+                              :memory     => 256,
                           })
       )
 
@@ -100,27 +100,84 @@ module BoxGrinder
       @appliance.create
     end
 
-    it "should read definition" do
-      prepare_appliance
+    describe ".validate_definition" do
+      it "should read definition with standard appliance definition file" 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])
+
+        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+
+        appliance_config_helper = mock(ApplianceConfigHelper)
+
+        appliance_config.should_receive(:clone).and_return(appliance_config)
+        appliance_config.should_receive(:init_arch).and_return(appliance_config)
+        appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
+
+        appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
+
+        ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
+
+        @appliance.read_definition
+      end
+
+      it "should read definition with kickstart appliance definition file" do
+        prepare_appliance(OpenStruct.new, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
+
+        appliance_config = ApplianceConfig.new
+
+        appliance_helper = mock(ApplianceHelper)
+        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
+
+        clazz          = mock('PluginClass')
 
-      appliance_config = ApplianceConfig.new
+        plugin_manager = mock(PluginManager)
+        plugin_manager.should_receive(:plugins).and_return({:os => {:fedora => {:class => clazz, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}}})
+
+        plugin = mock('Plugin')
+        plugin.should_receive(:respond_to?).with(:read_file).and_return(true)
+        plugin.should_receive(:read_file).and_return(appliance_config)
+
+        clazz.should_receive(:new).and_return(plugin)
+
+        PluginManager.should_receive(:instance).and_return(plugin_manager)
+
+        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+
+        appliance_config_helper = mock(ApplianceConfigHelper)
+
+        appliance_config.should_receive(:clone).and_return(appliance_config)
+        appliance_config.should_receive(:init_arch).and_return(appliance_config)
+        appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
+
+        appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
 
-      appliance_helper = mock(ApplianceHelper)
-      appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.appl").and_return([{}, appliance_config])
+        ApplianceConfigHelper.should_receive(:new).with([appliance_config]).and_return(appliance_config_helper)
 
-      ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
+        @appliance.read_definition
+      end
+
+      it "should read definition with kickstart appliance definition file and fail because there was no plugin able to read .ks" do
+        prepare_appliance(OpenStruct.new, "#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks")
 
-      appliance_config_helper = mock(ApplianceConfigHelper)
+        appliance_helper = mock(ApplianceHelper)
+        appliance_helper.should_receive(:read_definitions).with("#{File.dirname(__FILE__)}/rspec/src/appliances/jeos-f13.ks").and_raise("Unknown format")
+
+        plugin_manager = mock(PluginManager)
+        plugin_manager.should_receive(:plugins).and_return({:os => {}})
 
-      appliance_config.should_receive(:clone).and_return(appliance_config)
-      appliance_config.should_receive(:init_arch).and_return(appliance_config)
-      appliance_config.should_receive(:initialize_paths).and_return(appliance_config)
 
-      appliance_config_helper.should_receive(:merge).with(appliance_config).and_return(appliance_config)
+        PluginManager.should_receive(:instance).and_return(plugin_manager)
 
-      ApplianceConfigHelper.should_receive(:new).with({}).and_return(appliance_config_helper)
+        ApplianceHelper.should_receive(:new).with(:log => @log).and_return(appliance_helper)
 
-      @appliance.read_definition
+        lambda {
+          @appliance.read_definition
+        }.should raise_error("Couldn't read appliance definition file: jeos-f13.ks")
+      end
     end
 
     describe ".validate_definition" do
@@ -133,8 +190,6 @@ module BoxGrinder
 
         ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
 
-        puts @appliance_config
-
         plugin_manager = mock(PluginManager)
         plugin_manager.stub!(:plugins).and_return({:os => {:fedora => {:type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}}})
 
@@ -157,12 +212,9 @@ module BoxGrinder
 
         PluginManager.stub!(:instance).and_return(plugin_manager)
 
-        begin
+        lambda {
           @appliance.validate_definition
-          raise "Shouldn't raise"
-        rescue => e
-          e.message.should == "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"
-        end
+        }.should raise_error(SystemExit, "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")
       end
 
       it "should validate definition and fail because no supported operating system plugins is installed" do
@@ -174,19 +226,14 @@ module BoxGrinder
 
         ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
 
-        puts @appliance_config
-
         plugin_manager = mock(PluginManager)
         plugin_manager.stub!(:plugins).and_return({:os => {:rhel => {}}})
 
         PluginManager.stub!(:instance).and_return(plugin_manager)
 
-        begin
+        lambda {
           @appliance.validate_definition
-          raise "Shouldn't raise"
-        rescue => e
-          e.message.should == "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: rhel"
-        end
+        }.should raise_error(SystemExit, "Not supported operating system selected: fedora. Make sure you have installed right operating system plugin, see http://community.jboss.org/docs/DOC-15214. Supported OSes are: rhel")
       end
 
       it "should validate definition and fail because no supported operating system version plugins is installed" do
@@ -198,19 +245,14 @@ module BoxGrinder
 
         ApplianceConfigValidator.should_receive(:new).with(@appliance_config).and_return(appliance_config_validator)
 
-        puts @appliance_config
-
         plugin_manager = mock(PluginManager)
         plugin_manager.stub!(:plugins).and_return({:os => {:fedora => {:type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["xyz"]}}})
 
         PluginManager.stub!(:instance).and_return(plugin_manager)
 
-        begin
+        lambda {
           @appliance.validate_definition
-          raise "Shouldn't raise"
-        rescue => e
-          e.message.should == "Not supported operating system version selected: 11. Supported versions are: xyz"
-        end
+        }.should raise_error(SystemExit, "Not supported operating system version selected: 11. Supported versions are: xyz")
       end
     end
 

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

@@ -44,6 +44,7 @@ module BoxGrinder
       @guestfs.should_receive(:aug_load)
       @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
       @guestfs.should_receive(:aug_save)
+      @guestfs.should_receive(:aug_close)
 
       @helper.edit do
         set('/etc/ssh/sshd_config', 'UseDNS', 'no')
@@ -61,6 +62,7 @@ module BoxGrinder
       @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
       @guestfs.should_receive(:aug_set).with("/files/etc/sysconfig/selinux/SELINUX", "permissive")
       @guestfs.should_receive(:aug_save)
+      @guestfs.should_receive(:aug_close)
 
       @helper.edit do
         set('/etc/ssh/sshd_config', 'UseDNS', 'no')
@@ -78,6 +80,7 @@ module BoxGrinder
       @guestfs.should_receive(:aug_load)
       @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
       @guestfs.should_receive(:aug_save)
+      @guestfs.should_receive(:aug_close)
 
       @helper.edit do
         set('/etc/ssh/sshd_config', 'UseDNS', 'no')
@@ -94,6 +97,7 @@ module BoxGrinder
       @guestfs.should_receive(:aug_load)
       @guestfs.should_receive(:aug_set).with("/files/etc/ssh/sshd_config/UseDNS", "no")
       @guestfs.should_receive(:aug_save)
+      @guestfs.should_receive(:aug_close)
 
       @helper.edit do
         set('/etc/ssh/sshd_config', 'UseDNS', 'no')

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

@@ -26,7 +26,7 @@ module BoxGrinder
     end
 
     before(:each) do
-      @log    = Logger.new('/dev/null')
+      @log = Logger.new('/dev/null')
       @helper = GuestFSHelper.new('a/raw/disk', :log => @log)
     end
 
@@ -35,8 +35,10 @@ module BoxGrinder
       guetfs.should_receive(:set_append).with('noapic')
       guetfs.should_receive(:set_verbose)
       guetfs.should_receive(:set_trace)
+      guetfs.should_receive(:set_selinux).with(1)
 
       @helper.should_receive(:hw_virtualization_available?).and_return(true)
+      @helper.should_receive(:load_selinux_policy)
 
       guetfs.should_receive(:set_qemu).with(wrapper) unless wrapper.nil?
       guetfs.should_receive(:add_drive).with('a/raw/disk')
@@ -190,5 +192,37 @@ module BoxGrinder
         @helper.hw_virtualization_available?.should == false
       end
     end
+
+    describe ".load_selinux_policy" do
+      it "should load SElinux policy for SElinux enabled guests" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(1)
+        guestfs.should_receive(:aug_init).with("/", 32)
+        guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/sysconfig/selinux']")
+        guestfs.should_receive(:aug_load)
+        guestfs.should_receive(:aug_get).with("/files/etc/sysconfig/selinux/SELINUX").and_return('permissive')
+        guestfs.should_receive(:sh).with("/usr/sbin/load_policy")
+        guestfs.should_receive(:aug_close)
+
+        @helper.load_selinux_policy
+      end
+
+      it "should not load SElinux policy for SElinux disabled guests" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(1)
+        guestfs.should_receive(:aug_init).with("/", 32)
+        guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/sysconfig/selinux']")
+        guestfs.should_receive(:aug_load)
+        guestfs.should_receive(:aug_get).with("/files/etc/sysconfig/selinux/SELINUX").and_return('disabled')
+        guestfs.should_not_receive(:sh).with("/usr/sbin/load_policy")
+        guestfs.should_receive(:aug_close)
+
+        @helper.load_selinux_policy
+      end
+    end
   end
 end

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

@@ -149,7 +149,7 @@ module BoxGrinder
 
 
     it "should sync files" do
-      @exec_helper.should_receive(:execute).with("rsync -u -r -a from_dir/* to_dir")
+      @exec_helper.should_receive(:execute).with("rsync -Xura from_dir/* to_dir")
 
       @helper.sync_files('from_dir', 'to_dir')
     end

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

@@ -27,7 +27,7 @@ module BoxGrinder
     end
 
     before(:each) do
-      @plugin_helper = PluginHelper.new( :options => OpenStruct.new )
+      @plugin_helper = PluginHelper.new(:options => OpenStruct.new)
     end
 
     it "should parse plugin list and return empty array when no plugins are provided" do
@@ -35,23 +35,22 @@ module BoxGrinder
     end
 
     it "should parse plugin list with double quotes" do
-      @plugin_helper = PluginHelper.new( :options => OpenStruct.new( :plugins => '"abc,def"' ) )
+      @plugin_helper = PluginHelper.new(:options => OpenStruct.new(:plugins => '"abc,def"'))
       @plugin_helper.parse_plugin_list.should == ['abc', 'def']
     end
 
     it "should parse plugin list with single quotes" do
-      @plugin_helper = PluginHelper.new( :options => OpenStruct.new( :plugins => "'abc,def'" ) )
+      @plugin_helper = PluginHelper.new(:options => OpenStruct.new(:plugins => "'abc,def'"))
       @plugin_helper.parse_plugin_list.should == ['abc', 'def']
     end
 
     it "should parse plugin list with single quotes and clean up it" do
-      @plugin_helper = PluginHelper.new( :options => OpenStruct.new( :plugins => "'    abc ,    def'" ) )
+      @plugin_helper = PluginHelper.new(:options => OpenStruct.new(:plugins => "'    abc ,    def'"))
       @plugin_helper.parse_plugin_list.should == ['abc', 'def']
     end
 
     it "should require default plugins" do
       @plugin_array.each do |plugin|
-        @plugin_helper.should_receive(:gem).ordered.with(plugin)
         @plugin_helper.should_receive(:require).once.with(plugin)
       end
 
@@ -59,16 +58,13 @@ module BoxGrinder
     end
 
     it "should read plugins specified in command line" do
-      @plugin_helper = PluginHelper.new( :options => OpenStruct.new( :plugins => 'abc,def' ) )
+      @plugin_helper = PluginHelper.new(:options => OpenStruct.new(:plugins => 'abc,def'))
 
       @plugin_array.each do |plugin|
-        @plugin_helper.should_receive(:gem).ordered.with(plugin)
         @plugin_helper.should_receive(:require).once.with(plugin)
       end
 
-      @plugin_helper.should_receive(:gem).ordered.with('abc')
       @plugin_helper.should_receive(:require).ordered.with('abc')
-      @plugin_helper.should_receive(:gem).ordered.with('def')
       @plugin_helper.should_receive(:require).ordered.with('def')
 
       @plugin_helper.read_and_require

data/spec/rspec/src/appliances/jeos-f13.ks

@@ -0,0 +1,23 @@
+# bg_os_name: fedora
+# bg_os_version: 13
+
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --enablemd5
+selinux --permissive
+firewall --disabled
+bootloader --timeout=1 --append="acpi=force scsi_mod.scan=sync"
+firstboot --disabled
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+rootpw boxgrinder
+
+part / --size 2048 --fstype ext4  --ondisk sda
+
+repo --name=fedora-14-base --cost=40 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64
+repo --name=fedora-14-updates --cost=41 --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64
+
+%packages --excludedocs --nobase
+  @core
+%end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 5
-  version: 0.6.5
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +01:00
+date: 2010-12-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 5
+        version: 0.1.5
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.
@@ -102,6 +102,7 @@ files:
 - 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
 has_rdoc: true
 homepage: http://www.jboss.org/boxgrinder
 licenses: []