albanpeignier-gepetto 0.0.5 → 0.0.6

data/Manifest.txt

@@ -7,6 +7,7 @@ app_generators/gepetto/gepetto_generator.rb
 app_generators/gepetto/templates/Rakefile
 app_generators/gepetto/templates/config/fileserver.conf
 app_generators/gepetto/templates/config/puppet.conf
+app_generators/gepetto/templates/manifests/classes/empty.pp
 app_generators/gepetto/templates/manifests/defaults.pp
 app_generators/gepetto/templates/manifests/nodes.pp
 app_generators/gepetto/templates/manifests/site.pp
@@ -18,7 +19,6 @@ app_generators/gepetto/templates/script/puppetrun
 bin/gepetto
 gepetto.gemspec
 lib/gepetto.rb
-lib/gepetto/module.rb
 lib/gepetto/tasks.rb
 puppet_generators/module/USAGE
 puppet_generators/module/module_generator.rb

data/Rakefile

@@ -1,27 +1,24 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require 'rubygems'
+gem 'hoe', '>= 2.1.0'
+require 'hoe'
+require 'fileutils'
+
 require File.dirname(__FILE__) + '/lib/gepetto'
 
+Hoe.plugin :newgem
+
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('gepetto', Gepetto::VERSION) do |p|
-  p.developer('Alban Peignier', 'alban.peignier@free.fr')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_deps         = [
-     ['rubigen',">= #{RubiGen::VERSION}"],
-     ['echoe',">= 3.0.2"],
-     ['cucumber',">= 0.1.8"],
-     ['hoe',">= 1.8.0"],
-     ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  # p.extra_dev_deps = [
-  #   ['newgem', ">= #{::Newgem::VERSION}"]
-  # ]
+$hoe = Hoe.spec 'gepetto' do 
+  self.version = Gepetto::VERSION
+  self.developer('Alban Peignier', 'alban.peignier@free.fr')
+  self.changes              = self.paragraphs_of("History.txt", 0..1).join("\n\n")
+  self.rubyforge_name       = self.name # TODO this is default value
 
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+  self.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (self.rubyforge_name == self.name) ? self.rubyforge_name : "\#{self.rubyforge_name}/\#{self.name}"
+  self.remote_rdoc_dir = File.join(path.gsub(/^#{self.rubyforge_name}\/?/,''), 'rdoc')
+  self.rsync_args = '-av --delete --ignore-errors'
 end
 
 require 'newgem/tasks' # load /tasks/*.rake

data/app_generators/gepetto/templates/Rakefile

@@ -15,7 +15,7 @@ Sandbox.new do |s|
     # d.mirror = 'http://ftp.fr.debian.org/debian'
 
     # Use a local apt-proxy
-    # d.mirror = 'http://localhost:9999/debian'
+    # d.mirror = 'http://127.0.0.1:9999/debian'
   end
 
   # s.disk_size = '1G'

data/app_generators/gepetto/templates/manifests/classes/empty.pp

@@ -0,0 +1 @@
+# Remove me when your first classes are defined

data/app_generators/gepetto/templates/manifests/defaults.pp

@@ -0,0 +1,12 @@
+# Some useful defaults
+
+Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin:/usr/local/bin:/usr/local/sbin" }
+
+File { 
+  ignore => ['.svn', '.git', 'CVS' ], 
+  checksum => md5, 
+  owner => root, group => root, 
+  backup => server 
+}
+
+filebucket { server: server => puppet }

data/app_generators/gepetto/templates/script/puppetmasterd

@@ -6,7 +6,7 @@
 # change working directories
 OPTIONS="--logdir=$PWD/log --vardir=$PWD/tmp/lib --rundir=$PWD/tmp/run --ssldir=$PWD/tmp/ssl"
 # use local files
-OPTIONS="$OPTIONS --templatedir=$PWD/templates --manifestdir=$PWD/manifests --modulepath=$PWD/modules"
+OPTIONS="$OPTIONS --templatedir=$PWD/templates --manifestdir=$PWD/manifests --modulepath=$PWD/modules --confdir=$PWD/config"
 
 OPTIONS="$OPTIONS --certname=puppet --logdest=console"
 

data/gepetto.gemspec

@@ -2,50 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gepetto}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alban Peignier"]
-  s.date = %q{2009-02-03}
+  s.date = %q{2009-07-22}
   s.default_executable = %q{gepetto}
-  s.description = %q{A helper suite for Puppet projects to create, manage and help daily development  More information about Puppet: http://reductivelabs.com/trac/puppet/}
+  s.description = %q{A helper suite for Puppet projects to create, manage and help daily development
+
+More information about Puppet: http://reductivelabs.com/trac/puppet/}
   s.email = ["alban.peignier@free.fr"]
   s.executables = ["gepetto"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "app_generators/gepetto/USAGE", "app_generators/gepetto/gepetto_generator.rb", "app_generators/gepetto/templates/Rakefile", "app_generators/gepetto/templates/config/fileserver.conf", "app_generators/gepetto/templates/config/puppet.conf", "app_generators/gepetto/templates/manifests/nodes.pp", "app_generators/gepetto/templates/manifests/site.pp", "app_generators/gepetto/templates/manifests/templates.pp", "app_generators/gepetto/templates/script/module", "app_generators/gepetto/templates/script/puppetca", "app_generators/gepetto/templates/script/puppetmasterd", "app_generators/gepetto/templates/script/puppetrun", "bin/gepetto", "gepetto.gemspec", "lib/gepetto.rb", "lib/gepetto/module.rb", "lib/gepetto/tasks.rb", "puppet_generators/module/USAGE", "puppet_generators/module/module_generator.rb", "puppet_generators/module/templates/README", "puppet_generators/module/templates/manifests/init.pp", "script/destroy", "script/generate", "tasks/host.pp", "tasks/log.rake", "tasks/puppet.rake", "tasks/sandbox.pp", "tasks/sandbox.rake", "tasks/tmp.rake", "tasks/utils.rake"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "app_generators/gepetto/USAGE", "app_generators/gepetto/gepetto_generator.rb", "app_generators/gepetto/templates/Rakefile", "app_generators/gepetto/templates/config/fileserver.conf", "app_generators/gepetto/templates/config/puppet.conf", "app_generators/gepetto/templates/manifests/classes/empty.pp", "app_generators/gepetto/templates/manifests/defaults.pp", "app_generators/gepetto/templates/manifests/nodes.pp", "app_generators/gepetto/templates/manifests/site.pp", "app_generators/gepetto/templates/manifests/templates.pp", "app_generators/gepetto/templates/script/module", "app_generators/gepetto/templates/script/puppetca", "app_generators/gepetto/templates/script/puppetmasterd", "app_generators/gepetto/templates/script/puppetrun", "bin/gepetto", "gepetto.gemspec", "lib/gepetto.rb", "lib/gepetto/tasks.rb", "puppet_generators/module/USAGE", "puppet_generators/module/module_generator.rb", "puppet_generators/module/templates/README", "puppet_generators/module/templates/manifests/init.pp", "script/destroy", "script/generate", "tasks/host.pp", "tasks/log.rake", "tasks/puppet.rake", "tasks/sandbox.pp", "tasks/sandbox.rake", "tasks/tmp.rake", "tasks/utils.rake"]
   s.homepage = %q{http://github.com/albanpeignier/gepetto/}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{gepetto}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{A helper suite for Puppet projects to create, manage and help daily development  More information about Puppet: http://reductivelabs.com/trac/puppet/}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
-      s.add_runtime_dependency(%q<echoe>, [">= 3.0.2"])
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.1.8"])
-      s.add_runtime_dependency(%q<hoe>, [">= 1.8.0"])
-      s.add_runtime_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.2"])
     else
-      s.add_dependency(%q<rubigen>, [">= 1.5.2"])
-      s.add_dependency(%q<echoe>, [">= 3.0.2"])
-      s.add_dependency(%q<cucumber>, [">= 0.1.8"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<hoe>, [">= 2.3.2"])
     end
   else
-    s.add_dependency(%q<rubigen>, [">= 1.5.2"])
-    s.add_dependency(%q<echoe>, [">= 3.0.2"])
-    s.add_dependency(%q<cucumber>, [">= 0.1.8"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<hoe>, [">= 2.3.2"])
   end
 end

data/lib/gepetto.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Gepetto
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/tasks/host.pp

@@ -3,7 +3,10 @@ Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin" }
 # install qemu
 
 package { qemu: 
-  ensure => "0.9.1+svn20090104-1"
+  ensure => $operatingsystem ? {
+    debian => "0.9.1+svn20090104-1",
+    ubuntu => "latest"
+  }
 }
 
 case $operatingsystem {
@@ -28,7 +31,10 @@ case $operatingsystem {
 # compile kqemu module 
 
 package { kqemu-source:
-  ensure => "1.4.0~pre1-1",
+  ensure => $operatingsystem ? {
+    debian => "1.4.0~pre1-1",
+    ubuntu => "present"
+  },
   require => Package[qemu]
 }
 

data/tasks/sandbox.rake

@@ -84,10 +84,51 @@ class Sandbox < Rake::TaskLib
         end
 
         task :kernel do
-          # TODO : install a kernel and a boot loader grub
-          # mount do
-          #   sudo "chroot #{mount_point} sh -c \"echo 'do_initrd = Yes' >> /etc/kernel-img.conf && DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes grub linux-image-2.6-686\""
-          # end
+          mount do
+            chroot_sh "echo 'do_initrd = Yes' >> /etc/kernel-img.conf"
+
+            kernel_packages = {
+              'etch'     => 'linux-image-2.6-686',
+              'lenny'    => 'linux-image-2.6-686',
+              'hardy'    => 'linux-image-2.6.24-16-generic',
+              'intrepid' => 'linux-image-generic'
+            }
+            kernel_package = kernel_packages[self.bootstraper.version]
+
+            chroot_sh "DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes #{kernel_package}"
+          end
+        end
+
+        task :grub do
+          mount do
+            chroot_sh "DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes grub"
+
+            grub_dir = "#{mount_point}/boot/grub"
+            chroot_sh "mkdir /boot/grub" unless File.exists?(grub_dir)
+
+            stage_files = Dir["#{mount_point}/usr/lib/grub/**/stage?", "#{mount_point}/usr/lib/grub/**/e2fs_stage1_5"]
+            sudo "cp #{stage_files.join(' ')} #{grub_dir}"
+
+            Tempfile.open('menu_lst') do |f|
+              f.write(['default 0',
+                       'timeout 0',
+                       'title Linux',
+                       'root (hd0,0)',
+                       'kernel /vmlinuz root=/dev/hda1 ro',
+                       'initrd /initrd.img'].join("\n"))
+              f.close
+              sudo "cp #{f.path} #{grub_dir}"
+            end
+          end
+
+          Tempfile.open('grub_input') do |f| 
+            f.write(["device (hd0) #{disk_image}",
+                     "root (hd0,0)",
+                     "setup (hd0)",
+                     "quit"].join("\n"))
+            f.close
+            sudo "grub --device-map=/dev/null < #{f.path}"
+          end
         end
 
         task :config do
@@ -118,7 +159,7 @@ class Sandbox < Rake::TaskLib
       end
 
       desc "Create a fresh image for sandbox"
-      task :create => [ 'clean', 'create:image', 'create:fs', 'create:system', 'create:kernel', 'create:config', 'create:snapshot' ]
+      task :create => [ 'clean', 'create:image', 'create:fs', 'create:system', 'create:kernel', 'create:grub', 'create:config', 'create:snapshot' ]
 
       desc "Destroy sandbox images"
       task :destroy => 'clean' do
@@ -194,10 +235,7 @@ class Sandbox < Rake::TaskLib
       :daemonize => true,
       :snapshot => ENV['SNAPSHOT'],
       :hda => disk_image,
-      :initrd => '/initrd.img',
-      :kernel => '/vmlinuz',
-      :append => 'console=ttyS0 root=/dev/hda1 ro',
-      :nographic => true,
+      :nographic => false,
       :m => memory_size,
       :net => ["nic", "tap,ifname=#{tap_device}"]
     }.update(options)
@@ -225,7 +263,15 @@ class Sandbox < Rake::TaskLib
       end
     end.compact.join(' ')
 
-    sh "qemu #{options_as_string}"
+    qemu_command = 
+      case PLATFORM
+      when /x86_64/
+        "qemu-system-x86_64"
+      else
+        "qemu"
+      end
+
+    sh "#{qemu_command} #{options_as_string}"
   end
 
   def snapshot(name)
@@ -297,33 +343,64 @@ class Sandbox < Rake::TaskLib
     puts self.inspect
   end
 
+  def chroot_sh(cmd)
+    sudo "chroot #{mount_point} sh -c \"#{cmd}\""
+  end
+
 end
 
 class DebianBoostraper
 
-  attr_accessor :version, :mirror
+  attr_accessor :version, :mirror, :include, :exclude, :architecture
 
   def initialize(&block)
+    default_attributes
+
+    @include = %w{puppet ssh udev resolvconf}
+    @exclude = %w{syslinux at exim mailx libstdc++2.10-glibc2.2 mbr setserial fdutils info ipchains iptables lilo pcmcia-cs ppp pppoe pppoeconf pppconfig telnet exim4 exim4-base exim4-config exim4-daemon-light pciutils modconf tasksel console-common console-tools console-data base-config man-db manpages}
+
+    yield self if block_given?
+  end
+
+  def default_attributes
     @version = 'lenny'
     @mirror = 'http://ftp.debian.org/debian'
 
-    yield self if block_given?
+    @architecture =
+      case PLATFORM
+      when /x86_64/
+        "amd64"
+      else
+        "i386"
+      end
   end
 
   def bootstrap(root)
-    options = {
-      :arch => 'i386',
-      :exclude => debootstrap_excludes,
-      :include => %w{puppet ssh udev resolvconf}
-    }
-    
     options_as_string = options.collect{|k,v| "--#{k} #{Array(v).join(',')}"}.join(' ')
     sudo "debootstrap #{options_as_string} #{version} #{root} #{mirror}"
   end
 
-  def debootstrap_excludes
-    # excluded by qemu-make-debian-root
-    %w{syslinux at exim mailx libstdc++2.10-glibc2.2 mbr setserial fdutils info ipchains iptables lilo pcmcia-cs ppp pppoe pppoeconf pppconfig telnet exim4 exim4-base exim4-config exim4-daemon-light pciutils modconf tasksel console-common console-tools console-data base-config man-db manpages}
+  def options
+    {
+      :arch => architecture,  
+      :exclude => @exclude,
+      :include => @include
+    }
+  end
+
+end
+
+class UbuntuBoostraper < DebianBoostraper
+
+  def default_attributes
+    super
+
+    @version = 'intrepid'
+    @mirror = 'http://archive.ubuntu.com/ubuntu/'
+  end
+
+  def options
+    super.update :components => 'main,universe'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: albanpeignier-gepetto
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alban Peignier
@@ -9,62 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-03 00:00:00 -08:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: gepetto
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rubigen
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
 description: "A helper suite for Puppet projects to create, manage and help daily development  More information about Puppet: http://reductivelabs.com/trac/puppet/"
 email: 
@@ -76,7 +32,6 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
@@ -87,6 +42,8 @@ files:
 - app_generators/gepetto/templates/Rakefile
 - app_generators/gepetto/templates/config/fileserver.conf
 - app_generators/gepetto/templates/config/puppet.conf
+- app_generators/gepetto/templates/manifests/classes/empty.pp
+- app_generators/gepetto/templates/manifests/defaults.pp
 - app_generators/gepetto/templates/manifests/nodes.pp
 - app_generators/gepetto/templates/manifests/site.pp
 - app_generators/gepetto/templates/manifests/templates.pp
@@ -97,7 +54,6 @@ files:
 - bin/gepetto
 - gepetto.gemspec
 - lib/gepetto.rb
-- lib/gepetto/module.rb
 - lib/gepetto/tasks.rb
 - puppet_generators/module/USAGE
 - puppet_generators/module/module_generator.rb
@@ -112,7 +68,7 @@ files:
 - tasks/sandbox.rake
 - tasks/tmp.rake
 - tasks/utils.rake
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/albanpeignier/gepetto/
 post_install_message: 
 rdoc_options: 
@@ -137,7 +93,7 @@ requirements: []
 rubyforge_project: gepetto
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: "A helper suite for Puppet projects to create, manage and help daily development  More information about Puppet: http://reductivelabs.com/trac/puppet/"
 test_files: []