boxgrinder-build 0.7.0 → 0.7.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.7.1
+
+* [BGBUILD-124] Guestfs fails while mounting multiple partitions with '_' prefix
+* [BGBUILD-123] Remove RPM database recreation code
 
 v0.7.0
 

data/Manifest

@@ -0,0 +1,31 @@
+CHANGELOG
+LICENSE
+Manifest
+README
+Rakefile
+bin/boxgrinder-build
+boxgrinder-build.gemspec
+lib/boxgrinder-build/appliance.rb
+lib/boxgrinder-build/helpers/appliance-customize-helper.rb
+lib/boxgrinder-build/helpers/augeas-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/managers/plugin-manager.rb
+lib/boxgrinder-build/plugins/base-plugin.rb
+rubygem-boxgrinder-build.spec
+spec/Rakefile
+spec/appliance-spec.rb
+spec/helpers/appliance-customize-helper-spec.rb
+spec/helpers/augeas-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/managers/plugin-manager-spec.rb
+spec/plugins/base-plugin-spec.rb
+spec/rspec/src/appliances/jeos-f13.appl
+spec/rspec/src/appliances/jeos-f13.ks

data/bin/boxgrinder-build

@@ -46,7 +46,7 @@ module Commander
 end
 
 program :name, 'BoxGrinder Build'
-program :version, '0.6.5'
+program :version, '0.7.1'
 program :description, "A tool for building VM images from simple definition files."
 program :help, 'Homepage', 'http://www.jboss.org/boxgrinder/build.html'
 program :help, 'Documentation', 'http://community.jboss.org/docs/DOC-14358'

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2011-01-03}
   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/helpers/guestfs-helper.rb

@@ -219,14 +219,6 @@ module BoxGrinder
       @log.trace "Partition mounted."
     end
 
-    # TODO this is shitty, I know... https://bugzilla.redhat.com/show_bug.cgi?id=507188
-    def rebuild_rpm_database
-      @log.debug "Cleaning RPM database..."
-      @guestfs.sh("rm -f /var/lib/rpm/__db.*")
-      @guestfs.sh("rpm --rebuilddb")
-      @log.debug "Cleaning RPM database finished."
-    end
-
     def mount_partitions
       root_partition = nil
 
@@ -245,7 +237,7 @@ module BoxGrinder
 
       @guestfs.list_partitions.each do |partition|
         next if partition == root_partition
-        mount_partition(partition, @guestfs.sh("/sbin/e2label #{partition}").chomp.strip)
+        mount_partition(partition, @guestfs.sh("/sbin/e2label #{partition}").strip.chomp.gsub('_', ''))
       end
     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.7.0
+Version: 0.7.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -85,6 +85,11 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Mon Dec 20 2010  <mgoldman@redhat.com> - 0.7.1-1
+- Upstream release: 0.7.1
+- [BGBUILD-123] Remove RPM database recreation code
+- [BGBUILD-124] Guestfs fails while mounting multiple partitions with '_' prefix
+
 * Fri Dec 17 2010  <mgoldman@redhat.com> - 0.7.0-1
 - Updated to upstream version: 0.7.0
 - [BGBUILD-113] Allow to specify supported file formats for operating system plugin

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

@@ -98,17 +98,26 @@ module BoxGrinder
       @helper.mount_partition("/dev/sda", "/")
     end
 
-    it "should rebuild RPM database for Fedora" do
+    it "should mount partitions" do
       guestfs = mock('Guestfs')
 
-      guestfs.should_receive(:sh).with("rm -f /var/lib/rpm/__db.*")
-      guestfs.should_receive(:sh).with("rpm --rebuilddb")
+      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
+
+      @helper.should_receive(:mount_partition).with('/boot', '/')
+      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(0)
+      guestfs.should_receive(:umount).with('/boot')
+      @helper.should_receive(:mount_partition).with('/', '/')
+      guestfs.should_receive(:exists).with('/sbin/e2label').and_return(1)
+
+      guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
+      guestfs.should_receive(:sh).with('/sbin/e2label /boot').and_return('/boot')
+      @helper.should_receive(:mount_partition).with('/boot', '/boot')
 
       @helper.instance_variable_set(:@guestfs, guestfs)
-      @helper.rebuild_rpm_database
+      @helper.mount_partitions
     end
 
-    it "should mount partitions" do
+    it "should mount partitions with new type of labels" do
       guestfs = mock('Guestfs')
 
       guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
@@ -120,7 +129,7 @@ module BoxGrinder
       guestfs.should_receive(:exists).with('/sbin/e2label').and_return(1)
 
       guestfs.should_receive(:list_partitions).and_return(['/boot', '/'])
-      guestfs.should_receive(:sh).with('/sbin/e2label /boot').and_return('/boot')
+      guestfs.should_receive(:sh).with('/sbin/e2label /boot').and_return('_/boot')
       @helper.should_receive(:mount_partition).with('/boot', '/boot')
 
       @helper.instance_variable_set(:@guestfs, guestfs)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency