dock0 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0c85a99736593eaac925427d5d0b99d0eea0f55
-  data.tar.gz: 454ce31758bf64e21dcce751b72e8f16ff28a851
+  metadata.gz: 5e03efc79249c833960aa75d7df70773e809fec0
+  data.tar.gz: 06e14ea724f68d12664dc0e9df7bc5d5c5a20a86
 SHA512:
-  metadata.gz: 7f0f0a10d88d24def266db10a99833a0226f95e7eac7b26f5bf269469154f818e3a6659a8d6f710068faf901f173f365bf7c18f56afd6e8a9427e7b8af9f4c39
-  data.tar.gz: c81724d111c0556768b1475f86985062243bf1d67ed4fec577d57c2111841f5ccbd2595233405fe23da413e9a8080cdaa4f6f425f52a7e9f7bbcead09ff2218d
+  metadata.gz: 06c1c5c0a8f07af437714525a1c76a11fbbf790c27ab832e1126f639676fd97ad324ba8c2cbf201dc5a6bb75a093712d0098ff16390a777bf02b5a1faef1ac71
+  data.tar.gz: e6cc0e1b04ffc8edff39e8aa5d5cae671ca56f1b60280ab7180f851bd0855663ad9b5c6705150430ce18524594f4befa042034a5f146d530b96b7c8181e1e060

data/bin/dock0

@@ -1,8 +1,30 @@
 #!/usr/bin/env ruby
 
 require 'dock0'
+require 'mercenary'
 
-Dir.chdir File.dirname(ARGV.first)
-Dock0.new(*ARGV).easy_mode
+Mercenary.program(:dock0) do |p|
+  p.version Dock0::VERSION
+  p.description 'Tool for creating server components'
+  p.syntax 'dock0 [command] CONFIG1 [... CONFIGN]'
 
-puts 'All done!'
+  p.command(:image) do |c|
+    c.syntax 'image CONFIG1 [... CONFIGN]'
+    c.description 'Build a root image'
+
+    c.action do |args, _|
+      Dock0.easy_mode Dock0::Image, args
+      puts 'All done!'
+    end
+  end
+
+  p.command(:config) do |c|
+    c.syntax 'config CONFIG1 [... CONFIGN]'
+    c.description 'Build a configuration bundle'
+
+    c.action do |args, _|
+      Dock0.easy_mode Dock0::Config, args
+      puts 'All done!'
+    end
+  end
+end

data/dock0.gemspec

@@ -1,6 +1,9 @@
+$:.unshift File.expand_path('../lib/', __FILE__)
+require 'dock0/version'
+
 Gem::Specification.new do |s|
   s.name        = 'dock0'
-  s.version     = '0.1.4'
+  s.version     = Dock0::VERSION
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Builds a read-only Arch host for Docker'
@@ -14,8 +17,10 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files spec/*`.split
   s.executables = ['dock0']
 
+  s.add_dependency 'mercenary', '~> 0.3.4'
+
   s.add_development_dependency 'rubocop', '~> 0.27.0'
-  s.add_development_dependency 'rake', '~> 10.3.2'
+  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 'fuubar', '~> 2.0.0'

data/lib/dock0.rb

@@ -1,3 +1,6 @@
+require 'yaml'
+require 'English'
+
 ##
 # Dock0 provides an interface for building Arch images
 module Dock0
@@ -8,7 +11,54 @@ module Dock0
     def new(*args)
       Dock0::Image.new(*args)
     end
+
+    ##
+    # Helper for simplifying object creation
+    def easy_mode(type, args)
+      Dir.chdir File.dirname(args.first)
+      const_get(type).new(*args).easy_mode
+    end
+  end
+
+  ##
+  # Base class for common methods
+  class Base
+    attr_reader :config
+
+    DEFAULT_CONFIG = {
+      'paths' => {
+        'scripts' => './scripts'
+      }
+    }
+
+    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_script(script)
+      Dir.chdir('.') { instance_eval File.read(script), script, 0 }
+    end
+
+    def run_scripts
+      Dir.glob(@paths['scripts'] + '/*.rb').sort.each do |script|
+        puts "Running #{script}"
+        run_script script
+      end
+    end
   end
 end
 
+require 'dock0/version'
 require 'dock0/image'
+require 'dock0/config'

data/lib/dock0/config.rb

@@ -0,0 +1,36 @@
+require 'erb'
+require 'fileutils'
+
+module Dock0
+  ##
+  # A Config is a system-specific customization layer
+  class Config < Base
+    DEFAULT_CONFIG = {
+      'paths' => {
+        'templates' => './templates',
+        'build' => './build'
+      }
+    }
+
+    def templates
+      Dir.chdir(@paths['templates']) do
+        Dir.glob('**/*').select { |x| File.file? x }
+      end
+    end
+
+    def render_templates
+      templates.each do |path|
+        template = File.read "#{@paths['templates']}/#{path}"
+        parsed = ERB.new(template, nil, '<>').result(binding)
+
+        target_path = "#{@paths['build']}/templates/#{path}"
+        FileUtils.mkdir_p File.dirname(target_path)
+        File.open(target_path, 'w') { |fh| fh.write parsed }
+      end
+    end
+
+    def easy_mode
+      render_templates
+    end
+  end
+end

data/lib/dock0/image.rb

@@ -1,13 +1,9 @@
-require 'yaml'
 require 'fileutils'
-require 'English'
 
 module Dock0
   ##
-  # An Image is an Arch system being built
-  class Image
-    attr_reader :device_path, :config, :stamp
-
+  # An Image is a rootfs for a system
+  class Image < Base
     DEFAULT_CONFIG = {
       'paths' => {
         'build_file' => '/opt/build_file',
@@ -24,24 +20,6 @@ module Dock0
       }
     }
 
-    ##
-    # 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 #{@paths['build']} #{cmd}"
     end
@@ -50,7 +28,7 @@ module Dock0
       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']}"
+      run "dd if=/dev/zero of=#{build_file} bs=1MB count=#{filesystem['size']}"
       mkfs = "mkfs.#{filesystem['type']} #{filesystem['flags']}"
       run "#{mkfs} #{build_file}"
       puts "Mounting FS at #{@paths['build']}"
@@ -71,17 +49,6 @@ module Dock0
       FileUtils.cp_r overlay_path, @paths['build']
     end
 
-    def run_script(script)
-      Dir.chdir('.') { instance_eval File.read(script), script, 0 }
-    end
-
-    def run_scripts
-      Dir.glob(@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|

data/lib/dock0/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mercenary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.3.2
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +112,9 @@ files:
 - bin/dock0
 - dock0.gemspec
 - lib/dock0.rb
+- lib/dock0/config.rb
 - lib/dock0/image.rb
+- lib/dock0/version.rb
 - spec/dock0_spec.rb
 - spec/examples/alpha.yml
 - spec/examples/beta.yml