dock0 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfcec4e9449bb947d140d9f5170c853347c72b2
-  data.tar.gz: 25330447a67a1a60655e9bc1e44161decd0c731e
+  metadata.gz: b4ef255c069bf314b8c1f1108d0215ca2d42b94f
+  data.tar.gz: bc3b05cfc4b6da6e16860c5506d80689e9009dd2
 SHA512:
-  metadata.gz: 9c1b3bd103eed81464c5e310d25877b053690f1df7ddcabf769c30a6833443874a260027bb0689a7a7bf4f59e02f4e2ef7f0ebf2a9bb5c08be9f611ad0b3ddcd
-  data.tar.gz: a38460650f598efa379ae7103369f506094b7893e468dfbead4dc0f254c77d36ffcbea60cb583e78e01fd2c89fb72a85f8c78a89592caeee472aef243f5fe797
+  metadata.gz: 7d021f20b9729deb9548d7507c7b5b41d213fbc40a9317e46301f87899c8882554dda8e6686a85fc9df33c37f2978c8b569423fe6777708802da98b8421012e8
+  data.tar.gz: 7002494fe80e3ad94343c5fd0a8d2ee49965bc569acdd873e280c2867f02295dd1b448180b8f359cbca52e397745d3a8b23f681e65293045f18b957fa3992f01

data/.travis.yml

@@ -1,15 +1,15 @@
 language: ruby
 cache: bundler
+sudo: false
 rvm:
-- 2.1.2
-- 2.1.1
-- 2.1.0
-- 2.0.0
-- 1.9.3
+- 2.2.0
+- 2.1.5
+- 2.0.0-p598
+- 1.9.3-p551
 notifications:
   email: false
   irc:
-    channels:
-    - secure: dfWgouxmAn52BMnVIonQJv4XXXL+9nMRehTQIESu67yZF8laXmLfXFTer20OqLeHfjU94TL2LKaijzR1jlMKwwwe6960vsaWMlX4Lx9BK3OKDHO0d2+IpqrmKwlKyA2dfLTf0SX8VpaF6YNt88V6Zk7uiaiU9ea+9qYkBsFp2vc=
     template:
     - "%{repository}/%{branch}/%{build_number}: %{message} -- %{build_url}"
+    channels:
+    - irc.oftc.net#akerl

data/README.md

@@ -10,6 +10,11 @@ dock0
 
 Component generator for building Arch systems
 
+For information on how this is used, check out my blog posts:
+
+* [The original workflow](http://blog.akerl.org/2014/01/30/dock0-minimal-docker-host/)
+* [Newer layout, with more features](http://blog.akerl.org/2014/12/17/dock0-round-2/)
+
 ## Usage
 
 ### Build a rootfs

data/dock0.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
   s.executables = ['dock0']
 
   s.add_dependency 'mercenary', '~> 0.3.4'
-  s.add_dependency 'menagerie', '~> 0.0.1'
+  s.add_dependency 'menagerie', '~> 1.0.0'
+  s.add_dependency 'meld', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.28.0'
+  s.add_development_dependency 'rubocop', '~> 0.29.0'
   s.add_development_dependency 'rake', '~> 10.4.0'
   s.add_development_dependency 'coveralls', '~> 0.7.1'
-  s.add_development_dependency 'rspec', '~> 3.1.0'
+  s.add_development_dependency 'rspec', '~> 3.2.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
 end

data/lib/dock0.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'English'
 require 'fileutils'
+require 'meld'
 
 ##
 # Dock0 provides an interface for building Arch images
@@ -30,7 +31,7 @@ module Dock0
       @config = configs.each_with_object(default_config) do |path, obj|
         new = YAML.load(File.read(path))
         next unless new
-        obj.merge! new
+        obj.deep_merge! new
       end
       @paths = @config['paths']
     end

data/lib/dock0/install.rb

@@ -19,7 +19,7 @@ module Dock0
     end
 
     def build_url(artifact)
-      org = @config['org']
+      org = artifact['org'] || @config['org']
       name, version, file = artifact.values_at('name', 'version', 'file')
       "https://github.com/#{org}/#{name}/releases/download/#{version}/#{file}"
     end

data/lib/dock0/version.rb

@@ -1,5 +1,5 @@
 ##
 # Set the version (needed for Mercenary -v)
 module Dock0
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: meld
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Builds a read-only Arch host for Docker