dapp 0.9.4 → 0.10.0

data/lib/dapp/dimg/config/directive/base.rb

@@ -2,7 +2,11 @@ module Dapp
   module Dimg
     module Config
       module Directive
-        class Base < ::Dapp::Config::Directive::Base; end
+        class Base < ::Dapp::Config::Directive::Base
+          def clone_to_artifact
+            clone
+          end
+        end
       end
     end
   end

data/lib/dapp/dimg/config/directive/chef.rb

@@ -14,24 +14,28 @@ module Dapp
           end
 
           def dimod(name, *args)
-            @_dimod << name
-            cookbook(name, *args)
+            sub_directive_eval do
+              @_dimod << name
+              cookbook(name, *args)
+            end
           end
 
           def recipe(name)
-            @_recipe << name
+            sub_directive_eval { @_recipe << name }
           end
 
           def attributes
             @_attributes ||= Attributes.new
           end
 
-          def cookbook(name, version_constraint=nil, **kwargs)
-            @_cookbook[name] = {}.tap do |desc|
-              desc.update(kwargs)
-              desc[:name] = name
-              desc[:version_constraint] = version_constraint if version_constraint
-              desc[:path] = File.expand_path(desc[:path], dapp.path) if desc.key? :path
+          def cookbook(name, version_constraint = nil, **kwargs)
+            sub_directive_eval do
+              @_cookbook[name] = {}.tap do |desc|
+                desc.update(kwargs)
+                desc[:name] = name
+                desc[:version_constraint] = version_constraint if version_constraint
+                desc[:path] = File.expand_path(desc[:path], dapp.path) if desc.key? :path
+              end
             end
           end
 
@@ -52,12 +56,10 @@ module Dapp
 
           %i(before_install install before_setup setup build_artifact).each do |stage|
             define_method("__#{stage}_attributes") do
-              attributes.in_depth_merge send("_#{stage}_attributes")
+              attributes.in_depth_merge public_send("_#{stage}_attributes")
             end
           end
 
-          protected
-
           def empty?
             (@_dimod + @_recipe).empty? && attributes.empty?
           end

data/lib/dapp/dimg/config/directive/docker/base.rb

@@ -7,12 +7,13 @@ module Dapp
             attr_reader :_from, :_from_cache_version
 
             def from(image, cache_version: nil)
-              image = image.to_s
-              raise(Error::Config, code: :docker_from_incorrect,
-                                   data: { name: image }) unless ::Dapp::Dimg::Image::Docker.image_name?(image)
-              raise(Error::Config, code: :docker_from_without_tag, data: { name: image }) unless image.include?(':')
-              @_from = image
-              @_from_cache_version = cache_version
+              sub_directive_eval do
+                image = image.to_s
+                raise(Error::Config, code: :docker_from_incorrect, data: { name: image }) unless ::Dapp::Dimg::Image::Docker.image_name?(image)
+                raise(Error::Config, code: :docker_from_without_tag, data: { name: image }) unless image.include?(':')
+                @_from = image
+                @_from_cache_version = cache_version
+              end
             end
           end
         end

data/lib/dapp/dimg/config/directive/docker/dimg.rb

@@ -18,39 +18,39 @@ module Dapp
             end
 
             def volume(*args)
-              @_volume.concat(args)
+              sub_directive_eval { @_volume.concat(args) }
             end
 
             def expose(*args)
-              @_expose.concat(args)
+              sub_directive_eval { @_expose.concat(args) }
             end
 
             def env(**options)
-              @_env.merge!(options)
+              sub_directive_eval { @_env.merge!(options) }
             end
 
             def label(**options)
-              @_label.merge!(options)
+              sub_directive_eval { @_label.merge!(options) }
             end
 
             def cmd(*args)
-              @_cmd.concat(args)
+              sub_directive_eval { @_cmd.concat(args) }
             end
 
             def onbuild(*args)
-              @_onbuild.concat(args)
+              sub_directive_eval { @_onbuild.concat(args) }
             end
 
             def workdir(path)
-              @_workdir = path_format(path)
+              sub_directive_eval { @_workdir = path_format(path) }
             end
 
             def user(val)
-              @_user = val
+              sub_directive_eval { @_user = val }
             end
 
             def entrypoint(*cmd_with_args)
-              @_entrypoint = cmd_with_args.flatten
+              sub_directive_eval { @_entrypoint = cmd_with_args.flatten }
             end
 
             def _change_options
@@ -67,8 +67,6 @@ module Dapp
               }
             end
 
-            protected
-
             def clone_to_artifact
               Artifact.new(dapp: dapp).tap do |docker|
                 docker.instance_variable_set('@_from', @_from)

data/lib/dapp/dimg/config/directive/git_artifact_local.rb

@@ -11,19 +11,25 @@ module Dapp
               @stage_dependencies ||= StageDependencies.new(&blk)
             end
 
+            def validate!
+              raise Error::Config, code: :add_to_required if _to.nil?
+            end
+
             def _artifact_options
               super.merge(stages_dependencies: stage_dependencies.to_h)
             end
 
