boxgrinder-core 0.0.22 → 0.1.0

data/CHANGELOG

@@ -1,4 +1,11 @@
 
+v0.1.0
+
+* [BGBUILD-58] Add ability to substitute custom variables in appliance definition file
+* [BGBUILD-52] Wrong post section inheritance
+* [BGBUILD-48] Hint about missing plugins
+* [BGBUILD-46] Allow building 32 bit images on 64 bit arch
+
 v0.0.22
 
 * [BGBUILD-44] ExecHelper should raise exception if execution fails

data/Manifest

@@ -1,29 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-Rakefile
-lib/boxgrinder-core.rb
-lib/boxgrinder-core/defaults.rb
-lib/boxgrinder-core/helpers/appliance-config-helper.rb
-lib/boxgrinder-core/helpers/appliance-helper.rb
-lib/boxgrinder-core/helpers/exec-helper.rb
-lib/boxgrinder-core/helpers/log-helper.rb
-lib/boxgrinder-core/helpers/queue-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
-lib/openhash/openhash.rb
-spec/Rakefile
-spec/helpers/appliance-config-helper-spec.rb
-spec/helpers/appliance-helper-spec.rb
-spec/helpers/exec-helper-spec.rb
-spec/helpers/log-helper-spec.rb
-spec/helpers/queue-helper-spec.rb
-spec/rspec/rspec-config-helper.rb
-spec/rspec/src/appliances/ephemeral-repo.appl
-spec/rspec/src/appliances/full.appl
-spec/rspec/src/appliances/repo.appl
-spec/validators/appliance-config-validator-spec.rb

data/boxgrinder-core.gemspec

