dock0 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b238d089226011f034ce5c9b8459534c6b513d4
-  data.tar.gz: 882458842cec24f4eab1fd917a4f65acb2c86678
+  metadata.gz: 88c5b1d4137f84e35d4a01d18b4ec614a4adb3b4
+  data.tar.gz: eb27dad335f368a046242a36475be8f844cdc041
 SHA512:
-  metadata.gz: c87a7ce67857bc1f87144c3e40d509f9705dd12af931ef793c322c8c085199b766a80e250966fa40ed657c785108050f7c0b46350c5ea972ca4e2af82d3c39bd
-  data.tar.gz: bf23b528e9973accfdf5d219751fd944b9f5309cfade57885a85793b5559d157d5590cb8630ca4d04156dfaeb7406d8400bfcbe03d716c19d3d747bc4a878ec3
+  metadata.gz: 37a3ad2c146edf4abe250ef0b0523dd0a43ce3b539177c14dbee9c40985a1c9fc2901f0de815d84206e46affd5b67606f9cea9ba110f82607d26279305f95e48
+  data.tar.gz: 9fc04569d006102707eb51b19357d3093717ab3be3c19f398599ac45b095699f93cb72b23d6ccaaecc13797d7dc88880db2e07b504182d8e039668e20f2e057d

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*.gem
 coverage/
 .coveralls.yml
 .bundle
+.test

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 cache: bundler
 rvm:
+- 2.1.2
+- 2.1.1
 - 2.1.0
 - 2.0.0
 - 1.9.3

data/Rakefile

@@ -6,14 +6,9 @@ desc 'Run tests'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run Rubocop on the gem'
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
   task.fail_on_error = true
 end
 
-desc 'Run travis-lint on .travis.yml'
-task :travislint do
-  print 'There may be an issue with your .travis.yml' unless system('travis-lint')
-end
-
-task default: [:spec, :travislint, :rubocop, :build]
+task default: [:spec, :rubocop, :build]

data/dock0.gemspec

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

data/lib/dock0.rb

@@ -14,17 +14,34 @@ module Dock0
     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
+  }
+
   ##
   # An Image is an Arch system being built
   class Image
-    attr_reader :device_path, :config
+    attr_reader :device_path, :config, :stamp
 
     ##
     # Make a new Image object with the given config
 
     def initialize(*configs)
-      @config = configs.each_with_object({}) do |path, obj|
-        obj.merge! YAML.load(File.read(path))
+      @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
@@ -35,9 +52,13 @@ module Dock0
       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.ext2 #{@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']}"
@@ -81,7 +102,7 @@ module Dock0
       cmds = @config['commands']
       cmds.fetch('chroot', []).each do |cmd|
         puts "Running #{cmd} in chroot"
-        run "arch-chroot #{@config['paths']['build']} #{cmd}"
+        run_chroot cmd
       end
       cmds.fetch('host', []).each do |cmd|
         puts "Running #{cmd} on host"

data/spec/dock0_spec.rb

@@ -1,7 +1,34 @@
 require 'spec_helper'
+require 'fileutils'
 
 describe Dock0 do
-  it 'is' do
-    expect(1).to eql 1
+  describe '#new' do
+    it 'creates Image objects' do
+      expect(Dock0.new).to be_an_instance_of Dock0::Image
+    end
+  end
+
+  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"
+      end
+      it 'raises if the command fails' do
+        expect { image.run('dasdks') }.to raise_error RuntimeError
+      end
+    end
   end
 end

data/spec/examples/alpha.yml

@@ -0,0 +1,4 @@
+---
+foo: bar
+test: 5
+...

data/spec/examples/beta.yml

@@ -0,0 +1,4 @@
+---
+foo: override
+other: 6
+...

data/spec/examples/image.yml

@@ -0,0 +1,5 @@
+---
+paths:
+  device: .test/fs
+  mount: .test/mount
+...

metadata

@@ -1,99 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: travis-lint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 2.0.0.rc1
 description: Generates a read-only Arch host for running Docker containers
 email: me@lesaker.org
 executables:
@@ -101,10 +87,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -113,6 +99,9 @@ files:
 - dock0.gemspec
 - lib/dock0.rb
 - spec/dock0_spec.rb
+- spec/examples/alpha.yml
+- spec/examples/beta.yml
+- spec/examples/image.yml
 - spec/spec_helper.rb
 homepage: https://github.com/aker/dock0
 licenses:
@@ -124,20 +113,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Builds a read-only Arch host for Docker
 test_files:
 - spec/dock0_spec.rb
+- spec/examples/alpha.yml
+- spec/examples/beta.yml
+- spec/examples/image.yml
 - spec/spec_helper.rb
+has_rdoc: