dapp 0.6.17 → 0.7.1

data/lib/dapp/{application → dimg}/tags.rb

@@ -1,6 +1,6 @@
 module Dapp
-  # Application
-  class Application
+  # Dimg
+  class Dimg
     # Tags
     module Tags
       protected
@@ -21,7 +21,7 @@ module Dapp
 
       def branch_tags
         return [] unless project.cli_options[:tag_branch]
-        raise Error::Application, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
+        raise Error::Dimg, code: :git_branch_without_name if (branch = git_repo.branch) == 'HEAD'
         [branch]
       end
 
@@ -39,7 +39,7 @@ module Dapp
         elsif ENV['TRAVIS']
           build_id = ENV['TRAVIS_BUILD_NUMBER']
         else
-          raise Error::Application, code: :ci_environment_required
+          raise Error::Dimg, code: :ci_environment_required
         end
 
         [build_id]
@@ -55,11 +55,11 @@ module Dapp
           branch = ENV['TRAVIS_BRANCH']
           tag = ENV['TRAVIS_TAG']
         else
-          raise Error::Application, code: :ci_environment_required
+          raise Error::Dimg, code: :ci_environment_required
         end
 
         [branch, tag].compact
       end
     end # Tags
-  end # Application
+  end # Dimg
 end # Dapp

data/lib/dapp/docker_registry.rb

@@ -2,9 +2,9 @@ module Dapp
   # DockerRegistry
   module DockerRegistry
     def self.new(repo)
-      /^#{repo_name_format}$/ =~ repo
-      expected_hostname = Regexp.last_match(:hostname)
-      expected_repo_suffix = Regexp.last_match(:repo_suffix)
+      repo_regex =~ repo
+      expected_hostname = Regexp.last_match(1)
+      expected_repo_suffix = Regexp.last_match(2)
       expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
 
       if hostname_exist?(expected_hostname_url)
@@ -14,18 +14,14 @@ module Dapp
       end
     end
 
