dock0 0.0.18 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d86c522c5bf668bd0cd71dca01380f1158577b1
-  data.tar.gz: 7e705f72379947f9616ecce7d6d53fda1f1f4c2b
+  metadata.gz: 9afeb4b7bbfa1f902ce7bd38953bbb0525afa5ae
+  data.tar.gz: 99742d7ad4ab6957a0b4bafc2650883088fef914
 SHA512:
-  metadata.gz: fb5a744af7e73ed0387f285f0742cdb40f0e83020edced95f41aec40a7e5da70ccef6673eec2da4f2c090a2f7bedd58e0664758d56a60a5c5c743ee2dadc94f5
-  data.tar.gz: 318e8c5493a2987684eb1ad00e3b0db6fc8fc538955f58de0b05524ecba1c4d33607b165f44e34911da2c011d1b8055d60980b3599c9a8753bb0f5077ebb953c
+  metadata.gz: d7ce4f31cf96516df77a9dd787f12ce96757730843c35429defbd8c33c125ff30d597a1b26ad00655b2d1fd6457d560ebd96cbe94a7bfe4a0543db4a2572cf87
+  data.tar.gz: 5c91c44a8b2e87622f210e75700837e99567cfac83fbf67efd8e4954dacd9e0abc04635e02e3295ab27366863fdfde37f27273c35ec1be9606d0208affa1dc16

data/dock0.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'dock0'
-  s.version     = '0.0.18'
+  s.version     = '0.1.0'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Builds a read-only Arch host for Docker'
@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['dock0']
 
-  s.add_development_dependency 'rubocop', '~> 0.24.0'
+  s.add_development_dependency 'rubocop', '~> 0.27.0'
   s.add_development_dependency 'rake', '~> 10.3.2'
-  s.add_development_dependency 'coveralls', '~> 0.7.0'
-  s.add_development_dependency 'rspec', '~> 3.0.0'
-  s.add_development_dependency 'fuubar', '~> 2.0.0.rc1'
+  s.add_development_dependency 'coveralls', '~> 0.7.1'
+  s.add_development_dependency 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'fuubar', '~> 2.0.0'
 end

data/lib/dock0.rb

@@ -1,7 +1,3 @@
-require 'yaml'
-require 'fileutils'
-require 'English'
-
 ##
 # Dock0 provides an interface for building Arch images
 module Dock0
@@ -13,138 +9,6 @@ module Dock0
       Dock0::Image.new(*args)
     end
   end
-
-  ##
-  # Default config for images
-  DEFAULT_CONFIG = {
-    'paths' => {
-      'device' => '/dev/xvdc',
-      'mount' => '/opt/target',
-      'build_file' => '/opt/build_file',
-      'build' => '/opt/build_file_mount',
-      'package_list' => './packages',
-      'overlay' => './overlay',
-      'scripts' => './scripts'
-    },
-    'root_size' => 512,
-    'fs' => {
-      'type' => 'ext4',
-      'flags' => '-F'
-    }
-  }
-
-  ##
-  # An Image is an Arch system being built
-  class Image
-    attr_reader :device_path, :config, :stamp
-
-    ##
-    # Make a new Image object with the given config
-
-    def initialize(*configs)
-      @config = configs.each_with_object(DEFAULT_CONFIG.dup) do |path, obj|
-        new = YAML.load(File.read(path))
-        next unless new
-        obj.merge! new
-      end
-      @stamp = Time.new.strftime '%F-%H%M'
-    end
-
-    def run(cmd)
-      results = `#{cmd} 2>&1`
-      return results if $CHILD_STATUS.success?
-      fail "Failed running #{cmd}:\n#{results}"
-    end
-
-    def run_chroot(cmd)
-      run "arch-chroot #{@config['paths']['build']} #{cmd}"
-    end
-
-    def prepare_device
-      puts "Making new filesystem on #{@config['paths']['device']}"
-      run "mkfs.ext4 -F #{@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']}"
-      mkfs = "mkfs.#{@config['fs']['type']} #{@config['fs']['flags']}"
-      run "#{mkfs} #{@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|
-        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']['build']
-      File.open("#{@config['paths']['build']}/.stamp", 'w') do |fh|
-        fh.write @stamp
-      end
-    end
-
-    def run_script(script)
-      Dir.chdir('.') { instance_eval File.read(script), script, 0 }
-    end
-
-    def run_scripts
-      Dir.glob(@config['paths']['scripts'] + '/*.rb').sort.each do |script|
-        puts "Running #{script}"
-        run_script script
-      end
-    end
-
-    def run_commands
-      cmds = @config.fetch('commands', {})
-      cmds.fetch('chroot', []).each do |cmd|
-        puts "Running #{cmd} in chroot"
-        run_chroot cmd
-      end
-      cmds.fetch('host', []).each do |cmd|
-        puts "Running #{cmd} on host"
-        run cmd
-      end
-    end
-
-    def finalize
-      puts 'Packing up root FS'
-      mount_path = @config['paths']['mount']
-      squash_path = "#{mount_path}/#{@stamp}.fs.sfs"
-      run "umount #{@config['paths']['build']}"
-      run "mksquashfs #{@config['paths']['build_file']} #{squash_path}"
-      File.symlink "#{@stamp}.fs.sfs", "#{mount_path}/root.fs.sfs"
-    end
-
-    def cleanup
-      puts 'Removing temporary build image'
-      File.unlink @config['paths']['build_file']
-      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
-      sleep 5
-      finalize
-      cleanup
-    end
-  end
 end
