boxgrinder-build 0.9.5.3 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.9.6
+
+* [BGBUILD-298] Fedora 16 or newer has networking issue on platforms different than EC2 because of biosdevname not disabled
+* [BGBUILD-299] Wrong filenames in GRUB discovery
+* [BGBUILD-276] Import files into appliance via appliance definition file (Files section)
+* [BGBUILD-300] Add support for swap partitions
+* [BGBUILD-301] Swap feature not working properly
+
 v0.9.5.3
 
 * What a shame, fixing the mocks again...

data/Manifest

@@ -91,4 +91,12 @@ 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-ba
+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

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.5.3"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-08-27}
+  s.date = %q{2011-09-02}
   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}

data/lib/boxgrinder-build/appliance.rb

@@ -102,7 +102,6 @@ module BoxGrinder
 
     def execute_plugin_chain
       @log.info "Building '#{@appliance_config.name}' appliance for #{@appliance_config.hardware.arch} architecture."
-
       @plugin_chain.each { |p| execute_plugin(p[:plugin], p[:param]) }
     end
 

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

@@ -257,14 +257,16 @@ module BoxGrinder
       partitions.each_index { |i| mount_partition(partitions[i], mount_points[i], mount_prefix) }
     end
 
-    def mountable_partitions(device)
-      partitions = @guestfs.list_partitions.reject { |i| !(i =~ /^#{device}/) }
+    def mountable_partitions(device, options = {})
+      options = {:list_swap => false}.merge(options)
+
+      partitions = @guestfs.list_partitions
 
       # we need to remove extended partition
       # extended partition is always #3
       partitions.delete_at(3) if partitions.size > 4
 
-      partitions
+      partitions.reject { |i| !(i =~ /^#{device}/) or (@guestfs.vfs_type(i) == 'swap' and !options[:list_swap]) }
     end
 
     def umount_partition(part)
@@ -276,7 +278,7 @@ module BoxGrinder
     # Unmounts partitions in reverse order.
     #
     def umount_partitions(device)
-      partitions = @guestfs.list_partitions.reject { |i| !(i =~ /^#{device}/) }
+      partitions = mountable_partitions(device)
 
       @log.trace "Unmounting partitions..."
       partitions.reverse.each { |part| umount_partition(part) }
@@ -295,4 +297,4 @@ module BoxGrinder
       AugeasHelper.new(@guestfs, self, :log => @log).edit(&block)
     end
   end
-end
+end

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

@@ -27,19 +27,24 @@ module BoxGrinder
     # Returns valid array of sorted mount points
     #
     # ['/', '/home'] => ['/', '/home']
+    # ['swap', '/', '/home'] => ['/', '/home', 'swap']
     # ['/tmp-eventlog', '/', '/ubrc', '/tmp-config'] => ['/', '/ubrc', '/tmp-config', '/tmp-eventlog']
     #
     def partition_mount_points(partitions)
       partitions.keys.sort do |a, b|
-        if a.count('/') > b.count('/')
-          v = 1
+        a_count = a.count('/')
+        b_count = b.count('/')
+
+        if a_count > b_count
+          v = (b_count == 0 ? -1 : 1)
         else
-          if a.count('/') < b.count('/')
+          if a_count < b_count
             v = -1
           else
             v = a.length <=> b.length
           end
         end
+
         v
       end
     end

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

@@ -45,12 +45,12 @@ module BoxGrinder
       build_with_appliance_creator(appliance_definition_file, @repos) do |guestfs, guestfs_helper|
         if @appliance_config.os.version >= "15"
           disable_biosdevname(guestfs)
+          # https://issues.jboss.org/browse/BGBUILD-298
+          switch_to_grub2(guestfs, guestfs_helper) if @appliance_config.os.version >= "16"
           change_runlevel(guestfs)
           disable_netfs(guestfs)
           link_mtab(guestfs)
         end
-
-        switch_to_grub2(guestfs, guestfs_helper) if @appliance_config.os.version >= "16"
       end
     end
 
@@ -86,7 +86,7 @@ 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.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

@@ -113,6 +113,8 @@ module BoxGrinder
     end
 
     def build_with_appliance_creator(appliance_definition_file, repos = {})
+      @appliance_definition_file = appliance_definition_file
+
       if File.extname(appliance_definition_file).eql?('.ks')
         kickstart_file = appliance_definition_file
       else
@@ -137,10 +139,12 @@ module BoxGrinder
         change_configuration(guestfs_helper)
         # TODO check if this is still required
         apply_root_password(guestfs)
+        set_label_for_swap_partitions(guestfs, guestfs_helper)
         use_labels_for_partitions(guestfs)
         disable_firewall(guestfs)
         set_motd(guestfs)
         install_repos(guestfs)
+        install_files(guestfs)
 
         guestfs.sh("chkconfig firstboot off") if guestfs.exists('/etc/init.d/firstboot') != 0
 
@@ -238,22 +242,35 @@ module BoxGrinder
       @log.debug "Firewall disabled."
     end
 
+    # https://issues.jboss.org/browse/BGBUILD-301
+    def set_label_for_swap_partitions(guestfs, guestfs_helper)
+      @log.trace "Searching for swap partition to set label..."
+
+      guestfs_helper.mountable_partitions(guestfs.list_devices.first, :list_swap => true).each do |p|
+        if guestfs.vfs_type(p).eql?('swap')
+          @log.debug "Setting 'swap' label for partiiton '#{p}'."
+          guestfs.mkswap_L('swap', p)
+          @log.debug "Label set."
+          # We assume here that nobody will want to have two swap partitions
+          break
+        end
+      end
+    end
+
     def use_labels_for_partitions(guestfs)
+      @log.debug "Using labels for partitions..."
       device = guestfs.list_devices.first
 
       # /etc/fstab
-      if fstab = guestfs.read_file('/etc/fstab').gsub!(/^(\/dev\/sda.)/) { |path| "LABEL=#{read_label(guestfs, path.gsub('/dev/sda', device))}" }
+      if fstab = guestfs.read_file('/etc/fstab').gsub!(/^(\/dev\/sda.)/) { |path| "LABEL=#{guestfs.vfs_label(path.gsub('/dev/sda', device))}" }
         guestfs.write_file('/etc/fstab', fstab, 0)
       end
 
       # /boot/grub/grub.conf
-      if grub = guestfs.read_file('/boot/grub/grub.conf').gsub!(/(\/dev\/sda.)/) { |path| "LABEL=#{read_label(guestfs, path.gsub('/dev/sda', device))}" }
+      if grub = guestfs.read_file('/boot/grub/grub.conf').gsub!(/(\/dev\/sda.)/) { |path| "LABEL=#{guestfs.vfs_label(path.gsub('/dev/sda', device))}" }
         guestfs.write_file('/boot/grub/grub.conf', grub, 0)
       end
-    end
-
-    def read_label(guestfs, partition)
-      (guestfs.respond_to?(:vfs_label) ? guestfs.vfs_label(partition) : guestfs.sh("/sbin/e2label #{partition}").chomp.strip).gsub('_', '')
+      @log.debug "Done."
     end
 
     def apply_root_password(guestfs)
@@ -307,5 +324,55 @@ module BoxGrinder
       @log.debug "Repositories installed."
     end
 
+    # Copies specified files into appliance.
+    #
+    # There are two types of paths:
+    # 1. remote - starting with http:// or https:// or ftp://
+    # 2. local - all other.
+    #
+    # Please use relative paths. Relative means relative to the appliance definition file.
+    # Using absolute paths will cause creating whole directory structure in appliance,
+    # which is most probably not exactly what you want.
+    #
+    # https://issues.jboss.org/browse/BGBUILD-276
+    def install_files(guestfs)
+      @log.debug "Installing files specified in appliance definition file..."
+
+      @appliance_config.files.each do |dir, files|
+
+        @log.debug "Proceding files for '#{dir}' destination directory..."
+
+        local_files = []
+
+        # Create the directory if it doesn't exists
+        guestfs.mkdir_p(dir) unless guestfs.exists(dir) != 0
+
+        files.each do |f|
+          if f.match(/^(http|ftp|https):\/\//)
+            # Remote url provided
+            @log.trace "Remote url detected: '#{f}'."
+
+            # We have a remote file, try to download it using curl!
+            guestfs.sh("cd #{dir} && curl -O -L #{f}")
+          else
+            @log.trace "Local path detected: '#{f}'."
+
+            local_files << (f.match(/^\//) ? f : "#{File.dirname(@appliance_definition_file)}/#{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(' ')}")
+        @log.trace "Files tarred."
+
+        @log.trace "Uploading and unpacking..."
+        guestfs.tar_in("/tmp/bg_install_files.tar", dir)
+        @log.trace "Files uploaded."
+
+      end
+      @log.debug "Files installed."
+    end
   end
 end

data/lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb

@@ -22,7 +22,7 @@ rootpw --iscrypted <%= appliance_config.os.password.crypt((0...8).map { 65.+(ran
 
 <% mount_points.each do |root| %>
 <% partition = appliance_config.hardware.partitions[root]%>
-part <%= root %> --size <%= (partition['size'].to_f * 1024).to_i %> --fstype <%= partition['type'] %> <% unless partition['options'].nil? %> --fsoptions '<%= partition['options'] %>' <% end %> <% if partition['passphrase'] %> --encrypted --passphrase='<%= partition['passphrase'] %>' <% end %> --ondisk sda<% end %>
+part <%= root %> --size <%= (partition['size'].to_f * 1024).to_i %> --fstype <%= root.eql?('swap') ? 'swap' : partition['type'] %> <% unless partition['options'].nil? %> --fsoptions '<%= partition['options'] %>' <% end %> <% if partition['passphrase'] %> --encrypted --passphrase='<%= partition['passphrase'] %>' <% end %> --ondisk sda<% end %>
 
 <% for repo in repos %>
 <%= repo %><% end %>

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.5.3
+Version: 0.9.6
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -130,6 +130,14 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* 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
+- [BGBUILD-299] Wrong filenames in GRUB discovery
+- [BGBUILD-276] Import files into appliance via appliance definition file (Files section)
+- [BGBUILD-300] Add support for swap partitions
+- [BGBUILD-301] Swap feature not working properly
+
 * Sat Aug 27 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.5.3-1
 - Upstream release: 0.9.5.3
 

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

@@ -26,7 +26,7 @@ module BoxGrinder
     before(:each) do
       ENV.delete("LIBGUESTFS_MEMSIZE")
 
-      @log = Logger.new('/dev/null')
+      @log = LogHelper.new(:level => :trace, :type => :stdout)
       @appliance_config = mock('ApplianceConfig')
       @appliance_config.stub!(:hardware).and_return(:partitions => {})
 
@@ -228,6 +228,24 @@ module BoxGrinder
 
         @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil}))
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
+
+        @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
+        @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
+
+        @helper.instance_variable_set(:@guestfs, guestfs)
+        @helper.mount_partitions('/dev/vda')
+      end
+
+      it "should mount two partitions from three where one is a swap partition" do
+        guestfs = mock('Guestfs')
+
+        @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil, 'swap' => nil}))
+        guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3'])
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda3').and_return('swap')
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
@@ -241,6 +259,10 @@ module BoxGrinder
 
         @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:partitions => {'/' => nil, '/home' => nil, '/var/www' => nil, '/var/mock' => nil}))
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2', '/dev/vda3', '/dev/vda4', '/dev/vda5'])
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda3').and_return('ext4')
+        guestfs.should_receive(:vfs_type).with('/dev/vda5').and_return('ext4')
 
         @helper.should_receive(:mount_partition).with('/dev/vda1', '/', '')
         @helper.should_receive(:mount_partition).with('/dev/vda2', '/home', '')
@@ -340,6 +362,8 @@ module BoxGrinder
         @helper.instance_variable_set(:@guestfs, guestfs)
 
         guestfs.should_receive(:list_partitions).and_return(['/dev/vda1', '/dev/vda2'])
+        guestfs.should_receive(:vfs_type).with('/dev/vda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/vda2').and_return('ext3')
 
         @helper.should_receive(:umount_partition).ordered.with('/dev/vda2')
         @helper.should_receive(:umount_partition).ordered.with('/dev/vda1')
@@ -398,5 +422,42 @@ module BoxGrinder
         @helper.log_hack
       end
     end
+
+    describe ".mountable_partitions" do
+      it "return list of partitions to mount without swap" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2'])
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('swap')
+
+        @helper.mountable_partitions('/dev/sda').should == ['/dev/sda1']
+      end
+
+      it "return list of partitions to mount with swap" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2'])
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('swap')
+
+        @helper.mountable_partitions('/dev/sda', :list_swap => true).should == ['/dev/sda1', '/dev/sda2']
+      end
+
+      it "return list of partitions to mount without extended partitions" do
+        guestfs = mock('Guestfs')
+        @helper.instance_variable_set(:@guestfs, guestfs)
+
+        guestfs.should_receive(:list_partitions).and_return(['/dev/sda1', '/dev/sda2', '/dev/sda3', '/dev/sda4', '/dev/sda5'])
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda3').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda5').and_return('ext3')
+
+        @helper.mountable_partitions('/dev/sda').should == ['/dev/sda1', '/dev/sda2', '/dev/sda3', '/dev/sda5']
+      end
+    end
   end
 end

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

@@ -71,6 +71,11 @@ module BoxGrinder
         @helper.partition_mount_points(hash).should == ['/', '/home']
       end
 
+      it "should return ['/', '/home', 'swap']" do
+        hash = {'swap' => {"size" => 1}, "/"=>{"size"=>2, "type"=>"ext3"}, "/home"=>{"size"=>2, "type"=>"ext3"}}
+        @helper.partition_mount_points(hash).should == ['/', '/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/os/fedora/fedora-plugin-spec.rb

@@ -39,6 +39,7 @@ module BoxGrinder
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '13'}))
       @appliance_config.stub!(:hardware).and_return(OpenCascade.new({:arch => 'x86_64'}))
       @appliance_config.stub!(:is64bit?).and_return(true)
+      @appliance_config.stub!(:packages).and_return(['mc'])
 
       @plugin = FedoraPlugin.new.init(@config, @appliance_config, {:class => BoxGrinder::FedoraPlugin, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["11", "12", "13", "14", "rawhide"]}, :log => LogHelper.new(:level => :trace, :type => :stdout))
 
@@ -92,7 +93,7 @@ module BoxGrinder
       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.cfg").and_return(1)
+        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
@@ -100,7 +101,7 @@ module BoxGrinder
       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.cfg").and_return(0)
+        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
@@ -124,6 +125,51 @@ module BoxGrinder
       guestfs.should_receive(:ln_sf).with("/proc/self/mounts", "/etc/mtab")
       @plugin.link_mtab(guestfs)
     end
+
+    it "should replace GRUB legacy with GRUB2" do
+      guestfs = mock("GuestFS")
+      guestfs_helper = mock("GuestFSHelper")
+      guestfs_helper.should_receive(:sh).ordered.with("yum -y remove grub")
+      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")
+      @plugin.switch_to_grub2(guestfs, guestfs_helper)
+    end
+    describe ".execute" do
+      it "should make Fedora 15 or higher work" do
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '15'}))
+
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        @plugin.should_receive(:normalize_packages).ordered
+        @plugin.should_receive(:disable_biosdevname).ordered.with(guestfs)
+        @plugin.should_receive(:change_runlevel).ordered.with(guestfs)
+        @plugin.should_receive(:disable_netfs).ordered.with(guestfs)
+        @plugin.should_receive(:link_mtab).ordered.with(guestfs)
+
+        @plugin.should_receive(:build_with_appliance_creator).with("file", an_instance_of(Hash)).and_yield(guestfs, guestfs_helper)
+        @plugin.execute("file")
+      end
+
+      # https://issues.jboss.org/browse/BGBUILD-298
+      it "should for Fedora 16 or higher first install GRUB2 then look after it" do
+        @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '16'}))
+
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        @plugin.should_receive(:normalize_packages).ordered
+        @plugin.should_receive(:disable_biosdevname).ordered.with(guestfs)
+        @plugin.should_receive(:switch_to_grub2).ordered.with(guestfs, guestfs_helper)
+        @plugin.should_receive(:change_runlevel).ordered.with(guestfs)
+        @plugin.should_receive(:disable_netfs).ordered.with(guestfs)
+        @plugin.should_receive(:link_mtab).ordered.with(guestfs)
+
+        @plugin.should_receive(:build_with_appliance_creator).with("file", an_instance_of(Hash)).and_yield(guestfs, guestfs_helper)
+        @plugin.execute("file")
+      end
+    end
   end
 end
 

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

