dapp 0.6.1 → 0.6.2

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

@@ -0,0 +1,85 @@
+module Dapp
+  module Config
+    module Directive
+      module Shell
+        # Base
+        class Base
+          attr_reader :_before_install, :_before_setup, :_install, :_setup
+          attr_reader :_before_install_cache_version, :_before_setup_cache_version, :_install_cache_version, :_setup_cache_version
+
+          def initialize
+            @_before_install = []
+            @_before_setup   = []
+            @_install        = []
+            @_setup          = []
+          end
+
+          def before_install(*args, cache_version: nil)
+            @_before_install.concat(args)
+            @_before_install_cache_version = cache_version
+          end
+
+          def before_setup(*args, cache_version: nil)
+            @_before_setup.concat(args)
+            @_before_setup_cache_version = cache_version
+          end
+
+          def install(*args, cache_version: nil)
+            @_install.concat(args)
+            @_install_cache_version = cache_version
+          end
+
+          def setup(*args, cache_version: nil)
+            @_setup.concat(args)
+            @_setup_cache_version = cache_version
+          end
+
+          def reset_before_install
+            @_before_install = []
+          end
+
+          def reset_before_setup
+            @_before_setup = []
+          end
+
+          def reset_install
+            @_install = []
+          end
+
+          def reset_setup
+            @_setup = []
+          end
+
+          def reset_all
+            methods.tap { |arr| arr.delete(__method__) }.grep(/^reset_/).each(&method(:send))
+          end
+
+          protected
+
+          def clone
+            marshal_dup(self)
+          end
+
+          def clone_to_artifact
+            Artifact.new.tap do |shell|
+              instance_variables.each do |variable|
+                shell.instance_variable_set(variable, marshal_dup(instance_variable_get(variable)))
+                shell.instance_variable_set("#{variable}_cache_version", marshal_dup(instance_variable_get("#{variable}_cache_version")))
+              end
+            end
+          end
+
+          def empty?
+            @_before_install.empty? && @_before_setup.empty? && @_install.empty? && @_setup.empty?
+          end
+
+          private
+
+          def marshal_dup(obj)
+            Marshal.load(Marshal.dump(obj))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/directive/tmp_dir.rb

@@ -0,0 +1,36 @@
+module Dapp
+  module Config
+    module Directive
+      # TmpDir
+      class TmpDir
+        attr_reader :_store
+
+        def initialize
+          @_store = []
+        end
+
+        def store(*args)
+          _store.concat(args)
+        end
+
+        def unstore(*args)
+          @_store -= args
+        end
+
+        def reset
+          @_store = []
+        end
+
+        protected
+
+        def empty?
+          _store.empty?
+        end
+
+        def clone
+          Marshal.load(Marshal.dump(self))
+        end
+      end
+    end
+  end
+end

data/lib/dapp/config/main.rb

@@ -1,6 +1,6 @@
 module Dapp
   module Config
-    # Main
+    # Application
     class Main < Application
       def initialize(dappfile_path:, project:)
         @project = project
@@ -8,12 +8,6 @@ module Dapp
         @_home_path    = Pathname.new(dappfile_path).parent.expand_path.to_s
         @_basename     = Pathname.new(@_home_path).basename.to_s
         @_builder      = Pathname.new(@_home_path).join('Berksfile').exist? ? :chef : :shell
-
-        @_docker       = Docker.new
-        @_git_artifact = GitArtifact.new
-        @_shell        = Shell.new
-        @_chef         = Chef.new
-
         super(nil)
       end
 

data/lib/dapp/core_ext/hash.rb

@@ -0,0 +1,21 @@
+module Dapp
+  # CoreExt
+  module CoreExt
+    # Hash
+    module Hash
+      def in_depth_merge(hash) # do not conflict with activesupport`s deep_merge
+        merge(hash) do |_, v1, v2|
+          if v1.is_a?(::Hash) && v2.is_a?(::Hash)
+            v1.merge(v2)
+          elsif v1.is_a?(::Array) || v2.is_a?(::Array)
+            [v1, v2].flatten
+          else
+            v2
+          end
+        end
+      end
+    end
+  end
+end
+
+::Hash.send(:include, ::Dapp::CoreExt::Hash)

