dapp 0.7.17 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3cccdbfe9bb2fb9aab05958f1fa1d8f2db5ab5
-  data.tar.gz: c8518534ebe63840f47ff76327186f6b78d542bc
+  metadata.gz: a0dcb2453cc6b24dceb7490d086e4c755c56d4c7
+  data.tar.gz: 438de659b1cde4c9312e959cdb406a51a99e3363
 SHA512:
-  metadata.gz: 043df0615ad8084c2deca2fec4bb98f932a60a3ce7969f2ad84e4a14fef2643ed6e5889a8387c67701b287ef945d0f7198b1143be1fb3e24b78aaa9e5ae7bc6b
-  data.tar.gz: 12099bf042bb1282be953c32f12bce147fe2a6103a90a82eb88dcf3e296bb1af4d782fde0aa12988d6caad8dc2b881dad8a222f703f82ce4ba7caf7f4b8a28ef
+  metadata.gz: a2f7072fc7882ef94e2d9864ef7bad40dad70d820a679b2267da3316931118c6a02bfbced85ec3c451b5bc47ce58975e12d85e50225501ba90727ef6e27e61d0
+  data.tar.gz: e682d5bc70806fcd53af05c2ded8dc9a16471dff0ee5d6774038ff8ec4f4035cc629320a787991e515cbc09defb3e2e84a113cc539085d8dcbfa2b7623489d74

data/lib/dapp/config/artifact_group.rb

@@ -2,15 +2,6 @@ module Dapp
   module Config
     # ArtifactGroup
     class ArtifactGroup < DimgGroup
-      attr_reader :_artifact_dependencies, :_export
-
-      def initialize(project:)
-        @_artifact_dependencies = []
-        @_export = []
-
-        super(project: project)
-      end
-
       def _shell(&blk)
         @_shell ||= Directive::Shell::Artifact.new(project: project, &blk)
       end
@@ -19,6 +10,14 @@ module Dapp
         @_docker ||= Directive::Docker::Artifact.new(project: project, &blk)
       end
 
+      def _export
+        @_export ||= []
+      end
+
+      def _artifact_dependencies
+        @_artifact_dependencies ||= []
+      end
+
       undef :artifact
       undef :dimg
       undef :dimg_group
@@ -26,16 +25,21 @@ module Dapp
       protected
 
       def artifact_depends_on(*args)
-        @_artifact_dependencies.concat(args)
+        _artifact_dependencies.concat(args)
       end
 
       def export(*args, &blk)
-        @_export.concat begin
-                          artifact_config = pass_to_default(ArtifactDimg.new("artifact-#{SecureRandom.hex(2)}", project: project))
-                          artifact = Directive::Artifact.new(project: project, config: artifact_config)
-                          artifact.send(:export, *args, &blk)
-                          artifact._export
-                        end
+        _export.concat begin
+          artifact_config = pass_to_default(ArtifactDimg.new(
+            "artifact-#{SecureRandom.hex(2)}",
+            project: project
+          ))
+
+          artifact = Directive::Artifact.new(project: project, config: artifact_config)
+          artifact.send(:export, *args, &blk)
+
+          artifact._export
+        end
       end
 
       def check_dimg_directive_order(_directive)

data/lib/dapp/config/dimg/instance_methods.rb

@@ -185,7 +185,8 @@ module Dapp
         def passed_directives
           [:@_chef, :@_shell, :@_docker,
            :@_git_artifact, :@_mount,
-           :@_artifact, :@_builder, :@_dev_mode]
+           :@_artifact, :@_builder, :@_dev_mode,
+           :@_install_dependencies, :@_setup_dependencies]
         end
       end
     end

data/lib/dapp/dimg/path.rb

@@ -8,7 +8,7 @@ module Dapp
       end
 
       def cookbook_path(*path)
-        home_path('.dapp_chef', *path)
+        make_path(project.cookbook_path, *path)
       end
 
       def tmp_path(*path)

data/lib/dapp/git_artifact.rb

@@ -67,11 +67,11 @@ module Dapp
     end
 
     def paramshash
-      Digest::SHA256.hexdigest [to, cwd, *include_paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
+      Digest::SHA256.hexdigest [full_name, 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)
+      base_paths(repo.dimg.project.system_files.concat(@exclude_paths), with_cwd)
     end
 
     def include_paths(with_cwd = false)

data/lib/dapp/project.rb

@@ -84,6 +84,10 @@ module Dapp
       @path ||= expand_path(dappfile_path)
     end
 
+    def cookbook_path
+      File.join(path, '.dapp_chef')
+    end
+
     def build_path
       @build_path ||= begin
         if cli_options[:build_dir]
@@ -94,6 +98,10 @@ module Dapp
       end
     end
 
+    def system_files
+      [dappfile_path, cookbook_path, build_path].map { |p| File.basename(p) }
+    end
+
     def stage_cache
       "dimgstage-#{name}"
     end

data/lib/dapp/project/command/stages/cleanup_repo.rb

@@ -70,7 +70,7 @@ module Dapp
           def proper_repo_git_commit(registry)
             log_proper_git_commit do
               unproper_images = []
-              repo_project_images_detailed(registry).each do |_, attrs|
+              repo_project_dappstage_images_detailed(registry).each do |_, attrs|
                 attrs[:labels].each do |repo_name, commit|
                   next if (repo = project_git_repositories[repo_name]).nil?
                   git = repo.name == 'own' ? :git : :git_bare
@@ -81,9 +81,11 @@ module Dapp
             end
           end
 
-          def repo_project_images_detailed(registry)
+          def repo_project_dappstage_images_detailed(registry)
             @repo_project_images_detailed ||= begin
               registry.tags.map do |tag|
+                next unless tag.start_with?('dimgstage')
+
                 image_history = registry.image_history(tag)
                 attrs = {
                   id: registry.image_id(tag),
@@ -91,7 +93,7 @@ module Dapp
                   labels: image_history['config']['Labels']
                 }
                 [tag, attrs]
-              end
+              end.compact
             end
           end
 
@@ -103,12 +105,12 @@ module Dapp
               hierarchy.concat(iids)
               break if begin
                 iids.map! do |iid|
-                  repo_project_images_detailed(registry).map { |_, attrs| attrs[:id] if attrs[:parent] == iid }.compact
+                  repo_project_dappstage_images_detailed(registry).map { |_, attrs| attrs[:id] if attrs[:parent] == iid }.compact
                 end.flatten!.empty?
               end
             end
 
-            repo_project_images_detailed(registry).map { |tag, attrs| tag if hierarchy.include? attrs[:id] }.compact
+            repo_project_dappstage_images_detailed(registry).map { |tag, attrs| tag if hierarchy.include? attrs[:id] }.compact
           end
 
           def remove_repo_images(registry, tags)

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.17'.freeze
+  VERSION = '0.7.18'.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.17
+  version: 0.7.18
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout