dock0 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ef255c069bf314b8c1f1108d0215ca2d42b94f
-  data.tar.gz: bc3b05cfc4b6da6e16860c5506d80689e9009dd2
+  metadata.gz: 83c126fbfd1dce025ab4e55c8d5824c78427bfe5
+  data.tar.gz: b23d2424d470c95e2528b5abbc640c439b903c5f
 SHA512:
-  metadata.gz: 7d021f20b9729deb9548d7507c7b5b41d213fbc40a9317e46301f87899c8882554dda8e6686a85fc9df33c37f2978c8b569423fe6777708802da98b8421012e8
-  data.tar.gz: 7002494fe80e3ad94343c5fd0a8d2ee49965bc569acdd873e280c2867f02295dd1b448180b8f359cbca52e397745d3a8b23f681e65293045f18b957fa3992f01
+  metadata.gz: 10e63b9f04934b722d6aac4b2ea9e87a409c4c55b464cf6c668542ca1592302d541243c4847ffc935b6220f288f44dfec4999b8aa57e229fff0d7891826c7e77
+  data.tar.gz: c64d88a22c91e0ce3be3fde0fe971d474d067f35fbe19f193fb0d3088be45afa75560e4720a3cf2549c6fbd858bec5cb7802f31a659e0f6fa8120079277dc2bb

data/dock0.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mercenary', '~> 0.3.4'
   s.add_dependency 'menagerie', '~> 1.0.0'
   s.add_dependency 'meld', '~> 1.0.0'
+  s.add_dependency 'cymbal', '~> 1.0.0'
 
   s.add_development_dependency 'rubocop', '~> 0.29.0'
   s.add_development_dependency 'rake', '~> 10.4.0'

data/lib/dock0.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'English'
 require 'fileutils'
 require 'meld'
+require 'cymbal'
 
 ##
 # Dock0 provides an interface for building Arch images
@@ -31,17 +32,13 @@ module Dock0
       @config = configs.each_with_object(default_config) do |path, obj|
         new = YAML.load(File.read(path))
         next unless new
-        obj.deep_merge! new
+        obj.deep_merge! Cymbal.symbolize(new)
       end
-      @paths = @config['paths']
+      @paths = @config[:paths]
     end
 
     def default_config
-      {
-        'paths' => {
-          'scripts' => './scripts'
-        }
-      }
+      { paths: { scripts: './scripts' } }
     end
 
     def run(cmd)
@@ -51,7 +48,7 @@ module Dock0
     end
 
     def templates
-      Dir.chdir(@paths['templates']) do
+      Dir.chdir(@paths[:templates]) do
         Dir.glob('**/*').select { |x| File.file? x }
       end
     end
@@ -59,10 +56,10 @@ module Dock0
     def render_templates(prefix)
       templates.each do |path|
         puts "Templating #{path}"
-        template = File.read "#{@paths['templates']}/#{path}"
+        template = File.read "#{@paths[:templates]}/#{path}"
         parsed = ERB.new(template, nil, '<>').result(binding)
 
-        target_path = "#{@paths['build']}/#{prefix}/#{path}"
+        target_path = "#{@paths[:build]}/#{prefix}/#{path}"
         FileUtils.mkdir_p File.dirname(target_path)
         File.open(target_path, 'w') { |fh| fh.write parsed }
       end
@@ -73,7 +70,7 @@ module Dock0
     end
 
     def run_scripts
-      Dir.glob(@paths['scripts'] + '/*.rb').sort.each do |script|
+      Dir.glob(@paths[:scripts] + '/*.rb').sort.each do |script|
         puts "Running #{script}"
         run_script script
       end

data/lib/dock0/config.rb

