boxgrinder-core 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,13 @@
+v0.3.1
+
+* [BGBUILD-164] Guestfs writes to /tmp/ by default, potentially filling the root filesystem
+* [BGBUILD-97] some filesystems dont get unmounted on BG interruption
+* [BGBUILD-155] Images built on Centos5.x (el5) for VirtualBox kernel panic (/dev/root missing)
+* [BGBUILD-190] Allow to specify kernel variant (PAE or not) for Fedora OS
+* [BGBUILD-192] Use IO.popen4 instead open4 gem on JRuby
+* [BGBUILD-198] root password is not inherited
+* [BGBUILD-156] Validate appliance definition files early and return meaningful error messages
+
 v0.3.0
 
 * [BGBUILD-178] Remove sensitive data from logs

data/Rakefile

@@ -17,19 +17,24 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'rubygems'
-require 'spec/rake/spectask'
+
+begin
+  require 'rake/dsl'
+rescue LoadError
+end
+
 require 'echoe'
 
 Echoe.new("boxgrinder-core") do |p|
-  p.project     = "BoxGrinder"
-  p.author      = "Marek Goldmann"
-  p.summary     = "Core library for BoxGrinder"
-  p.url         = "http://www.jboss.org/boxgrinder"
-  p.email       = "info@boxgrinder.org"
-  p.runtime_dependencies = ['open4 >=1.0.0', 'hashery >=1.3.0']
+  p.project = "BoxGrinder"
+  p.author = "Marek Goldmann"
+  p.summary = "Core library for BoxGrinder"
+  p.url = "http://boxgrinder.org"
+  p.email = "info@boxgrinder.org"
+  p.runtime_dependencies = ['hashery >=1.3.0', 'kwalify >=0.7.2']
+  p.runtime_dependencies << 'open4 >=1.0.0' unless RUBY_PLATFORM =~ /java/
 end
 
-desc "Run all tests"
 Spec::Rake::SpecTask.new('spec') do |t|
   t.rcov = false
   t.spec_files = FileList["spec/**/*-spec.rb"]
@@ -37,7 +42,6 @@ Spec::Rake::SpecTask.new('spec') do |t|
   t.verbose = true
 end
 
-desc "Run all tests and generate code coverage report"
 Spec::Rake::SpecTask.new('spec:coverage') do |t|
   t.spec_files = FileList["spec/**/*-spec.rb"]
   t.spec_opts = ['--colour', '--format', 'html:pkg/rspec_report.html', '-b']

data/boxgrinder-core.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-03-09}
+  s.date = %q{2011-04-27}
   s.description = %q{Core library for BoxGrinder}
   s.email = %q{info@boxgrinder.org}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "boxgrinder-core.gemspec", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/validators/appliance-config-validator.rb", "lib/boxgrinder-core/validators/errors.rb", "rubygem-boxgrinder-core.spec", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-definition-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/models/config-spec.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid", "spec/validators/appliance-config-validator-spec.rb"]
-  s.homepage = %q{http://www.jboss.org/boxgrinder}
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/errors.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/appliance-transformation-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "boxgrinder-core.gemspec", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/appliance-parser.rb", "lib/boxgrinder-core/appliance-validator.rb", "lib/boxgrinder-core/errors.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-definition-helper.rb", "lib/boxgrinder-core/helpers/appliance-transformation-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/models/appliance-config.rb", "lib/boxgrinder-core/models/config.rb", "lib/boxgrinder-core/models/task.rb", "lib/boxgrinder-core/schemas/appliance_schema_0.8.0.yaml", "lib/boxgrinder-core/schemas/appliance_schema_0.9.0.yaml", "rubygem-boxgrinder-core.spec", "spec/appliance-parser-spec.rb", "spec/appliance-validator-spec.rb", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-definition-helper-spec.rb", "spec/helpers/appliance-transformation-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/models/config-spec.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/src/appliances/0.8.x.appl", "spec/rspec/src/appliances/0.9.x-invalid.appl", "spec/rspec/src/appliances/0.9.x.appl", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/invalid-yaml.appl", "spec/rspec/src/appliances/legacy.appl", "spec/rspec/src/appliances/repo.appl", "spec/rspec/src/config/empty", "spec/rspec/src/config/valid"]
+  s.homepage = %q{http://boxgrinder.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{BoxGrinder}
@@ -23,14 +23,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<hashery>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<kwalify>, [">= 0.7.2"])
+      s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
     else
-      s.add_dependency(%q<open4>, [">= 1.0.0"])
       s.add_dependency(%q<hashery>, [">= 1.3.0"])
+      s.add_dependency(%q<kwalify>, [">= 0.7.2"])
+      s.add_dependency(%q<open4>, [">= 1.0.0"])
     end
   else
-    s.add_dependency(%q<open4>, [">= 1.0.0"])
     s.add_dependency(%q<hashery>, [">= 1.3.0"])
+    s.add_dependency(%q<kwalify>, [">= 0.7.2"])
+    s.add_dependency(%q<open4>, [">= 1.0.0"])
   end
 end

data/lib/boxgrinder-core/appliance-parser.rb

@@ -0,0 +1,84 @@
+#
+# 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 'kwalify'
+require 'boxgrinder-core/helpers/appliance-transformation-helper'
+require 'boxgrinder-core/helpers/log-helper'
+require 'boxgrinder-core/appliance-validator'
+require 'boxgrinder-core/errors'
+
+module BoxGrinder
+  class ApplianceParser
+    def initialize(options = {})
+      @log = options[:log] || LogHelper.new
+      @schemas = {}
+    end
+
+    def load_schemas
+      Dir.glob("#{File.dirname(__FILE__)}/schemas/{*.yaml,*.yml}").each do |f|
+        schema = Kwalify::Yaml.load_file(f)
+        @schemas[schema['version']] = schema
+      end
+    end
+
+    def parse_definition(appliance_definition, file = true)
+      if file
+        @log.info "Validating appliance definition from #{appliance_definition} file..."
+        appliance_definition = File.read(appliance_definition)
+      else
+        @log.info "Validating appliance definition from string..."
+      end
+
+      failures = {}
+      schema_versions = @schemas.keys.sort.reverse
+
+      schema_versions.each do |schema_version|
+        @schemas[schema_version].delete('version')
+        appliance_config, errors = parse(@schemas[schema_version], appliance_definition)
+
+        if errors.empty?
+          @log.info "Appliance definition is valid."
+          return ApplianceTransformationHelper.new(schema_versions.first, :log => @log).transform(appliance_config, schema_version)
+        end
+
+        failures[schema_version] = errors
+      end
+
+      # If all schemas fail then we assume they are using the latest schema..
+      failures[schema_versions.first].each do |error|
+        @log.error "Error: [line #{error.linenum}, col #{error.column}] [#{error.path}] #{error.message}"
+      end
+
+      raise ApplianceValidationError, "The appliance definition was invalid according to schema #{schema_versions.first}. See log for details."
+    end
+
+    def parse(schema_document, appliance_definition)
+      validator = ApplianceValidator.new(schema_document)
+      parser = Kwalify::Yaml::Parser.new(validator)
+
+      begin
+        parsed = parser.parse(appliance_definition)
+      rescue Kwalify::KwalifyError => e
+        raise ApplianceValidationError, "The appliance definition couldn't be parsed. [line #{e.linenum}, col #{e.column}] [#{e.path}] Most probably you try to specify partition mount point starting with backslash (/), please quote it like this: \"/foo\"." if e.message =~ /document end expected \(maybe invalid tab char found\)/
+        raise ApplianceValidationError, "The appliance definition couldn't be parsed. #{e}"
+      end
+
+      [parsed, parser.errors]
+    end
+  end
+end

data/{spec/validators/appliance-config-validator-spec.rb → lib/boxgrinder-core/appliance-validator.rb}

@@ -16,9 +16,22 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'boxgrinder-core/validators/appliance-config-validator'
+require 'kwalify'
+require 'boxgrinder-core/helpers/log-helper'
 
 module BoxGrinder
-  describe ApplianceConfigValidator do
+  class ApplianceValidator < Kwalify::Validator
+    def initialize(schema)
+      super(schema) # Super constructor
+    end
+
+    def validate_hook(value, rule, path, errors)
+      case rule.name
+        when 'Repository' # enforce baseurl xor mirrorlist
+          errors << Kwalify::ValidationError.new("Please specify either a baseurl or a mirrorlist.", path) unless value['baseurl'].nil? ^ value['mirrorlist'].nil?
+        when 'Hardware' # enforce multiple of 64
+          errors << Kwalify::ValidationError.new("Specified memory amount: #{value['memory']} is invalid. The value must be a multiple of 64.", path) unless value['memory'].nil? or value['memory']%64==0
+      end
+    end
   end
 end

data/lib/boxgrinder-core/{validators/errors.rb → errors.rb}

@@ -24,6 +24,22 @@ module BoxGrinder
   class ApplianceValidationError < ValidationError
 
   end
+
+  class SchemaValidationError < ValidationError
+
+  end
+
+  class PluginValidationError < ValidationError
+
+  end
+
+  class UnknownFormatError < ValidationError
+
+  end
+
+  class PluginError < StandardError
+
+  end
 end
 
 class StandardError

data/lib/boxgrinder-core/helpers/appliance-config-helper.rb

@@ -16,7 +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 'boxgrinder-core/validators/errors'
+require 'boxgrinder-core/errors'
 require 'set'
 
 module BoxGrinder
@@ -80,7 +80,7 @@ module BoxGrinder
               resolve_stack.index(k).nil?
         }
         refs.each do |ref|
