boxgrinder-build 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.6.1
+
+* [BGBUILD-81] post command execution w/ setarch breaks commands which are scripts
+
 v0.6.0
 
 * [BGBUILD-52] Wrong post section inheritance

data/README

@@ -1,6 +1,6 @@
 Project home page
 
-    http://www.jboss.org/stormgrind/projects/boxgrinder/build.html
+    http://www.jboss.org/boxgrinder
 
 Project documentation
 

data/Rakefile

@@ -7,5 +7,5 @@ Echoe.new("boxgrinder-build") do |p|
   p.url         = "http://www.jboss.org/boxgrinder"
   p.email       = "info@boxgrinder.org"
   p.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git|\.log/
-  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.0"]
+  p.runtime_dependencies = ["commander ~>4.0.3", "boxgrinder-core ~>0.1.1"]
 end

data/bin/boxgrinder-build

@@ -1,13 +1,10 @@
 #!/usr/bin/env ruby
 
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+# 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 2.1 of
+# 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,
@@ -22,7 +19,7 @@
 
 require 'rubygems'
 
-gem 'boxgrinder-core', '>= 0.1.0'
+gem 'boxgrinder-core', '>= 0.1.1'
 gem 'commander', '>= 4.0.3'
 
 require 'boxgrinder-core/helpers/log-helper'
@@ -38,7 +35,7 @@ end
 require 'commander/import'
 
 program :name, 'BoxGrinder Build'