@@ -7,29 +7,29 @@ module Dock0
   class Config < Base
     def default_config
       {
-        'paths' => {
-          'templates' => './templates',
-          'scripts' => './scripts',
-          'build' => './build/config',
-          'output' => './build.tar.gz'
+        paths: {
+          templates: './templates',
+          scripts: './scripts',
+          build: './build/config',
+          output: './build.tar.gz'
         }
       }
     end
 
     def finalize
-      puts "Packing config into #{@paths['output']}"
-      tar = Dir.chdir(File.dirname(@paths['build'])) do
+      puts "Packing config into #{@paths[:output]}"
+      tar = Dir.chdir(File.dirname(@paths[:build])) do
         run 'tar -cz --owner=root --group=root *'
       end
-      File.open(@paths['output'], 'w') { |fh| fh << tar }
+      File.open(@paths[:output], 'w') { |fh| fh << tar }
     end
 
     def easy_mode
-      cleanup @paths.values_at('build', 'output')
+      cleanup @paths.values_at(:build, :output)
       render_templates('templates')
       run_scripts
       finalize
-      cleanup @paths.values_at('build')
+      cleanup @paths.values_at(:build)
     end
   end
 end

data/lib/dock0/image.rb

@@ -6,58 +6,58 @@ module Dock0
   class Image < Base
     def default_config # rubocop:disable Metrics/MethodLength
       {
-        'paths' => {
-          'build_file' => './root.fs',
-          'build' => './build',
-          'package_list' => './packages',
-          'overlay' => './overlay',
-          'scripts' => './scripts',
-          'output' => './root.fs.sfs'
+        paths: {
+          build_file: './root.fs',
+          build: './build',
+          package_list: './packages',
+          overlay: './overlay',
+          scripts: './scripts',
+          output: './root.fs.sfs'
         },
-        'fs' => {
-          'size' => 512,
-          'type' => 'ext4',
-          'flags' => '-F'
+        fs: {
+          size: 512,
+          type: 'ext4',
+          flags: '-F'
         }
       }
     end
 
     def run_chroot(cmd)
-      run "arch-chroot #{@paths['build']} #{cmd}"
+      run "arch-chroot #{@paths[:build]} #{cmd}"
     end
 
     def prepare_root
-      build_file = @paths['build_file']
-      filesystem = @config['fs']
+      build_file = @paths[:build_file]
+      filesystem = @config[:fs]
       puts "Making build FS at #{build_file}"
-      run "dd if=/dev/zero of=#{build_file} bs=1MB count=#{filesystem['size']}"
-      mkfs = "mkfs.#{filesystem['type']} #{filesystem['flags']}"
+      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']}"
-      FileUtils.mkdir_p @paths['build']
-      run "mount #{build_file} #{@paths['build']}"
+      puts "Mounting FS at #{@paths[:build]}"
+      FileUtils.mkdir_p @paths[:build]
+      run "mount #{build_file} #{@paths[:build]}"
     end
 
     def install_packages
-      File.read(@paths['package_list']).split("\n").each do |package|
+      File.read(@paths[:package_list]).split("\n").each do |package|
         puts "Installing #{package}"
-        run "pacstrap -G -M #{@paths['build']} #{package}"
+        run "pacstrap -G -M #{@paths[:build]} #{package}"
       end
     end
 
     def apply_overlay
-      puts "Applying overlay from #{@paths['overlay']}"
-      overlay_path = @paths['overlay'] + '/.'
-      FileUtils.cp_r overlay_path, @paths['build']
+      puts "Applying overlay from #{@paths[:overlay]}"
+      overlay_path = @paths[:overlay] + '/.'
+      FileUtils.cp_r overlay_path, @paths[:build]
     end
 
     def run_commands
-      cmds = @config.fetch('commands', {})
-      cmds.fetch('chroot', []).each do |cmd|
+      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|
+      cmds.fetch(:host, []).each do |cmd|
         puts "Running #{cmd} on host"
         run cmd
       end
@@ -65,20 +65,20 @@ module Dock0
 
     def finalize
       puts 'Packing up root FS'
-      run "umount #{@paths['build']}"
-      FileUtils.rm_f @paths['output']
-      run "mksquashfs #{@paths['build_file']} #{@paths['output']}"
+      run "umount #{@paths[:build]}"
+      FileUtils.rm_f @paths[:output]
+      run "mksquashfs #{@paths[:build_file]} #{@paths[:output]}"
     end
 
     def easy_mode
-      cleanup @paths.values_at('build_file', 'build', 'output')
+      cleanup @paths.values_at(:build_file, :build, :output)
       prepare_root
       install_packages
       apply_overlay
       run_scripts
       run_commands
       finalize
-      cleanup @paths.values_at('build_file', 'build')
+      cleanup @paths.values_at(:build_file, :build)
     end
   end
 end

data/lib/dock0/install.rb

@@ -7,33 +7,33 @@ module Dock0
   class Install < Base
     def default_config
       {
-        'paths' => {
-          'templates' => './templates',
-          'scripts' => './scripts',
-          'build' => './build',
-          'base' => '/'
+        paths: {
+          templates: './templates',
+          scripts: './scripts',
+          build: './build',
+          base: '/'
         },
-        'org' => 'dock0',
-        'artifacts' => []
+        org: 'dock0',
+        artifacts: []
       }
     end
 
     def build_url(artifact)
-      org = artifact['org'] || @config['org']
-      name, version, file = artifact.values_at('name', 'version', 'file')
+      org = artifact[:org] || @config[:org]
+      name, version, file = artifact.values_at(:name, :version, :file)
       "https://github.com/#{org}/#{name}/releases/download/#{version}/#{file}"
     end
 
     def artifacts
-      @config['artifacts'].map do |artifact|
-        artifact['url'] ||= build_url(artifact)
+      @config[:artifacts].map do |artifact|
+        artifact[:url] ||= build_url(artifact)
         artifact
       end
     end
 
     def load_artifacts
-      Dir.chdir("#{@paths['build']}/#{@paths['base']}") do
-        menagerie = Menagerie.new @config['menagerie']
+      Dir.chdir("#{@paths[:build]}/#{@paths[:base]}") do
+        menagerie = Menagerie.new @config[:menagerie]
         menagerie.create artifacts
       end
     end

data/lib/dock0/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: cymbal
+  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