dapp 0.7.23 → 0.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a274af8b41a35e353f391b7f9c7b0bde96981e5
-  data.tar.gz: 9b40b2671fe479229e8e4c0e3e923af694514255
+  metadata.gz: d5ff393b9a62aa273cec389c96fcbef80d2ad14b
+  data.tar.gz: 208c4ff07ab82f1568a20650941666bb45502869
 SHA512:
-  metadata.gz: 34c747b33c7cf04d4509141c1d4ed8715854b61656fbc146dafb162eb62dcb6688c4da8206ca8a31a37d126e4099f0867edd2963c89211ade78fc73a409a052b
-  data.tar.gz: 1722b58dad85758d12405cfed80afbfe9eff1cfc4bfd7378e18f7c21da6efc8ca03156314cf30ce274bcf688f04daae53cf065428fbfa83f4eaf23023c883f7c
+  metadata.gz: cf6c726e0477a26497852b4a9ad5842de3ae75cdcd1051670f1258a3a107c1f3dda3a384346bddba518d1db3fec42a2799db6de11f38f28f8df49a6cee0f15c6
+  data.tar.gz: 4f26f2d25f6d2a361989603f45860cfca08402f4cfb711c144485a4275c3071252675b50d16419965d2e174c2c42a5e8ffb0d5f7b6d5b7e33cfbe875192b2413

data/bin/dapp

@@ -5,7 +5,20 @@
 require 'rubygems'
 require 'dapp'
 
+def check_docker_version
+  required_docker_version = '1.10.0'
+  if Gem::Version.new(required_docker_version) >= Gem::Version.new(`docker --version`[/(\d+\.)+\d+/])
+    $stderr.puts(Dapp::Project.paint_string("Required docker version: >= #{required_docker_version}!", :warning))
+    exit 1
+  end
+rescue Errno::ENOENT => e
+  $stderr.puts(Dapp::Project.paint_string(e.message, :warning))
+  exit 1
+end
+
 begin
+  check_docker_version
+
   begin
     Dapp::CLI.new.run
   rescue ::SystemExit

data/config/en/common.yml

@@ -10,8 +10,6 @@ en:
       instructions: "instructions:"
     container:
       launched_command: "Launched command: `%{command}`"
-    system_shellout:
-      launched_command: "Launched system-shellout command: `%{command}`"
     process:
       artifact_copy: "copying artifact `%{name}`"
       artifact_building: "building artifact `%{name}`"
@@ -23,7 +21,6 @@ en:
       gitartifact_container_creating: 'creating dappdeps/gitartifact container'
       base_container_creating: 'creating dappdeps/base container'
       chefdk_container_creating: 'creating dappdeps/chefdk container'
-      system_shellout_container_starting: 'starting system-shellout container'
       image_pull: "pulling image `%{name}`"
       image_push: "pushing image `%{name}`"
     status:

data/config/en/net_status.yml

@@ -66,5 +66,7 @@ en:
     rugged:
       rugged_remote_error: "Remote git repo `%{url}`: `%{message}`!"
       local_git_repository_does_not_exist: "Local git repo: doesn't exist!"
+      commit_not_found_in_local_git_repository: "Local git repo: commit `%{commit}` not found (run command `dapp stages cleanup local --improper-git-commit`)!"
+      commit_not_found_in_remote_git_repository: "Remote git repo `%{url}`: commit `%{commit}` not found (run command `dapp stages cleanup local --improper-git-commit`)!"
     lock:
       timeout: "Could not obtain lock for `%{name}` within %{timeout} seconds"

data/lib/dapp.rb

@@ -150,7 +150,6 @@ require 'dapp/project/deps/base'
 require 'dapp/project/deps/gitartifact'
 require 'dapp/project/shellout/streaming'
 require 'dapp/project/shellout/base'
-require 'dapp/project/system_shellout'
 require 'dapp/project'
 require 'dapp/docker_registry'
 require 'dapp/docker_registry/mod/request'
@@ -161,7 +160,6 @@ require 'dapp/dimg/git_artifact'
 require 'dapp/dimg/path'
 require 'dapp/dimg/tags'
 require 'dapp/dimg/stages'
