system-builder 0.0.6 → 0.0.7

data/Manifest.txt

@@ -18,7 +18,10 @@ lib/system_builder/boot.rb
 lib/system_builder/cli.rb
 lib/system_builder/configurator.rb
 lib/system_builder/core_ext.rb
-lib/system_builder/image.rb
+lib/system_builder/disk_image.rb
+lib/system_builder/disk_squashfs_image.rb
+lib/system_builder/iso_image.rb
+lib/system_builder/live_image.rb
 lib/system_builder/task.rb
 script/console
 script/destroy

data/lib/system_builder/boot.rb

@@ -11,6 +11,18 @@ class SystemBuilder::DebianBoot
     @@default_mirror = mirror    
   end
 
+  @@apt_proxy = nil
+  def self.apt_proxy=(proxy)
+    @@apt_proxy = proxy    
+  end
+  def self.apt_proxy
+    @@apt_proxy
+  end
+
+  def self.apt_options
+    "-o Acquire::http::Proxy='#{apt_proxy}'" if apt_proxy
+  end
+
   def initialize(root)
     @root = root
 
@@ -42,7 +54,7 @@ class SystemBuilder::DebianBoot
   def bootstrap
     unless File.exists?(root)
       FileUtils::mkdir_p root
-      FileUtils::sudo "debootstrap", debbootstrap_options, version, root, mirror
+      FileUtils::sudo "debootstrap", debbootstrap_options, version, root, debbootstrap_url
     end
   end
 
@@ -81,7 +93,7 @@ class SystemBuilder::DebianBoot
     SystemBuilder::ProcConfigurator.new do |chroot|
       puts "* create fstab"
       chroot.image.open("/etc/fstab") do |f|
-        f.puts "LABEL=boot /boot vfat defaults,noatime 0 1"
+        f.puts "LABEL=boot /boot auto defaults,noatime,ro 0 0"
         %w{/tmp /var/run /var/log /var/lock /var/tmp}.each do |directory|
           f.puts "tmpfs #{directory} tmpfs defaults,noatime 0 0"
         end
@@ -108,10 +120,76 @@ class SystemBuilder::DebianBoot
   end
 
   def apt_configurator
-    # TODO see if this step is really needed
-    SystemBuilder::ProcConfigurator.new do |chroot|    
-      chroot.sudo "apt-get update"
+    AptConfigurator.new(self)
+  end
+
+  def apt_confd_proxy_file
+    "/etc/apt/apt.conf.d/02proxy-systembuilder"
+  end
+
+  class AptConfigurator
+
+    attr_reader :boot
+    def initialize(boot)
+      @boot = boot
+    end
+
+    def apt_proxy
+      SystemBuilder::DebianBoot.apt_proxy
+    end
+
+    def apt_options
+      SystemBuilder::DebianBoot.apt_options
+    end
+
+    def offline?
+      ENV['OFFLINE'] == 'true'
+    end
+
+    def debbootstrap_url
+      boot.debbootstrap_url
+    end
+
+    def mirror
+      boot.mirror
+    end
+
+    def sources_list(chroot)
+      File.readlines(chroot.image.file("/etc/apt/sources.list")).collect(&:strip)
+    end
+
+    def rewrite_sources_url(chroot)
+      return unless apt_proxy
+
+      chroot.image.open("/etc/apt/sources.list") do |f|
+        sources_list(chroot).each do |line|
+          f.puts line.gsub(/^deb #{debbootstrap_url}/, "deb #{mirror}")
+        end
+      end
+    end
+
+    def update(chroot)
+      chroot.sudo "apt-get #{apt_options} update" unless offline?
+    end
+
+    def apt_confd_file
+      boot.apt_confd_proxy_file
+    end
+
+    def configure_proxy(chroot)
+      return unless apt_proxy
+
+      chroot.image.open(apt_confd_file) do |f|
+        f.puts "Acquire::http { Proxy \"#{apt_proxy}\"; };"
+      end
     end
+
+    def configure(chroot)
+      rewrite_sources_url(chroot)
+      update(chroot)
+      configure_proxy(chroot)
+    end
+
   end
 
   def policyrc_configurator
@@ -126,6 +204,10 @@ class SystemBuilder::DebianBoot
 
   def apt_cleaner
     Proc.new do |chroot|
+      if chroot.image.exists?(apt_confd_proxy_file)
+        puts "* remove apt proxy configuration"
+        chroot.sudo "rm #{apt_confd_proxy_file}"
+      end
       puts "* clean apt caches"
       chroot.sudo "apt-get clean"      
       puts "* autoremove packages"
@@ -160,6 +242,14 @@ class SystemBuilder::DebianBoot
     end.compact
   end
 
+  def debbootstrap_url
+    if self.class.apt_proxy
+      "#{self.class.apt_proxy}#{mirror.gsub('http:/','')}"
+    else
+      mirror
+    end
+  end
+
   def image(&block)
     @image ||= Image.new(root)
 
@@ -190,9 +280,10 @@ class SystemBuilder::DebianBoot
     end
 
     def rsync(target, *sources)
+      sources = sources.flatten
       options = (Hash === sources.last ? sources.pop : {})
-      rsync_options = options.collect { |k,v| "--#{k}=#{v}" }
-      FileUtils::sudo "rsync -av #{rsync_options.join(' ')} #{sources.join(' ')} #{expand_path(target)}"
+      rsync_options = options.collect { |k,v| v == true ? "--#{k}" : "--#{k}=#{v}" }
+      FileUtils::sudo "rsync -a #{rsync_options.join(' ')} #{sources.join(' ')} #{expand_path(target)}"
     end
 
     def open(filename, &block) 
@@ -208,6 +299,7 @@ class SystemBuilder::DebianBoot
     def expand_path(path)
       File.join(@root,path)
     end
+    alias_method :file, :expand_path
 
     def exists?(path)
       path = expand_path(path)
@@ -225,7 +317,7 @@ class SystemBuilder::DebianBoot
     end
 
     def apt_install(*packages)
-      sudo "apt-get install --yes --force-yes #{packages.join(' ')}"
+      sudo "apt-get install #{SystemBuilder::DebianBoot.apt_options} --yes --force-yes #{packages.join(' ')}"
     end
 
     def cp(*arguments)

data/lib/system_builder/configurator.rb

@@ -20,6 +20,10 @@ module SystemBuilder
       @manifest = manifest
     end
 
+    def puppet_directories
+      %w{manifests files modules templates plugins}.collect { |d| "#{manifest}/#{d}" }.select { |d| File.directory?(d) }
+    end
+
     def configure(chroot)
       puts "* run puppet configuration"
 
@@ -30,12 +34,34 @@ module SystemBuilder
 
       unless File.directory?(manifest)
         chroot.image.install "/tmp/puppet.pp", manifest
-        chroot.sudo "puppet tmp/puppet.pp"
+        chroot.sudo "puppet --color=false tmp/puppet.pp | tee /tmp/puppet.log"
+        process_log_file(chroot.image.expand_path("/tmp/puppet.log"))
       else
-        chroot.image.mkdir "/tmp/puppet"
+        context_dir = "/tmp/puppet"
+        chroot.image.mkdir context_dir
+
+        chroot.image.rsync context_dir, puppet_directories, :exclude => "*~", :delete => true
+
+        chroot.image.mkdir "#{context_dir}/config"
+        chroot.image.open("#{context_dir}/config/fileserver.conf") do |f|
+          %w{files plugins}.each do |mount_point|
+            f.puts "[#{mount_point}]"
+            f.puts "path #{context_dir}/#{mount_point}"
+            f.puts "allow *"
+          end
+        end
+
+        chroot.image.mkdir "#{context_dir}/tmp"
+        chroot.sudo "puppet --color=false --modulepath '#{context_dir}/modules' --confdir='#{context_dir}/config' --templatedir='#{context_dir}/templates' --manifestdir='#{context_dir}/manifests' --vardir=#{context_dir}/tmp '#{context_dir}/manifests/site.pp' | tee #{context_dir}/puppet.log"
+
+        process_log_file(chroot.image.expand_path("#{context_dir}/puppet.log"))
+      end
+    end
 
-        chroot.image.rsync "/tmp/puppet", "#{manifest}/manifests", "#{manifest}/files", :exclude => "*~"
-        chroot.sudo "puppet tmp/puppet/manifests/site.pp"
+    def process_log_file(log_file)
+      FileUtils.cp log_file, "puppet.log"
+      unless File.readlines("puppet.log").grep(/^err:/).empty?
+        raise "Error(s) during puppet configuration, see puppet.log file"
       end
     end
 

data/lib/system_builder/{image.rb → disk_image.rb}

@@ -90,7 +90,7 @@ class SystemBuilder::DiskImage
 
   def sync_root_fs
     mount_root_fs do |mount_dir|
-      FileUtils::sudo "rsync -a --delete --exclude='boot/**' #{boot.root}/ #{mount_dir}"
+      FileUtils::sudo "rsync -a --delete --exclude='boot/**' --exclude='tmp/**' #{boot.root}/ #{mount_dir}"
     end
     FileUtils.touch file
   end
@@ -113,7 +113,7 @@ class SystemBuilder::DiskImage
         f.puts "default linux"
         f.puts "label linux"
         f.puts "kernel #{readlink_boot_file('vmlinuz')}"
-        f.puts "append ro root=#{root} initrd=#{readlink_boot_file('initrd.img')}"
+        f.puts "append ro root=#{root} initrd=#{readlink_boot_file('initrd.img')} console=tty0 console=ttyS0"
       end
     end
   end

data/lib/system_builder/disk_squashfs_image.rb

@@ -0,0 +1,165 @@
+require 'tempfile'
+
+class SystemBuilder::DiskSquashfsImage
+
+  attr_accessor :boot, :size
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+    @size = 512.megabytes
+  end
+
+  def create
+    boot.configurators << SystemBuilder::ProcConfigurator.new do |chroot|
+      puts "* install initramfs-tools"
+      chroot.apt_install %w{initramfs-tools syslinux}
+
+      script = "/usr/share/initramfs-tools/scripts/local-top/mount_boot"
+      unless chroot.image.exists?(script)
+        chroot.image.open(script) do |f|
+        f.puts <<EOF
+#!/bin/sh -x
+case ${1:-} in
+  prereqs) echo ""; exit 0;;
+esac
+modprobe loop
+mkdir /boot
+mount -r -t ext3 LABEL=#{fs_label} /boot
+exit 0
+EOF
+        end  
+        chroot.sudo "chmod +x #{script}"
+
+        chroot.image.mkdir "/usr/share/initramfs-tools/scripts/local-bottom"
+        chroot.image.open("/usr/share/initramfs-tools/scripts/local-bottom/umount_boot") do |f|
+        f.puts <<EOF
+#!/bin/sh -x
+case ${1:-} in
+  prereqs) echo ""; exit 0;;
+esac
+mount -n -o move /boot /root/boot
+exit 0
+EOF
+        end  
+        chroot.sudo "chmod +x /usr/share/initramfs-tools/scripts/local-bottom/umount_boot"
+
+        chroot.image.open("/etc/initramfs-tools/modules") do |f|
+          f.puts "squashfs"
+        end
+        chroot.sudo "/usr/sbin/update-initramfs -u"
+      end
+    end
+
+    boot.create
+
+    file_creation = (not File.exists?(file))
+    if file_creation
+      create_file
+      create_partition_table
+
+      format_boot_fs
+    end
+
+    sync_boot_fs
+    install_extlinux_files
+
+    compress_root_fs
+    install_extlinux
+
+    self
+  end
+
+  def create_file
+    FileUtils::sh "dd if=/dev/zero of=#{file} count=#{size.in_megabytes.to_i} bs=1M"
+  end
+
+  def create_partition_table
+    # Partition must be bootable for syslinux
+    FileUtils::sh "echo '#{free_sectors},,L,*' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
+  end
+ 
+  def format_boot_fs
+    loop_device = "/dev/loop0"
+    begin
+      FileUtils::sudo "losetup -o #{boot_fs_offset} #{loop_device} #{file}"
+      FileUtils::sudo "mke2fs -L #{fs_label} -jqF #{loop_device} #{boot_fs_block_size}"
+    ensure
+      FileUtils::sudo "losetup -d #{loop_device}"
+    end
+  end
+
+  def mount_boot_fs(mount_dir = "/tmp/mount_boot_fs", &block)
+    FileUtils::mkdir_p mount_dir
+
+    begin
+      FileUtils::sudo "mount -o loop,offset=#{boot_fs_offset} #{file} #{mount_dir}"
+      yield mount_dir
+    ensure
+      FileUtils::sudo "umount #{mount_dir}"
+    end
+  end
+
+  def compress_root_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "mksquashfs #{boot.root}/ #{mount_dir}/filesystem.squashfs -noappend -e #{boot.root}/"
+    end
+    FileUtils.touch file
+  end
+  
+  def sync_boot_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "rsync -a --delete #{boot.root}/boot/ #{mount_dir}/"
+      FileUtils::sudo "ln -s #{readlink_boot_file('initrd.img')} #{mount_dir}/initrd.img"
+      FileUtils::sudo "ln -s #{readlink_boot_file('vmlinuz')} #{mount_dir}/vmlinuz.img"
+    end
+    FileUtils.touch file
+  end
+
+  def install_extlinux_files(options = {})
+    root = (options[:root] or "LABEL=#{fs_label}")
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
+
+    mount_boot_fs do |mount_dir|
+      SystemBuilder::DebianBoot::Image.new(mount_dir).tap do |image|
+        image.open("extlinux.conf") do |f|
+          f.puts "DEFAULT linux"
+          f.puts "LABEL linux"
+          f.puts "SAY Now booting #{version} from syslinux ..."
+          f.puts "KERNEL /vmlinuz"
+          f.puts "APPEND ro initrd=/initrd.img boot=local root=/boot/filesystem.squashfs rootflags=loop rootfstype=squashfs debug"
+        end
+      end
+    end
+  end
+
+  def install_extlinux
+    mount_boot_fs("#{boot.root}/boot") do 
+      boot.chroot do |chroot|
+        chroot.sudo "extlinux --install -H16 -S63 /boot"
+      end
+    end
+    FileUtils::sh "dd if=#{boot.root}/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
+  end
+
+  def fs_label
+    "boot"
+  end
+
+  def readlink_boot_file(boot_file)
+    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
+  end
+
+  def free_sectors
+    64
+  end
+
+  def boot_fs_offset
+    free_sectors * 512
+  end
+
+  def boot_fs_block_size
+    linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*Linux}).first
+    linux_partition_info.split[5].to_i
+  end
+end

