dock0 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d7456a2290387ed74a1b3d5dacfd934faf86b2
-  data.tar.gz: f0752fe961880c4cc65eef15125f89627d0356b8
+  metadata.gz: 65012095e39136647f62864f6bd21447cd15dd10
+  data.tar.gz: cd192de12e6ac2e612d3b372c6748e0b710b7e9e
 SHA512:
-  metadata.gz: 0aae22f19127ceaa4eefad8b4eb50f5e58e9e0a793c1260702e5cda3a14728ad2080db9da300a911123fec1bdb79556973eecd63f8751d8b62683fd505630c64
-  data.tar.gz: 2e5d2ea2a39355e3516c28f85d9ea45c860ff46937f9f3bed59db305498055db92ec8c0f7ee854e3cbfe8bd51d4bad1c288b667e68139788ed6b543963ff2df5
+  metadata.gz: fc78d710c6f27a6528016143d78ba8858a850ff213b0551210b371f82457a5d4b390fce015b719ad8b30ce41051514f38d811f6b38cb414258ebf04a6ff879c4
+  data.tar.gz: 0853929148b265d2f290759437b3184a3c4f8c8b44cba56e64ccd6d2eee7ee03aad97d9f13836068caa34e3a00b2b737d4c8842934c3c34d7527e081a636f61d

data/lib/dock0/image.rb

@@ -7,8 +7,8 @@ module Dock0
     def default_config # rubocop:disable Metrics/MethodLength
       {
         'paths' => {
-          'build_file' => './build_file',
-          'build' => './build_file_mount',
+          'build_file' => './root.fs',
+          'build' => './build',
           'package_list' => './packages',
           'overlay' => './overlay',
           'scripts' => './scripts',

data/lib/dock0/install.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'open-uri'
+require 'pathname'
 
 module Dock0
   ##
@@ -10,45 +11,63 @@ module Dock0
         'paths' => {
           'templates' => './templates',
           'scripts' => './scripts',
-          'build' => './build'
+          'build' => './build',
+          'base' => '/'
         },
+        'org' => 'dock0',
         'artifacts' => []
       }
     end
 
     def build_url(artifact)
-      org = @config[:org]
-      name, version, file = artifact.fetch('name', 'version', 'file')
+      org = @config['org']
+      name, version, file = artifact.values_at('name', 'version', 'file')
       "https://github.com/#{org}/#{name}/releases/download/#{version}/#{file}"
     end
 
     def build_path(artifact)
-      "#{artifact['name']}/#{artifact['file']}"
+      "#{artifact['name']}/#{artifact['version']}/#{artifact['file']}"
+    end
+
+    def qualify_path(path)
+      "#{@paths['build']}/#{@paths['base']}/#{path}"
+    end
+
+    def missing(path, artifact)
+      return true unless File.exist? path
+      puts "#{artifact['name']} (#{artifact['version']}) already loaded"
     end
 
     def download(artifact)
       url, path = artifact.values_at('url', 'full_path')
+      return unless missing(path, artifact)
       puts "Downloading #{url} to #{path}"
+      FileUtils.mkdir_p File.dirname(path)
       File.open(path, 'wb') do |fh|
         open(url, 'rb') { |request| fh.write request.read }
       end
     end
 
     def chmod(artifact)
-      File.chmod(artifact['mode'], full_path) if artifact['mode']
+      File.chmod(artifact['mode'], full_path)
     end
 
     def link(artifact)
-      FileUtils.ln_sf artifact['link'], artifact['path']
+      full_link_path = qualify_path artifact['link']
+      FileUtils.mkdir_p File.dirname(full_link_path)
+      relative_path = Pathname(artifact['path']).relative_path_from(
+        Pathname(File.dirname(full_link_path))
+      )
+      FileUtils.ln_sf relative_path, full_link_path
     end
 
     def load_artifacts
       @config['artifacts'].each do |artifact|
         artifact['url'] ||= build_url(artifact)
         artifact['path'] ||= build_path(artifact)
-        artifact['full_path'] = "#{@config['build']}/#{artifact['path']}"
+        artifact['full_path'] = qualify_path artifact['path']
         download artifact
-        chmod artifact
+        chmod artifact if artifact['mode']
         link(artifact) if artifact['link']
       end
     end
@@ -71,17 +90,10 @@ 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
       load_artifacts
       render_templates
       run_scripts
-      finalize
     end
   end
 end

data/lib/dock0/version.rb

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

metadata

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