-require 'dapp/dimg/system_shellout'
 require 'dapp/dimg'
 require 'dapp/artifact'
 require 'dapp/image/argument'

data/lib/dapp/dimg.rb

@@ -5,7 +5,6 @@ module Dapp
     include Path
     include Tags
     include Stages
-    include SystemShellout
 
     include Helper::Sha256
 

data/lib/dapp/git_artifact.rb

@@ -26,16 +26,21 @@ module Dapp
     def apply_archive_command(stage)
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
-      ["#{repo.dimg.project.install_bin} #{credentials.join(' ')} -d #{to}",
-       ["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{include_paths.join(' ')}",
-        "#{sudo}#{repo.dimg.project.tar_bin} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')]
+      [].tap do |commands|
+        commands << "#{repo.dimg.project.install_bin} #{credentials.join(' ')} -d #{to}"
+
+        if include_paths_or_cwd.empty? || include_paths_or_cwd.any? { |path| file_exist_in_repo?(stage.layer_commit(self), path) }
+          commands << ["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{include_paths.join(' ')}",
+                       "#{sudo}#{repo.dimg.project.tar_bin} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')
+        end
+      end
     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)
+      if any_changes?(prev_commit, current_commit)
         [["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
           "#{sudo}#{repo.dimg.project.git_bin} apply --whitespace=nowarn --directory=#{to} #{patch_command_excludes.join(' ')} --unsafe-paths"].join(' | ')]
       else
@@ -55,11 +60,24 @@ module Dapp
     end
 
     def any_changes?(from, to = latest_commit)
-      !repo.old_git_bare(diff_command(from, to, quiet: true), returns: [0, 1]).status.success?
+      diff_patches(from, to).any?
     end
 
     def patch_size(from, to)
-      repo.old_git_bare("#{diff_command(from, to)} | wc -c").stdout.strip.to_i
+      diff_patches(from, to).reduce(0) do |bytes, patch|
+        patch.hunks.each do |hunk|
+          hunk.lines.each do |l|
+            bytes +=
+              case l.line_origin
+              when :eof_newline_added, :eof_newline_removed then 1
+              when :addition, :deletion, :binary            then l.content.size
+              else # :context, :file_header, :hunk_header, :eof_no_newline
+                0
+              end
+          end
+        end
+        bytes
+      end
     end
 
     def latest_commit
@@ -102,5 +120,24 @@ module Dapp
     def diff_command(from, to, quiet: false)
       "diff --binary #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{include_paths(true).join(' ')}"
     end
+
+    def include_paths_or_cwd
+      case
+      when !include_paths(true).empty? then include_paths(true)
+      when !cwd.empty? then [cwd]
+      else
+        []
+      end
+    end
+
+    def diff_patches(from, to)
+      repo.diff(from, to, paths: include_paths_or_cwd).patches.select do |p|
+        exclude_paths(true).any? { |path| !p.delta.new_file[:path].start_with?(path) }
+      end
+    end
+
+    def file_exist_in_repo?(from, path)
+      repo.file_exist_in_tree?(repo.lookup_commit(from).tree, path.split('/'))
+    end
   end
 end

data/lib/dapp/git_repo/base.rb

@@ -22,12 +22,12 @@ module Dapp
         @git_bare ||= Rugged::Repository.new(path, bare: true)
       end
 
-      def old_git_bare(command, **kwargs)
-        old_git "--git-dir=#{path} #{command}", **kwargs
+      def diff(from, to, **kwargs)
+        lookup_commit(from).diff(lookup_commit(to), **kwargs)
       end
 
       def commit_at(commit)
-        git_bare.lookup(commit).time.to_i
+        lookup_commit(commit).time.to_i
       end
 
       def latest_commit(branch)
@@ -42,15 +42,23 @@ module Dapp
         git_bare.head.name.sub(/^refs\/heads\//, '')
       end
 
+      def file_exist_in_tree?(tree, paths)
+        path = paths.shift
+        paths.empty? ?
+          tree.each { |obj| return true if obj[:name] == path } :
+          tree.each_tree { |tree| return file_exist_in_tree?(tree, paths) if tree[:name] == path }
+        false
+      end
+
+      def lookup_commit(commit)
+        git_bare.lookup(commit)
+      end
+
       protected
 
       def git
         @git ||= Rugged::Repository.new(path)
       end
-
-      def old_git(command, **kwargs)
-        dimg.system_shellout! "#{dimg.project.git_bin} #{command}", **kwargs
-      end
     end
   end
 end

data/lib/dapp/git_repo/own.rb

@@ -19,6 +19,12 @@ module Dapp
       def latest_commit(branch = nil)
         super(branch || 'HEAD')
       end
+
+      def lookup_commit(commit)
+        super
+      rescue Rugged::OdbError => _e
+        raise Error::Rugged, code: :commit_not_found_in_local_git_repository, data: { commit: commit }
+      end
     end
   end
 end

data/lib/dapp/git_repo/remote.rb

@@ -30,9 +30,21 @@ module Dapp
         FileUtils.rm_rf path
       end
 
+      def lookup_commit(commit)
+        super
+      rescue Rugged::OdbError => _e
+        raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
+      end
+
       protected
 
       attr_reader :url
+
+      def lookup_commit(commit)
+        super
+      rescue Rugged::OdbError => _e
+        raise Error::Rugged, code: :commit_not_found_in_remote_git_repository, data: { commit: commit, url: url }
+      end
     end
   end
 end

data/lib/dapp/image/scratch.rb

@@ -13,13 +13,15 @@ module Dapp
       end
 
       def build!(**_kwargs)
-        build_from_command = if from_archives.empty?
-                               "#{project.tar_bin} c --files-from /dev/null"
-                             else
-                               "#{project.cat_bin} #{from_archives.join(' ')}"
-                             end
-        #FIXME: do not use docker import from system-shellout
-        @built_id = project.system_shellout!("#{build_from_command} | docker import #{prepared_change} - ").stdout.strip
+        raise
+
+        #FIXME: system-shellout rejected
+        # build_from_command = if from_archives.empty?
+        #                        "#{project.tar_bin} c --files-from /dev/null"
+        #                      else
+        #                        "#{project.cat_bin} #{from_archives.join(' ')}"
+        #                      end
+        # @built_id = project.system_shellout!("#{build_from_command} | docker import #{prepared_change} - ").stdout.strip
       end
 
       protected

data/lib/dapp/project.rb

@@ -35,7 +35,6 @@ module Dapp
     include Deps::Base
 
     include Shellout::Base
-    include SystemShellout
 
     attr_reader :cli_options
     attr_reader :dimgs_patterns

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

@@ -7,26 +7,24 @@ module Dapp
       module Mrproper
         def mrproper
           log_step_with_indent(:mrproper) do
-            if proper_all?
-              flush_by_label('dapp')
-            elsif proper_dev_mode_cache?
-              flush_by_label('dapp-dev-mode')
-            elsif proper_cache_version?
-              log_proper_cache do
-                proper_cache_images = proper_cache_all_images
-                remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
-              end
-            else
-              raise Error::Project, code: :mrproper_required_option
-            end
+            raise Error::Project, code: :mrproper_required_option unless proper_all? || proper_dev_mode_cache? || proper_cache_version?
+
+            project_dangling_images_flush
+
+            flush_by_label('dapp') if proper_all?
+            flush_by_label('dapp-dev-mode', adding_message: '(dev)') if proper_all? || proper_dev_mode_cache?
+            log_proper_cache do
+              proper_cache_images = proper_cache_all_images
+              remove_images(dapp_images_by_label('dapp').select { |id| !proper_cache_images.include?(id) }.map(&:strip))
+            end if proper_cache_version?
           end
         end
 
         protected
 
-        def flush_by_label(label)
-          log_step_with_indent(:containers) { dapp_containers_flush_by_label(label) }
-          log_step_with_indent(:images) { dapp_images_flush_by_label(label) }
+        def flush_by_label(label, adding_message: nil)
+          log_step_with_indent([:containers, adding_message].compact.join(' ')) { dapp_containers_flush_by_label(label) }
+          log_step_with_indent([:images, adding_message].compact.join(' ')) { dapp_images_flush_by_label(label) }
         end
 
         def proper_all?

data/lib/dapp/project/ssh_agent.rb

@@ -6,7 +6,6 @@ module Dapp
       class << self
         def included(_base)
           ::Dapp::Project::Shellout::Base.default_env_keys << 'SSH_AUTH_SOCK'
-          ::Dapp::Project::SystemShellout.default_env_keys << 'SSH_AUTH_SOCK'
         end
       end # << self
 

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.23'.freeze
+  VERSION = '0.7.24'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.23
+  version: 0.7.24
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -459,7 +459,6 @@ files:
 - lib/dapp/dimg/git_artifact.rb
 - lib/dapp/dimg/path.rb
 - lib/dapp/dimg/stages.rb
-- lib/dapp/dimg/system_shellout.rb
 - lib/dapp/dimg/tags.rb
 - lib/dapp/docker_registry.rb
 - lib/dapp/docker_registry/base.rb
@@ -526,7 +525,6 @@ files:
 - lib/dapp/project/shellout/base.rb
 - lib/dapp/project/shellout/streaming.rb
 - lib/dapp/project/ssh_agent.rb
-- lib/dapp/project/system_shellout.rb
 - lib/dapp/version.rb
 homepage: https://github.com/flant/dapp
 licenses:

data/lib/dapp/dimg/system_shellout.rb

@@ -1,17 +0,0 @@
-module Dapp
-  # Dimg
-  class Dimg
-    # SystemShellout
-    module SystemShellout
-      def system_shellout(command, **kwargs)
-        project.system_shellout_extra(volume: tmp_path) do
-          project.system_shellout(command, **kwargs)
-        end
-      end
-
-      def system_shellout!(command, **kwargs)
-        system_shellout(command, raise_error: true, **kwargs)
-      end
-    end # SystemShellout
-  end # Dimg
-end # Dapp

data/lib/dapp/project/system_shellout.rb

@@ -1,71 +0,0 @@
-module Dapp
-  # Project
-  class Project
-    module SystemShellout
-      SYSTEM_SHELLOUT_IMAGE = 'ubuntu:16.04'.freeze
-
-      def system_shellout(command, raise_error: false, **kwargs)
-        system_shellout_extra(volume: (git_path ? File.dirname(git_path) : path)) do
-          begin
-            if raise_error
-              shellout! _to_system_shellout_command(command), **kwargs
-            else
-              shellout _to_system_shellout_command(command), **kwargs
-            end
-          rescue Error::Shellout
-            log_warning(
-              desc: { code: :launched_command,
-                      data: { command: _to_system_shellout_command(command) },
-                      context: :system_shellout }
-            )
-            raise
-          end
-        end
-      end
-
-      def system_shellout!(command, **kwargs)
-        system_shellout(command, raise_error: true, **kwargs)
-      end
-
-      def system_shellout_extra(volume: [], workdir: nil, &blk)
-        old = system_shellout_opts.dup
-
-        system_shellout_opts[:volume] += Array(volume)
-        system_shellout_opts[:workdir] = workdir if workdir
-
-        yield if block_given?
-      ensure
-        @system_shellout_opts = old
-      end
-
-      protected
-
-      def system_shellout_opts
-        @system_shellout_opts ||= {volume: []}
-      end
-
-      def _to_system_shellout_command(command)
-        volumes_from = [base_container, gitartifact_container]
-
-        ['docker run',
-         '--rm',
-         "--workdir #{system_shellout_opts[:workdir] || Dir.pwd}",
-         *volumes_from.map { |container| "--volumes-from #{container}" },
-         *Array(system_shellout_opts[:volume]).map { |volume| "--volume #{volume}:#{volume}" },
-         *SystemShellout.default_env_keys.map { |env_key|
-           env_key = env_key.to_s.upcase
-           "--env #{env_key}=#{ENV[env_key]}"
-         },
-         SYSTEM_SHELLOUT_IMAGE,
-         "#{bash_bin} -ec '#{shellout_pack(command)}'"
-        ].join(' ')
-      end
-
-      class << self
-        def default_env_keys
-          @default_env_keys ||= []
-        end
-      end # << self
-    end # SystemShellout
-  end # Project
-end # Dapp