-            class StageDependencies < Base
+            class StageDependencies < Directive::Base
               STAGES = [:install, :setup, :before_setup, :build_artifact].freeze
 
               STAGES.each do |stage|
                 define_method(stage) do |*glob|
-                  if (globs = glob.map { |g| path_format(g) }).any? { |g| Pathname(g).absolute? }
-                    raise Error::Config, code: :stages_dependencies_paths_relative_path_required, data: { stage: stage }
+                  sub_directive_eval do
+                    if (globs = glob.map { |g| path_format(g) }).any? { |g| Pathname(g).absolute? }
+                      raise Error::Config, code: :stages_dependencies_paths_relative_path_required, data: { stage: stage }
+                    end
+                    instance_variable_set(:"@#{stage}", globs)
                   end
-                  instance_variable_set(:"@#{stage}", globs)
                 end
 
                 define_method("_#{stage}") do
@@ -36,7 +42,7 @@ module Dapp
               end
 
               def to_h
-                STAGES.map { |stage| [stage, send("_#{stage}")] }.to_h
+                STAGES.map { |stage| [stage, public_send("_#{stage}")] }.to_h
               end
             end
           end

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -15,6 +15,14 @@ module Dapp
             super(**kwargs, &blk)
           end
 
+          def branch(value)
+            sub_directive_eval { @_branch = value }
+          end
+
+          def commit(value)
+            sub_directive_eval { @_commit = value }
+          end
+
           def _export
             super do |export|
               export._url    = @_url
@@ -31,14 +39,12 @@ module Dapp
               super.merge(name: _name, branch: _branch, commit: _commit)
             end
 
-            protected
-
             def branch(value)
-              @_branch = value
+              sub_directive_eval { @_branch = value }
             end
 
             def commit(value)
-              @_commit = value
+              sub_directive_eval { @_commit = value }
             end
 
             def validate!
@@ -46,16 +52,6 @@ module Dapp
               raise Error::Config, code: :git_artifact_remote_branch_with_commit if !_branch.nil? && !_commit.nil?
             end
           end
-
-          protected
-
-          def branch(value)
-            @_branch = value
-          end
-
-          def commit(value)
-            @_commit = value
-          end
         end
       end
     end

data/lib/dapp/dimg/config/directive/mount.rb

@@ -3,7 +3,7 @@ module Dapp
     module Config
       module Directive
         class Mount < Base
-          attr_reader :_from, :_to
+          attr_reader :_to
           attr_reader :_type
 
           def initialize(to, **kwargs, &blk)
@@ -13,12 +13,16 @@ module Dapp
             super(**kwargs, &blk)
           end
 
-          protected
-
           def from(type)
-            type = type.to_sym
-            raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? type
-            @_type = type
+            sub_directive_eval do
+              type = type.to_sym
+              raise Error::Config, code: :mount_from_type_required unless [:tmp_dir, :build_dir].include? type
+              @_type = type
+            end
+          end
+
+          def validate!
+            raise Error::Config, code: :mount_from_required if _type.nil?
           end
         end
       end

data/lib/dapp/dimg/config/directive/shell/dimg.rb

@@ -8,13 +8,14 @@ module Dapp
             attr_reader :_before_install, :_before_setup, :_install, :_setup
 
             def version(value)
-              @_version = value
+              sub_directive_eval { @_version = value }
             end
 
             def self.stage_command_generator(stage)
               define_method stage do |&blk|
-                (variable = instance_variable_get("@_#{stage}") || StageCommand.new(dapp: dapp)).instance_eval(&blk)
-                instance_variable_set("@_#{stage}", variable)
+                (instance_variable_get("@_#{stage}") || StageCommand.new(dapp: dapp)).tap do |variable|
+                  instance_variable_set("@_#{stage}", directive_eval(variable, &blk))
+                end
               end
 
               define_method "_#{stage}_command" do
@@ -29,34 +30,31 @@ module Dapp
             end
             [:before_install, :before_setup, :install, :setup].each(&method(:stage_command_generator))
 
+            def empty?
+              (_before_install_command + _before_setup_command + _install_command + _setup_command).empty?
+            end
+
+            def clone_to_artifact
+              _clone_to Artifact.new(dapp: dapp)
+            end
+
             class StageCommand < Directive::Base
               attr_reader :_version
               attr_reader :_run
 
               def initialize(**kwargs, &blk)
                 @_run = []
-
                 super(**kwargs, &blk)
               end
 
               def run(*args)
-                @_run.concat(args)
+                sub_directive_eval { @_run.concat(args) }
               end
 
               def version(value)
-                @_version = value
+                sub_directive_eval { @_version = value }
               end
             end
-
-            protected
-
-            def empty?
-              (_before_install_command + _before_setup_command + _install_command + _setup_command).empty?
-            end
-
-            def clone_to_artifact
-              _clone_to Artifact.new(dapp: dapp)
-            end
           end
         end
       end

data/lib/dapp/dimg/dapp/command/stages/cleanup_local.rb