-program :version, '0.6.0'
+program :version, '0.6.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,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.0"
+  s.version = "0.6.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-10-12}
+  s.date = %q{2010-11-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}
   s.executables = ["boxgrinder-build"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/boxgrinder-build", "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"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "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", "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", "boxgrinder-build.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/boxgrinder-build", "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", "boxgrinder-build.gemspec"]
   s.homepage = %q{http://www.jboss.org/boxgrinder}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README"]
   s.require_paths = ["lib"]
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.1.1"])
     else
       s.add_dependency(%q<commander>, ["~> 4.0.3"])
-      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
+      s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.1"])
     end
   else
     s.add_dependency(%q<commander>, ["~> 4.0.3"])
-    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.0"])
+    s.add_dependency(%q<boxgrinder-core>, ["~> 0.1.1"])
   end
 end

data/lib/boxgrinder-build/appliance.rb

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -123,12 +121,7 @@ module BoxGrinder
 
       delivery_plugin, delivery_plugin_info = PluginManager.instance.initialize_plugin(:delivery, @options.delivery )
       delivery_plugin.init( @config, @appliance_config, :log => @log, :plugin_info => delivery_plugin_info, :previous_plugin_info => previous_plugin_output[:plugin_info], :previous_deliverables => previous_plugin_output[:deliverables] )
-
-      if @options.delivery != delivery_plugin_info[:name]
-        delivery_plugin.run( @options.delivery )
-      else
-        delivery_plugin.run
-      end
+      delivery_plugin.run( @options.delivery )
     end
   end
 end

data/lib/boxgrinder-build/helpers/appliance-customize-helper.rb

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -40,6 +38,9 @@ module BoxGrinder
         return
       end
 
+      @log.trace "Enabling coredump catching for augeas..."
+      @guestfs.debug( "core_pattern", [ "/sysroot/core" ] )
+
       @guestfs.aug_init( "/", 32 )
 
       unload = []
@@ -73,4 +74,4 @@ module BoxGrinder
       @files[name][key] = value
     end
   end
-end
+end

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -24,14 +22,14 @@ require 'logger'
 
 module BoxGrinder
   class SilencerProxy
-    def initialize( o, destination )
+    def initialize(o, destination)
       @o            = o
       @destination  = destination
     end
 
-    def method_missing( m, *args, &block )
+    def method_missing(m, *args, &block)
       begin
-        redirect_streams( @destination ) do
+        redirect_streams(@destination) do
           @o.send(m, *args, &block)
         end
       rescue
@@ -39,20 +37,20 @@ module BoxGrinder
       end
     end
 
-    def redirect_streams( destination )
+    def redirect_streams(destination)
       old_stdout_stream = STDOUT.dup
       old_stderr_stream = STDERR.dup
 
-      STDOUT.reopen( destination )
-      STDERR.reopen( destination )
+      STDOUT.reopen(destination)
+      STDERR.reopen(destination)
 
       STDOUT.sync = true
       STDERR.sync = true
 
       yield
     ensure
-      STDOUT.reopen( old_stdout_stream )
-      STDERR.reopen( old_stderr_stream )
+      STDOUT.reopen(old_stdout_stream)
+      STDERR.reopen(old_stderr_stream)
     end
   end
 end
@@ -61,9 +59,9 @@ module Guestfs
   class Guestfs
     alias_method :sh_original, :sh
 
-    def sh( command )
+    def sh(command)
       begin
-        output = sh_original( command )
+        output = sh_original(command)
         puts output
       rescue => e
         puts "Error occurred while executing above command. Appliance may not work properly."
@@ -72,15 +70,15 @@ module Guestfs
       output
     end
 
-    def redirect( destination )
-      BoxGrinder::SilencerProxy.new( self, destination )
+    def redirect(destination)
+      BoxGrinder::SilencerProxy.new(self, destination)
     end
   end
 end
 
 module BoxGrinder
   class GuestFSHelper
-    def initialize( raw_disk, options = {} )
+    def initialize(raw_disk, options = {})
       @raw_disk = raw_disk
       @log      = options[:log] || Logger.new(STDOUT)
 
@@ -102,7 +100,7 @@ module BoxGrinder
         end
       end
 
-      helper = execute( write_pipe )
+      helper = execute(write_pipe)
 
       yield @guestfs, helper
 
@@ -113,14 +111,15 @@ module BoxGrinder
       Process.wait
     end
 
-    def execute( pipe = nil )
+    def execute(pipe = nil)
       @log.debug "Preparing guestfs..."
 
-      @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect( pipe )
+      @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect(pipe)
 
       # TODO remove this, https://bugzilla.redhat.com/show_bug.cgi?id=502058
-      @guestfs.set_append( "noapic" )
+      @guestfs.set_append("noapic")
 
+      @log.trace "Setting debug + trace..."
       @guestfs.set_verbose(1)
       @guestfs.set_trace(1)
 
@@ -130,22 +129,25 @@ module BoxGrinder
       # Looks like in F13 (qemu-img-0.12.3-8.fc13.i686) this is fixed
       qemu_wrapper = "/usr/share/qemu-stable/bin/qemu.wrapper"
 
-      if File.exists?( qemu_wrapper )
-        @guestfs.set_qemu( qemu_wrapper )
+      if File.exists?(qemu_wrapper)
+        @guestfs.set_qemu(qemu_wrapper)
       end
 
       @log.trace "Adding drive '#{@raw_disk}'..."
-      @guestfs.add_drive( @raw_disk )
+      @guestfs.add_drive(@raw_disk)
       @log.trace "Drive added."
 
+      @log.debug "Enabling networking for GuestFS..."
+      @guestfs.set_network(1)
+
       @log.debug "Launching guestfs..."
       @guestfs.launch
 
       case @guestfs.list_partitions.size
         when 0
-          mount_partition( @guestfs.list_devices.first, '/' )
+          mount_partition(@guestfs.list_devices.first, '/')
         when 1
-          mount_partition( @guestfs.list_partitions.first, '/' )
+          mount_partition(@guestfs.list_partitions.first, '/')
         else
           mount_partitions
       end
@@ -165,17 +167,17 @@ module BoxGrinder
       @log.trace "Guestfs closed."
     end
 
-    def mount_partition( part, mount_point )
+    def mount_partition(part, mount_point)
       @log.trace "Mounting #{part} partition to #{mount_point}..."
-      @guestfs.mount_options( "", part, mount_point )
+      @guestfs.mount_options("", part, mount_point)
       @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" )
+      @guestfs.sh("rm -f /var/lib/rpm/__db.*")
+      @guestfs.sh("rpm --rebuilddb")
       @log.debug "Cleaning RPM database finished."
     end
 
@@ -183,24 +185,33 @@ module BoxGrinder
       root_partition = nil
 
       @guestfs.list_partitions.each do |partition|
-        mount_partition( partition, '/' )
-        if @guestfs.exists( '/sbin/e2label' ) != 0
+        mount_partition(partition, '/')
+
+        # TODO: use this http://libguestfs.org/guestfs.3.html#guestfs_vfs_label
+        if @guestfs.exists('/sbin/e2label') != 0
           root_partition = partition
           break
         end
-        @guestfs.umount( partition )
+        @guestfs.umount(partition)
       end
 
-      raise "No root partition found for '#{File.basename( @raw_disk )}' disk!" if root_partition.nil?
+      raise "No root partition found for '#{File.basename(@raw_disk)}' disk!" if root_partition.nil?
 
       @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}").chomp.strip)
       end
     end
 
-    def augeas( &block )
-      AugeasHelper.new( @guestfs, self, :log => @log ).edit( &block )
+    def sh(cmd, options = {})
+      arch = options[:arch] || `uname -m`.chomp.strip
+
+      @log.debug "Executing #{cmd}"
+      @guestfs.sh("setarch #{arch} << SETARCH_EOF\n#{cmd.gsub('$', '\$')}\nSETARCH_EOF\n")
+    end
+
+    def augeas(&block)
+      AugeasHelper.new(@guestfs, self, :log => @log).edit(&block)
     end
   end
 end

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -66,4 +64,4 @@ module BoxGrinder
       @log.debug "Kernel image recreated."
     end
   end
-end
+end

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -29,46 +27,32 @@ module BoxGrinder
       @exec_helper      = options[:exec_helper] || ExecHelper.new({:log => @log})
     end
 
-    def package(deliverables, options = {})
-      type        =  options[:type]     || :tar
-      plugin_info =  options[:plugin_info]
-
-      platform = 'raw'
-
-      unless plugin_info.nil?
-        if plugin_info[:type] == :platform
-          platform = plugin_info[:name].to_s
-        end
-      end
-
+    def package(deliverables, package, type = :tar)
       files = []
 
       deliverables.each_value do |file|
         files << File.basename(file)
       end
 
-      #TODO rewrite this to use deliverables and previous_deliverables
-      package_path = "#{@dir.tmp}/#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}-#{@appliance_config.hardware.arch}-#{platform}.tgz"
-
-      if File.exists?(package_path)
-        @log.info "Package of #{type} type for #{@appliance_config.name} appliance and #{platform} platform already exists, skipping."
-        return package_path
+      if File.exists?(package)
+        @log.info "Package of #{type} type for #{@appliance_config.name} appliance already exists, skipping."
+        return package
       end
 
-      FileUtils.mkdir_p(File.dirname(package_path))
+      FileUtils.mkdir_p(File.dirname(package))
 
-      @log.info "Packaging #{@appliance_config.name} appliance for #{platform} platform to #{type}..."
+      @log.info "Packaging #{@appliance_config.name} appliance to #{type}..."
 
       case type
         when :tar
-          @exec_helper.execute "tar -C #{File.dirname(deliverables[:disk])} -cvzf '#{package_path}' #{files.join(' ')}"
+          @exec_helper.execute "tar -C #{File.dirname(deliverables[:disk])} -cvzf '#{package}' #{files.join(' ')}"
         else
           raise "Only tar format is currently supported."
       end
 
       @log.info "Appliance #{@appliance_config.name} packaged."
 
-      package_path
+      package
     end
   end
-end
+end

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -86,4 +84,4 @@ module BoxGrinder
     attr_reader :platform_plugins
     attr_reader :delivery_plugins
   end
-end
+end

data/lib/boxgrinder-build/managers/plugin-manager.rb

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,

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

@@ -1,11 +1,9 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
+#
+# 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 2.1 of
+# 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,
@@ -28,13 +26,13 @@ require 'logger'
 module BoxGrinder
   class BasePlugin
     def init(config, appliance_config, options = {})
-      @config           = config
-      @appliance_config = appliance_config
-      @options          = options
+      @config                 = config
+      @appliance_config       = appliance_config
+      @options                = options
 
-      @log              = options[:log]           || Logger.new(STDOUT)
-      @exec_helper      = options[:exec_helper]   || ExecHelper.new( :log => @log )
-      @image_helper     = options[:image_helper]  || ImageHelper.new( :log => @log )
+      @log                    = options[:log] || Logger.new(STDOUT)
+      @exec_helper            = options[:exec_helper] || ExecHelper.new(:log => @log)
+      @image_helper           = options[:image_helper] || ImageHelper.new(:log => @log)
 
       @plugin_info            = options[:plugin_info]
       @previous_plugin_info   = options[:previous_plugin_info]
@@ -54,14 +52,14 @@ module BoxGrinder
 
       read_plugin_config
 
-      @initialized = true
+      @initialized            = true
 
       after_init
 
       self
     end
 
-    def register_deliverable( deliverable )
+    def register_deliverable(deliverable)
       raise "You can only register deliverables after the plugin is initialized, please initialize the plugin using init method." if @initialized.nil?
       raise "Please specify deliverables as Hash, not #{deliverable.class}." unless deliverable.is_a?(Hash)
 
@@ -71,7 +69,7 @@ module BoxGrinder
       end
     end
 
-    def register_supported_os( name, versions )
+    def register_supported_os(name, versions)
       raise "You can register supported operating system only after the plugin is initialized, please initialize the plugin using init method." if @initialized.nil?
 
       @supported_oses[name] = OpenHash.new if @supported_oses[name].nil?
@@ -94,6 +92,16 @@ module BoxGrinder
       supported
     end
 
+    def current_platform
+      platform = :raw
+
+      if @previous_plugin_info[:type] == :platform
+        platform = @previous_plugin_info[:name]
+      end unless @previous_plugin_info.nil?
+
+      platform.to_s
+    end
+
     def validate_plugin_config(fields = [], doc = nil)
       more_info = doc.nil? ? '' : "See #{doc} for more info"
 
@@ -108,11 +116,11 @@ module BoxGrinder
       raise "You can only execute the plugin after the plugin is initialized, please initialize the plugin using init method." if @initialized.nil?
     end
 
-    def run( *args )
+    def run(*args)
       FileUtils.rm_rf @dir.tmp
       FileUtils.mkdir_p @dir.tmp
 
-      execute( *args )
+      execute(*args)
 
       after_execute
     end
@@ -123,7 +131,7 @@ module BoxGrinder
     def after_execute
       @deliverables.each do |name, path|
         @log.trace "Moving '#{path}' deliverable to target destination '#{@target_deliverables[name]}'..."
-        FileUtils.mv( path, @target_deliverables[name] )
+        FileUtils.mv(path, @target_deliverables[name])
       end
 
       FileUtils.rm_rf @dir.tmp
@@ -164,4 +172,4 @@ module BoxGrinder
       end
     end
   end
-end
+end

data/rubygem-boxgrinder-build.spec

@@ -0,0 +1,69 @@
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname boxgrinder-build
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global rubyabi 1.8
+
+Summary: A tool for creating appliances from simple plain text files
+Name: rubygem-%{gemname}
+Version: 0.6.1
+Release: 1%{?dist}
+Group: Development/Languages
+License: LGPL
+URL: http://www.jboss.org/boxgrinder
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+
+Requires: ruby(abi) = %{rubyabi}
+Requires: rubygems >= 1.2
+Requires: ruby >= 0
+Requires: rubygem(commander) => 4.0.3
+Requires: rubygem(commander) < 4.1
+Requires: rubygem(boxgrinder-core) => 0.1.0
+Requires: rubygem(boxgrinder-core) < 0.2
+BuildRequires: rubygems >= 1.2
+BuildRequires: ruby >= 0
+
+BuildArch: noarch
+Provides: rubygem(%{gemname}) = %{version}
+
+%description
+A tool for creating appliances from simple plain text files for various
+virtual environments
+
+%prep
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+gem install --local --install-dir %{buildroot}%{gemdir} \
+            --force --rdoc %{SOURCE0}
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{buildroot}%{gemdir}/bin
+find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%{_bindir}/boxgrinder-build
+%dir %{geminstdir}
+%{geminstdir}/bin
+%{geminstdir}/lib
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%doc %{geminstdir}/%{gemname}.gemspec
+%doc %{geminstdir}/rubygem-%{gemname}.spec
+%doc %{geminstdir}/CHANGELOG
+%doc %{geminstdir}/LICENSE
+%doc %{geminstdir}/README
+%doc %{geminstdir}/Manifest
+%doc %{geminstdir}/Rakefile
+%doc %{geminstdir}/spec
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%changelog
+* Mon Oct 18 2010  <mgoldman@redhat.com> - 0.6.1-1
+- Initial package

data/spec/Rakefile

@@ -1,3 +1,21 @@
+#
+# 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 'rake'
 require 'spec/rake/spectask'
 

data/spec/appliance-spec.rb

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/appliance'
 require 'rspec/rspec-config-helper'
 require 'ostruct'
@@ -180,7 +198,7 @@ module BoxGrinder
 
       delivery_plugin = mock('S3 Plugin')
       delivery_plugin.should_receive(:init)
-      delivery_plugin.should_receive(:run).with(no_args())
+      delivery_plugin.should_receive(:run).with( :same )
 
       @plugin_manager.should_receive(:plugins).and_return( { :delivery => "something" } )
       @plugin_manager.should_receive(:initialize_plugin).with(:delivery, :same).and_return([ delivery_plugin, {:class => Appliance, :type => :delivery, :name => :same, :full_name  => "A plugin"} ] )

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/helpers/appliance-customize-helper'
 require 'rspec/rspec-config-helper'
 

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/helpers/augeas-helper'
 
 module BoxGrinder
@@ -18,6 +36,7 @@ module BoxGrinder
     end
 
     it "should change configuration for one file" do
+      @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:aug_init).with('/', 32)
       @guestfs.should_receive(:aug_rm).with("/augeas/load//incl[. != '/etc/ssh/sshd_config']")
