boxgrinder-core 0.1.5 → 0.2.0

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

@@ -17,7 +17,6 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-core/validators/errors'
-require 'boxgrinder-core/defaults'
 
 module BoxGrinder
   class ApplianceConfigValidator

data/rubygem-boxgrinder-core.spec

@@ -5,12 +5,13 @@
 
 Summary: Core library for BoxGrinder
 Name: rubygem-%{gemname}
-Version: 0.1.5
+Version: 0.2.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
 URL: http://www.jboss.org/boxgrinder
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: ruby(abi) = %{rubyabi}
 Requires: rubygem(open4)
@@ -73,6 +74,22 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Jan 04 2011  <mgoldman@redhat.com> - 0.2.0-1
+- Upstream release: 0.2.0
+- Added BuildRoot tag to build for EPEL 5
+- [BGBUILD-79] Allow to use BoxGrinder Build as a library
+- [BGBUILD-127] Use appliance definition object instead of a file when using BG as a library
+- [BGBUILD-68] Global .boxgrinder/config or rc style file for config
+- [BGBUILD-93] Add Red Hat Enterprise Linux 6 support
+- [BGBUILD-133] Support a consolidated configuration file
+- [BGBUILD-101] Don't use 'includes' subsection when specifying packages
+- [BGBUILD-60] Post section merging pattern for appliances depending on the same appliance
+- [BGBUILD-151] Overriding hardware partitions via inclusion in Appliance Definition File causes build failure
+
+* Tue Dec 21 2010  <mgoldman@redhat.com> - 0.1.6-1
+- Updated to upstream version: 0.1.6
+- [BGBUILD-100] Enable boxgrinder_build to create a Fedora image with encrypted partition(s)
+
 * Sun Dec 12 2010  <mgoldman@redhat.com> - 0.1.5-1
 - Updated to upstream version: 0.1.5
 - [BGBUILD-73] Add support for kickstart files

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

@@ -74,6 +74,38 @@ module BoxGrinder
       config.post['base'].should == ['3_1', '3_2', '2_1', '2_2', '1_1', '1_2']
     end
 
+    # https://issues.jboss.org/browse/BGBUILD-60
+    it "should merge post sections in right order for appliances depending on same base appliance" 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_b1.appliances << 'c'
+
+      config_b2 = ApplianceConfig.new
+      config_b2.name = 'b2'
+      config_b2.post['base'] = ["3_1", "3_2"]
+      config_b2.appliances << 'c'
+
+      config_c = ApplianceConfig.new
+      config_c.name = 'c'
+      config_c.post['base'] = ["4_1", "4_2"]
+
+      prepare_helper([config_a, config_b1, config_c, config_b2, config_c])
+      @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 == 8
+      config.post['base'].should == ['4_1', '4_2', '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'
@@ -137,148 +169,200 @@ module BoxGrinder
       config.post['ec2'].should == ['2_1', '2_2']
     end
 
-    it "should merge partitions for default fs_types without options for Fedora 13 (ext4)" do
-      config_a = ApplianceConfig.new
-      config_a.name = 'a'
-      config_a.appliances << 'b'
-      config_a.hardware.partitions = {"/" => {'size' => '2'}}
-      config_a.os.name = 'fedora'
-      config_a.os.version = '13'
+    describe ".merge_partitions" do
+      it "should merge partitions for default fs_types without options for Fedora 13 (ext4)" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.hardware.partitions = {"/" => {'size' => '2'}}
+        config_a.os.name = 'fedora'
+        config_a.os.version = '13'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '13'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @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', 'type' => 'ext4'}}
-    end
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.hardware.partitions.size.should == 2
+        config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4'}, "/home" => {'size' => '2', 'type' => 'ext4'}}
+      end
 
-    it "should merge partitions for default fs_types without options for Fedora 13 (ext4) and specified options" do
-      config_a = ApplianceConfig.new
-      config_a.name = 'a'
-      config_a.appliances << 'b'
-      config_a.hardware.partitions = {"/" => {'size' => '2'}}
-      config_a.os.name = 'fedora'
-      config_a.os.version = '13'
+      it "should merge partitions for default fs_types without options for Fedora 13 (ext4) and specified options" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.hardware.partitions = {"/" => {'size' => '2'}}
+        config_a.os.name = 'fedora'
+        config_a.os.version = '13'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '13'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4', 'options' => 'barrier=0,nodelalloc,nobh,noatime'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @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', 'type' => 'ext4'}}
-    end
+        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', 'type' => 'ext4'}}
+      end
 
-    it "should merge partitions for default fs_types without options for Fedora 11 (ext3)" do
-      config_a = ApplianceConfig.new
-      config_a.name = 'a'
-      config_a.appliances << 'b'
-      config_a.hardware.partitions = {"/" => {'size' => '2'}}
-      config_a.os.name = 'fedora'
-      config_a.os.version = '11'
+      it "should merge partitions for default fs_types without options for RHEL 5 (ext3)" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.hardware.partitions = {"/" => {'size' => '2'}}
+        config_a.os.name = 'rhel'
+        config_a.os.version = '5'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '11'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'rhel'
+        config_b.os.version = '5'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @helper.merge_partitions
 
-      config = @helper.instance_variable_get(:@appliance_config)
-      config.hardware.partitions.size.should == 2
-      config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2', 'type' => 'ext3'}}
-    end
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.hardware.partitions.size.should == 2
+        config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2', 'type' => 'ext3'}}
+      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_a.os.name = 'fedora'
-      config_a.os.version = '12'
+      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_a.os.name = 'fedora'
+        config_a.os.version = '13'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '11'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'rhel'
+        config_b.os.version = '5'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @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', 'type' => 'ext3'}}
-    end
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.hardware.partitions.size.should == 2
+        config.os.name.should == 'fedora'
+        config.os.version.should == '13'
+        config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4'}, "/home" => {'size' => '2', 'type' => 'ext4'}}
+      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_a.os.name = 'fedora'
-      config_a.os.version = '13'
+      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_a.os.name = 'fedora'
+        config_a.os.version = '13'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '13'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @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', 'type' => 'ext4'}}
-    end
+        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', 'type' => 'ext4'}}
+      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_a.os.name = 'fedora'
-      config_a.os.version = '13'
+      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_a.os.name = 'fedora'
+        config_a.os.version = '13'
 
-      config_b = ApplianceConfig.new
-      config_b.name = 'b'
-      config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
-      config_b.os.name = 'fedora'
-      config_b.os.version = '13'
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4', 'type' => 'ext3', 'options' => 'shouldnt appear'}, "/home" => {'size' => '2'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
 
-      prepare_helper([config_a, config_b])
-      @helper.instance_variable_set(:@appliance_config, config_a.clone)
+        prepare_helper([config_a, config_b])
+        @helper.instance_variable_set(:@appliance_config, config_a.clone)
 
-      @helper.merge_partitions
+        @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', 'type' => 'ext4'}}
+        config = @helper.instance_variable_get(:@appliance_config)
+        config.hardware.partitions.size.should == 2
+        config.hardware.partitions.should == {"/" => {'size' => '4', 'type' => 'ext4'}, "/home" => {'size' => '2', 'type' => 'ext4'}}
+      end
+
+      it "should encrypt the partition while merging the partition" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.hardware.partitions = {"/" => {'size' => '2'}}
+        config_a.os.name = 'fedora'
+        config_a.os.version = '13'
+
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
+
+        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 == 1
+        config.hardware.partitions['/']['passphrase'].should == nil
+      end
+
+      it "should use encrypted partitions while merging the partition" do
+        config_a = ApplianceConfig.new
+        config_a.name = 'a'
+        config_a.appliances << 'b'
+        config_a.hardware.partitions = {"/" => {'size' => '2', 'passphrase' => 'marek'}}
+        config_a.os.name = 'fedora'
+        config_a.os.version = '13'
+
+        config_b = ApplianceConfig.new
+        config_b.name = 'b'
+        config_b.hardware.partitions = {"/" => {'size' => '4'}}
+        config_b.os.name = 'fedora'
+        config_b.os.version = '13'
+
+        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 == 1
+        config.hardware.partitions['/']['passphrase'].should == 'marek'
+      end
     end
 
     it "should substitute variables in repos" do

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

@@ -25,79 +25,194 @@ module BoxGrinder
       @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
