boxgrinder-build 0.3.3 → 0.3.5

data/bin/boxgrinder-build

@@ -26,7 +26,7 @@ require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.8'
+gem 'boxgrinder-core', '>= 0.0.9'
 gem 'aws-s3', '>= 0.6.2'
 gem 'amazon-ec2', '>= 0.9.6'
 gem 'net-sftp', '>= 2.0.4'
@@ -40,7 +40,7 @@ gem 'commander', '>= 4.0.3'
 #$stderr.reopen('/dev/null')
 
 program :name, 'BoxGrinder'
-program :version, '0.3.0'
+program :version, '0.3.5'
 program :description, 'A tool for building VM images from simple definition files.'
 default_command :build
 
@@ -66,6 +66,9 @@ module BoxGrinder
       options.default :delivery => :none
       options.default :force    => false
 
+      options.name      = program(:name)
+      options.version   = program(:version)
+
       options.verbose   = $verbose
       options.platform  = options.platform.to_s.downcase.to_sym
       options.delivery  = options.delivery.to_s.downcase.to_sym

data/lib/boxgrinder-build/appliance.rb

@@ -28,11 +28,14 @@ require 'boxgrinder-core/validators/appliance-config-validator'
 module BoxGrinder
   class Appliance < Rake::TaskLib
 
-    def initialize(  appliance_definition_file, options = {} )
-      @config            = Config.new
+    def initialize( appliance_definition_file, options = {} )
+      @config                     = Config.new
       @appliance_definition_file  = appliance_definition_file
-      @log               = options[:log] || Logger.new(STDOUT)
-      @options           = options[:options]
+      @log                        = options[:log] || Logger.new(STDOUT)
+      @options                    = options[:options]
+
+      @config.name    = @options.name
+      @config.version = @options.version
     end
 
     def create

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

@@ -34,13 +34,13 @@ module BoxGrinder
       @plugin_helper    = options[:plugin_helper] || PluginHelper.new( :log => @log )
 
       @plugin_config    = {}
+      @deliverables     = Hash.new({})
 
       if self.respond_to?(:info)
         @config_file = "#{ENV['HOME']}/.boxgrinder/plugins/#{self.info[:name]}"
 
         read_plugin_config
 
-        @deliverables             = Hash.new({})
         @deliverables[:disk]      = nil
         @deliverables[:platform]  = self.info[:name]
       end

data/lib/boxgrinder-build/plugins/os/base/kickstart.rb

@@ -101,7 +101,6 @@ module BoxGrinder
       cost = 40
 
       for repo in valid_repos + @appliance_config.repos
-
         if repo.keys.include?('mirrorlist')
           urltype = 'mirrorlist'
         else

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

@@ -0,0 +1,51 @@
+# 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.
+#
+# 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
+# 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/os/base/rpm-based-os-plugin'
+
+module BoxGrinder
+  class RHELBasedOSPlugin < RPMBasedOSPlugin
+    def build_rhel( repos = {} )
+      adjust_partition_table
+
+      disk_path = build_with_appliance_creator( repos )  do |guestfs, guestfs_helper|
+        kernel_version = guestfs.ls("/lib/modules").first
+
+        @log.debug "Recreating initrd for #{kernel_version} kernel..."
+        guestfs.sh( "/sbin/mkinitrd -f -v --preload=mptspi /boot/initrd-#{kernel_version}.img #{kernel_version}" )
+        @log.debug "Initrd recreated."
+
+        @log.debug "Applying root password..."
+        guestfs.sh( "/usr/bin/passwd -d root" )
+        guestfs.sh( "/usr/sbin/usermod -p '#{@appliance_config.os.password.crypt((0...8).map{65.+(rand(25)).chr}.join)}' root" )
+        @log.debug "Password applied."
+      end
+
+      @log.info "Done."
+
+      disk_path
+    end
+
+    # https://bugzilla.redhat.com/show_bug.cgi?id=466275
+    def adjust_partition_table
+      @appliance_config.hardware.partitions['/boot'] = { 'root' => '/boot', 'size' => 0.1 } if @appliance_config.hardware.partitions['/boot'].nil?
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module BoxGrinder
       }
     end
 