@@ -2,27 +2,27 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-core}
-  s.version = "0.0.22"
+  s.version = "0.1.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-08-23}
+  s.date = %q{2010-10-12}
   s.description = %q{Core files for BoxGrinder.}
   s.email = %q{info@boxgrinder.org}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-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", "lib/openhash/openhash.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-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", "lib/openhash/openhash.rb", "spec/Rakefile", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/helpers/queue-helper-spec.rb", "spec/rspec/rspec-config-helper.rb", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/repo.appl", "spec/validators/appliance-config-validator-spec.rb", "boxgrinder-core.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/boxgrinder-core.rb", "lib/boxgrinder-core/defaults.rb", "lib/boxgrinder-core/helpers/appliance-config-helper.rb", "lib/boxgrinder-core/helpers/appliance-helper.rb", "lib/boxgrinder-core/helpers/exec-helper.rb", "lib/boxgrinder-core/helpers/log-helper.rb", "lib/boxgrinder-core/helpers/queue-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", "lib/openhash/openhash.rb", "spec/Rakefile", "spec/helpers/appliance-config-helper-spec.rb", "spec/helpers/appliance-helper-spec.rb", "spec/helpers/exec-helper-spec.rb", "spec/helpers/log-helper-spec.rb", "spec/helpers/queue-helper-spec.rb", "spec/rspec/ls/one", "spec/rspec/ls/two", "spec/rspec/rspec-config-helper.rb", "spec/rspec/src/appliances/ephemeral-repo.appl", "spec/rspec/src/appliances/full.appl", "spec/rspec/src/appliances/repo.appl", "spec/validators/appliance-config-validator-spec.rb", "boxgrinder-core.gemspec"]
   s.homepage = %q{http://www.jboss.org/stormgrind/projects/boxgrinder.html}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-core", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{BoxGrinder Core}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Core files for BoxGrinder.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<open4>, [">= 1.0.0"])
     else
       s.add_dependency(%q<open4>, [">= 1.0.0"])

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

@@ -19,12 +19,13 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/validators/errors'
+require 'set'
 
 module BoxGrinder
   class ApplianceConfigHelper
 
-    def initialize(appliance_configs)
-      @appliance_configs  = appliance_configs.values.reverse
+    def initialize( appliance_configs )
+      @appliance_configs  = appliance_configs.reverse
     end
 
     def merge(appliance_config)
@@ -33,6 +34,7 @@ module BoxGrinder
       prepare_os
       prepare_appliances
 
+      merge_variables
       merge_hardware
       merge_repos
       merge_packages
@@ -41,7 +43,41 @@ module BoxGrinder
       @appliance_config
     end
 
-    protected
+    def merge_variables
+      @appliance_config.variables = {} if @appliance_config.variables.nil?
+      @appliance_configs.each do |appliance_config|
+        appliance_config.variables.each do |var, val|
+          @appliance_config.variables[var] = val
+        end
+      end
+
+      @appliance_config.variables["OS_NAME"] = @appliance_config.os.name
+      @appliance_config.variables["OS_VERSION"] = @appliance_config.os.version
+      @appliance_config.variables["ARCH"] = @appliance_config.hardware.arch
+      @appliance_config.variables["BASE_ARCH"] = @appliance_config.hardware.base_arch
+
+      resolve
+    end
+
+    def resolve(resolve_stack = nil, resolved_set = Set.new())
+      if resolve_stack.nil?
+        @appliance_config.variables.keys.each { |var| resolve([var], resolved_set) }
+      else
+        var = resolve_stack.last
+        refs = @appliance_config.variables.keys.delete_if { |k|
+          @appliance_config.variables[k].nil? ||
+          @appliance_config.variables[k].index("##{k}#").nil? ||
+          resolve_stack.index(k).nil?
+        }
+        refs.each do |ref|
+          resolve(Arrays.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
+        end
+        resolved_set << var
+      end
+    end
 
     def merge_hardware
       merge_cpus
@@ -61,6 +97,12 @@ module BoxGrinder
         parts.each do |root, partition|
           if partitions.keys.include?(root)
             partitions[root]['size'] = partition['size'] if partitions[root]['size'] < partition['size']
+
+            unless partition['type'].nil?
+              partitions[root].delete('options') if partitions[root]['type'] != partition['type']
+              partitions[root]['type'] = partition['type']
+            end
+            partitions[root]['options'] = partition['options'] unless partition['options'].nil? and partitions[root]['type'] == partition['type']
           else
             partitions[root] = partition
           end
@@ -95,9 +137,9 @@ module BoxGrinder
 
       @appliance_configs.each do |appliance_config|
         for repo in appliance_config.repos
-          repo['name'] = substitute_repo_parameters(repo['name'])
+          repo['name'] = substitute_vars(repo['name'])
           ['baseurl', 'mirrorlist'].each do |type|
-            repo[type] = substitute_repo_parameters(repo[type]) unless repo[type].nil?
+            repo[type] = substitute_vars(repo[type]) unless repo[type].nil?
           end
 
           @appliance_config.repos << repo
@@ -105,9 +147,12 @@ module BoxGrinder
       end
     end
 
-    def substitute_repo_parameters(str)
+    def substitute_vars(str)
       return if str.nil?
-      str.gsub(/#OS_NAME#/, @appliance_config.os.name).gsub(/#OS_VERSION#/, @appliance_config.os.version).gsub(/#ARCH#/, @appliance_config.hardware.arch)
+      @appliance_config.variables.keys.each do |var|
+        str = str.gsub("##{var}#", @appliance_config.variables[var])
+      end
+      str
     end
 
     def merge_packages
@@ -130,7 +175,8 @@ module BoxGrinder
 
       @appliance_configs.each do |appliance_config|
         appliance_config.post.each do |platform, cmds|
-          cmds.each { |cmd| @appliance_config.post[platform] << cmd }
+          @appliance_config.post[platform] = [] if @appliance_config.post[platform].nil?
+          cmds.each { |cmd| @appliance_config.post[platform] << substitute_vars(cmd) }
         end
       end
     end

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

@@ -30,11 +30,11 @@ module BoxGrinder
       @log.debug "Reading definition from '#{definition_file}' file..."
 
       definition_file_extension = File.extname(definition_file)
-      configs = {}
+      configs = []
 
       appliance_config =
               case definition_file_extension
-                when '.appl', '.yml'
+                when '.appl', '.yml', '.yaml'
                   read_yaml(definition_file)
                 when '.xml'
                   read_xml(definition_file)
@@ -51,13 +51,13 @@ module BoxGrinder
                   end
               end
 
-      configs[appliance_config.name] = appliance_config
+      configs << appliance_config
 
-      appliance_config.appliances.each do |appliance_name|
-        configs.merge!(read_definitions("#{File.dirname(definition_file)}/#{appliance_name}#{definition_file_extension}").first)
+      appliance_config.appliances.reverse.each do |appliance_name|
+        configs << read_definitions("#{File.dirname(definition_file)}/#{appliance_name}#{definition_file_extension}").first
       end unless appliance_config.appliances.nil? or !appliance_config.appliances.is_a?(Array)
 
-      [ configs, appliance_config ]
+      [ configs.flatten, appliance_config ]
     end
 
     def read_yaml(file)
@@ -74,6 +74,9 @@ module BoxGrinder
 
       appliance_config.name         = definition['name'] unless definition['name'].nil?
       appliance_config.summary      = definition['summary'] unless definition['summary'].nil?
+
+      definition['variables'].each { |key, value| appliance_config.variables[key] = value } unless definition['variables'].nil?
+
       appliance_config.appliances   = definition['appliances'] unless definition['appliances'].nil?
       appliance_config.repos        = definition['repos'] unless definition['repos'].nil?
 

data/lib/boxgrinder-core/models/appliance-config.rb

@@ -20,7 +20,6 @@
 
 require 'boxgrinder-core/defaults'
 require 'openhash/openhash'
-require 'rbconfig'
 
 module BoxGrinder
   class ApplianceConfig
@@ -28,6 +27,8 @@ module BoxGrinder
       @name     = nil
       @summary  = nil
 
+      @variables = {}
+
       @os = OpenHash.new
 
       @os.name      = nil
@@ -53,6 +54,7 @@ module BoxGrinder
       @release      = 0
     end
 
+    attr_reader :variables
     attr_reader :os
     attr_reader :hardware
     attr_reader :path
@@ -74,7 +76,8 @@ module BoxGrinder
     end
 
     def init_arch
-      @hardware.arch = RbConfig::CONFIG['target_cpu']
+      @hardware.arch = `uname -m`.chomp.strip
+      @hardware.base_arch = is64bit? ? "x86_64" : "i386"
       self
     end
 

data/lib/boxgrinder-core/models/config.rb

@@ -20,7 +20,6 @@
 
 require 'boxgrinder-core/defaults'
 require 'ostruct'
-require 'rbconfig'
 
 module BoxGrinder
   class Config
@@ -52,6 +51,8 @@ module BoxGrinder
       if File.exists?( @config_file )
         @data = YAML.load_file( @config_file )
         @data['gpg_password'].gsub!(/\$/, "\\$") unless @data['gpg_password'].nil? or @data['gpg_password'].length == 0
+        @dir.rpms_cache = @data['rpms_cache'] || @dir.rpms_cache
+        @dir.src_cache  = @data['src_cache']  || @dir.src_cache
       end
     end
 

data/lib/boxgrinder-core/validators/appliance-config-validator.rb

@@ -44,14 +44,13 @@ module BoxGrinder
     end
 
     def validate_os
-      raise ApplianceValidationError, "No operating system selected" if @appliance_config.os.name.nil?
+      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?
 
-      unless @options[:os_plugins].nil?
-        os_plugin = @options[:os_plugins][@appliance_config.os.name.to_sym]
+      os_plugin = PluginManager.instance.plugins[:os][@appliance_config.os.name.to_sym]
 
-        raise ApplianceValidationError, "Not supported operating system selected: #{@appliance_config.os.name}. Supported OSes are: #{@options[:os_plugins].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 )
-      end
+      raise ApplianceValidationError, "No operating system selected" if @appliance_config.os.name.nil?
+      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 )
     end
 
     def validate_hardware

data/spec/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'spec/rake/spectask'
 
 desc "Run all examples"
-Spec::Rake::SpecTask.new('examples') do |t|
+Spec::Rake::SpecTask.new(:default) do |t|
   t.spec_files = FileList['**/*-spec.rb']
   t.rcov = true
   t.spec_opts = ['--colour', '--format', 'nested']

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

@@ -1,6 +1,267 @@
 require 'boxgrinder-core/helpers/appliance-config-helper'
+require 'rspec/rspec-config-helper'
 
 module BoxGrinder
   describe ApplianceConfigHelper do
+    include RSpecConfigHelper
+
+    before(:all) do
+      @arch = `uname -m`.chomp.strip
+      @base_arch = @arch.eql?("x86_64") ? "x86_64" : "i386"
+    end
+
+    def prepare_helper( configs )
+      @helper = ApplianceConfigHelper.new( configs )
+    end
+
+    it "should merge post sections in right order" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.appliances << 'b'
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.post['base'] = [ "2_1", "2_2" ]
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post['base'].size.should == 4
+      config.post['base'].should == ['2_1', '2_2', '1_1', '1_2']
+    end
+
+    it "should merge post sections in right order with more complicated inheritance" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.appliances << 'b1'
+      config_a.appliances << 'b2'
+
+      config_b1 = ApplianceConfig.new
+      config_b1.name = 'b1'
+      config_b1.post['base'] = [ "2_1", "2_2" ]
+
+      config_b2 = ApplianceConfig.new
+      config_b2.name = 'b2'
+      config_b2.post['base'] = [ "3_1", "3_2" ]
+
+      prepare_helper( [ config_a, config_b1, config_b2 ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post['base'].size.should == 6
+      config.post['base'].should == ['3_1', '3_2', '2_1', '2_2', '1_1', '1_2']
+    end
+
+    it "should merge post sections in right order with even more and more complicated inheritance" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.appliances << 'b1'
+      config_a.appliances << 'b2'
+
+      config_b1 = ApplianceConfig.new
+      config_b1.name = 'b1'
+      config_b1.appliances << 'c1'
+      config_b1.post['base'] = [ "2_1", "2_2" ]
+
+      config_b2 = ApplianceConfig.new
+      config_b2.name = 'b2'
+      config_b2.appliances << 'c2'
+      config_b2.post['base'] = [ "3_1", "3_2" ]
+
+      config_c1 = ApplianceConfig.new
+      config_c1.name = 'c1'
+      config_c1.post['base'] = [ "4_1", "4_2" ]
+
+      config_c2 = ApplianceConfig.new
+      config_c2.name = 'c2'
+      config_c2.post['base'] = [ "5_1", "5_2" ]
+
+      prepare_helper( [
+              config_a,
+              config_b1,
+              config_c1,
+              config_b2,
+              config_c2
+      ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post['base'].size.should == 10
+      config.post['base'].should == ['5_1', '5_2', '3_1', '3_2', '4_1', '4_2', '2_1', '2_2', '1_1', '1_2']
+    end
+
+    it "should merge post sections when dependent appliance has post section for platform for which we haven't specified post operations" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.post['base'] = [ "1_1", "1_2" ]
+      config_a.appliances << 'b'
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.post['ec2'] = [ "2_1", "2_2" ]
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post['base'].size.should == 2
+      config.post['base'].should == ['1_1', '1_2']
+      config.post['ec2'].size.should == 2
+      config.post['ec2'].should == ['2_1', '2_2']
+    end
+
+    it "should merge partitions" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = { "/" => { 'size' => '2' } }
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = { "/" => { 'size' => '4' }, "/home" => { 'size' => '2' } }
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_partitions
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.hardware.partitions.size.should == 2
+      config.hardware.partitions.should == { "/" => { 'size' => '4' }, "/home" => { 'size' => '2' } }
+    end
+
+    it "should merge partitions with different filesystem types" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4' } }
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3' }, "/home" => { 'size' => '2' } }
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_partitions
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.hardware.partitions.size.should == 2
+      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4' }, "/home" => { 'size' => '2' } }
+    end
+
+    it "should merge partitions with different options" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime' } }
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear' }, "/home" => { 'size' => '2' } }
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_partitions
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.hardware.partitions.size.should == 2
+      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4', 'options' => 'barrier=0,nodelalloc,nobh,noatime' }, "/home" => { 'size' => '2' } }
+    end
+
+    it "should merge partitions with different options, another case where type is changing - options should be vanished" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.appliances << 'b'
+      config_a.hardware.partitions = { "/" => { 'size' => '2', 'type' => 'ext4' } }
+
+      config_b = ApplianceConfig.new
+      config_b.name = 'b'
+      config_b.hardware.partitions = { "/" => { 'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear' }, "/home" => { 'size' => '2' } }
+
+      prepare_helper( [ config_a, config_b ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_partitions
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.hardware.partitions.size.should == 2
+      config.hardware.partitions.should == { "/" => { 'size' => '4', 'type' => 'ext4' }, "/home" => { 'size' => '2' } }
+    end
+
+    it "should substitute variables in repos" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.os.name = 'fedora'
+      config_a.os.version = '12'
+      config_a.repos << { 'name' => '#ARCH#', 'baseurl' => '#BASE_ARCH#', 'mirrorlist' => '#OS_NAME#-#OS_VERSION#' }
+      config_a.init_arch
+
+      prepare_helper( [ config_a ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_variables
+      @helper.merge_repos
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.repos.size.should == 1
+      config.repos.first.should == { 'name' => "#{@arch}", 'baseurl' => "#{@base_arch}", 'mirrorlist' => 'fedora-12' }
+    end
+
+    it "should substitute variables in post section" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.os.name = 'fedora'
+      config_a.os.version = '12'
+      config_a.post['base'] = ['#ARCH#', '#BASE_ARCH#', '#OS_VERSION#', '#OS_NAME#']
+      config_a.post['ec2'] = ['#ARCH#', '#BASE_ARCH#', '#OS_VERSION#', '#OS_NAME#']
+      config_a.init_arch
+
+      prepare_helper( [ config_a ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_variables
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post.size.should == 2
+      config.post['base'].should == [@arch, @base_arch, '12', 'fedora']
+      config.post['ec2'].should == [@arch, @base_arch, '12', 'fedora']
+    end
+
+    it "should substitute custom variables" do
+      config_a = ApplianceConfig.new
+      config_a.name = 'a'
+      config_a.os.name = 'fedora'
+      config_a.os.version = '12'
+      config_a.variables['CUSTOM_A'] = "AAA"
+      config_a.variables['CUSTOM_B'] = "BBB"
+      config_a.post['base'] = ['#ARCH#', '#BASE_ARCH#', '#OS_VERSION#', '#OS_NAME#', '#CUSTOM_A#', '#CUSTOM_B#']
+      config_a.init_arch
+
+      prepare_helper( [ config_a ] )
+      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+
+      @helper.merge_variables
+      @helper.merge_post_operations
+
+      config = @helper.instance_variable_get(:@appliance_config)
+      config.post.size.should == 1
+      config.post['base'].should == [@arch, @base_arch, '12', 'fedora', 'AAA', 'BBB']
+    end
+
   end
 end

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

@@ -1,6 +1,62 @@
 require 'boxgrinder-core/helpers/appliance-helper'
+require 'rspec/rspec-config-helper'
 
 module BoxGrinder
   describe ApplianceHelper do
+    include RSpecConfigHelper
+
+    before(:each) do
+      @helper = ApplianceHelper.new( :log => Logger.new('/dev/null') )
+    end
+
+    it "should read definition from one file" do
+      appliance_config = ApplianceConfig.new
+      @helper.should_receive(:read_yaml).with('file.appl').and_return( appliance_config )
+      @helper.read_definitions( "file.appl" ).should == [ [ appliance_config ], appliance_config ]
+    end
+
+    it "should read definition from two files" do
+      appliance_a = ApplianceConfig.new
+      appliance_a.name = 'a'
+      appliance_a.appliances << "b"
+
+      appliance_b = ApplianceConfig.new
+      appliance_b.name = 'b'
+
+      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return( appliance_a )
+      @helper.should_receive(:read_yaml).ordered.with('./b.appl').and_return( appliance_b )
+
+      @helper.read_definitions( "a.appl" ).should == [ [ appliance_a, appliance_b ], appliance_a ]
+    end
+
+    it "should read definitions from a tree file structure" do
+      appliance_a = ApplianceConfig.new
+      appliance_a.name = 'a'
+      appliance_a.appliances << "b1"
+      appliance_a.appliances << "b2"
+
+      appliance_b1 = ApplianceConfig.new
+      appliance_b1.name = 'b1'
+      appliance_b1.appliances << "c1"
+
+      appliance_b2 = ApplianceConfig.new
+      appliance_b2.name = 'b2'
+      appliance_b2.appliances << "c2"
+
+      appliance_c1 = ApplianceConfig.new
+      appliance_c1.name = 'c1'
+
+      appliance_c2 = ApplianceConfig.new
+      appliance_c2.name = 'c2'
+
+      @helper.should_receive(:read_yaml).ordered.with('a.appl').and_return( appliance_a )
+      @helper.should_receive(:read_yaml).ordered.with('./b2.appl').and_return( appliance_b2 )
+      @helper.should_receive(:read_yaml).ordered.with('./c2.appl').and_return( appliance_c2 )
+      @helper.should_receive(:read_yaml).ordered.with('./b1.appl').and_return( appliance_b1 )
+      @helper.should_receive(:read_yaml).ordered.with('./c1.appl').and_return( appliance_c1 )
+
+      @helper.read_definitions( "a.appl" ).should == [ [ appliance_a, appliance_b2, appliance_c2, appliance_b1, appliance_c1 ], appliance_a ]
+    end
+
   end
 end

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

@@ -31,11 +31,11 @@ module BoxGrinder
     end
 
     it "should execute the command and return output" do
-      @helper.execute("ls rspec/ls | wc -l").should == "2"
+      @helper.execute("ls #{File.dirname( __FILE__ )}/../rspec/ls | wc -l").should == "2"
     end
 
     it "should execute the command and return multi line output" do
-      @helper.execute("ls -1 rspec/ls").should == "one\ntwo"
+      @helper.execute("ls -1 #{File.dirname( __FILE__ )}/../rspec/ls").should == "one\ntwo"
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-core
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 22
-  version: 0.0.22
+  version: 0.1.0
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -79,6 +82,8 @@ files:
 - spec/helpers/exec-helper-spec.rb
 - spec/helpers/log-helper-spec.rb
 - spec/helpers/queue-helper-spec.rb
+- spec/rspec/ls/one
+- spec/rspec/ls/two
 - spec/rspec/rspec-config-helper.rb
 - spec/rspec/src/appliances/ephemeral-repo.appl
 - spec/rspec/src/appliances/full.appl
@@ -100,16 +105,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -117,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: BoxGrinder Core
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Core files for BoxGrinder.