dock0 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e31bedaa3cdf7f2f0b6a1d9f3b2a616507c3e8
-  data.tar.gz: 4aa1571f764516df89d8ecef220b194c0ecad8d5
+  metadata.gz: d2f57a1a3b08ff1f59b94635eaeebe86039b4058
+  data.tar.gz: cfc32381992549151e151df216fffefd2ff30ea9
 SHA512:
-  metadata.gz: 490523b79088c2c192cfd060f8bebfd8f63de4f23c390f2604b8a42aa557195e05348554ca461fb9da38ac41d503f1150bd5ad67ea7fecf9f3345ff192edf1ab
-  data.tar.gz: 88b2b55fd8e9ae34af1ebca922cfcbc1a73b8250833daf352171830de2c22c1206980581398513f1790cd97242e1b3d98e7428d858d1f451304c8d63194c3478
+  metadata.gz: 99559e3271444984bfc633f002c62d65f89fead820e14840ad74b3406ea0d8ed4d13dda25b3df11199287ea4770d834a60aa1b7c0ca7dbf5ee660c5b031bfb5b
+  data.tar.gz: b5d1a12d8a1773dd1744a9e3099e9ccf85ec068f1f6d4fadfba06963dc2b64d70bbbeb343797bd07a44e41e91681125d2874914faaf13faa6b97c9be9a69b952

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 pkg/*.gem
 coverage/
 .coveralls.yml

data/bin/dock0

@@ -3,6 +3,6 @@
 require 'dock0'
 
 Dir.chdir File.dirname(ARGV.first)
-Dock0.new(ARGV).easy_mode
+Dock0.new(*ARGV).easy_mode
 
 puts 'All done!'

data/dock0.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'dock0'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Builds a read-only Arch host for Docker'
@@ -17,4 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop'
   s.add_development_dependency 'travis-lint'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'fuubar'
 end

data/lib/dock0.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'fileutils'
+require 'english'
 
 ##
 # Dock0 provides an interface for building Arch images
@@ -29,44 +30,80 @@ module Dock0
       end
     end
 
+    def run(cmd)
+      results = `#{cmd} 2>&1`
+      return results if $CHILD_STATUS.success?
+      fail "Failed running #{cmd}:\n#{results}"
+    end
+
     def prepare_device
-      `mkfs.ext2 #{@config['paths']['device']}`
-      `mount #{@config['paths']['device']} #{@config['paths']['mount']}`
+      puts "Making new filesystem on #{@config['paths']['device']}"
+      run "mkfs.ext2 #{@config['paths']['device']}"
+      puts "Mounting filesystem on #{@config['paths']['mount']}"
+      FileUtils.mkdir_p @config['paths']['mount']
+      run "mount #{@config['paths']['device']} #{@config['paths']['mount']}"
+    end
+
+    def prepare_root
+      puts "Making build FS at #{@config['paths']['build_file']}"
+      run "dd if=/dev/zero of=#{@config['paths']['build_file']} \
+        bs=1M count=#{@config['root_size']}"
+      run "mkfs.ext2 -F #{@config['paths']['build_file']}"
+      puts "Mounting FS at #{@config['paths']['build']}"
+      FileUtils.mkdir_p @config['paths']['build']
+      run "mount #{@config['paths']['build_file']} \
+        #{@config['paths']['build']}"
     end
 
     def install_packages
       File.read(@config['paths']['package_list']).split("\n").each do |package|
-        `pacstrap -G -M #{@config['paths']['mount']} #{package}`
+        puts "Installing #{package}"
+        run "pacstrap -G -M #{@config['paths']['build']} #{package}"
       end
     end
 
     def apply_overlay
+      puts "Applying overlay from #{@config['paths']['overlay']}"
       overlay_path = @config['paths']['overlay'] + '/.'
-      FileUtils.cp_r overlay_path, @config['paths']['mount']
+      FileUtils.cp_r overlay_path, @config['paths']['build']
     end
 
     def run_scripts
       Dir.glob(@config['paths']['scripts'] + '/*.rb').each do |script|
-        load script
+        puts "Running #{script}"
+        instance_eval File.read(script), script, 0
       end
     end
 
     def run_commands
       cmds = @config['commands']
       cmds.fetch('chroot', []).each do |cmd|
-        `arch_chroot #{@config['path']['mount']} #{cmd}`
+        puts "Running #{cmd} in chroot"
+        run "arch-chroot #{@config['paths']['build']} #{cmd}"
       end
       cmds.fetch('host', []).each do |cmd|
-        `#{cmd}`
+        puts "Running #{cmd} on host"
+        run cmd
       end
     end
 
+    def finalize
+      puts 'Packing up root FS'
+      run "umount #{@config['paths']['build']}"
+      run "mksquashfs #{@config['paths']['build_file']} \
+        #{@config['paths']['mount']}/root.fs.sfs"
+      puts 'Unmounting target device'
+      run "umount #{@config['paths']['mount']}"
+    end
+
     def easy_mode
       prepare_device
+      prepare_root
       install_packages
       apply_overlay
       run_scripts
       run_commands
+      finalize
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -52,6 +52,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generates a read-only Arch host for running Docker containers
 email: me@lesaker.org
 executables:
@@ -64,7 +106,6 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,34 +0,0 @@
-PATH
-  remote: .
-  specs:
-    dock0 (0.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (1.1.0)
-    hashr (0.0.22)
-    json (1.8.1)
-    parser (2.1.4)
-      ast (~> 1.1)
-      slop (~> 3.4, >= 3.4.5)
-    powerpack (0.0.9)
-    rainbow (1.99.2)
-    rake (10.1.1)
-    rubocop (0.17.0)
-      json (~> 1.8)
-      parser (~> 2.1.3)
-      powerpack (~> 0.0.6)
-      rainbow (~> 1.99.1)
-    slop (3.4.7)
-    travis-lint (1.7.0)
-      hashr (~> 0.0.22)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dock0!
-  rake
-  rubocop
-  travis-lint