boxgrinder-build 0.9.6 → 0.9.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.9.7
+
+* [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos
+* [BGBUILD-306] Switch for updates-testing repository for integration tests
+
 v0.9.6
 
 * [BGBUILD-298] Fedora 16 or newer has networking issue on platforms different than EC2 because of biosdevname not disabled

data/Manifest

@@ -5,25 +5,28 @@ README.md
 Rakefile
 bin/boxgrinder-build
 boxgrinder-build.gemspec
-integ/appliances/_hardware_cpus.appl
-integ/appliances/_hardware_memory.appl
-integ/appliances/_hardware_partitions_home.appl
-integ/appliances/_hardware_partitions_root.appl
-integ/appliances/_os_password.appl
-integ/appliances/_packages_groups_base.appl
-integ/appliances/_packages_groups_core.appl
-integ/appliances/_packages_squid.appl
-integ/appliances/_packages_utils.appl
-integ/appliances/_repos_boxgrinder_permanent_noarch.appl
-integ/appliances/_repos_testlocal_ephemeral_noarch.appl
-integ/appliances/_test_base.appl
 integ/appliances/gnome-fedora.appl
-integ/appliances/jeos-centos.appl
+integ/appliances/jeos-centos5-files.appl
+integ/appliances/jeos-centos5.appl
+integ/appliances/jeos-f15.appl
+integ/appliances/jeos-f16-files.appl
 integ/appliances/jeos-f16.appl
-integ/appliances/jeos-fedora.appl
-integ/appliances/modular.appl
+integ/appliances/modular/_hardware_cpus.appl
+integ/appliances/modular/_hardware_memory.appl
+integ/appliances/modular/_hardware_partitions_home.appl
+integ/appliances/modular/_hardware_partitions_root.appl
+integ/appliances/modular/_os_password.appl
+integ/appliances/modular/_packages_groups_base.appl
+integ/appliances/modular/_packages_groups_core.appl
+integ/appliances/modular/_packages_squid.appl
+integ/appliances/modular/_packages_utils.appl
+integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl
+integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl
+integ/appliances/modular/_test_base.appl
+integ/appliances/modular/modular.appl
 integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm
 integ/packages/local-repo-test.spec
+integ/spec/files-spec.rb
 integ/spec/jeos-spec.rb
 integ/spec/modular-spec.rb
 lib/boxgrinder-build.rb
@@ -86,17 +89,4 @@ spec/plugins/delivery/ebs/ebs.yaml
 spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb
 spec/plugins/delivery/local/local-plugin-spec.rb
 spec/plugins/delivery/s3/s3-plugin-spec.rb
-spec/plugins/delivery/sftp/sftp-plugin-spec.rb
-spec/plugins/os/centos/centos-plugin-spec.rb
-spec/plugins/os/fedora/fedora-plugin-spec.rb
-spec/plugins/os/rhel/rhel-plugin-spec.rb
-spec/plugins/os/rpm-based/kickstart-spec.rb
-spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb
-spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb
-spec/plugins/os/rpm-based/src/jeos-f13-plain.ks
-spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks
-spec/plugins/os/rpm-based/src/jeos-f13.ks
-spec/plugins/os/sl/sl-plugin-spec.rb
-spec/plugins/platform/ec2/ec2-plugin-spec.rb
-spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb
-spec/plugins/platform/vmware/vmware-plugin-spec.rb
+spec/plugins/delivery/sftp/sftp-plugin-

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-09-02}
+  s.date = %q{2011-09-10}
   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.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-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/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/_hardware_cpus.appl", "integ/appliances/_hardware_memory.appl", "integ/appliances/_hardware_partitions_home.appl", "integ/appliances/_hardware_partitions_root.appl", "integ/appliances/_os_password.appl", "integ/appliances/_packages_groups_base.appl", "integ/appliances/_packages_groups_core.appl", "integ/appliances/_packages_squid.appl", "integ/appliances/_packages_utils.appl", "integ/appliances/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/_test_base.appl", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos.appl", "integ/appliances/jeos-f16.appl", "integ/appliances/jeos-fedora.appl", "integ/appliances/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-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/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/ec2-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/helpers/s3-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos5-files.appl", "integ/appliances/jeos-centos5.appl", "integ/appliances/jeos-f15.appl", "integ/appliances/jeos-f16-files.appl", "integ/appliances/jeos-f16.appl", "integ/appliances/modular/_hardware_cpus.appl", "integ/appliances/modular/_hardware_memory.appl", "integ/appliances/modular/_hardware_partitions_home.appl", "integ/appliances/modular/_hardware_partitions_root.appl", "integ/appliances/modular/_os_password.appl", "integ/appliances/modular/_packages_groups_base.appl", "integ/appliances/modular/_packages_groups_core.appl", "integ/appliances/modular/_packages_squid.appl", "integ/appliances/modular/_packages_utils.appl", "integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/modular/_test_base.appl", "integ/appliances/modular/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/files-spec.rb", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-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/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/ec2-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/helpers/s3-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
   s.homepage = %q{http://boxgrinder.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]

data/integ/appliances/gnome-fedora.appl

@@ -5,7 +5,7 @@ hardware:
     "/":
       size: 8
 appliances:
-  - jeos-fedora
+  - jeos-f15
 packages:
   - @base
   - @base-x

data/integ/appliances/jeos-centos5-files.appl

@@ -0,0 +1,15 @@
+name: jeos-centos5-files
+os:
+  name: centos
+  version: 5
+files:
+  "/opt":
+    - jeos-centos5.appl
+    - /etc/yum.repos.d/fedora.repo
+    - /etc/sysconfig
+    - modular
+  "/opt/abc":
+    - "http://ftp.tpnet.pl/vol/d1/apache//couchdb/1.0.3/apache-couchdb-1.0.3.tar.gz"
+    - "https://raw.github.com/boxgrinder/boxgrinder-build/master/README.md"
+    - "ftp://ftp.fu-berlin.de/unix/www/apache/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz"
+

data/integ/appliances/{jeos-centos.appl → jeos-centos5.appl}

@@ -1,4 +1,4 @@
-name: jeos-centos
+name: jeos-centos5
 os:
   name: centos
   version: 5

data/integ/appliances/jeos-f15.appl

@@ -0,0 +1,9 @@
+name: jeos-f15
+os:
+  name: fedora
+  version: 15
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true
+

data/integ/appliances/jeos-f16-files.appl

@@ -0,0 +1,14 @@
+name: jeos-f16-files
+appliances:
+  - jeos-f16
+files:
+  "/opt":
+    - jeos-centos5.appl
+    - /etc/yum.repos.d/fedora.repo
+    - /etc/sysconfig
+    - modular
+  "/opt/abc":
+    - "http://ftp.tpnet.pl/vol/d1/apache//couchdb/1.0.3/apache-couchdb-1.0.3.tar.gz"
+    - "https://raw.github.com/boxgrinder/boxgrinder-build/master/README.md"
+    - "ftp://ftp.fu-berlin.de/unix/www/apache/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz"
+

data/integ/appliances/{modular.appl → modular/modular.appl}

@@ -4,7 +4,6 @@ version: 1
 release: 2
 appliances:
   - _test_base
-  - jeos-fedora
 post:
   base:
     - "/bin/echo 'true' > /fedora-boxgrinder-test"
@@ -14,3 +13,10 @@ post:
     - "/bin/echo 'true' > /fedora-vmware-boxgrinder-test"
   virtualbox:
     - "/bin/echo 'true' > /fedora-virtualbox-boxgrinder-test"
+os:
+  name: fedora
+  version: 15
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true

data/integ/spec/files-spec.rb

@@ -0,0 +1,73 @@
+#
+# Copyright 2010 Red Hat, Inc.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 3 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+require 'rubygems'
+require 'boxgrinder-build/appliance'
+require 'boxgrinder-core/models/config'
+require 'boxgrinder-core/helpers/log-helper'
+require 'boxgrinder-build/helpers/guestfs-helper'
+require 'fileutils'
+
+module BoxGrinder
+  describe 'BoxGrinder Build' do
+    before(:all) do
+      # Cleaning up before build
+      FileUtils.rm_rf('build/')
+    end
+
+    after(:all) do
+      # Cleaning up after build
+      FileUtils.rm_rf('build/')
+    end
+
+    before(:each) do
+      # Deliver the packaged appliance to CloudFront
+      @config = Config.new(:delivery => :cloudfront)
+      @log = LogHelper.new(:level => :trace, :type => :stdout)
+    end
+
+    after(:each) do
+      # Make sure all deliverables really exists
+      @appliance.plugin_chain.last[:plugin].deliverables.each_value do |file|
+        File.exists?(file).should == true
+      end
+        
+      GuestFSHelper.new([@appliance.plugin_chain.first[:plugin].deliverables[:disk]], @appliance.appliance_config, @config, :log => @log ).customize do |guestfs, guestfs_helper|
+        # Helper to see what's there
+        guestfs.sh('ls -hall')
+        guestfs.exists('/opt/jeos-centos5.appl').should == 1
+        guestfs.exists('/opt/etc/yum.repos.d/fedora.repo').should == 1
+        guestfs.exists('/opt/etc/sysconfig/network').should == 1
+        guestfs.exists('/opt/abc/apache-couchdb-1.0.3.tar.gz').should == 1
+        guestfs.exists('/opt/abc/README.md').should == 1
+        guestfs.exists('/opt/abc/apache-couchdb-1.1.0.tar.gz').should == 1
+      end
+    end
+
+    context "Files section" do
+      it "should build appliance with files section for Fedora 16" do
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f16-files.appl", @config, :log => @log).create
+      end
+        
+      it "should build appliance with files section for CentOS 5" do
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos5-files.appl", @config, :log => @log).create
+      end
+    end
+  end
+end
+

data/integ/spec/jeos-spec.rb

@@ -50,7 +50,7 @@ module BoxGrinder
 
     context "operating system plugin" do
       it "should build Fedora JEOS" do
-        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-fedora.appl", @config, :log => @log).create
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f16.appl", @config, :log => @log).create
       end
 
       it "should build Fedora 16 JEOS and create an AMI" do
@@ -58,15 +58,25 @@ module BoxGrinder
         @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f16.appl", @config, :log => @log).create
       end
 
-      it "should build CentOS JEOS" do
-        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos.appl", @config, :log => @log).create
+      it "should build Fedora 15 JEOS and create an AMI" do
+        @config.merge!(:platform => :ec2, :delivery => :ami)
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f15.appl", @config, :log => @log).create
+      end
+
+      it "should build CentOS 5 JEOS" do
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos5.appl", @config, :log => @log).create
+      end
+
+      it "should build CentOS 5 JEOS and create an AMI" do
+        @config.merge!(:platform => :ec2, :delivery => :ami)
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos5.appl", @config, :log => @log).create
       end
     end
 
     context "platform plugin" do
       it "should create Fedora JEOS appliance and convert it to VMware personal platform" do
         @config.merge!(:platform => :vmware, :platform_config => {'type' => 'personal'})
-        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-fedora.appl", @config, :log => @log).create
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f16.appl", @config, :log => @log).create
       end
     end
   end

data/integ/spec/modular-spec.rb

@@ -56,7 +56,7 @@ module BoxGrinder
     context "modular appliances" do
       it "should build modular appliance based on Fedora and convert it to VirtualBox" do
         @config.merge!(:platform => :virtualbox)
-        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/modular.appl", @config, :log => @log).create
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/modular/modular.appl", @config, :log => @log).create
 
         GuestFSHelper.new([@appliance.plugin_chain[1][:plugin].deliverables[:disk]], @appliance.appliance_config, @config, :log => @log ).customize do |guestfs, guestfs_helper|
           guestfs.exists('/fedora-boxgrinder-test').should == 1

data/lib/boxgrinder-build/appliance.rb

@@ -136,11 +136,11 @@ module BoxGrinder
         return
       end
 
-      @log.debug "Executing #{plugin.plugin_info[:type]} plugin for #{@appliance_config.os.name}..."
+      @log.debug "Executing #{plugin.plugin_info[:type]} plugin..."
 
       param.nil? ? plugin.run : plugin.run(param)
 
-      @log.debug "Operating system plugin executed."
+      @log.debug "#{plugin.plugin_info[:type].to_s.capitalize} plugin executed."
     end
   end
 end

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

@@ -254,6 +254,9 @@ module BoxGrinder
 
       partitions = mountable_partitions(device)
       mount_points = LinuxHelper.new(:log => @log).partition_mount_points(@appliance_config.hardware.partitions)
+      # https://issues.jboss.org/browse/BGBUILD-307
+      # We don't want to mount swap partitions at all...
+      mount_points.delete("swap")
       partitions.each_index { |i| mount_partition(partitions[i], mount_points[i], mount_prefix) }
     end
 

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

@@ -28,6 +28,7 @@ module BoxGrinder
     #
     # ['/', '/home'] => ['/', '/home']
     # ['swap', '/', '/home'] => ['/', '/home', 'swap']
+    # ['swap', '/', '/home', '/boot'] => ['/', '/boot', '/home', 'swap']
     # ['/tmp-eventlog', '/', '/ubrc', '/tmp-config'] => ['/', '/ubrc', '/tmp-config', '/tmp-eventlog']
     #
     def partition_mount_points(partitions)
@@ -36,15 +37,23 @@ module BoxGrinder
         b_count = b.count('/')
 
         if a_count > b_count
-          v = (b_count == 0 ? -1 : 1)
+          v = 1
         else
           if a_count < b_count
             v = -1
           else
-            v = a.length <=> b.length
+            if a.length == b.length
+              v = a <=> b
+            else
+              v = a.length <=> b.length
+            end
           end
         end
 
+        # This forces having swap partition at the end of the disk
+        v = 1 if a_count == 0
+        v = -1 if b_count == 0
+
         v
       end
     end

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

@@ -37,6 +37,7 @@ module BoxGrinder
 
       @deliverables = OpenCascade.new
       @supported_oses = OpenCascade.new
+      @supported_platforms = []
       @target_deliverables = OpenCascade.new
       @dir = OpenCascade.new
     end
@@ -126,6 +127,17 @@ module BoxGrinder
       @supported_oses[name] = versions
     end
 
+    def register_supported_platform(name)
+      raise "You can register supported platform only after the plugin is initialized, please initialize the plugin using init method." if @initialized.nil?
+      @supported_platforms << name
+    end
+
+    def is_supported_platform?
+      return true if @supported_platforms.empty?
+      return false if @previous_plugin_info[:type] == :platform and !@supported_platforms.include?(@previous_plugin_info[:name])
+      true
+    end
+
     def is_supported_os?
       return true if @supported_oses.empty?
       return false unless !@supported_oses[@appliance_config.os.name].nil? and @supported_oses[@appliance_config.os.name].include?(@appliance_config.os.version)
@@ -171,6 +183,11 @@ module BoxGrinder
         return
       end
 
+      unless is_supported_platform?
+        @log.error "#{@plugin_info[:full_name]} plugin supports following platforms: #{@supported_platforms.join(', ')}. You selected #{@previous_plugin_info[:name]} platform which is not supported by this plugin, sorry."
+        return
+      end
+
       FileUtils.rm_rf @dir.tmp
       FileUtils.mkdir_p @dir.tmp
 

data/lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb

@@ -65,7 +65,7 @@ module BoxGrinder
     end
 
     def after_init
-      register_supported_os('fedora', ['13', '14', '15'])
+      register_supported_os('fedora', ['13', '14', '15', '16'])
       register_supported_os('rhel', ['6'])
       register_supported_os('centos', ['5'])
     end

data/lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb

@@ -68,6 +68,8 @@ module BoxGrinder
       else
         @plugin_config['PAE'] ? packages << "kernel-PAE" : packages << "kernel"
       end
+
+      packages << "-grub2" if @appliance_config.os.version >= "16"
     end
 
     # Since Fedora 16 by default GRUB2 is used - we remove Legacy GRUB
@@ -77,6 +79,9 @@ module BoxGrinder
     def switch_to_grub2(guestfs, guestfs_helper)
       @log.debug "Switching to GRUB2..."
       guestfs_helper.sh("yum -y remove grub")
+      guestfs_helper.sh("yum -y install grub2")
+      # Disabling biosdevname in GRUB2
+      guestfs.write("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n") if guestfs.exists("/boot/grub2/grub.cfg") != 0
       # We are using only one disk, so this is save
       guestfs.sh("cd / && grub2-install --force #{guestfs.list_devices.first}")
       guestfs.sh("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
@@ -85,7 +90,6 @@ module BoxGrinder
 
     def disable_biosdevname(guestfs)
       @log.debug "Disabling biosdevname..."
-      guestfs.write("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n") if guestfs.exists("/boot/grub2/grub.cfg") != 0
       guestfs.sh('sed -i "s/kernel\(.*\)/kernel\1 biosdevname=0/g" /boot/grub/grub.conf') if guestfs.exists("/boot/grub/grub.conf") != 0
       @log.debug "Biosdevname disabled."
     end

data/lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb

@@ -21,6 +21,7 @@ require 'boxgrinder-build/plugins/base-plugin'
 require 'boxgrinder-build/plugins/os/rpm-based/kickstart'
 require 'boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator'
 require 'boxgrinder-build/helpers/linux-helper'
+require 'boxgrinder-core/errors'
 
 module BoxGrinder
   class RPMBasedOSPlugin < BasePlugin
@@ -357,14 +358,19 @@ module BoxGrinder
           else
             @log.trace "Local path detected: '#{f}'."
 
-            local_files << (f.match(/^\//) ? f : "#{File.dirname(@appliance_definition_file)}/#{f}")
+            file_path = (f.match(/^\//) ? f : "#{File.dirname(@appliance_definition_file)}/#{f}")
+
+            # TODO validate this earlier
+            raise ValidationError, "File '#{f}' specified in files section of appliance definition file doesn't exists." unless File.exists?(file_path)
+
+            local_files << f
           end
         end
 
         next if local_files.empty?
 
         @log.trace "Tarring files..."
-        @exec_helper.execute("tar -cvf /tmp/bg_install_files.tar --wildcards #{local_files.join(' ')}")
+        @exec_helper.execute("cd #{File.dirname(@appliance_definition_file)} && tar -cvf /tmp/bg_install_files.tar --wildcards #{local_files.join(' ')}")
         @log.trace "Files tarred."
 
         @log.trace "Uploading and unpacking..."

data/lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb

@@ -98,7 +98,7 @@ module BoxGrinder
     def generate_package_list
       packages = []
       for package in @appliance_config.packages
-        packages << package unless package.match /^@/
+        packages << package unless package.match /^@/ or package.match /^-/
       end
       packages
     end

data/lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb

@@ -165,22 +165,36 @@ module BoxGrinder
     end
 
     def upload_rc_local(guestfs)
-      @log.debug "Uploading '/etc/rc.local' file..."
+      @log.debug "Uploading '/etc/rc.d/rc.local' file..."
       rc_local = Tempfile.new('rc_local')
-      rc_local << guestfs.read_file("/etc/rc.local") + File.read("#{File.dirname(__FILE__)}/src/rc_local")
+
+      if guestfs.exists("/etc/rc.d/rc.local") == 1
+        # We're appending
+        rc_local << guestfs.read_file("/etc/rc.d/rc.local")
+      else
+        # We're creating new file
+        rc_local << "#!/bin/bash\n\n"
+      end
+
+      rc_local << File.read("#{File.dirname(__FILE__)}/src/rc_local")
       rc_local.flush
 
-      guestfs.upload(rc_local.path, "/etc/rc.local")
+      guestfs.upload(rc_local.path, "/etc/rc.d/rc.local")
 
       rc_local.close
 
+      # Fedora 16 doesn't have /etc/rc.local file and we need to
+      # enable rc.local compatibility with systemd
       # We need to make sure that network is available when executing rc.local
       if (@appliance_config.os.name == 'fedora' and @appliance_config.os.version >= '16')
         guestfs.cp("/lib/systemd/system/rc-local.service", "/etc/systemd/system/")
         guestfs.sh("sed -i '/^ConditionFileIsExecutable/a After=network.target' /etc/systemd/system/rc-local.service")
+        guestfs.sh("systemctl enable rc-local.service")
+        guestfs.ln_sf("/etc/rc.d/rc.local", "/etc/rc.local")
+        guestfs.chmod(0755, "/etc/rc.d/rc.local")
       end
 
-      @log.debug "'/etc/rc.local' file uploaded."
+      @log.debug "'/etc/rc.d/rc.local' file uploaded."
     end
 
     def change_configuration(guestfs_helper)

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.9.6
+Version: 0.9.7
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -130,6 +130,11 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Tue Sep 06 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.7-1
+- Upstream release: 0.9.7
+- [BGBUILD-307] Appliance with swap file fails to build if selected OS is centos
+- [BGBUILD-306] Switch for updates-testing repository for integration tests
+
 * Sat Aug 27 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.6-1
 - Upstream release: 0.9.6
 - [BGBUILD-298] Fedora 16 or newer has networking issue on platforms different than EC2 because of biosdevname not disabled

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

@@ -76,6 +76,11 @@ module BoxGrinder
         @helper.partition_mount_points(hash).should == ['/', '/home', 'swap']
       end
 
+      it "should return ['/', '/boot', '/home', 'swap']" do
+        hash = {'swap' => {"size" => 1}, "/boot" => {"size" => 0.1}, "/"=>{"size"=>2, "type"=>"ext3"}, "/home"=>{"size"=>2, "type"=>"ext3"}}
+        @helper.partition_mount_points(hash).should == ['/', '/boot', '/home', 'swap']
+      end
+
       it "should return ['/', '/ubrc', '/tmp-config', '/tmp-eventlog']" do
         hash = {"/tmp-eventlog"=>{"size"=>0.01, "type"=>"ext3"}, "/"=>{"size"=>2, "type"=>"ext3"}, "/ubrc"=>{"size"=>0.02, "type"=>"ext3"}, "/tmp-config"=>{"size"=>0.26}}
         @helper.partition_mount_points(hash).should == ["/", "/ubrc", "/tmp-config", "/tmp-eventlog"]

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

@@ -131,6 +131,20 @@ module BoxGrinder
         @log.should_receive(:error).with('Amazon Simple Storage Service (Amazon S3) plugin supports following operating systems: fedora (versions: 12, 13). Your appliance contains fedora 14 operating system which is not supported by this plugin, sorry.')
         @plugin.run
       end
+
+      it "should fail if platform is not supported" do
+        @plugin.instance_variable_set(:@previous_plugin_info, {:type => :platform, :name => :ec2})
+        @plugin.register_supported_platform('vmware')
+        @log.should_receive(:error).with('Amazon Simple Storage Service (Amazon S3) plugin supports following platforms: vmware. You selected ec2 platform which is not supported by this plugin, sorry.')
+        @plugin.run
+      end
+
+      it "should not fail if previous plugin is not a platform plugin" do
+        @plugin.instance_variable_set(:@previous_plugin_info, {:type => :os, :name => :fedora})
+        @plugin.register_supported_platform('vmware')
+        @log.should_not_receive(:error)
+        @plugin.run
+      end
     end
 
     it "should register a supported os" do

data/spec/plugins/delivery/ebs/ebs-plugin-spec.rb

@@ -85,7 +85,7 @@ module BoxGrinder
       supported_oses.size.should == 3
       Set.new(supported_oses.keys).should == Set.new(['fedora', 'rhel', 'centos'])
       supported_oses['rhel'].should == ['6']
-      supported_oses['fedora'].should == ['13', '14', '15']
+      supported_oses['fedora'].should == ['13', '14', '15', '16']
       supported_oses['centos'].should == ['5']
     end
 

data/spec/plugins/os/fedora/fedora-plugin-spec.rb

@@ -92,20 +92,11 @@ module BoxGrinder
     context "BGBUILD-204" do
       it "should disable bios device name hints for GRUB legacy" do
         guestfs = mock("GuestFS")
-        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(0)
         guestfs.should_receive(:exists).with("/boot/grub/grub.conf").and_return(1)
         guestfs.should_receive(:sh).with("sed -i \"s/kernel\\(.*\\)/kernel\\1 biosdevname=0/g\" /boot/grub/grub.conf")
         @plugin.disable_biosdevname(guestfs)
       end
 
-      it "should disable bios device name hints for GRUB2" do
-        guestfs = mock("GuestFS")
-        guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(1)
-        guestfs.should_receive(:exists).with("/boot/grub/grub.conf").and_return(0)
-        guestfs.should_receive(:write).with("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
-        @plugin.disable_biosdevname(guestfs)
-      end
-
       it "should change to runlevel 3 by default" do
         guestfs = mock("GuestFS")
         guestfs.should_receive(:rm).with("/etc/systemd/system/default.target")
@@ -130,9 +121,12 @@ module BoxGrinder
       guestfs = mock("GuestFS")
       guestfs_helper = mock("GuestFSHelper")
       guestfs_helper.should_receive(:sh).ordered.with("yum -y remove grub")
+      guestfs_helper.should_receive(:sh).ordered.with("yum -y install grub2")
       guestfs.should_receive(:list_devices).and_return(['/dev/vda'])
       guestfs.should_receive(:sh).ordered.with("cd / && grub2-install --force /dev/vda")
       guestfs.should_receive(:sh).ordered.with("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
+      guestfs.should_receive(:exists).with("/boot/grub2/grub.cfg").and_return(1)
+      guestfs.should_receive(:write).with("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n")
       @plugin.switch_to_grub2(guestfs, guestfs_helper)
     end
     describe ".execute" do

data/spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb

@@ -353,7 +353,11 @@ module BoxGrinder
         guestfs.should_receive(:exists).with("/opt").once.and_return(1)
         guestfs.should_receive(:tar_in).with("/tmp/bg_install_files.tar", "/opt")
 
-        @exec_helper.should_receive(:execute).with("tar -cvf /tmp/bg_install_files.tar --wildcards ./abc ./def")
+        File.stub!(:exists?)
+        File.should_receive(:exists?).with('./abc').and_return(true)
+        File.should_receive(:exists?).with('./def').and_return(true)
+
+        @exec_helper.should_receive(:execute).with("cd . && tar -cvf /tmp/bg_install_files.tar --wildcards abc def")
 
         @plugin.install_files(guestfs)
       end
@@ -366,7 +370,11 @@ module BoxGrinder
         guestfs.should_receive(:exists).with("/opt").once.and_return(1)
         guestfs.should_receive(:tar_in).with("/tmp/bg_install_files.tar", "/opt")
 
-        @exec_helper.should_receive(:execute).with("tar -cvf /tmp/bg_install_files.tar --wildcards /opt/abc /opt/def")
+        File.stub!(:exists?)
+        File.should_receive(:exists?).with('/opt/abc').and_return(true)
+        File.should_receive(:exists?).with('/opt/def').and_return(true)
+
+        @exec_helper.should_receive(:execute).with("cd . && tar -cvf /tmp/bg_install_files.tar --wildcards /opt/abc /opt/def")
 
         @plugin.install_files(guestfs)
       end
@@ -394,10 +402,45 @@ module BoxGrinder
         guestfs.should_receive(:mkdir_p).with("/opt/aaa")
         guestfs.should_receive(:tar_in).with("/tmp/bg_install_files.tar", "/opt/aaa")
 
-        @exec_helper.should_receive(:execute).with("tar -cvf /tmp/bg_install_files.tar --wildcards ./abc")
+        File.stub!(:exists?)
+        File.should_receive(:exists?).with('./abc').and_return(true)
+
+        @exec_helper.should_receive(:execute).with("cd . && tar -cvf /tmp/bg_install_files.tar --wildcards abc")
+
+        @plugin.install_files(guestfs)
+      end
+
+      it "should upload files when correctly when appliance definition file is not in current directory" do
+        @appliance_config.stub!(:files).and_return("/opt/aaa" => ['abc', '/blah/def'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "some/dir/to/file.appl")
+
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/opt/aaa").and_return(0)
+        guestfs.should_receive(:mkdir_p).with("/opt/aaa")
+        guestfs.should_receive(:tar_in).with("/tmp/bg_install_files.tar", "/opt/aaa")
+
+        File.stub!(:exists?)
+        File.should_receive(:exists?).with('some/dir/to/abc').and_return(true)
+        File.should_receive(:exists?).with('/blah/def').and_return(true)
+
+        @exec_helper.should_receive(:execute).with("cd some/dir/to && tar -cvf /tmp/bg_install_files.tar --wildcards abc /blah/def")
 
         @plugin.install_files(guestfs)
       end
+
+      it "should raise if file doesn't exists" do
+        @appliance_config.stub!(:files).and_return("/opt/aaa" => ['abc', '/blah/def'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "some/dir/to/file.appl")
+
+        guestfs = mock("GuestFS")
+        guestfs.should_receive(:exists).with("/opt/aaa").and_return(0)
+        guestfs.should_receive(:mkdir_p).with("/opt/aaa")
+
+        File.stub!(:exists?)
+        File.should_receive(:exists?).with('some/dir/to/abc').and_return(false)
+
+        lambda { @plugin.install_files(guestfs) }.should raise_error(ValidationError, "File 'abc' specified in files section of appliance definition file doesn't exists.")
+      end
     end
 
     describe ".set_label_for_swap_partitions" do

data/spec/plugins/platform/ec2/ec2-plugin-spec.rb

@@ -109,15 +109,17 @@ module BoxGrinder
       Tempfile.should_receive(:new).with("rc_local").and_return(tempfile)
       File.should_receive(:read).with(any_args()).and_return("with other content")
 
-      guestfs.should_receive(:read_file).once.ordered.with("/etc/rc.local").and_return("content ")
-      tempfile.should_receive(:<<).once.ordered.with("content with other content")
+      guestfs.should_receive(:exists).with('/etc/rc.d/rc.local').and_return(1)
+      guestfs.should_receive(:read_file).once.ordered.with("/etc/rc.d/rc.local").and_return("content ")
+      tempfile.should_receive(:<<).once.ordered.with("content ")
+      tempfile.should_receive(:<<).once.ordered.with("with other content")
       tempfile.should_receive(:flush).once.ordered
       tempfile.should_receive(:path).once.ordered.and_return("path")
-      guestfs.should_receive(:upload).once.ordered.with("path", "/etc/rc.local")
+      guestfs.should_receive(:upload).once.ordered.with("path", "/etc/rc.d/rc.local")
       tempfile.should_receive(:close).once.ordered
 
-      @log.should_receive(:debug).once.with("Uploading '/etc/rc.local' file...")
-      @log.should_receive(:debug).once.with("'/etc/rc.local' file uploaded.")
+      @log.should_receive(:debug).once.with("Uploading '/etc/rc.d/rc.local' file...")
+      @log.should_receive(:debug).once.with("'/etc/rc.d/rc.local' file uploaded.")
 
       @plugin.upload_rc_local(guestfs)
     end
@@ -131,18 +133,23 @@ module BoxGrinder
       Tempfile.should_receive(:new).with("rc_local").and_return(tempfile)
       File.should_receive(:read).with(any_args()).and_return("with other content")
 
-      guestfs.should_receive(:read_file).once.ordered.with("/etc/rc.local").and_return("content ")
-      tempfile.should_receive(:<<).once.ordered.with("content with other content")
+      guestfs.should_receive(:exists).with('/etc/rc.d/rc.local').and_return(0)
+      guestfs.should_not_receive(:read_file).with("/etc/rc.d/rc.local")
+      tempfile.should_receive(:<<).once.ordered.with("#!/bin/bash\n\n")
+      tempfile.should_receive(:<<).once.ordered.with("with other content")
       tempfile.should_receive(:flush).once.ordered
       tempfile.should_receive(:path).once.ordered.and_return("path")
-      guestfs.should_receive(:upload).once.ordered.with("path", "/etc/rc.local")
+      guestfs.should_receive(:upload).once.ordered.with("path", "/etc/rc.d/rc.local")
       tempfile.should_receive(:close).once.ordered
 
-      @log.should_receive(:debug).once.with("Uploading '/etc/rc.local' file...")
-      @log.should_receive(:debug).once.with("'/etc/rc.local' file uploaded.")
+      @log.should_receive(:debug).once.with("Uploading '/etc/rc.d/rc.local' file...")
+      @log.should_receive(:debug).once.with("'/etc/rc.d/rc.local' file uploaded.")
 
       guestfs.should_receive(:cp).with("/lib/systemd/system/rc-local.service", "/etc/systemd/system/")
       guestfs.should_receive(:sh).with("sed -i '/^ConditionFileIsExecutable/a After=network.target' /etc/systemd/system/rc-local.service")
+      guestfs.should_receive(:sh).with("systemctl enable rc-local.service")
+      guestfs.should_receive(:ln_sf).with("/etc/rc.d/rc.local", "/etc/rc.local")
+      guestfs.should_receive(:chmod).with(0755, "/etc/rc.d/rc.local")
 
       @plugin.upload_rc_local(guestfs)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 +02:00
+date: 2011-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,25 +168,28 @@ files:
 - Rakefile
 - bin/boxgrinder-build
 - boxgrinder-build.gemspec
-- integ/appliances/_hardware_cpus.appl
-- integ/appliances/_hardware_memory.appl
-- integ/appliances/_hardware_partitions_home.appl
-- integ/appliances/_hardware_partitions_root.appl
-- integ/appliances/_os_password.appl
-- integ/appliances/_packages_groups_base.appl
-- integ/appliances/_packages_groups_core.appl
-- integ/appliances/_packages_squid.appl
-- integ/appliances/_packages_utils.appl
-- integ/appliances/_repos_boxgrinder_permanent_noarch.appl
-- integ/appliances/_repos_testlocal_ephemeral_noarch.appl
-- integ/appliances/_test_base.appl
 - integ/appliances/gnome-fedora.appl
-- integ/appliances/jeos-centos.appl
+- integ/appliances/jeos-centos5-files.appl
+- integ/appliances/jeos-centos5.appl
+- integ/appliances/jeos-f15.appl
+- integ/appliances/jeos-f16-files.appl
 - integ/appliances/jeos-f16.appl
-- integ/appliances/jeos-fedora.appl
-- integ/appliances/modular.appl
+- integ/appliances/modular/_hardware_cpus.appl
+- integ/appliances/modular/_hardware_memory.appl
+- integ/appliances/modular/_hardware_partitions_home.appl
+- integ/appliances/modular/_hardware_partitions_root.appl
+- integ/appliances/modular/_os_password.appl
+- integ/appliances/modular/_packages_groups_base.appl
+- integ/appliances/modular/_packages_groups_core.appl
+- integ/appliances/modular/_packages_squid.appl
+- integ/appliances/modular/_packages_utils.appl
+- integ/appliances/modular/_repos_boxgrinder_permanent_noarch.appl
+- integ/appliances/modular/_repos_testlocal_ephemeral_noarch.appl
+- integ/appliances/modular/_test_base.appl
+- integ/appliances/modular/modular.appl
 - integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm
 - integ/packages/local-repo-test.spec
+- integ/spec/files-spec.rb
 - integ/spec/jeos-spec.rb
 - integ/spec/modular-spec.rb
 - lib/boxgrinder-build.rb

data/integ/appliances/jeos-fedora.appl

@@ -1,5 +0,0 @@
-name: jeos-fedora
-os:
-  name: fedora
-  version: 15
-