data/lib/system_builder/iso_image.rb

@@ -0,0 +1,55 @@
+require 'tempfile'
+
+class SystemBuilder::IsoImage
+
+  attr_accessor :boot
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+  end
+
+  def create
+    boot.create
+    create_iso
+
+    self
+  end
+
+  def create_iso
+    install_isolinux_files
+    make_iso_fs
+  end
+
+  def install_isolinux_files(options = {})
+    root = (options[:root] or "/dev/hdc")
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
+
+    boot.image do |image|
+      image.mkdir "/boot/isolinux"
+
+      image.open("/boot/isolinux/isolinux.cfg") do |f|
+        f.puts "default linux"
+        f.puts "label linux"
+        f.puts "kernel /vmlinuz"
+        f.puts "append ro root=#{root} initrd=/initrd.img"
+      end
+
+      image.install "/boot/isolinux", "/usr/lib/syslinux/isolinux.bin"
+    end
+  end
+
+  def readlink_boot_file(boot_file)
+    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
+  end
+
+  def make_iso_fs
+    FileUtils::sudo "mkisofs -quiet -R -o #{file} -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -A #{root_fs_label} -V #{root_fs_label} -graft-points -hide build/root/initrd.img -hide build/root/vmlinuz vmlinuz=#{boot.root}/boot/#{readlink_boot_file('vmlinuz')} initrd.img=#{boot.root}/boot/#{readlink_boot_file('initrd.img')} #{boot.root}"
+    FileUtils::sudo "chown $USER #{file}"
+  end
+
+  def root_fs_label
+    "root"
+  end
+
+end