@@ -31,6 +50,7 @@ module BoxGrinder
     end
 
     it "should change configuration for two files" do
+      @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(1)
       @guestfs.should_receive(:aug_init).with('/', 32)
@@ -47,6 +67,7 @@ module BoxGrinder
     end
 
     it "should change one configuration for two files because one file doesn't exists" do
+      @guestfs.should_receive(:debug).with("core_pattern", ["/sysroot/core"])
       @guestfs.should_receive(:exists).with('/etc/ssh/sshd_config').and_return(1)
       @guestfs.should_receive(:exists).with('/etc/sysconfig/selinux').and_return(0)
       @guestfs.should_receive(:aug_init).with('/', 32)

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

@@ -1,14 +1,36 @@
+#
+# 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 'boxgrinder-build/helpers/guestfs-helper'
 
 module BoxGrinder
   describe GuestFSHelper do
 
+    before(:all) do
+      @arch = `uname -m`.chomp.strip
+    end
+
     before(:each) do
       @log    = Logger.new('/dev/null')
       @helper = GuestFSHelper.new('a/raw/disk', :log => @log)
     end
 
-    def prepare_and_launch( partitions )
+    def prepare_and_launch(partitions)
       guetfs = mock('Guestfs')
       guetfs.should_receive(:set_append).with('noapic')
       guetfs.should_receive(:set_verbose)