+    describe ".read_definitions" do
+      it "should read definition from files with different extensions" do
+        appliance_config = ApplianceConfig.new
+
+        ['appl', 'yml', 'yaml'].each do |ext|
+          File.should_receive(:exists?).with("file.#{ext}").and_return(true)
+          @helper.should_receive(:read_yaml_file).with("file.#{ext}").and_return(appliance_config)
+          @helper.read_definitions("file.#{ext}").should == [[appliance_config], appliance_config]
+        end
+      end
+
+      it "should read YAML definition from files with different content types" do
+        appliance_config = ApplianceConfig.new
+
+        ['application/x-yaml', 'text/yaml'].each do |type|
+          File.should_receive(:exists?).with("file").and_return(true)
+          @helper.should_receive(:read_yaml_file).with("file").and_return(appliance_config)
+          @helper.read_definitions("file", type).should == [[appliance_config], appliance_config]
+        end
+      end
 
-    it "should read definition from two files" do
-      appliance_a = ApplianceConfig.new
-      appliance_a.name = 'a'
-      appliance_a.appliances << "b"
+      it "should read XML definition from files with different content types" do
+        appliance_config = ApplianceConfig.new
 
-      appliance_b = ApplianceConfig.new
-      appliance_b.name = 'b'
+        ['application/xml', 'text/xml', 'application/x-xml'].each do |type|
+          File.should_receive(:exists?).with("file").and_return(true)
+          @helper.should_receive(:read_xml_file).with("file").and_return(appliance_config)
+          @helper.read_definitions("file", type).should == [[appliance_config], appliance_config]
+        end
+      end
 
-      @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)
+      it "should read definition from two files" do
+        appliance_a = ApplianceConfig.new
+        appliance_a.name = 'a'
+        appliance_a.appliances << "b"
 
-      @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b], appliance_a]
-    end
+        appliance_b = ApplianceConfig.new
+        appliance_b.name = 'b'
+
+        File.should_receive(:exists?).ordered.with('a.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./b.appl').and_return(true)
+
+        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
+        @helper.should_receive(:read_yaml_file).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'
 
-    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"
+        File.should_receive(:exists?).ordered.with('a.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./b2.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./c2.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./b1.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./c1.appl').and_return(true)
 
-      appliance_b1 = ApplianceConfig.new
-      appliance_b1.name = 'b1'
-      appliance_b1.appliances << "c1"
+        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
+        @helper.should_receive(:read_yaml_file).ordered.with('./b2.appl').and_return(appliance_b2)
+        @helper.should_receive(:read_yaml_file).ordered.with('./c2.appl').and_return(appliance_c2)
+        @helper.should_receive(:read_yaml_file).ordered.with('./b1.appl').and_return(appliance_b1)
+        @helper.should_receive(:read_yaml_file).ordered.with('./c1.appl').and_return(appliance_c1)
 
-      appliance_b2 = ApplianceConfig.new
-      appliance_b2.name = 'b2'
-      appliance_b2.appliances << "c2"
+        @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b2, appliance_c2, appliance_b1, appliance_c1], appliance_a]
+      end
+
+      # https://issues.jboss.org/browse/BGBUILD-60
+      it "should read definitions from a tree file structure based on same appliance" 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 << "c"
+
+        appliance_b2 = ApplianceConfig.new
+        appliance_b2.name = 'b2'
+        appliance_b2.appliances << "c"
+
+        appliance_c = ApplianceConfig.new
+        appliance_c.name = 'c'
+
+        File.should_receive(:exists?).ordered.with('a.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./b2.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./c.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./b1.appl').and_return(true)
+        File.should_receive(:exists?).ordered.with('./c.appl').and_return(true)
+
+        @helper.should_receive(:read_yaml_file).ordered.with('a.appl').and_return(appliance_a)
+        @helper.should_receive(:read_yaml_file).ordered.with('./b2.appl').and_return(appliance_b2)
+        @helper.should_receive(:read_yaml_file).ordered.with('./c.appl').and_return(appliance_c)
+        @helper.should_receive(:read_yaml_file).ordered.with('./b1.appl').and_return(appliance_b1)
+        @helper.should_receive(:read_yaml_file).ordered.with('./c.appl').and_return(appliance_c)
+
+        @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b2, appliance_c, appliance_b1, appliance_c], appliance_a]
+      end
+
+      it "should read a YAML content instead of a loading a file" do
+        yaml = "name: abc\nos:\n  name: fedora\n  version: 13\npackages:\n  - @core\nhardware:\n  partitions:\n    \"/\":\n      size: 6"
+        appliance = @helper.read_definitions(yaml).last
+
+        appliance.name.should == 'abc'
+        appliance.os.version.should == '13'
+        appliance.hardware.partitions['/']['size'].should == 6
+      end
 