data/lib/dapp/docker_registry/base.rb

@@ -23,25 +23,80 @@ module Dapp
       end
 
       def tags
-        @tags ||= api_request(repo_suffix, 'tags/list')['tags']
+        @tags ||= api_request(repo_suffix, 'tags/list')['tags'] || []
       end
 
-      def image_id_by_tag(tag)
-        response = api_request(repo_suffix, "/manifests/#{tag}", headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
+      def image_id(tag)
+        response = manifest_v2(tag)
         response['config']['digest'] if response['schemaVersion'] == 2
       end
 
+      def image_parent_id(tag)
+        image_history(tag)['container_config']['Image']
+      end
+
+      def image_labels(tag)
+        image_history(tag)['config']['Labels']
+      end
+
+      def image_delete(tag)
+        image_blobs(tag).each { |hash| blob_delete(hash.values.first) }
+        api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
+                    method: :delete,
+                    expects: [202, 404],
+                    headers: { Accept: 'Accept: application/vnd.docker.distribution.manifest.v2+json' })
+      end
+
       protected
 
+      def image_digest(tag)
+        raw_api_request(repo_suffix, "/manifests/#{tag}",
+                        headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' }).headers['Docker-Content-Digest']
+      end
+
+      def image_blobs(tag)
+        manifest_v1(tag)['fsLayers']
+      end
+
+      def manifest_v1(tag)
+        api_request(repo_suffix, "/manifests/#{tag}")
+      end
+
+      def manifest_v2(tag)
+        api_request(repo_suffix, "/manifests/#{tag}",
+                    headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
+      end
+
+      def image_history(tag)
+        response = manifest_v1(tag)
+        JSON.load(response['history'].first['v1Compatibility'])
+      end
+
+      def blob_delete(id)
+        api_request(repo_suffix, "/blobs/#{id}",
+                    method: :delete, expects: [202, 404])
+      end
+
       def api_request(*uri, **options)
-        JSON.load(request(api_url(*uri), expects: [200], **options).body)
+        JSON.load(raw_api_request(*uri, **options).body)
+      end
+
+      def raw_api_request(*uri, **options)
+        url = api_url(*uri)
+        request(url, **default_api_options.merge(options))
       rescue Excon::Error::NotFound
-        raise Error::Registry, code: :not_found
+        raise Error::Registry, code: :page_not_found, data: { url: url }
+      rescue Excon::Error::Unauthorized
+        raise Error::Registry, code: :user_not_authorized
       end
 
       def api_url(*uri)
         File.join(hostname_url, API_VERSION, '/', *uri)
       end
+
+      def default_api_options
+        { expects: [200] }
+      end
     end
   end # DockerRegistry
 end # Dapp

data/lib/dapp/docker_registry/mod/request.rb

@@ -5,11 +5,11 @@ module Dapp
       # Request
       module Request
         def request(url, **options)
-          raw_request(url, deep_merge(options, authorization_options(url)))
+          raw_request(url, options.in_depth_merge(authorization_options(url)))
         end
 
         def raw_request(url, **options)
-          Excon.new(url).request(deep_merge(default_request_options, options))
+          Excon.new(url).request(default_request_options.in_depth_merge(options))
         end
 
         def url_available?(url)
@@ -24,18 +24,6 @@ module Dapp
         def default_request_options
           { method: :get, omit_default_port: true }
         end
-
-        private
-
-        def deep_merge(hash1, hash2)
-          hash1.merge(hash2) do |_, v1, v2|
-            if v1.is_a?(Hash) && v2.is_a?(Hash)
-              v1.merge(v2)
-            else
-              [v1, v2].flatten
-            end
-          end
-        end
       end
     end # Mod
   end # DockerRegistry

data/lib/dapp/git_artifact.rb

@@ -6,7 +6,7 @@ module Dapp
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(repo, where_to_add:, name: nil, branch: nil, commit: nil,
-                   cwd: nil, paths: nil, owner: nil, group: nil)
+                   cwd: nil, paths: nil, exclude_paths: nil, owner: nil, group: nil)
       @repo = repo
       @name = name
 
@@ -15,19 +15,21 @@ module Dapp
       @branch = branch || repo.application.project.cli_options[:git_artifact_branch] || repo.branch
       @commit = commit
 
+      cwd = File.expand_path(File.join('/', cwd))[1..-1] unless cwd.nil? || cwd.empty?
       @cwd = cwd
       @paths = paths
+      @exclude_paths = exclude_paths
       @owner = owner
       @group = group
     end
     # rubocop:enable Metrics/ParameterLists
 
-    def archive_apply_command(stage)
+    def apply_archive_command(stage)
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
-      ["install #{credentials.join(' ')} -d #{where_to_add}",
-       ["git --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths}",
-        "#{sudo}tar -x -C #{where_to_add}"].join(' | ')]
+      ["#{repo.application.project.install_path} #{credentials.join(' ')} -d #{where_to_add}",
+       ["#{repo.application.project.git_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths.join(' ')}",
+        "#{sudo}#{repo.application.project.tar_path} -x -C #{where_to_add} #{archive_command_excludes.join(' ')}"].join(' | ')]
     end
 
     def apply_patch_command(stage)
@@ -35,13 +37,24 @@ module Dapp
       prev_commit = stage.prev_g_a_stage.layer_commit(self)
 
       if prev_commit != current_commit || any_changes?(prev_commit, current_commit)
-        [["git --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
-          "#{sudo}git apply --whitespace=nowarn --directory=#{where_to_add} --unsafe-paths"].join(' | ')]
+        [["#{repo.application.project.git_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
+          "#{sudo}#{repo.application.project.git_path} apply --whitespace=nowarn --directory=#{where_to_add} #{patch_command_excludes.join(' ')} --unsafe-paths"].join(' | ')]
       else
         []
       end
     end
 
+    def archive_command_excludes
+      exclude_paths.map { |path| %(--exclude=#{path}) }
+    end
+
+    def patch_command_excludes
+      exclude_paths.map do |path|
+        base = File.join(where_to_add, path)
+        path =~ /[\*\?\[\]\{\}]/ ? %(--exclude=#{base} ) : %(--exclude=#{base} --exclude=#{File.join(base, '*')})
+      end
+    end
+
     def any_changes?(from, to = latest_commit)
       !repo.git_bare(diff_command(from, to, quiet: true), returns: [0, 1]).status.success?
     end
@@ -55,11 +68,19 @@ module Dapp
     end
 
     def paramshash
-      Digest::SHA256.hexdigest [where_to_add, cwd, paths, owner, group].map(&:to_s).join(':::')
+      Digest::SHA256.hexdigest [where_to_add, cwd, *paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
+    end
+
+    def exclude_paths(with_cwd = false)
+      base_paths(@exclude_paths, with_cwd)
     end
 
     def paths(with_cwd = false)
-      [@paths].flatten.compact.map { |path| (with_cwd && cwd ? "#{cwd}/#{path}" : path).gsub(%r{^\/*|\/*$}, '') }.join(' ') if @paths
+      base_paths(@paths, with_cwd)
+    end
+
+    def base_paths(paths, with_cwd = false)
+      [paths].flatten.compact.map { |path| (with_cwd && cwd ? File.join(cwd, path) : path).gsub(%r{^\/*|\/*$}, '') }
     end
 
     def full_name
@@ -75,24 +96,12 @@ module Dapp
     attr_reader :owner
     attr_reader :group
 
-    def sudo_format_user(user)
-      user.to_s.to_i.to_s == user ? "\\\##{user}" : user
-    end
-
     def sudo
-      sudo = ''
-
-      if owner || group
-        sudo = 'sudo -E '
-        sudo += "-u #{sudo_format_user(owner)} " if owner
-        sudo += "-g #{sudo_format_user(group)} " if group
-      end
-
-      sudo
+      repo.application.project.sudo_command(owner: owner, group: group)
     end
 
     def diff_command(from, to, quiet: false)
-      "diff --binary #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true)}"
+      "diff --binary #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true).join(' ')}"
     end
   end
 end

data/lib/dapp/git_repo/base.rb

@@ -44,7 +44,7 @@ module Dapp
       protected
 
       def git(command, **kwargs)
-        application.project.shellout!("git #{command}", **kwargs)
+        application.project.system_shellout! "#{application.project.git_path} #{command}", **kwargs
       end
     end
   end

data/lib/dapp/image/argument.rb

@@ -106,7 +106,7 @@ module Dapp
       end
 
       def service_options
-        { entrypoint: '/bin/bash', name: container_name }
+        { entrypoint: project.bash_path, name: container_name }
       end
 
       def prepared_change
@@ -118,11 +118,11 @@ module Dapp
       end
 
       def prepared_bash_command
-        shellout_pack prepared_commands.join(' && ')
+        project.shellout_pack prepared_commands.join(' && ')
       end
 
       def prepared_commands
-        return ['true'] if bash_commands.empty?
+        return [project.true_path] if bash_commands.empty?
         bash_commands
       end
     end

data/lib/dapp/image/docker.rb

@@ -3,8 +3,6 @@ module Dapp
   module Image
     # Docker
     class Docker
-      include Helper::Shellout
-
       attr_reader :from
       attr_reader :name
       attr_reader :project
@@ -16,24 +14,27 @@ module Dapp
       end
 
       def id
-        @id || cache[:id]
+        cache[:id]
       end
 
       def untag!
         raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
-        shellout!("docker rmi #{name}")
+        project.shellout!("docker rmi #{name}")
         cache_reset
       end
 
-      def push!(log_verbose: false, log_time: false)
+      def push!
         raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
-        shellout!("docker push #{name}", log_verbose: log_verbose, log_time: log_time)
+        project.log_secondary_process(project.t(code: 'process.image_push', data: { name: name })) do
+          project.shellout!("docker push #{name}", log_verbose: true)
+        end
       end
 
-      def pull!(log_verbose: false, log_time: false)
+      def pull!
         return if tagged?
-        shellout!("docker pull #{name}", log_verbose: log_verbose, log_time: log_time)
-        @pulled = true
+        project.log_secondary_process(project.t(code: 'process.image_pull', data: { name: name })) do
+          project.shellout!("docker pull #{name}", log_verbose: true)
+        end
         cache_reset
       end
 
@@ -41,10 +42,6 @@ module Dapp
         !!id
       end
 
-      def pulled?
-        !!@pulled
-      end
-
       def created_at
         raise Error::Build, code: :image_not_exist, data: { name: name } unless tagged?
         cache[:created_at]
@@ -56,7 +53,7 @@ module Dapp
       end
 
       def self.image_config_option(image_id:, option:)
-        output = shellout!("docker inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
+        output = Project.shellout!("docker inspect --format='{{json .Config.#{option.to_s.capitalize}}}' #{image_id}").stdout.strip
         output == 'null' ? [] : JSON.parse(output)
       end
 
@@ -77,8 +74,8 @@ module Dapp
 
         def cache_reset(name = '')
           cache.delete(name)
-          shellout!("docker images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' #{name}").stdout.lines.each do |line|
-            name, id, created_at, size = line.split(';')
+          Project.shellout!("docker images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}").stdout.lines.each do |l|
+            name, id, created_at, size = l.split(';')
             cache[name] = { id: id, created_at: created_at, size: size }
           end
         end