@@ -18,8 +40,9 @@ module BoxGrinder
 
       guetfs.should_receive(:set_qemu).with('/usr/share/qemu-stable/bin/qemu.wrapper')
       guetfs.should_receive(:add_drive).with('a/raw/disk')
+      guetfs.should_receive(:set_network).with(1)
       guetfs.should_receive(:launch)
-      guetfs.should_receive(:list_partitions).and_return( partitions )
+      guetfs.should_receive(:list_partitions).and_return(partitions)
 
       Guestfs.should_receive(:create).and_return(guetfs)
 
@@ -123,7 +146,24 @@ module BoxGrinder
       end
     end
 
+    it "execute a command for current arch" do
+      guestfs = mock('Guestfs')
 
+      @helper.should_receive(:`).with('uname -m').and_return('bleh')
+      @helper.instance_variable_set(:@guestfs, guestfs)
+
+      guestfs.should_receive(:sh).with("setarch bleh << SETARCH_EOF\ncommand\nSETARCH_EOF\n")
 
+      @helper.sh("command")
+    end
+
+    it "execute a command for specified arch" do
+      guestfs = mock('Guestfs')
+      @helper.instance_variable_set(:@guestfs, guestfs)
+
+      guestfs.should_receive(:sh).with("setarch arch << SETARCH_EOF\ncommand\nSETARCH_EOF\n")
+
+      @helper.sh("command", :arch => 'arch')
+    end
   end
 end

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/helpers/linux-helper'
 
 module BoxGrinder

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/helpers/package-helper'
 
 module BoxGrinder

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/helpers/plugin-helper'
 require 'rspec/rspec-config-helper'
 require 'ostruct'

data/spec/managers/plugin-manager-spec.rb

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/managers/plugin-manager'
 
 module BoxGrinder

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

@@ -1,3 +1,21 @@
+#
+# 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 'boxgrinder-build/plugins/base-plugin'
 require 'rspec/rspec-config-helper'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id002
 description: A tool for creating appliances from simple plain text files for various virtual environments.
@@ -88,6 +88,7 @@ files:
 - 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