-      appliance_c1 = ApplianceConfig.new
-      appliance_c1.name = 'c1'
+      it "should read invalid YAML content" do
+        lambda { @helper.read_definitions("@$FEWYERTH") }.should raise_error(RuntimeError, 'Provided definition is not a Hash.')
+      end
 
-      appliance_c2 = ApplianceConfig.new
-      appliance_c2.name = 'c2'
+      it "should catch exception if YAML parsing raises it" do
+        lambda { @helper.read_definitions("!!") }.should raise_error(RuntimeError, 'Provided definition could not be read.')
+      end
 
-      @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)
+      it "should catch exception if YAML file parsing raises it" do
+        lambda { @helper.read_definitions("#{File.dirname(__FILE__)}/../rspec/src/appliances/invalid_yaml.appl") }.should raise_error(RuntimeError, /File '(.*)' could not be read./)
+      end
 
-      @helper.read_definitions("a.appl").should == [[appliance_a, appliance_b2, appliance_c2, appliance_b1, appliance_c1], appliance_a]
+      it "should raise because xml files aren't supported yet" do
+        File.should_receive(:exists?).with("file.xml").and_return(true)
+        lambda { @helper.read_definitions("file.xml") }.should raise_error(RuntimeError, "Reading XML files is not supported right now. File 'file.xml' could not be read.")
+      end
+
+      it "should raise because of unsupported file format" do
+        File.should_receive(:exists?).with("file.xmdfl").and_return(true)
+        lambda { @helper.read_definitions("file.xmdfl") }.should raise_error(RuntimeError, "Unsupported file format for appliance definition file.")
+      end
     end
 
-    describe "read_yaml" do
+    describe "read_yaml_file" do
       it "should read default_repos and set to false" do
         YAML.should_receive(:load_file).with('default_repos_false.appl').and_return({'default_repos'=>false})
-        @helper.read_yaml('default_repos_false.appl').default_repos.should == false
+        @helper.read_yaml_file('default_repos_false.appl').default_repos.should == false
       end
 
       it "should read default_repos and set to true" do
         YAML.should_receive(:load_file).with('default_repos_true.appl').and_return({'default_repos'=>true})
-        @helper.read_yaml('default_repos_true.appl').default_repos.should == true
+        @helper.read_yaml_file('default_repos_true.appl').default_repos.should == true
       end
 
       it "should read default_repos but not set it" do
         YAML.should_receive(:load_file).with('default_repos_empty.appl').and_return({})
-        @helper.read_yaml('default_repos_empty.appl').default_repos.should == nil
+        @helper.read_yaml_file('default_repos_empty.appl').default_repos.should == nil
       end
 
       it "should read default_repos and raise" do
         YAML.should_receive(:load_file).with('default_repos_bad.appl').and_return({'default_repos'=>'something'})
 
-        begin
-          @helper.read_yaml("default_repos_bad.appl")
-          raise 'Should raise'
-        rescue => e
-          e.message.should == 'default_repos_bad.appl: default_repos should be set to true or false'
+        lambda {
+          @helper.read_yaml_file("default_repos_bad.appl")
+        }.should raise_error(RuntimeError, 'default_repos should be set to true or false')
+      end
+    end
+
+    describe ".parse_yaml" do
+      context "partitions" do
+        it "should add default partition when no partitions are specified" do
+          appliance_config = @helper.parse_yaml({})
+
+          appliance_config.hardware.partitions.size.should == 1
+          appliance_config.hardware.partitions['/'].should == {'size' => 1}
+        end
+
+        it "should merge partitions with the default one specified in appliance config" do
+          appliance_config = @helper.parse_yaml({'hardware' => {'partitions' => {'/home' => {'size' => 1}}}})
+
+          appliance_config.hardware.partitions.size.should == 2
+          appliance_config.hardware.partitions['/'].should == {'size' => 1}
+          appliance_config.hardware.partitions['/home'].should == {'size' => 1}
         end
       end
     end