dock0 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e03efc79249c833960aa75d7df70773e809fec0
-  data.tar.gz: 06e14ea724f68d12664dc0e9df7bc5d5c5a20a86
+  metadata.gz: dc715c368b527dcfc38003b9a92c518d02b33a04
+  data.tar.gz: 5dc7b512052f879254ba807a80b8e0c4d8cc0eb7
 SHA512:
-  metadata.gz: 06c1c5c0a8f07af437714525a1c76a11fbbf790c27ab832e1126f639676fd97ad324ba8c2cbf201dc5a6bb75a093712d0098ff16390a777bf02b5a1faef1ac71
-  data.tar.gz: e6cc0e1b04ffc8edff39e8aa5d5cae671ca56f1b60280ab7180f851bd0855663ad9b5c6705150430ce18524594f4befa042034a5f146d530b96b7c8181e1e060
+  metadata.gz: f532497c23cad81480947e8bf5c8952814d4761a0713c4089448cb8740adb5aec9162d718800ecbacd9bf491f155eac20f5b0a9002ebb844f04fd0cc4ef60dba
+  data.tar.gz: 0c5c7adfcb2eea1fa55722f470792a4c15c78076744e7853085ffc519114ee84c3feb55435dee1c40c7dbb668a150a7d1c7de0d596065646ba17968916ddfd4d

data/Rakefile

@@ -7,8 +7,8 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run Rubocop on the gem'
 RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
+  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb', 'bin/*']
   task.fail_on_error = true
 end
 
-task default: [:spec, :rubocop, :build]
+task default: [:spec, :rubocop, :build, :install]

data/bin/dock0

@@ -6,14 +6,14 @@ require 'mercenary'
 Mercenary.program(:dock0) do |p|
   p.version Dock0::VERSION
   p.description 'Tool for creating server components'
-  p.syntax 'dock0 [command] CONFIG1 [... CONFIGN]'
+  p.syntax 'dock0 <subcommand> [args]'
 
   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
+      Dock0.easy_mode :Image, args
       puts 'All done!'
     end
   end
@@ -23,8 +23,13 @@ Mercenary.program(:dock0) do |p|
     c.description 'Build a configuration bundle'
 
     c.action do |args, _|
-      Dock0.easy_mode Dock0::Config, args
+      Dock0.easy_mode :Config, args
       puts 'All done!'
     end
   end
+
+  p.action do
+    puts p
+    exit
+  end
 end

data/lib/dock0.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'English'
+require 'fileutils'
 
 ##
 # Dock0 provides an interface for building Arch images
@@ -25,14 +26,8 @@ module Dock0
   class Base
     attr_reader :config
 
-    DEFAULT_CONFIG = {
-      'paths' => {
-        'scripts' => './scripts'
-      }
-    }
-
     def initialize(*configs)
-      @config = configs.each_with_object(DEFAULT_CONFIG.dup) do |path, obj|
+      @config = configs.each_with_object(default_config) do |path, obj|
         new = YAML.load(File.read(path))
         next unless new
         obj.merge! new
@@ -40,6 +35,14 @@ module Dock0
       @paths = @config['paths']
     end
 
+    def default_config
+      {
+        'paths' => {
+          'scripts' => './scripts'
+        }
+      }
+    end
+
     def run(cmd)
       results = `#{cmd} 2>&1`
       return results if $CHILD_STATUS.success?
@@ -56,6 +59,11 @@ module Dock0
         run_script script
       end
     end
+
+    def cleanup(list)
+      puts "Removing: #{list.join(', ')}"
+      FileUtils.rm_rf list
+    end
   end
 end
 

data/lib/dock0/config.rb

@@ -5,12 +5,16 @@ module Dock0
   ##
   # A Config is a system-specific customization layer
   class Config < Base
-    DEFAULT_CONFIG = {
-      'paths' => {
-        'templates' => './templates',
-        'build' => './build'
+    def default_config
+      {
+        'paths' => {
+          'templates' => './templates',
+          'scripts' => './scripts',
+          'build' => './build/config',
+          'output' => './build.tar.gz'
+        }
       }
-    }
+    end
 
     def templates
       Dir.chdir(@paths['templates']) do
@@ -20,6 +24,7 @@ module Dock0
 
     def render_templates
       templates.each do |path|
+        puts "Templating #{path}"
         template = File.read "#{@paths['templates']}/#{path}"
         parsed = ERB.new(template, nil, '<>').result(binding)
 
@@ -29,8 +34,18 @@ module Dock0
       end
     end
 
+    def finalize
+      puts "Packing config into #{@paths['output']}"
+      tar = Dir.chdir(File.dirname(@paths['build'])) { run 'tar cz .' }
+      File.open(@paths['output'], 'w') { |fh| fh << tar }
+    end
+
     def easy_mode
+      cleanup @paths.values_at('build', 'output')
       render_templates
+      run_scripts
+      finalize
+      cleanup @paths.values_at('build')
     end
   end
 end

data/lib/dock0/image.rb

@@ -4,21 +4,23 @@ module Dock0
   ##
   # An Image is a rootfs for a system
   class Image < Base
-    DEFAULT_CONFIG = {
-      'paths' => {
-        'build_file' => '/opt/build_file',
-        'build' => '/opt/build_file_mount',
-        'package_list' => './packages',
-        'overlay' => './overlay',
-        'scripts' => './scripts',
-        'output' => './root.fs.sfs'
-      },
-      'fs' => {
-        'size' => 512,
-        'type' => 'ext4',
-        'flags' => '-F'
+    def default_config # rubocop:disable Metrics/MethodLength
+      {
+        'paths' => {
+          'build_file' => './build_file',
+          'build' => './build_file_mount',
+          'package_list' => './packages',
+          'overlay' => './overlay',
+          'scripts' => './scripts',
+          'output' => './root.fs.sfs'
+        },
+        'fs' => {
+          'size' => 512,
+          'type' => 'ext4',
+          'flags' => '-F'
+        }
       }
-    }
+    end
 
     def run_chroot(cmd)
       run "arch-chroot #{@paths['build']} #{cmd}"
@@ -68,20 +70,15 @@ module Dock0
       run "mksquashfs #{@paths['build_file']} #{@paths['output']}"
     end
 
-    def cleanup
-      puts 'Removing temporary build image'
-      File.unlink @paths['build_file']
-    end
-
     def easy_mode
+      cleanup @paths.values_at('build_file', 'build', 'output')
       prepare_root
       install_packages
       apply_overlay
       run_scripts
       run_commands
-      sleep 5
       finalize
-      cleanup
+      cleanup @paths.values_at('build_file', 'build')
     end
   end
 end

data/lib/dock0/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dock0
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Les Aker