-    def self.repo_name_format
-      separator = '[_.]|__|[-]*'
-      alpha_numeric = '[[:alnum:]]*'
-      component = "#{alpha_numeric}[#{separator}#{alpha_numeric}]*"
-      port_number = '[[:digit:]]+'
-      hostcomponent = '[[:alnum:]_-]*[[:alnum:]]'
-      hostname = "#{hostcomponent}[\\.#{hostcomponent}]*(?<port>:#{port_number})?"
-      "(?<hostname>#{hostname}/)?(?<repo_suffix>#{component}[/#{component}]*)"
-    end
-
-    def self.repo_name?(name)
-      !(/^#{repo_name_format}$/ =~ name).nil?
+    def self.repo_regex
+      separator = /[_.]|__|[-]*/
+      alpha_numeric = /[[:alnum:]]*/
+      component = /#{alpha_numeric}[#{separator}#{alpha_numeric}]*/
+      port_number = /[0-9]+/
+      hostcomponent = /[[:alnum:]-]*[[:alnum:]]/
+      hostname = /#{hostcomponent}[\.#{hostcomponent}]*[:#{port_number}]?/
+      %r{^(#{hostname}/)?(#{component}[/#{component}]*)$}
     end
 
     def self.hostname_exist?(url)

data/lib/dapp/error/dimg.rb

@@ -0,0 +1,6 @@
+module Dapp
+  module Error
+    # Dimg
+    class Dimg < Base; end
+  end
+end

data/lib/dapp/git_artifact.rb

@@ -5,19 +5,18 @@ module Dapp
     attr_reader :name
 
     # rubocop:disable Metrics/ParameterLists
-    def initialize(repo, where_to_add:, name: nil, branch: nil, commit: nil,
-                   cwd: nil, paths: nil, exclude_paths: nil, owner: nil, group: nil)
+    def initialize(repo, to:, name: nil, branch: nil, commit: nil,
+                   cwd: nil, include_paths: nil, exclude_paths: nil, owner: nil, group: nil)
       @repo = repo
       @name = name
 
-      @where_to_add = where_to_add
-
-      @branch = branch || repo.application.project.cli_options[:git_artifact_branch] || repo.branch
+      @branch = branch || repo.dimg.project.cli_options[:git_artifact_branch] || repo.branch
       @commit = commit
 
-      cwd = File.expand_path(File.join('/', cwd))[1..-1] unless cwd.nil? || cwd.empty?
+      @to = to
+      cwd = File.expand_path(File.join('/', cwd))[1..-1] unless cwd.nil? || cwd.empty? # must be relative!!!
       @cwd = cwd
-      @paths = paths
+      @include_paths = include_paths
       @exclude_paths = exclude_paths
       @owner = owner
       @group = group
@@ -27,18 +26,18 @@ module Dapp
     def apply_archive_command(stage)
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
-      ["#{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(' | ')]
+      ["#{repo.dimg.project.install_path} #{credentials.join(' ')} -d #{to}",
+       ["#{repo.dimg.project.git_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{include_paths.join(' ')}",
+        "#{sudo}#{repo.dimg.project.tar_path} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')]
     end
 
     def apply_patch_command(stage)
       current_commit = stage.layer_commit(self)
       prev_commit = stage.prev_g_a_stage.layer_commit(self)
 
-      if prev_commit != current_commit && any_changes?(prev_commit, current_commit)
-        [["#{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(' | ')]
+      if prev_commit != current_commit || any_changes?(prev_commit, current_commit)
+        [["#{repo.dimg.project.git_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
+          "#{sudo}#{repo.dimg.project.git_path} apply --whitespace=nowarn --directory=#{to} #{patch_command_excludes.join(' ')} --unsafe-paths"].join(' | ')]
       else
         []
       end
@@ -50,7 +49,7 @@ module Dapp
 
     def patch_command_excludes
       exclude_paths.map do |path|
-        base = File.join(where_to_add, path)
+        base = File.join(to, path)
         path =~ /[\*\?\[\]\{\}]/ ? %(--exclude=#{base} ) : %(--exclude=#{base} --exclude=#{File.join(base, '*')})
       end
     end
@@ -68,15 +67,15 @@ module Dapp
     end
 
     def paramshash
-      Digest::SHA256.hexdigest [where_to_add, cwd, *paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
+      Digest::SHA256.hexdigest [to, cwd, *include_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)
-      base_paths(@paths, with_cwd)
+    def include_paths(with_cwd = false)
+      base_paths(@include_paths, with_cwd)
     end
 
     def base_paths(paths, with_cwd = false)
@@ -89,7 +88,7 @@ module Dapp
 
     protected
 
-    attr_reader :where_to_add
+    attr_reader :to
     attr_reader :commit
     attr_reader :branch
     attr_reader :cwd
@@ -97,11 +96,11 @@ module Dapp
     attr_reader :group
 
     def sudo
-      repo.application.project.sudo_command(owner: owner, group: group)
+      repo.dimg.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).join(' ')}"
+      "diff --binary #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{include_paths(true).join(' ')}"
     end
   end
 end

data/lib/dapp/git_repo/base.rb

@@ -2,20 +2,20 @@ module Dapp
   module GitRepo
     # Base class for any Git repo (remote, gitkeeper, etc)
     class Base
-      attr_reader :application
+      attr_reader :dimg
       attr_reader :name
 
-      def initialize(application, name)
-        @application = application
+      def initialize(dimg, name)
+        @dimg = dimg
         @name = name
       end
 
       def container_path
-        application.container_tmp_path "#{name}.git"
+        dimg.container_tmp_path "#{name}.git"
       end
 
       def path
-        application.tmp_path "#{name}.git"
+        dimg.tmp_path "#{name}.git"
       end
 
       def git_bare(command, **kwargs)
@@ -44,7 +44,7 @@ module Dapp
       protected
 
       def git(command, **kwargs)
-        application.project.system_shellout! "#{application.project.git_path} #{command}", **kwargs
+        dimg.project.system_shellout! "#{dimg.project.git_path} #{command}", **kwargs
       end
     end
   end

data/lib/dapp/git_repo/own.rb

@@ -2,16 +2,16 @@ module Dapp
   module GitRepo
     # Own Git repo
     class Own < Base
-      def initialize(application)
-        super(application, 'own')
+      def initialize(dimg)
+        super(dimg, 'own')
       end
 
       def container_path
-        application.container_dapp_path('own', "#{name}.git")
+        dimg.container_dapp_path('own', "#{name}.git")
       end
 
       def path
-        @path ||= Pathname(git("-C #{application.home_path} rev-parse --git-dir").stdout.strip).expand_path
+        @path ||= Pathname(git("-C #{dimg.home_path} rev-parse --git-dir").stdout.strip).expand_path
       end
 
       def latest_commit(branch = nil)

data/lib/dapp/git_repo/remote.rb

@@ -2,20 +2,20 @@ module Dapp
   module GitRepo
     # Normal Git repo
     class Remote < Base
-      def initialize(application, name, url:)
-        super(application, name)
+      def initialize(dimg, name, url:)
+        super(dimg, name)
 
         @url = url
 
-        application.project.log_secondary_process(application.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
+        dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_clone', data: { name: name }), short: true) do
           git "clone --bare --depth 1 #{url} #{path}"
         end unless File.directory?(path)
       end
 
       def fetch!(branch = 'master')
-        application.project.log_secondary_process(application.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
+        dimg.project.log_secondary_process(dimg.project.t(code: 'process.git_artifact_fetch', data: { name: name }), short: true) do
           git_bare "fetch origin #{branch}:#{branch}"
-        end unless application.ignore_git_fetch || application.project.dry_run?
+        end unless dimg.ignore_git_fetch || dimg.project.dry_run?
       end
 
       def cleanup!

data/lib/dapp/image/docker.rb

@@ -68,21 +68,6 @@ module Dapp
       end
 
       class << self
-        def image_name_format
-          separator = '[_.]|__|[-]*'
-          tag = "[[:alnum:]][[[:alnum:]]#{separator}]{0,127}"
-          "#{DockerRegistry.repo_name_format}(:(?<tag>#{tag}))?"
-        end
-
-        def image_name?(name)
-          !(/^#{image_name_format}$/ =~ name).nil?
-        end
-
-        def tag!(id:, tag:)
-          Project.shellout!("docker tag #{id} #{tag}")
-          cache_reset
-        end
-
         def cache
           @cache ||= (@cache = {}).tap { cache_reset }
         end

data/lib/dapp/image/stage.rb

@@ -33,30 +33,24 @@ module Dapp
       end
 
       def export!(name)
-        tag!(name).tap do |image|
-          image.push!
-          image.untag!
-        end
-      end
-
-      def tag!(name)
-        clone!(name).tap do |image|
-          self.class.tag!(id: image.built_id, tag: image.name)
-        end
+        image = self.class.new(name: name, project: project, built_id: built_id)
+        image.tag!
+        image.push!
+        image.untag!
       end
 
       def import!(name)
-        clone!(name).tap do |image|
-          image.pull!
-          @built_id = image.built_id
-          save_in_cache!
-          image.untag!
-        end
+        image = self.class.new(name: name, project: project)
+        image.pull!
+        @built_id = image.built_id
+        tag!
+        image.untag!
       end
 
-      def save_in_cache!
+      def tag!
         project.log_warning(desc: { code: :another_image_already_tagged }) if !(existed_id = id).nil? && built_id != existed_id
-        self.class.tag!(id: built_id, tag: name)
+        project.shellout!("docker tag #{built_id} #{name}")
+        cache_reset
       end
 
       def labels
@@ -83,10 +77,6 @@ module Dapp
       def commit!
         project.shellout!("docker commit #{prepared_change} #{container_name}").stdout.strip
       end
-
-      def clone!(name)
-        self.class.new(name: name, project: project, built_id: built_id)
-      end
     end # Stage
   end # Image
 end # Dapp

data/lib/dapp/project.rb

@@ -10,7 +10,6 @@ module Dapp
     include Command::Bp
     include Command::Push
     include Command::Spush
-    include Command::Tag
     include Command::List
     include Command::Stages::CleanupLocal
     include Command::Stages::CleanupRepo
@@ -38,12 +37,12 @@ module Dapp
     include Shellout::System
 
     attr_reader :cli_options
-    attr_reader :apps_patterns
+    attr_reader :dimgs_patterns
 
-    def initialize(cli_options: {}, apps_patterns: nil)
+    def initialize(cli_options: {}, dimgs_patterns: nil)
       @cli_options = cli_options
-      @apps_patterns = apps_patterns || []
-      @apps_patterns << '*' unless @apps_patterns.any?
+      @dimgs_patterns = dimgs_patterns || []
+      @dimgs_patterns << '*' unless @dimgs_patterns.any?
 
       Logging::Paint.initialize(cli_options[:log_color])
       Logging::I18n.initialize
@@ -52,7 +51,11 @@ module Dapp
     def name
       @name ||= begin
         if File.exist? File.join(path, '.git')
-          system_shellout("#{git_path} -C #{path} config --get remote.origin.url").stdout.strip.split('/').last[/.*(?=.git)/] rescue File.basename(path)
+          begin
+            system_shellout("#{git_path} -C #{path} config --get remote.origin.url").stdout.strip.split('/').last[/.*(?=.git)/]
+          rescue
+            File.basename(path)
+          end
         else
           File.basename(path)
         end
@@ -60,14 +63,7 @@ module Dapp
     end
 
     def path
-      @path ||= begin
-        dappfile_path = dappfiles.first
-        if File.basename(expand_path(dappfile_path, 2)) == '.dapps'
-          expand_path(dappfile_path, 3)
-        else
-          expand_path(dappfile_path)
-        end
-      end
+      @path ||= expand_path(dappfile_path)
     end
 
     def build_path
@@ -80,12 +76,12 @@ module Dapp
       end
     end
 
-    def cache_format
-      "dappstage-#{name}-%{application_name}"
+    def stage_cache
+      "dimgstage-#{name}"
     end
 
-    def stage_dapp_label_format
-      '%{application_name}'
+    def stage_dapp_label
+      name
     end
 
     def dev_mode?

data/lib/dapp/project/command/build.rb

@@ -9,8 +9,8 @@ module Dapp
           setup_ssh_agent
 
           build_configs.each do |config|
-            log_step_with_indent(config._name) do
-              Application.new(config: config, project: self).build!
+            log_dimg_name_with_indent(config) do
+              Dimg.new(config: config, project: self).build!
             end
           end
         end

data/lib/dapp/project/command/cleanup.rb

@@ -6,17 +6,15 @@ module Dapp
       # Cleanup
       module Cleanup
         def cleanup
-          build_configs.map(&:_basename).uniq.each do |basename|
-            lock("#{basename}.images") do
-              log_step_with_indent(basename) do
-                project_containers_flush(basename)
-                project_dangling_images_flush(basename)
-                remove_images_by_query([
-                  'docker images',
-                  %(--format '{{if ne "#{stage_cache(basename)}" .Repository }}{{.ID}}{{ end }}'),
-                  %(-f "label=dapp=#{stage_dapp_label(basename)}")
-                ].join(' ')) # FIXME: negative filter is not currently supported by the Docker CLI
-              end
+          lock("#{name}.images") do
+            log_step_with_indent(name) do
+              project_containers_flush
+              project_dangling_images_flush
+              remove_images_by_query([
+                'docker images',
+                %(--format '{{if ne "#{stage_cache}" .Repository }}{{.ID}}{{ end }}'),
+                %(-f "label=dapp=#{stage_dapp_label}")
+              ].join(' ')) # FIXME: negative filter is not currently supported by the Docker CLI
             end
           end
         end