@@ -39,6 +39,7 @@ module BoxGrinder
       @appliance_config.stub!(:os).and_return(OpenCascade.new({:name => 'fedora', :version => '11'}))
       @appliance_config.stub!(:hardware).and_return(OpenCascade.new(:cpus => 1, :memory => 512, :partitions => {'/' => nil, '/home' => nil}))
       @appliance_config.stub!(:path).and_return(OpenCascade.new(:build => 'build/path', :main => 'mainpath'))
+      @appliance_config.stub!(:files).and_return({})
 
       @plugin = RPMBasedOSPlugin.new
 
@@ -221,6 +222,7 @@ module BoxGrinder
 
         @plugin.should_receive(:change_configuration).with(guestfs_helper)
         @plugin.should_receive(:apply_root_password).with(guestfs)
+        @plugin.should_receive(:set_label_for_swap_partitions).with(guestfs, guestfs_helper)
         @plugin.should_receive(:use_labels_for_partitions).with(guestfs)
         @plugin.should_receive(:disable_firewall).with(guestfs)
         @plugin.should_receive(:set_motd).with(guestfs)
@@ -341,5 +343,91 @@ module BoxGrinder
         @plugin.recreate_rpm_database(guestfs, guestfs_helper)
       end
     end
+
+    describe ".install_files" do
+      it "should install files with relative paths" do
+        @appliance_config.stub!(:files).and_return("/opt" => ['abc', 'def'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "file")
+
+        guestfs = mock("GuestFS")
+        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")
+
+        @plugin.install_files(guestfs)
+      end
+
+      it "should install files with absolute paths" do
+        @appliance_config.stub!(:files).and_return("/opt" => ['/opt/abc', '/opt/def'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "file")
+
+        guestfs = mock("GuestFS")
+        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")
+
+        @plugin.install_files(guestfs)
+      end
+
+      it "should install files with remote paths" do
+        @appliance_config.stub!(:files).and_return("/opt" => ['http://somehost/file.zip', 'https://somehost/something.tar.gz', 'ftp://somehost/ftp.txt'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "file")
+
+        guestfs = mock("GuestFS")
+
+        guestfs.should_receive(:exists).with("/opt").once.and_return(1)
+        guestfs.should_receive(:sh).with("cd /opt && curl -O -L http://somehost/file.zip")
+        guestfs.should_receive(:sh).with("cd /opt && curl -O -L https://somehost/something.tar.gz")
+        guestfs.should_receive(:sh).with("cd /opt && curl -O -L ftp://somehost/ftp.txt")
+
+        @plugin.install_files(guestfs)
+      end
+
+      it "should create the destination directory if it doesn't exists" do
+        @appliance_config.stub!(:files).and_return("/opt/aaa" => ['abc'])
+        @plugin.instance_variable_set(:@appliance_definition_file, "file")
+
+        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")
+
+        @exec_helper.should_receive(:execute).with("tar -cvf /tmp/bg_install_files.tar --wildcards ./abc")
+
+        @plugin.install_files(guestfs)
+      end
+    end
+
+    describe ".set_label_for_swap_partitions" do
+      it "should NOT set label for any partition" do
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        guestfs_helper.should_receive(:mountable_partitions).with('/dev/sda', :list_swap => true).and_return(['/dev/sda1', '/dev/sda2'])
+
+        guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('ext4')
+        guestfs.should_not_receive(:set_e2label)
+
+        @plugin.set_label_for_swap_partitions(guestfs, guestfs_helper)
+      end
+
+      it "should set label for swap partition" do
+        guestfs = mock("GuestFS")
+        guestfs_helper = mock("GuestFSHelper")
+
+        guestfs_helper.should_receive(:mountable_partitions).with('/dev/sda', :list_swap => true).and_return(['/dev/sda1', '/dev/sda2'])
+
+        guestfs.should_receive(:list_devices).and_return(['/dev/sda'])
+        guestfs.should_receive(:vfs_type).with('/dev/sda1').and_return('ext3')
+        guestfs.should_receive(:vfs_type).with('/dev/sda2').and_return('swap')
+        guestfs.should_receive(:mkswap_L).with('swap', '/dev/sda2')
+
+        @plugin.set_label_for_swap_partitions(guestfs, guestfs_helper)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  - 3
-  version: 0.9.5.3
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-27 00:00:00 +02:00
+date: 2011-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency