matthewtodd-captain 0.1.0 → 0.1.1

data/Rakefile

@@ -14,7 +14,7 @@ else
   require 'shoe'
 end
 
-Shoe.tie('captain', '0.1.0', 'Builds an Ubuntu installation CD just as you like it.') do |spec|
+Shoe.tie('captain', '0.1.1', 'Builds an Ubuntu installation CD just as you like it.') do |spec|
   spec.requirements = ['mkisofs']
   spec.add_development_dependency 'cucumber'
 end

data/captain.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{captain}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Matthew Todd"]
+  s.date = %q{2009-07-30}
+  s.default_executable = %q{captain}
+  s.email = %q{matthew.todd@gmail.com}
+  s.executables = ["captain"]
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = ["Rakefile", "captain.gemspec", "README.rdoc", "bin/captain", "examples/chef_client.rb", "features/installer_image.feature", "features/steps", "features/steps/captain_steps.rb", "features/support", "features/support/env.rb", "features/support/helpers.rb", "lib/captain", "lib/captain/application.rb", "lib/captain/image.rb", "lib/captain/package.rb", "lib/captain/package_list.rb", "lib/captain/release.rb", "lib/captain/remote.rb", "lib/captain/resource.rb", "lib/captain.rb", "resources/disk_base_components.erb", "resources/disk_base_installable.erb", "resources/disk_cd_type.erb", "resources/disk_info.erb", "resources/disk_udeb_include.erb", "resources/isolinux.bin", "resources/isolinux.cfg", "resources/preseed.seed.erb", "resources/release.erb", "resources/release_component.erb"]
+  s.rdoc_options = ["--main", "README.rdoc", "--title", "captain-0.1.1", "--inline-source"]
+  s.require_paths = ["lib"]
+  s.requirements = ["mkisofs"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Builds an Ubuntu installation CD just as you like it.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<matthewtodd-shoe>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+    else
+      s.add_dependency(%q<matthewtodd-shoe>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<matthewtodd-shoe>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+  end
+end

data/examples/chef_client.rb

@@ -0,0 +1,43 @@
+# This file is lifted from my first use case for Captain, bringing up a server
+# with the chef gems installed, so that I can then run something like
+#
+#  SERVER=https://my-chef-server chef-client --config /cdrom/bundle/client.rb --token ${MY_CHEF_VALIDATION_TOKEN}
+#
+# to get the party started. (Although, now that I think about it, maybe that
+# would be more appropriately as a post-install command.) I'm eagerly awaiting
+# the Ubuntu packages for chef!
+
+# This tag will be appended to the iso filename, to help me remember.
+tag 'chef-0.7.4'
+
+repositories  ['http://us.archive.ubuntu.com/ubuntu jaunty main restricted universe']
+tasks         ['minimal', 'standard'] #, 'server', 'openssh-server', 'mail-server', 'samba-server']
+
+# These packages (and their dependencies) will be included in the ISO image.
+include_packages [
+  # These guys are necessary to make it through the installation process.
+  'linux-server', 'language-support-en', 'grub',
+  # The chef::client recipe configures chef-client to run under runit.
+  'runit'
+]
+
+# These packages will be included in the ISO image *and* installed at the end
+# of the installation process.
+install_packages [
+  # These are roughly the packages mentioned at
+  # http://wiki.opscode.com/pages/viewpage.action?pageId=2457665 for
+  # bootstrapping a chef client. I've removed the 1.8 version suffixes so
+  # we'll depend on the default provided packages. I've also excluded wget
+  # (since we install rubygems as a package, below) and ssl-cert (since we
+  # won't need to generate any certificates).
+  'ruby', 'ruby-dev', 'libopenssl-ruby', 'rdoc', 'ri', 'irb', 'build-essential',
+  # Opscode suggest building rubygems from source, but I'm going to risk
+  # installing it as a debian package here for convenience.
+  'rubygems'
+]
+
+# Here we take advantage of the fact that captain automatically includes the
+# bundle directory in the ISO image.
+post_install_commands [
+  'in-target gem install /cdrom/bundle/gems/chef-0.7.4.gem --local'
+]

data/lib/captain/application.rb

@@ -67,13 +67,17 @@ module Captain
     end
 
     def create_iso_image
-      Image.new(working_directory).burn(iso_image_path)
+      Image.new(working_directory).burn(iso_image_path, iso_image_name)
     end
 
     def installer_repository_mirror_and_codename
       repositories.first.split(' ').slice(0, 2)
     end
 
+    def iso_image_name
+      "#{label} #{version} #{tag.capitalize}"
+    end
+
     def iso_image_path
       File.join(output_directory, "#{label}-#{version}-#{tag}-#{architecture}.iso".downcase)
     end

data/lib/captain/image.rb

@@ -6,7 +6,7 @@ module Captain
       @base_directory = base_directory
     end
 
-    def burn(path)
+    def burn(path, name)
       path = Pathname.new(path)
       path.parent.mkpath unless path.parent.directory?
 
@@ -21,7 +21,7 @@ module Captain
         '-no-emul-boot',
         '-output', path,
         '-rational-rock',
-        '-volid', 'Name',
+        '-volid', name,
         @base_directory) || raise('Error creating iso image.')
     end
   end

data/lib/captain/package.rb

@@ -9,6 +9,7 @@ module Captain
     attr_reader :md5sum
     attr_reader :mirror
     attr_reader :name
+    attr_reader :tasks
 
     def initialize(mirror, codename, component, manifest)
       @mirror       = mirror
@@ -31,8 +32,6 @@ module Captain
           @md5sum = $1.strip
         when /^Package:(.*)$/
           @name = $1.strip
-        when /^Provides:(.*)$/
-          @provides.merge(parse_list($1))
         when /^Recommends:(.*)$/
           @recommends.merge(parse_list($1))
         when /^Task:(.*)$/
@@ -51,14 +50,6 @@ module Captain
       stream.puts
     end
 
-    def tasks
-      @tasks
-    end
-
-    def name_and_provides
-      @name_and_provides ||= @provides.dup.add(@name)
-    end
-
     private
 
     def parse_list(string)

data/lib/captain/package_list.rb

@@ -32,7 +32,7 @@ module Captain
     end
 
     def select_packages_by_name(pool, names=@selectors)
-      pool.partition { |package| !package.name_and_provides.intersection(names).empty? }
+      pool.partition { |package| names.include?(package.name) }
     end
 
     def select_packages_by_dependencies(pool, dependent_packages)

data/resources/disk_info.erb

@@ -1 +1 @@
-<%= label %> <%= version %> <%= tag.capitalize %>
+<%= iso_image_name %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewtodd-captain
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matthew Todd
@@ -42,8 +42,10 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Rakefile
+- captain.gemspec
 - README.rdoc
 - bin/captain
+- examples/chef_client.rb
 - features/installer_image.feature
 - features/steps
 - features/steps/captain_steps.rb
@@ -77,7 +79,7 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- captain-0.1.0
+- captain-0.1.1
 - --inline-source
 require_paths: 
 - lib