dapp 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4061e00229c336d61bc166f2c8e0e60ce267d2f0
-  data.tar.gz: 556a9a1a278f3cbc3814c21d1ee7ab6f5a5bafe4
+  metadata.gz: 7bc6a29dd7b243dc8d6f5432442b085926c05ce7
+  data.tar.gz: 771c938cc250204bc86e50ee796952bbe14d02b4
 SHA512:
-  metadata.gz: 61dff1c46677e388e53805d2e1f294a818f8270150404971bfb85f07b3d77b79aa074eea8ceb373e0640b33f09325f94064e49eadf8b79c84b436535acdfbf09
-  data.tar.gz: bfa01aa5f9297f82e266105c23148daa36f4fda40b066ed0433dfb4e4fc1fd193a792503342b9706daa47efe978ace31df6fa15b0a62168123ebf60db71ad3b1
+  metadata.gz: 5ce285874f213efc4f28908cf22d9f7a32c71aa0d0f5554ff89740c6308418a74ccd5c4f050f999077aaf40f7d68022712ebb00458c3d176c4595ae0c4bee35d
+  data.tar.gz: b8f9bc10ec5e3cd36d6e80dc6fc0aceac8bc3fc0c4afaf884da4941f641f2e099e608d0aab82b40163c9c990de22ea6a9a3dc22d4592c45fef1a833cc25e05dd

data/config/en/net_status.yml

@@ -27,3 +27,5 @@ en:
       stage_artifact_not_associated: "Artifact not associated with any stage!"
       stage_artifact_incorrect_associated_value: "Artifact option '%{option}' has incorrect value '%{value}'!"
       git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
+    chef:
+      stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"

data/lib/dapp.rb

@@ -25,6 +25,12 @@ require 'dapp/helper/paint'
 require 'dapp/helper/streaming'
 require 'dapp/helper/shellout'
 require 'dapp/helper/net_status'
+require 'dapp/error/base'
+require 'dapp/error/application'
+require 'dapp/error/build'
+require 'dapp/error/config'
+require 'dapp/error/controller'
+require 'dapp/error/shellout'
 require 'dapp/cli'
 require 'dapp/cli/base'
 require 'dapp/cli/build'
@@ -47,6 +53,7 @@ require 'dapp/config/git_artifact'
 require 'dapp/config/docker'
 require 'dapp/builder/base'
 require 'dapp/builder/chef'
+require 'dapp/builder/chef/error'
 require 'dapp/builder/chef/cookbook_metadata'
 require 'dapp/builder/chef/berksfile'
 require 'dapp/builder/shell'
@@ -79,12 +86,6 @@ require 'dapp/git_repo/base'
 require 'dapp/git_repo/own'
 require 'dapp/git_repo/remote'
 require 'dapp/git_artifact'
-require 'dapp/error/base'
-require 'dapp/error/application'
-require 'dapp/error/build'
-require 'dapp/error/config'
-require 'dapp/error/controller'
-require 'dapp/error/shellout'
 require 'dapp/exception/base'
 require 'dapp/exception/introspect_image'
 

data/lib/dapp/builder/chef.rb

@@ -214,6 +214,7 @@ module Dapp
         @install_stage_cookbooks[stage] ||= true.tap do
           common_paths = proc do |cookbook_path|
             [['metadata.json', 'metadata.json'],
+             ["attributes/common", 'attributes'],
              ["attributes/#{stage}", 'attributes'],
              ["files/#{stage}", 'files/default'],
              ["templates/#{stage}", 'templates/default']
@@ -257,16 +258,35 @@ module Dapp
 
           stage_cookbooks_path(stage).mkpath
           install_paths.each do |cookbook_path, paths|
+            cookbook = cookbook_path.basename
+
             paths.each do |from, to|
               if from.nil?
-                to_path = stage_cookbooks_path(stage, cookbook_path.basename, 'recipes/void.rb')
+                to_path = stage_cookbooks_path(stage, cookbook, 'recipes/void.rb')
                 to_path.parent.mkpath
                 FileUtils.touch to_path
               else
                 from_path = cookbook_path.join(from)
-                to_path = stage_cookbooks_path(stage, cookbook_path.basename, to)
-                to_path.parent.mkpath
-                FileUtils.cp_r from_path, to_path
+                to_path = stage_cookbooks_path(stage, cookbook, to)
+                if from_path.directory? && to_path.exist?
+                  Dir[from_path.join('**/*')]
+                    .map(&Pathname.method(:new))
+                    .each do |from_subpath|
+                      to_subpath = to_path.join(from_subpath.relative_path_from(from_path))
+                      raise Error, code: :stage_path_overlap,
+                                   data: { stage: stage,
+                                           cookbook: cookbook,
+                                           from: from_subpath.relative_path_from(cookbook_path),
+                                           to: to_subpath.relative_path_from(stage_cookbooks_path(stage, cookbook)),
+                                         } if to_subpath.exist?
+
+                      to_subpath.parent.mkpath
+                      FileUtils.cp_r from_subpath, to_subpath
+                    end
+                else
+                  to_path.parent.mkpath
+                  FileUtils.cp_r from_path, to_path
+                end
               end
             end
           end

data/lib/dapp/builder/chef/error.rb

@@ -0,0 +1,11 @@
+module Dapp
+  module Builder
+    class Chef < Base
+      class Error < ::Dapp::Error::Base
+        def initialize(**net_status)
+          super(context: :chef, **net_status)
+        end
+      end
+    end # Chef
+  end # Builder
+end # Dapp

data/lib/dapp/error/base.rb

@@ -3,7 +3,7 @@ module Dapp
     # Base
     class Base < NetStatus::Exception
       def initialize(net_status = {})
-        super(net_status.merge(context: self.class.to_s.split('::').last.downcase))
+        super({context: self.class.to_s.split('::').last.downcase}.merge(net_status))
       end
     end
   end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.4.6'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -351,6 +351,7 @@ files:
 - lib/dapp/builder/chef.rb
 - lib/dapp/builder/chef/berksfile.rb
 - lib/dapp/builder/chef/cookbook_metadata.rb
+- lib/dapp/builder/chef/error.rb
 - lib/dapp/builder/shell.rb
 - lib/dapp/cli.rb
 - lib/dapp/cli/base.rb