data/lib/system_builder/live_image.rb

@@ -0,0 +1,130 @@
+require 'tempfile'
+
+class SystemBuilder::LiveImage
+
+  attr_accessor :boot, :size
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+    @size = 512.megabytes
+  end
+
+  def create
+    boot.configurators << SystemBuilder::ProcConfigurator.new do |chroot|
+      puts "* install live-initramfs"
+      chroot.apt_install %w{live-initramfs}
+    end
+
+    boot.create
+
+    file_creation = (not File.exists?(file))
+    if file_creation
+      create_file
+      create_partition_table
+
+      format_boot_fs
+    end
+
+    install_syslinux_files
+
+    sync_boot_fs
+    compress_root_fs
+    install_syslinux
+
+    self
+  end
+
+  def create_file
+    FileUtils::sh "dd if=/dev/zero of=#{file} count=#{size.in_megabytes.to_i} bs=1M"
+  end
+
+  def create_partition_table
+    # Partition must be bootable for syslinux
+    FileUtils::sh "echo '#{free_sectors},,b,*' | /sbin/sfdisk --no-reread -uS -H16 -S63 #{file}"
+  end
+ 
+  def format_boot_fs
+    loop_device = "/dev/loop0"
+    begin
+      FileUtils::sudo "losetup -o #{boot_fs_offset} #{loop_device} #{file}"
+      FileUtils::sudo "mkdosfs -v -F 32 #{loop_device} #{boot_fs_block_size}"
+    ensure
+      FileUtils::sudo "losetup -d #{loop_device}"
+    end
+  end
+
+  def mount_boot_fs(&block)
+    # TODO use a smarter mount_dir
+    mount_dir = "/tmp/mount_boot_fs"
+    FileUtils::mkdir_p mount_dir
+
+    begin
+      FileUtils::sudo "mount -o loop,offset=#{boot_fs_offset} #{file} #{mount_dir}"
+      yield mount_dir
+    ensure
+      FileUtils::sudo "umount #{mount_dir}"
+    end
+  end
+
+  def compress_root_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "mksquashfs #{boot.root}/ #{mount_dir}/live/filesystem.squashfs -e #{boot.root}/boot"
+    end
+    FileUtils.touch file
+  end
+  
+  def sync_boot_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "rsync -a --delete #{boot.root}/boot/ #{mount_dir}/live"
+    end
+    FileUtils.touch file
+  end
+
+  def install_syslinux_files(options = {})
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
+
+    mount_boot_fs do |mount_dir|
+      SystemBuilder::DebianBoot::Image.new(mount_dir).tap do |image|
+        image.open("/syslinux.cfg") do |f|
+          f.puts "default linux"
+          f.puts "label linux"
+          f.puts "kernel /live/#{readlink_boot_file('vmlinuz')}"
+          f.puts "append ro boot=live initrd=/live/#{readlink_boot_file('initrd.img')} persistent=nofiles"
+          # console=tty0 console=ttyS0
+        end
+      end
+    end
+    FileUtils.touch file
+  end
+
+  def readlink_boot_file(boot_file)
+    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
+  end
+
+  def install_syslinux
+    FileUtils::sh "syslinux -o #{boot_fs_offset} #{file}"
+    FileUtils::sh "dd if=/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
+  end
+
+  def convert(export_file, options = {})
+    unless FileUtils.uptodate? export_file, file
+      arguments = []
+      arguments << "-O #{options[:format]}" if options[:format]
+      FileUtils::sh "qemu-img convert -f raw #{file} #{arguments.join(' ')} #{export_file}"
+    end
+  end
+
+  def free_sectors
+    64
+  end
+
+  def boot_fs_offset
+    free_sectors * 512
+  end
+
+  def boot_fs_block_size
+    linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*W95 FAT32}).first
+    linux_partition_info.split[5].to_i
+  end
+end