+
+require 'dock0/image'

data/lib/dock0/image.rb

@@ -0,0 +1,120 @@
+require 'yaml'
+require 'fileutils'
+require 'English'
+
+##
+# An Image is an Arch system being built
+module Dock0
+  class Image
+    attr_reader :device_path, :config, :stamp
+
+    DEFAULT_CONFIG = {
+      'paths' => {
+        'build_file' => '/opt/build_file',
+        'build' => '/opt/build_file_mount',
+        'package_list' => './packages',
+        'overlay' => './overlay',
+        'scripts' => './scripts',
+        'output' => './root.fs.sfs'
+      },
+      'fs' => {
+        'size' => 512,
+        'type' => 'ext4',
+        'flags' => '-F'
+      }
+    }
+
+    ##
+    # Make a new Image object with the given config
+
+    def initialize(*configs)
+      @config = configs.each_with_object(DEFAULT_CONFIG.dup) do |path, obj|
+        new = YAML.load(File.read(path))
+        next unless new
+        obj.merge! new
+      end
+      @paths = @config['paths']
+    end
+
+    def run(cmd)
+      results = `#{cmd} 2>&1`
+      return results if $CHILD_STATUS.success?
+      fail "Failed running #{cmd}:\n#{results}"
+    end
+
+    def run_chroot(cmd)
+      run "arch-chroot #{@config['paths']['build']} #{cmd}"
+    end
+
+    def prepare_root
+      build_file = @paths['build_file']
+      filesystem = @config['fs']
+      puts "Making build FS at #{build_file}"
+      run "dd if=/dev/zero of=#{build_file} bs=1M count=#{filesystem['size']}"
+      mkfs = "mkfs.#{filesystem['type']} #{filesystem['flags']}"
+      run "#{mkfs} #{build_file}"
+      puts "Mounting FS at #{@paths['build']}"
+      FileUtils.mkdir_p @paths['build']
+      run "mount #{build_file} #{@paths['build']}"
+    end
+
+    def install_packages
+      File.read(@config['paths']['package_list']).split("\n").each do |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']['build']
+    end
+
+    def run_script(script)
+      Dir.chdir('.') { instance_eval File.read(script), script, 0 }
+    end
+
+    def run_scripts
+      Dir.glob(@config['paths']['scripts'] + '/*.rb').sort.each do |script|
+        puts "Running #{script}"
+        run_script script
+      end
+    end
+
+    def run_commands
+      cmds = @config.fetch('commands', {})
+      cmds.fetch('chroot', []).each do |cmd|
+        puts "Running #{cmd} in chroot"
+        run_chroot cmd
+      end
+      cmds.fetch('host', []).each do |cmd|
+        puts "Running #{cmd} on host"
+        run cmd
+      end
+    end
+
+    def finalize
+      puts 'Packing up root FS'
+      squash_path = @config['paths']['output']
+      run "umount #{@config['paths']['build']}"
+      run "mksquashfs #{@config['paths']['build_file']} #{squash_path}"
+    end
+
+    def cleanup
+      puts 'Removing temporary build image'
+      File.unlink @config['paths']['build_file']
+    end
+
+    def easy_mode
+      prepare_root
+      install_packages
+      apply_overlay
+      run_scripts
+      run_commands
+      sleep 5
+      finalize
+      cleanup
+    end
+  end
+end

data/spec/dock0_spec.rb

@@ -11,17 +11,6 @@ describe Dock0 do
   describe Dock0::Image do
     let(:image) { Dock0::Image.new 'spec/examples/image.yml' }
 
-    it 'loads stacked config files' do
-      config_image = Dock0::Image.new(
-        'spec/examples/alpha.yml', 'spec/examples/beta.yml'
-      )
-      result = { 'foo' => 'override', 'test' => 5, 'other' => 6 }
-      expect(config_image.config).to eql Dock0::DEFAULT_CONFIG.merge(result)
-    end
-    it 'has a timestamp' do
-      expect(Dock0::Image.new.stamp).to match(/\d{4}-\d{2}-\d{2}-\d{4}/)
-    end
-
     describe '#run' do
       it 'runs a command' do
         expect(image.run('echo "hello"')).to eql "hello\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.1.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0
 description: Generates a read-only Arch host for running Docker containers
 email: me@lesaker.org
 executables:
@@ -98,6 +98,7 @@ files:
 - bin/dock0
 - dock0.gemspec
 - lib/dock0.rb
+- lib/dock0/image.rb
 - spec/dock0_spec.rb
 - spec/examples/alpha.yml
 - spec/examples/beta.yml