-          resolve(Arrays.new(resolve_stack).push(ref), resolved_set) unless resolved_set.include?(ref)
+          resolve(Array.new(resolve_stack).push(ref), resolved_set) unless resolved_set.include?(ref)
           while @appliance_config.variables[var].include? "##{ref}#" do
             @appliance_config.variables[var].gsub!("##{ref}#", @appliance_config.variables[ref])
           end
@@ -112,7 +112,7 @@ module BoxGrinder
               partitions[root].delete('options') if partitions[root]['type'] != partition['type']
               partitions[root]['type'] = partition['type']
             else
-              partitions[root]['type'] = default_filesystem_type
+              partitions[root]['type'] = @appliance_config.default_filesystem_type
             end
           else
             partitions[root] = {}
@@ -121,7 +121,7 @@ module BoxGrinder
             unless partition['type'].nil?
               partitions[root]['type'] = partition['type']
             else
-              partitions[root]['type'] = default_filesystem_type
+              partitions[root]['type'] = @appliance_config.default_filesystem_type
             end
           end
 
@@ -130,21 +130,10 @@ module BoxGrinder
         end
       end
 
-      @appliance_config.hardware.partitions = partitions
-    end
-
-    def default_filesystem_type
-      fs = 'ext4'
-
-      case @appliance_config.os.name
-        when 'rhel', 'centos'
-          case @appliance_config.os.version
-            when '5'
-              fs = 'ext3'
-          end
-      end
+      # https://bugzilla.redhat.com/show_bug.cgi?id=466275
+      partitions['/boot'] = {'type' => 'ext3', 'size' => 0.1} if partitions['/boot'].nil? and (@appliance_config.os.name == 'centos' or @appliance_config.os.name == 'rhel') and @appliance_config.os.version == '5'
 
-      fs
+      @appliance_config.hardware.partitions = partitions
     end
 
     def merge_memory
@@ -155,6 +144,9 @@ module BoxGrinder
       merge_field('os.name') { |name| @appliance_config.os.name = name.to_s }
       merge_field('os.version') { |version| @appliance_config.os.version = version.to_s }
       merge_field('os.password') { |password| @appliance_config.os.password = password.to_s }
+      merge_field('os.pae') { |pae| @appliance_config.os.pae = false unless pae }
+
+      @appliance_config.os.password = 'boxgrinder' if @appliance_config.os.password.nil?
     end
 
     def prepare_appliances

data/lib/boxgrinder-core/helpers/appliance-definition-helper.rb

@@ -16,40 +16,38 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-core/models/appliance-config'
-require 'yaml'
+require 'boxgrinder-core/appliance-parser'
 
 module BoxGrinder
   class ApplianceDefinitionHelper
     def initialize(options = {})
-      @log = options[:log] || Logger.new(STDOUT)
+      @log = options[:log] || LogHelper.new
       @appliance_configs = []
+      @appliance_parser = ApplianceParser.new(:log => @log)
     end
 
     attr_reader :appliance_configs
+    attr_reader :appliance_parser
 
     # Reads definition provided as string. This string can be a YAML document. In this case
     # definition is parsed and an ApplianceConfig object is returned. In other cases it tries to search
     # for a file with provided name.
     def read_definitions(definition, content_type = nil)
+      @appliance_parser.load_schemas
       if File.exists?(definition)
-        @log.debug "Reading definition from '#{definition}' file..."
-
         definition_file_extension = File.extname(definition)
 
         appliance_config =
             case definition_file_extension
               when '.appl', '.yml', '.yaml'
-                read_yaml_file(definition)
-              when '.xml'
-                read_xml_file(definition)
+                parse_yaml(@appliance_parser.parse_definition(definition))
               else
                 unless content_type.nil?
                   case content_type
                     when 'application/x-yaml', 'text/yaml'