data/lib/system_builder/task.rb

@@ -24,13 +24,33 @@ class SystemBuilder::Task < Rake::TaskLib
         @image.create
       end
       namespace :dist do
-        desc "Create vmwaire image in #{@image.file}.vdmk"
+        desc "Create vmware image in #{@image.file}.vdmk"
         task :vmware do
           @image.convert "#{@image.file}.vmdk", :format => "vmdk"
         end
+
+        desc "Create iso image in #{@image.file}.iso"
+        task :iso do
+          SystemBuilder::IsoImage.new("#{@image.file}.iso").tap do |image|
+            image.boot = @image.boot
+          end.create_iso
+        end
       end
       task "dist:vmware" => "dist"
 
+      namespace :build do
+        desc "Configure the image system"
+        task :configure do
+          @image.boot.configure
+          @image.boot.clean
+        end
+
+        desc "Clean the image system"
+        task :clean do
+          @image.boot.clean
+        end
+      end
+
       task :setup do
         required_packages = []
         required_packages << "qemu" # to convert image files

data/lib/system_builder.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SystemBuilder
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   @@configurations = {}
   
@@ -19,6 +19,9 @@ module SystemBuilder
 end
 
 require 'system_builder/core_ext'
-require 'system_builder/image'
+require 'system_builder/disk_image'
+require 'system_builder/iso_image'
+require 'system_builder/live_image'
+require 'system_builder/disk_squashfs_image'
 require 'system_builder/boot'
 require 'system_builder/configurator'