@@ -79,7 +79,7 @@ module Dapp
             def image_exist?(image_id)
               shellout!(%(docker inspect #{image_id}))
               true
-            rescue Error::Shellout
+            rescue ::Dapp::Error::Shellout
               false
             end
 

data/lib/dapp/dimg/dimg.rb

@@ -98,7 +98,7 @@ module Dapp
             begin
               image_name = format(format, repo: repo, signature: image.name.split(':').last)
               import_base!(image, image_name)
-            rescue Error::Shellout
+            rescue ::Dapp::Error::Shellout
               next
             end
             break unless dapp.pull_all_stages?

data/lib/dapp/dimg/dimg/stages.rb

@@ -6,6 +6,10 @@ module Dapp
           last_stage.send(:signature)
         end
 
+        def stage_by_name(name)
+          stages.find { |s| s.name == name }
+        end
+
         def stage_cache_format
           "#{dapp.stage_cache}:%{signature}"
         end
@@ -46,7 +50,7 @@ module Dapp
         end
 
         def stages
-          (@stages ||= []).tap do |stages|
+          @stages ||= [].tap do |stages|
             stage = last_stage
             loop do
               stages << stage

data/lib/dapp/dimg/git_artifact.rb

@@ -52,13 +52,14 @@ module Dapp
         patch_command(stage.prev_g_a_stage.layer_commit(self), nil)
       end
 
-      def stage_dependencies_checksums(stage)
+      def stage_dependencies_checksums(stage, from_commit = nil, to_commit = latest_commit)
         return [] if (stage_dependencies = stages_dependencies[stage.name]).empty?
 
         paths = include_paths(true) + base_paths(stage_dependencies, true)
-        diff_patches(nil, latest_commit, paths: paths).map do |patch|
+        diff_patches(from_commit, to_commit, paths: paths).map do |patch|
           delta_new_file = patch.delta.new_file
-          Digest::SHA256.hexdigest [delta_new_file[:path], repo.lookup_object(delta_new_file[:oid]).content].join(':::')
+          content = patch.hunks.map { |h| h.lines.select { |l| l.line_origin == :context }.map(&:content).join }.join
+          Digest::SHA256.hexdigest [delta_new_file[:path], content].join(':::')
         end
       end
 
@@ -122,10 +123,10 @@ module Dapp
         repo.dimg.dapp.sudo_command(owner: owner, group: group)
       end
 
-      def archive_file(commit)
-        create_file(repo.dimg.tmp_path('archives', archive_file_name(commit))) do |f|
+      def archive_file(to_commit)
+        create_file(repo.dimg.tmp_path('archives', archive_file_name(to_commit))) do |f|
           Gem::Package::TarWriter.new(f) do |tar|
-            diff_patches(nil, commit).each do |patch|
+            diff_patches(nil, to_commit).each do |patch|
               entry = patch.delta.new_file
               tar.add_file slice_cwd(entry[:path]), entry[:mode] do |tf|
                 tf.write repo.lookup_object(entry[:oid]).content
@@ -133,7 +134,7 @@ module Dapp
             end
           end
         end
-        repo.dimg.container_tmp_path('archives', archive_file_name(commit))
+        repo.dimg.container_tmp_path('archives', archive_file_name(to_commit))
       rescue Gem::Package::TooLongFileName => e
         raise Error::TarWriter, message: e.message
       end
@@ -212,10 +213,7 @@ module Dapp
       end
 
       def diff_patches(from, to, paths: include_paths_or_cwd)
-        (@diff_patches ||= {})[[from, to, paths]] = repo.patches(from, to,
-                                                                 paths: paths,
-                                                                 exclude_paths: exclude_paths(true),
-                                                                 force_text: true)
+        (@diff_patches ||= {})[[from, to, paths]] = repo.patches(from, to, paths: paths, exclude_paths: exclude_paths(true))
       end
 
       def include_paths_or_cwd
@@ -228,7 +226,7 @@ module Dapp
       end
 
       def exclude_paths(with_cwd = false)
-        base_paths(repo.exclude_paths + @exclude_paths, with_cwd)
+        repo.exclude_paths + base_paths(@exclude_paths, with_cwd)
       end
 
       def include_paths(with_cwd = false)

data/lib/dapp/dimg/git_repo/base.rb

@@ -39,6 +39,8 @@ module Dapp
 
         def branch
           git.head.name.sub(/^refs\/heads\//, '')
+        rescue Rugged::ReferenceError => e
+          raise Error::Rugged, code: :git_repository_reference_error, data: { name: name, message: e.message.downcase }
         end
 
         def commit_at(commit)

data/lib/dapp/dimg/git_repo/own.rb

@@ -18,7 +18,7 @@ module Dapp
 
         def diff(from, to, **kwargs)
           if to.nil?
-            git.lookup(from).diff_workdir
+            git.lookup(from).diff_workdir(**kwargs)
           else
             super
           end

data/lib/dapp/dimg/image/docker.rb

@@ -106,6 +106,7 @@ module Dapp
                         .lines
                         .each do |l|
               name, id, created_at, size_field = l.split(';')
+              name = name.reverse.chomp('docker.io/'.reverse).reverse
               size = begin
                 number, unit = size_field.split
                 coef = case unit.to_s.downcase