-                      read_yaml_file(definition)
-                    when 'application/xml', 'text/xml', 'application/x-xml'
-                      read_xml_file(definition)
+                      parse_yaml(@appliance_parser.parse_definition(definition))
                   end
                 end
             end
@@ -65,35 +63,12 @@ module BoxGrinder
           read_definitions("#{File.dirname(definition)}/#{appliance_name}#{definition_file_extension}") unless appliances.include?(appliance_name)
         end unless appliance_config.appliances.nil? or !appliance_config.appliances.is_a?(Array)
       else
-        @log.debug "Reading definition..."
-
-        @appliance_configs << read_yaml(definition)
-      end
-    end
-
-    def read_yaml(content)
-      begin
-        definition = YAML.load(content)
-        raise "Not a valid YAML content." if definition.nil? or definition == false
-      rescue
-        raise "Provided definition could not be read."
-      end
-
-      parse_yaml(definition)
-    end
-
-    def read_yaml_file(file)
-      begin
-        definition = YAML.load_file(file)
-        raise "Not a valid YAML file." if definition.nil? or definition == false
-      rescue
-        raise "File '#{file}' could not be read."
+        # Assuming that the definition is provided as string
+        @appliance_configs << parse_yaml(@appliance_parser.parse_definition(definition, false))
       end
-
-      parse_yaml(definition)
     end
 
-    # TODO this needs to be rewritten
+    # TODO this needs to be rewritten - using kwalify it could be possible to instantiate document structure as objects[, or opencascade hash?]
     def parse_yaml(definition)
       return definition if definition.is_a?(ApplianceConfig)
       raise "Provided definition is not a Hash." unless definition.is_a?(Hash)
@@ -107,27 +82,15 @@ module BoxGrinder
 
       @log.debug "Adding packages to appliance..."
 
-      unless definition['packages'].nil?
-        if definition['packages'].is_a?(Array)
-          # new format
-          appliance_config.packages = definition['packages']
-        elsif definition['packages'].is_a?(Hash)
-          # legacy format
-          @log.warn "BoxGrinder Build packages section format has been changed. Support for legacy format will be removed in the future. See http://boxgrinder.org/tutorials/appliance-definition/ for more information about current format."
-          appliance_config.packages = definition['packages']['includes'] if definition['packages']['includes'].is_a?(Array)
-          @log.warn "BoxGrinder Build no longer supports package exclusion, the following packages will not be explicitly excluded: #{definition['packages']['excludes'].join(", ")}." if definition['packages']['excludes'].is_a?(Array)
-        else
-          @log.warn "Unsupported format for packages section."
-        end
-      end
+      appliance_config.packages = definition['packages'] unless definition['packages'].nil?
 
-      @log.debug "#{appliance_config.packages.size} package(s) added to appliance."
+      @log.debug "#{appliance_config.packages.size} package(s) added to appliance." if appliance_config.packages
 
       appliance_config.appliances = definition['appliances'] unless definition['appliances'].nil?
       appliance_config.repos = definition['repos'] unless definition['repos'].nil?
 
-      appliance_config.version = definition['version'].to_s unless definition['version'].nil?
-      appliance_config.release = definition['release'].to_s unless definition['release'].nil?
+      appliance_config.version = definition['version'] unless definition['version'].nil?
+      appliance_config.release = definition['release'] unless definition['release'].nil?
 
       unless definition['default_repos'].nil?
         appliance_config.default_repos = definition['default_repos']
@@ -135,9 +98,10 @@ module BoxGrinder
       end
 
       unless definition['os'].nil?
-        appliance_config.os.name = definition['os']['name'].to_s unless definition['os']['name'].nil?
-        appliance_config.os.version = definition['os']['version'].to_s unless definition['os']['version'].nil?
-        appliance_config.os.password = definition['os']['password'].to_s unless definition['os']['password'].nil?
+        appliance_config.os.name = definition['os']['name'] unless definition['os']['name'].nil?
+        appliance_config.os.version = definition['os']['version'] unless definition['os']['version'].nil?
+        appliance_config.os.password = definition['os']['password'] unless definition['os']['password'].nil?
+        appliance_config.os.pae = definition['os']['pae'] unless definition['os']['pae'].nil?
       end
 
       unless definition['hardware'].nil?
@@ -157,9 +121,5 @@ module BoxGrinder
 
       appliance_config
     end
-
-    def read_xml_file(file)
-      raise "Reading XML files is not supported right now. File '#{file}' could not be read."
-    end
   end
 end

data/lib/boxgrinder-core/helpers/appliance-transformation-helper.rb