data/system-builder.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{system-builder}
-  s.version = "0.0.4"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2010-01-10}
+  s.date = %q{2010-04-17}
   s.default_executable = %q{system-builder}
   s.description = %q{FIX (describe your package)}
-  s.email = ["alban.peignier@free.fr"]
+  s.email = ["alban@tryphon.eu"]
   s.executables = ["system-builder"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/system-builder", "examples/Rakefile", "examples/config.rb", "examples/manifests/classes/test.pp", "examples/manifests/site.pp", "features/development.feature", "features/step_definitions/common_steps.rb", "features/support/common.rb", "features/support/env.rb", "features/support/matchers.rb", "lib/system_builder.rb", "lib/system_builder/boot.rb", "lib/system_builder/cli.rb", "lib/system_builder/configurator.rb", "lib/system_builder/core_ext.rb", "lib/system_builder/image.rb", "lib/system_builder/task.rb", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/system-builder_cli_spec.rb", "spec/system-builder_spec.rb", "system-builder.gemspec", "tasks/rspec.rake"]
-  s.homepage = %q{http://github.com/#{github_username}/#{project_name}}
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/system-builder", "examples/Rakefile", "examples/config.rb", "examples/manifests/classes/test.pp", "examples/manifests/site.pp", "features/development.feature", "features/step_definitions/common_steps.rb", "features/support/common.rb", "features/support/env.rb", "features/support/matchers.rb", "lib/system_builder.rb", "lib/system_builder/boot.rb", "lib/system_builder/cli.rb", "lib/system_builder/configurator.rb", "lib/system_builder/core_ext.rb", "lib/system_builder/disk_image.rb", "lib/system_builder/disk_squashfs_image.rb", "lib/system_builder/iso_image.rb", "lib/system_builder/live_image.rb", "lib/system_builder/task.rb", "script/console", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/system_builder/boot_spec.rb", "spec/system_builder/cli_spec.rb", "system-builder.gemspec", "tasks/rspec.rake"]
+  s.homepage = %q{http://projects.tryphon.eu/system-builder}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{system-builder}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{FIX (describe your package)}
 
   if s.respond_to? :specification_version then
@@ -25,17 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rubyforge>, [">= 2.0.3"])
-      s.add_development_dependency(%q<gemcutter>, [">= 0.3.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.5.0"])
+      s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_development_dependency(%q<hoe>, [">= 2.6.0"])
     else
-      s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
-      s.add_dependency(%q<gemcutter>, [">= 0.3.0"])
-      s.add_dependency(%q<hoe>, [">= 2.5.0"])
+      s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_dependency(%q<hoe>, [">= 2.6.0"])
     end
   else
-    s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
-    s.add_dependency(%q<gemcutter>, [">= 0.3.0"])
-    s.add_dependency(%q<hoe>, [">= 2.5.0"])
+    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+    s.add_dependency(%q<hoe>, [">= 2.6.0"])
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,39 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 +01:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id002
 description: FIX (describe your package)
 email: 
 - alban@tryphon.eu
@@ -74,7 +77,10 @@ files:
 - lib/system_builder/cli.rb
 - lib/system_builder/configurator.rb
 - lib/system_builder/core_ext.rb
-- lib/system_builder/image.rb
+- lib/system_builder/disk_image.rb
+- lib/system_builder/disk_squashfs_image.rb
+- lib/system_builder/iso_image.rb
+- lib/system_builder/live_image.rb
 - lib/system_builder/task.rb
 - script/console
 - script/destroy
@@ -99,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: system-builder
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: FIX (describe your package)