dock0 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86db9bf623fa4fbb36f27052e0840772fa84a5dd
-  data.tar.gz: d018c8f6b981ac4f65951c7071ae4d041f6b309a
+  metadata.gz: 72a1ac483ac3434ca192c35f523914204bcbb94b
+  data.tar.gz: 52387fb55eebc89045520cf4233baf152173d3ab
 SHA512:
-  metadata.gz: e53cdc249cb4ad2d804ba87035f3099e3b99befaf5af20ccc7816171dfb2517dee844652e5f16d02d065eec3903ecd666dd9083950c7b814e3a198b50cb10b76
-  data.tar.gz: 8de5fd31242d696a9d577a20225c6e7f6cad1358632c47fa42518496020421cf65d9a8162622fded233c50e146b56fcc331b2c5b7ed7aafb4c9efe02838ae35d
+  metadata.gz: 8fe7377163f44daef47d2a0ad380bb2884c1af22e8a58700004f4174b570a84455ef32e77a25ee2b033a6cfbee08cd1f0b253ad6a06b52deaaa4cc33383f0548
+  data.tar.gz: a97849f1eb43477128dcbc6e78294e64740de6be50b283fa308dd4bcb4748aec6a281dbc8cc8a7f1cc5628a6a6033b70125ac5cd1833aa9374b373ac76f41b97

data/.travis.yml

@@ -8,7 +8,6 @@ notifications:
   email: false
   irc:
     channels:
-      - ircs://irc.oftc.net:6697#akerl
-    channel_key: sekrit
+    - secure: dfWgouxmAn52BMnVIonQJv4XXXL+9nMRehTQIESu67yZF8laXmLfXFTer20OqLeHfjU94TL2LKaijzR1jlMKwwwe6960vsaWMlX4Lx9BK3OKDHO0d2+IpqrmKwlKyA2dfLTf0SX8VpaF6YNt88V6Zk7uiaiU9ea+9qYkBsFp2vc=
     template:
-      - '%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}'
+    - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"

data/README.md

@@ -1,9 +1,12 @@
 dock0
 =========
 
-[![Gem Version](https://badge.fury.io/rb/dock0.png)](http://badge.fury.io/rb/dock0)
-[![Dependency Status](https://gemnasium.com/akerl/dock0.png)](https://gemnasium.com/akerl/dock0)
-[![Code Climate](https://codeclimate.com/github/akerl/dock0.png)](https://codeclimate.com/github/akerl/dock0)
+[![Gem Version](https://img.shields.io/gem/v/dock0.svg)](https://rubygems.org/gems/dock0)
+[![Dependency Status](https://img.shields.io/gemnasium/dock0/dock0.svg)](https://gemnasium.com/dock0/dock0)
+[![Code Climate](https://img.shields.io/codeclimate/github/dock0/dock0.svg)](https://codeclimate.com/github/dock0/dock0)
+[![Coverage Status](https://img.shields.io/coveralls/dock0/dock0.svg)](https://coveralls.io/r/dock0/dock0)
+[![Build Status](https://img.shields.io/travis/dock0/dock0.svg)](https://travis-ci.org/dock0/dock0)
+[![MIT Licensed](https://img.shields.io/badge/license-MIT-green.svg)](https://tldrlegal.com/license/mit-license)
 
 Dynamic Arch image generator for building a read-only host system for [Docker](https://www.docker.io)
 
@@ -11,7 +14,7 @@ Dynamic Arch image generator for building a read-only host system for [Docker](h
 
 This is basically a meta-script that builds Arch images. Its primary use is to build read-only Docker hosts for me, but it could realistically be repurposed for other kinds of minimal deployments.
 
-An example configuration can be found in [this repo](https://www.github.com/akerl/my_dock0).
+An example configuration can be found in [this repo](https://www.github.com/dock0/host_config).
 
 The dock0 command accepts a list of configuration files as arguments. It changes to the directory of the first file given, so all other files and configuration options can use relative pathing based from that location:
 

data/Rakefile

@@ -1,21 +1,19 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-desc 'Update bundle'
-task :bundle do
-  `bundle update`
-end
+desc 'Run tests'
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run Rubocop on the gem'
 Rubocop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb', 'spec/*.rb', 'spec/helpers/*.rb', 'bin/*']
+  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
   task.fail_on_error = true
 end
 
 desc 'Run travis-lint on .travis.yml'
 task :travislint do
-  print 'There is an issue with your .travis.yml' unless system('travis-lint')
+  print 'There may be an issue with your .travis.yml' unless system('travis-lint')
 end
 
-task default: [:travislint, :rubocop, :build]
-task release: [:bundle]
+task default: [:spec, :travislint, :rubocop, :build]

data/dock0.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'dock0'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Builds a read-only Arch host for Docker'
@@ -14,8 +14,10 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['dock0']
 
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'travis-lint'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'fuubar'
+  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 'coveralls', '~> 0.7.0'
+  s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'fuubar', '~> 1.3.2'
 end

data/lib/dock0.rb

@@ -4,7 +4,6 @@ require 'English'
 
 ##
 # Dock0 provides an interface for building Arch images
-
 module Dock0
   class << self
     ##
@@ -17,7 +16,6 @@ module Dock0
 
   ##
   # An Image is an Arch system being built
-
   class Image
     attr_reader :device_path, :config
 
@@ -28,6 +26,7 @@ module Dock0
       @config = configs.each_with_object({}) do |path, obj|
         obj.merge! YAML.load(File.read(path))
       end
+      @stamp = Time.new.strftime '%F-%H%M'
     end
 
     def run(cmd)
@@ -66,6 +65,9 @@ module Dock0
       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_scripts
@@ -88,13 +90,19 @@ module Dock0
     end
 
     def finalize
-      sleep 5
       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']} \
-        #{@config['paths']['mount']}/root.fs.sfs"
+      run "mksquashfs #{@config['paths']['build_file']} #{squash_path}"
+      File.symlink "#{@stamp}.fs.sfs", "#{mount_path}/root.fs.sfs"
+    end
+
+    def cleanup
       puts 'Unmounting target device'
-      run "umount #{@config['paths']['mount']}"
+      run "umount #{mount_path}"
+      puts 'Removing temporary build image'
+      File.unlink @config['paths']['build_file']
     end
 
     def easy_mode
@@ -104,7 +112,9 @@ module Dock0
       apply_overlay
       run_scripts
       run_commands
+      sleep 5
       finalize
+      cleanup
     end
   end
 end

data/spec/dock0_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Dock0 do
+  it 'is' do
+    expect(1).to eql 1
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+require 'rspec'
+require 'dock0'

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
+- !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
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 description: Generates a read-only Arch host for running Docker containers
 email: me@lesaker.org
 executables:
@@ -73,10 +101,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -84,6 +112,8 @@ files:
 - bin/dock0
 - dock0.gemspec
 - lib/dock0.rb
+- spec/dock0_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/aker/dock0
 licenses:
 - MIT
@@ -94,18 +124,20 @@ 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.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Builds a read-only Arch host for Docker
-test_files: []
+test_files:
+- spec/dock0_spec.rb
+- spec/spec_helper.rb