dapp 0.7.33 → 0.7.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c5095ab59dcafa96d266fe6621054d73650f810
-  data.tar.gz: da9b7fc76f67b249253fa444519ff8d9d12656d8
+  metadata.gz: 057467ea87a01a2cf762174c86784e2cca072266
+  data.tar.gz: def7d534f9f24fbc1a58c6f9b6220f61f662745d
 SHA512:
-  metadata.gz: 93b35c7c59d78b784ef7cc17ca7ad5962fefec63843e1f818070432bba7f359a06af80c7131e6ed620a63c4a2f19bd7d685691a8b8653959ccdff932bebb1315
-  data.tar.gz: 5e2b182eb2a0c84f5276765b5745cbc5969a811b6d9c3f5ea68b5862cf9493a449361af53ac53afb7eeb29b1605f9d535f03860ae038744e16b280b90f3e2384
+  metadata.gz: 74efa859ec62149c1547250934b024d102909e274269993ae4f94d02bc1a24756e9d85a3ff9f5a994c055fcaef37f4d903e8be985c9687d3cc8b2b1314d42017
+  data.tar.gz: 29db42cab0de1664a24bf1561b0b9118c7fcad4285aeb26217bdf87ad1af7e471200c254dd810d3cd839c9e546f004217604cfa6fc97273550bad4f98b9ccf2f

data/config/en/net_status.yml

@@ -54,7 +54,7 @@ en:
     chef:
       stage_path_overlap: "Cannot install `%{cookbook}` cookbook's path %{from} into %{to}: already exists"
       mdapp_dependency_in_metadata_forbidden: "Using mdapp as dependency in metadata.rb forbidden: detected `%{dependency}`"
-      cookbook_path_not_found: "Dapp cookbook directory not found at %{path}"
+      local_cookbook_path_not_found: "Dapp cookbook directory not found at %{path}"
       cookbook_berksfile_not_found: "Dapp cookbook Berksfile not found at %{path}"
       cookbook_metadata_not_found: "Dapp cookbook metadata.rb file not found at %{path}"
       cookbook_not_specified_in_berksfile: "Dapp cookbook `%{name}` not specified in Berksfile at %{path}"

data/lib/dapp.rb

@@ -21,6 +21,7 @@ require 'net_status'
 
 require 'dapp/version'
 require 'dapp/core_ext/hash'
+require 'dapp/core_ext/pathname'
 require 'dapp/helper/cli'
 require 'dapp/helper/trivia'
 require 'dapp/helper/sha256'
@@ -123,7 +124,9 @@ require 'dapp/build/stage/ga_artifact_patch'
 require 'dapp/build/stage/build_artifact'
 require 'dapp/project/lock'
 require 'dapp/project/ssh_agent'
+require 'dapp/project/git_artifact'
 require 'dapp/project/dappfile'
+require 'dapp/project/chef'
 require 'dapp/project/command/common'
 require 'dapp/project/command/build'
 require 'dapp/project/command/bp'

data/lib/dapp/builder/chef.rb

@@ -97,21 +97,21 @@ module Dapp
         cookbook_metadata.name
       end
 
-      def cookbook_path(*path)
-        dimg.cookbook_path.tap do |cookbook_path|
-          unless cookbook_path.exist?
-            raise Error, code: :cookbook_path_not_found,
-                         data: { path: cookbook_path }
+      def local_cookbook_path(*path)
+        dimg.local_cookbook_path.tap do |local_cookbook_path|
+          unless local_cookbook_path.exist?
+            raise Error, code: :local_cookbook_path_not_found,
+                         data: { path: local_cookbook_path }
           end
         end.join(*path)
       end
 
       def berksfile_path
-        cookbook_path('Berksfile')
+        local_cookbook_path('Berksfile')
       end
 
       def berksfile_lock_path
-        cookbook_path('Berksfile.lock')
+        local_cookbook_path('Berksfile.lock')
       end
 
       def berksfile
@@ -121,7 +121,7 @@ module Dapp
                          data: { path: berksfile_path.to_s }
           end
 
-          Berksfile.new(cookbook_path, berksfile_path).tap do |berksfile|
+          Berksfile.new(local_cookbook_path, berksfile_path).tap do |berksfile|
             unless berksfile.local_cookbook? project_name
               raise Error, code: :cookbook_not_specified_in_berksfile,
                            data: { name: project_name, path: berksfile_path.to_s }
@@ -131,7 +131,7 @@ module Dapp
       end
 
       def cookbook_metadata_path
-        cookbook_path('metadata.rb')
+        local_cookbook_path('metadata.rb')
       end
 
       def check_cookbook_metadata_path_exist!

data/lib/dapp/core_ext/pathname.rb

@@ -0,0 +1,25 @@
+module Dapp
+  # CoreExt
+  module CoreExt
+    # Pathname
+    module Pathname
+      def subpath_of?(another_path)
+        another_path_descends = []
+        ::Pathname.new(another_path).cleanpath.descend {|d| another_path_descends << d}
+
+        path_descends = []
+        cleanpath.descend {|d| path_descends << d}
+
+        (path_descends & another_path_descends) == another_path_descends and
+          (path_descends - another_path_descends).any?
+      end
+
+      def subpath_of(another_path)
+        return unless subpath_of? another_path
+        cleanpath.to_s.partition(::Pathname.new(another_path).cleanpath.to_s + '/').last
+      end
+    end # Pathname
+  end # CoreExt
+end # Dapp
+
+::Pathname.send(:include, ::Dapp::CoreExt::Pathname)

data/lib/dapp/dimg/path.rb

@@ -7,8 +7,8 @@ module Dapp
         make_path(project.path, *path).expand_path
       end
 
-      def cookbook_path(*path)
-        make_path(project.cookbook_path, *path)
+      def local_cookbook_path(*path)
+        make_path(project.local_cookbook_path, *path)
       end
 
       def tmp_path(*path)

data/lib/dapp/git_artifact.rb

@@ -30,7 +30,7 @@ module Dapp
         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(' ')}",
+          commands << ["#{repo.dimg.project.git_bin} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} --prefix=/ #{include_paths.join(' ')}",
                        "#{sudo}#{repo.dimg.project.tar_bin} -x -C #{to} #{archive_command_excludes.join(' ')}"].join(' | ')
         end
       end
@@ -49,7 +49,7 @@ module Dapp
     end
 
     def archive_command_excludes
-      exclude_paths.map { |path| %(--exclude=#{path}) }
+      exclude_paths.map { |path| %(--exclude=#{File.join('/', path)}) }
     end
 
     def patch_command_excludes
@@ -89,7 +89,7 @@ module Dapp
     end
 
     def exclude_paths(with_cwd = false)
-      base_paths(repo.dimg.project.system_files.concat(@exclude_paths), with_cwd)
+      base_paths(repo.exclude_paths + @exclude_paths, with_cwd)
     end
 
     def include_paths(with_cwd = false)

data/lib/dapp/git_repo/base.rb

@@ -10,6 +10,10 @@ module Dapp
         @name = name
       end
 
+      def exclude_paths
+        []
+      end
+
       def container_path
         raise
       end

data/lib/dapp/git_repo/own.rb

@@ -6,6 +6,10 @@ module Dapp
         super(dimg, 'own')
       end
 
+      def exclude_paths
+        dimg.project.local_git_artifact_exclude_paths
+      end
+
       def container_path
         dimg.container_dapp_path('git_repo_own', "#{name}.git")
       end

data/lib/dapp/project.rb

@@ -2,7 +2,9 @@ module Dapp
   # Project
   class Project
     include Lock
+    include GitArtifact
     include Dappfile
+    include Chef
 
     include Command::Common
     include Command::Run
@@ -83,10 +85,6 @@ 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]
@@ -97,8 +95,13 @@ module Dapp
       end
     end
 
-    def system_files
-      [dappfile_path, cookbook_path, build_path].map { |p| File.basename(p) }
+    def local_git_artifact_exclude_paths(&blk)
+      super do |exclude_paths|
+        build_path_relpath = Pathname.new(build_path).subpath_of(path)
+        exclude_paths << build_path_relpath.to_s if build_path_relpath
+
+        yield exclude_paths if block_given?
+      end
     end
 
     def stage_cache

data/lib/dapp/project/chef.rb

@@ -0,0 +1,24 @@
+module Dapp
+  # Project
+  class Project
+    # Chef
+    module Chef
+      def local_git_artifact_exclude_paths(&blk)
+        super do |exclude_paths|
+          exclude_paths << '.dapp_chef'
+          exclude_paths << '.chefinit'
+
+          yield exclude_paths if block_given?
+        end
+      end
+
+      def local_cookbook_path
+        File.join(path, '.dapp_chef')
+      end
+
+      def chefinit_cookbook_path
+        File.join(path, '.chefinit')
+      end
+    end # Chef
+  end # Project
+end # Dapp

data/lib/dapp/project/dappfile.rb

@@ -3,6 +3,14 @@ module Dapp
   class Project
     # Dappfile
     module Dappfile
+      def local_git_artifact_exclude_paths(&blk)
+        super do |exclude_paths|
+          exclude_paths << 'Dappfile'
+
+          yield exclude_paths if block_given?
+        end
+      end
+
       def build_configs
         @configs ||= begin
           dimgs(dappfile_path).flatten.tap do |dimgs|

data/lib/dapp/project/git_artifact.rb

@@ -0,0 +1,13 @@
+module Dapp
+  # Project
+  class Project
+    # GitArtifact
+    module GitArtifact
+      def local_git_artifact_exclude_paths(&blk)
+        @local_git_artifact_exclude_paths ||= [].tap do |exclude_paths|
+          yield exclude_paths if block_given?
+        end
+      end
+    end # GitArtifact
+  end # Project
+end # Dapp

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.33'.freeze
-  BUILD_CACHE_VERSION = '6.2'
+  VERSION = '0.7.34'.freeze
+  BUILD_CACHE_VERSION = '6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.33
+  version: 0.7.34
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -455,6 +455,7 @@ files:
 - lib/dapp/config/directive/shell/artifact.rb
 - lib/dapp/config/directive/shell/dimg.rb
 - lib/dapp/core_ext/hash.rb
+- lib/dapp/core_ext/pathname.rb
 - lib/dapp/dimg.rb
 - lib/dapp/dimg/git_artifact.rb
 - lib/dapp/dimg/path.rb
@@ -496,6 +497,7 @@ files:
 - lib/dapp/lock/file.rb
 - lib/dapp/prctl.rb
 - lib/dapp/project.rb
+- lib/dapp/project/chef.rb
 - lib/dapp/project/command/bp.rb
 - lib/dapp/project/command/build.rb
 - lib/dapp/project/command/cleanup.rb
@@ -517,6 +519,7 @@ files:
 - lib/dapp/project/dappfile.rb
 - lib/dapp/project/deps/base.rb
 - lib/dapp/project/deps/gitartifact.rb
+- lib/dapp/project/git_artifact.rb
 - lib/dapp/project/lock.rb
 - lib/dapp/project/logging/base.rb
 - lib/dapp/project/logging/i18n.rb