system-builder 0.0.18 → 0.0.19

data/.gitignore

@@ -0,0 +1,2 @@
+*~
+pkg

data/Rakefile

@@ -1,26 +1,4 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/system_builder'
-
-Hoe.plugin :newgem
-# Hoe.plugin :website
-Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-Hoe.spec 'system-builder' do
-  self.version = SystemBuilder::VERSION
-  self.developer 'Alban Peignier', 'alban@tryphon.eu'
-  self.rubyforge_name       = self.name # TODO this is default value
-  self.url = "http://projects.tryphon.eu/system-builder"
-  # self.extra_deps         = [['activesupport','>= 2.0.2']]
-end
-
-require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-# task :default => [:spec, :features]
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/bin/box

@@ -2,6 +2,7 @@
 
 require 'optparse'
 
+@options = {}
 OptionParser.new do |opts|
   opts.banner = <<-BANNER.gsub(/^    /,'')
     Box : manage box
@@ -12,41 +13,148 @@ OptionParser.new do |opts|
     BANNER
   opts.separator ""
   opts.on("-r", "--root=disk|iso", String,
-          "The support used to boot") { |arg| @root = arg }
+          "The support used to boot") { |arg| @options[:root] = arg }
+  opts.on("-t", "--target=<disk device>", String,
+          "The target to clone an image") { |arg| @options[:target] = arg }
+  opts.on("-i", "--image=<disk image>", String,
+          "The box image to be cloned") { |arg| @options[:image] = arg }
+  opts.on("-h", "--host=<host>", String,
+          "The host to be upgraded") { |arg| @options[:host] = arg }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
   
   @command = ARGV.shift
-  
-  unless @command == "boot"
+
+  unless %w{boot clone upgrade}.include? @command
     puts opts; exit
   end
 end
 
-qemu_options = []
+class BoxCommand
 
-qemu_disks = []
+  def boot(options = {})
+    qemu_options = []
 
-case @root
-when "iso"
-  qemu_options << "-cdrom dist/iso"
-  qemu_options << "--boot order=d"
-else
-  qemu_disks << "dist/disk"
-end
+    qemu_disks = []
 
-qemu_disks.push *Dir["dist/storage*"]
+    case options[:root]
+    when "iso"
+      qemu_options << "-cdrom dist/iso"
+      qemu_options << "--boot order=d"
+    else
+      qemu_disks << "dist/disk"
+    end
 
-qemu_disks.each_with_index do |disk, index|
-  qemu_options << "-drive file=#{disk},if=ide,index=#{index+1},media=disk"
-end
+    qemu_disks.push *Dir["dist/storage*"]
+
+    qemu_disks.each_with_index do |disk, index|
+      qemu_options << "-drive file=#{disk},if=ide,index=#{index+1},media=disk"
+    end
+
+    qemu_options << "-net nic -net vde,sock=/var/run/vde2/tap0.ctl"
+
+    ENV['QEMU_AUDIO_DRV']='alsa'
+
+    qemu_command = "qemu -enable-kvm -m 512m -soundhw ac97 #{qemu_options.join(' ')}"
+
+    puts "Run #{qemu_command}"
+    system qemu_command
+  end
+
+  def clone(options = {})
+    target = (options[:target] or "/dev/sdb")
+    disk_image = (options[:image] or "dist/disk")
+    partition = "#{target}1"
+
+    if disk_image =~ /([a-z]+box)-(\d+-\d+)/
+      # like pigebox-20101014-1155
+      name = $1
+      release = $2
+      disk_image = "dist/#{name}-#{release}.disk"
+      sh "ssh dev.dbx.tryphon.priv cat /var/lib/buildbot/dist/#{name}/#{name}-#{release}.disk.gz | gunzip -c > #{disk_image}" unless File.exist?(disk_image)
+    end
+
+    raise "Can't find #{disk_image}" unless File.exists?(disk_image)
+
+    if partition_mount = mounts.assoc(partition)
+      partition_mount_point = partition_mount[1]
+    else
+      partition_mount_point = "/media/boot"
+      #sudo "mkdir #{partition_mount_point}" unless File.exist? partition_mount_point
+      #sudo "mount #{partition} #{partition_mount_point}"
+    end
+
+    #unless File.exists? "#{partition_mount_point}/config.pp"
+      $stdout.write "Confirm you want install box image (#{disk_image}) in #{target} [y/N] :"
+      $stdout.flush
+      exit 1 unless $stdin.read(1).downcase == 'y'
+    #end
+
+    if mounts.assoc(partition)
+      puts "Unmount #{target}"
+      exit 1 unless system "sudo umount #{partition}"
+    end
 
-qemu_options << "-net nic -net vde,sock=/var/run/vde2/tap0.ctl"
+    puts "Install filesystem"
+    sh "echo ',,L,*' | sudo /sbin/sfdisk -f -uS #{target}"
+    sudo "mke2fs -j -L boot #{partition}"
 
-ENV['QEMU_AUDIO_DRV']='alsa'
+    puts "Copy files"
+    sudo "mount #{partition} #{partition_mount_point}"
+    mount_disk_image_fs(disk_image) do |dir|
+      sudo "rsync -av #{dir}/ #{partition_mount_point}/"
+    end
+    sudo "umount #{partition_mount_point}"
 
-qemu_command = "qemu -enable-kvm -m 512m -soundhw ac97 #{qemu_options.join(' ')}"
+    puts "Install extlinux"
+    sudo "mount #{partition} build/root/boot"
+    sudo "mount proc build/root/proc -t proc"
+    sudo "mount -o bind /dev build/root/dev"
+
+    begin
+      sudo "chroot build/root /usr/bin/extlinux --install /boot"
+    ensure
+      sudo "umount build/root/proc"
+      sudo "umount build/root/boot"
+      sudo "umount build/root/dev"
+    end
+
+    sudo "dd if=build/root/usr/lib/syslinux/mbr.bin of=#{target}"
+  end
+
+  def sh(command)
+    puts "Run #{command}"
+    raise "command failed: '#{command}'" unless system command
+  end
+
+  def sudo(command)
+    sh "sudo #{command}"
+  end
+
+  def mounts
+    IO.readlines("/proc/mounts").map { |m| m.scan(/\S+/) }
+  end
+
+  def mount_disk_image_fs(disk_image)
+    mount_dir = "/tmp/mount_boot_fs"
+    sh "mkdir -p /tmp/mount_boot_fs"
+    begin
+      sudo "mount -o loop,offset=#{64*512} #{disk_image} #{mount_dir}"
+      yield mount_dir
+    ensure
+      sudo "umount #{mount_dir}"
+    end
+  end
+
+  def upgrade(options = {})
+    host = options[:host]
+    raise "No specified host for upgrade, use --host" unless host
+
+    sh "scp dist/latest.yml dist/upgrade.tar #{host}:/tmp/"
+    sh "ssh #{host} box-upgrade /tmp/upgrade.tar /tmp/latest.yml"
+  end
+
+end
 
-puts "Run #{qemu_command}"
-system qemu_command
+BoxCommand.new.send(@command, @options)

data/lib/system_builder/version.rb

@@ -0,0 +1,3 @@
+module SystemBuilder
+  VERSION = "0.0.19"
+end

data/lib/system_builder.rb

@@ -2,7 +2,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SystemBuilder
-  VERSION = '0.0.18'
 
   @@configurations = {}
   
@@ -18,6 +17,7 @@ module SystemBuilder
 
 end
 
+require 'system_builder/version'
 require 'system_builder/core_ext'
 require 'system_builder/disk_image'
 require 'system_builder/iso_image'

data/system-builder.gemspec

@@ -1,38 +1,21 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "system_builder/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{system-builder}
-  s.version = "0.0.9"
+  s.name        = "system-builder"
+  s.version     = SystemBuilder::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Alban Peignier", "Florent Peyraud"]
+  s.email       = ["alban@tryphon.eu", "florent@tryphon.eu"]
+  s.homepage    = "http://projects.tryphon.eu/system-builder"
+  s.summary     = %q{Build bootable images}
+  s.description = %q{}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alban Peignier"]
-  s.date = %q{2010-05-09}
-  s.default_executable = %q{system-builder}
-  s.description = %q{FIX (describe your package)}
-  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/disk_image.rb", "lib/system_builder/disk_squashfs_image.rb", "lib/system_builder/init_ram_fs_configurator.rb", "lib/system_builder/iso_image.rb", "lib/system_builder/iso_squashfs_image.rb", "lib/system_builder/live_image.rb", "lib/system_builder/mount_boot.sh", "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.6}
-  s.summary = %q{FIX (describe your package)}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "system-builder"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      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.4"])
-      s.add_dependency(%q<hoe>, [">= 2.6.0"])
-    end
-  else
-    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<hoe>, [">= 2.6.0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end

metadata

@@ -1,68 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Alban Peignier
+- Florent Peyraud
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 6
-        - 2
-        version: 2.6.2
-  type: :development
-  version_requirements: *id002
-description: FIX (describe your package)
+date: 2011-05-09 00:00:00 Z
+dependencies: []
+
+description: ""
 email: 
 - alban@tryphon.eu
+- florent@tryphon.eu
 executables: 
 - box
 - system-builder
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -95,6 +64,7 @@ files:
 - lib/system_builder/live_image.rb
 - lib/system_builder/mount_boot.sh
 - lib/system_builder/task.rb
+- lib/system_builder/version.rb
 - script/console
 - script/destroy
 - script/generate
@@ -104,14 +74,12 @@ files:
 - spec/system_builder/cli_spec.rb
 - system-builder.gemspec
 - tasks/rspec.rake
-has_rdoc: true
 homepage: http://projects.tryphon.eu/system-builder
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -135,9 +103,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: system-builder
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: FIX (describe your package)
-test_files: []
-
+summary: Build bootable images
+test_files: 
+- features/development.feature
+- features/step_definitions/common_steps.rb
+- features/support/common.rb
+- features/support/env.rb
+- features/support/matchers.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/system_builder/boot_spec.rb
+- spec/system_builder/cli_spec.rb