@@ -0,0 +1,58 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'boxgrinder-core/helpers/log-helper'
+
+module BoxGrinder
+  class ApplianceTransformationHelper
+    def initialize(latest_schema_version, options = {})
+      @latest_schema_version = latest_schema_version
+      @log = options[:log] || LogHelper.new
+
+      @versions = ['0.9.0']
+    end
+
+    def transform(appliance_definition, version)
+      return appliance_definition if version == @latest_schema_version
+
+      @log.debug "Transforming appliance definition from schema version #{version} to #{@latest_schema_version}..."
+
+      transformations = [version]
+      definition = appliance_definition
+
+      @versions.each do |v|
+        if (transformations.last <=> v) < 0
+          @log.trace "Round #{transformations.size}: transforming from version #{transformations.last} to #{v}..."
+          definition = self.send("to_#{v.gsub(/[-\.]/, '_')}", definition)
+          transformations << v
+        end
+      end
+
+      @log.debug "Following transformation were applied: #{transformations.join(' => ')}." if transformations.size > 1
+
+      definition
+    end
+
+    def to_0_9_0(appliance_definition)
+      packages = appliance_definition['packages']['includes']
+      @log.warn "BoxGrinder no longer supports package exclusion, the following packages will be not be explicitly excluded: #{appliance_definition['packages']['excludes'].join(", ")}." unless appliance_definition['packages']['excludes'].nil?
+      appliance_definition['packages'] = packages
+      appliance_definition
+    end
+  end
+end

data/lib/boxgrinder-core/helpers/exec-helper.rb

@@ -18,15 +18,23 @@
 
 require 'logger'
 require 'rubygems'
-require 'open4'
+require 'open4' unless RUBY_PLATFORM =~ /java/
 
 module BoxGrinder
+  class InterruptionError < Interrupt
+    attr_reader :pid
+
+    def initialize(pid)
+      @pid = pid
+    end
+  end
+
   class ExecHelper
-    def initialize( options = {} )
+    def initialize(options = {})
       @log = options[:log] || Logger.new(STDOUT)
     end
 
-    def execute( command, options = {} )
+    def execute(command, options = {})
       redacted = options[:redacted] || []
 
       redacted_command = command
@@ -41,38 +49,57 @@ module BoxGrinder
       STDERR.sync = true
 
       begin
-        status = Open4::popen4( command ) do |pid, stdin, stdout, stderr|
-          threads = []
+        pid, stdin, stdout, stderr = (RUBY_PLATFORM =~ /java/ ? IO : Open4).send(:popen4, command)
+        threads = []
 
-          threads << Thread.new(stdout) do |input_str|
-            input_str.each do |l|
-              l.chomp!
-              l.strip!
+        threads << Thread.new(stdout) do |out|
+          out.each do |l|
+            l.chomp!
+            l.strip!
 
-              output << "\n#{l}"
-              @log.debug l
-            end
+            output << "\n#{l}"
+            @log.debug l
           end
+        end
 
-          threads << Thread.new(stderr) do |input_str|
-            input_str.each do |l|
-              l.chomp!
-              l.strip!
+        threads << Thread.new(stderr) do |err|
+          err.each do |l|
+            l.chomp!
+            l.strip!
 
-              output << "\n#{l}"
-              @log.debug l
-            end
+            output << "\n#{l}"
+            @log.debug l
           end
-          threads.each{|t|t.join}
         end
 
-        raise "process exited with wrong exit status: #{status.exitstatus}" if status.exitstatus != 0
+        threads.each { |t| t.join }
+
+        # Assume the process exited cleanly, which can cause some bad behaviour, but I don't see better way
+        # to get reliable status for processes both on MRI and JRuby
+        #
+        # http://jira.codehaus.org/browse/JRUBY-5673
+        status = OpenCascade.new(:exitstatus => 0)
+        
+        fakepid, status = Process.waitpid2(pid) if process_alive?(pid)
+
+        raise "process exited with wrong exit status: #{status.exitstatus}" if !(RUBY_PLATFORM =~ /java/) and status.exitstatus != 0
 
         return output.strip
+      rescue Interrupt
+        raise InterruptionError.new(pid), "Program was interrupted."
       rescue => e
         @log.error e.backtrace.join($/)
         raise "An error occurred while executing command: '#{redacted_command}', #{e.message}"
       end
     end
+
+    def process_alive?(pid)
+      begin
+        Process.getpgid(pid)
+        true
+      rescue Errno::ESRCH
+        false
+      end
+    end
   end
 end