-    def build_with_appliance_creator( repos )
+    def build_with_appliance_creator( repos = {} )
       Kickstart.new( @config, @appliance_config, repos, :log => @log ).create
       RPMDependencyValidator.new( @config, @appliance_config, @options ).resolve_packages
 
@@ -124,6 +124,11 @@ module BoxGrinder
     def install_repos( guestfs )
       @log.debug "Installing repositories from appliance definition file..."
       @appliance_config.repos.each do |repo|
+        if repo['ephemeral']
+          @log.debug "Repository '#{repo['name']}' is a ephemeral repo. It'll not be installed to appliance."
+          next
+        end
+
         @log.debug "Installing #{repo['name']} repo..."
         repo_file = File.read( "#{File.dirname( __FILE__ )}/src/base.repo").gsub( /#NAME#/, repo['name'] )
 

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

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

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

@@ -18,10 +18,10 @@
 # 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/os/base/rpm-based-os-plugin'
+require 'boxgrinder-build/plugins/os/base/rhel-based-os-plugin'
 
 module BoxGrinder
-  class CentOSPlugin < RPMBasedOSPlugin
+  class CentOSPlugin < RHELBasedOSPlugin
 
     CENTOS_REPOS = {
             "5" => {
@@ -44,29 +44,9 @@ module BoxGrinder
     end
 
     def execute
-      adjust_partition_table
+      raise "Build cannot be started until the plugin isn't initialized" if @initialized.nil?
 
-      disk_path = build_with_appliance_creator( CENTOS_REPOS )  do |guestfs, guestfs_helper|
-        kernel_version = guestfs.ls("/lib/modules").first
-
-        @log.debug "Recreating initrd for #{kernel_version} kernel..."
-        guestfs.sh( "/sbin/mkinitrd -f -v --preload=mptspi /boot/initrd-#{kernel_version}.img #{kernel_version}" )
-        @log.debug "Initrd recreated."
-
-        @log.debug "Applying root password..."
-        guestfs.sh( "/usr/bin/passwd -d root" )
-        guestfs.sh( "/usr/sbin/usermod -p '#{@appliance_config.os.password.crypt((0...8).map{65.+(rand(25)).chr}.join)}' root" )
-        @log.debug "Password applied."
-      end
-
-      @log.info "Done."
-
-      disk_path
-    end
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=466275
-    def adjust_partition_table
-      @appliance_config.hardware.partitions['/boot'] = { 'root' => '/boot', 'size' => 0.1 } if @appliance_config.hardware.partitions['/boot'].nil?
+      build_rhel( CENTOS_REPOS )
     end
   end
 end

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

@@ -18,10 +18,10 @@
 # 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/os/base/rpm-based-os-plugin'
+require 'boxgrinder-build/plugins/os/base/rhel-based-os-plugin'
 
 module BoxGrinder
-  class RHELPlugin < RPMBasedOSPlugin
+  class RHELPlugin < RHELBasedOSPlugin
     def info
       {
               :name       => :rhel,
@@ -31,8 +31,10 @@ module BoxGrinder
       }
     end
 
-    def build
+    def execute
       raise "Build cannot be started until the plugin isn't initialized" if @initialized.nil?
+
+      build_rhel
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +02:00
+date: 2010-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 8
-        version: 0.0.8
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -167,6 +167,7 @@ files:
 - lib/boxgrinder-build/plugins/os/base/src/base.repo
 - lib/boxgrinder-build/plugins/os/base/validators/rpm-dependency-validator.rb
 - lib/boxgrinder-build/plugins/os/base/kickstart.rb
+- lib/boxgrinder-build/plugins/os/base/rhel-based-os-plugin.rb
 - lib/boxgrinder-build/managers/base-plugin-manager.rb
 - lib/boxgrinder-build/managers/platform-plugin-manager.rb
 - lib/boxgrinder-build/managers/delivery-plugin-manager.rb