dapp 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 099323795c3915334ad78240e4aaaac9b76e0299
-  data.tar.gz: 23c70869e1cb2f25369af05d629e09692a349ae9
+  metadata.gz: 01676cf63c920ea0e92fe63a31a56b6675bc6292
+  data.tar.gz: 3301444d6c80446d4c1e692e941627db4ed3b60f
 SHA512:
-  metadata.gz: afa7da11b4dc1c34e0817934c22cc8e2123f16e4c0c7c9c4ffec58b282c2c2d160301a5f6fa0a33adf6aa2df7df00b5b3f932b7f2254251fb2d6812836484632
-  data.tar.gz: 0c71e6fc8f2de0a7ca9378934e8d26c64c9e4055589d246a3b11c43a50ccd4b6b64cca3ccf60a0946e0228398b3e17e7fbb63b7ba39bcd00db6aa1e3b941391a
+  metadata.gz: dc8a5ab0d2441d9382e7cd4a1f2f6f1d5cec834c040e31130ce47f76cbfbc2e632d4f557066655bb40e6f0201edf5a4ad54eb701c7c10e99c913d30ee24e8ef0
+  data.tar.gz: cc7078af0e3daa91ab5062538d64ad72cff9b4e87eeee7a0668ed33c19442c4cee2f1a44025265d7d44ff4656c1d176d519cbb80f91a99924d6fe03f52bcf4d4

data/config/en/common.yml

@@ -12,7 +12,8 @@ en:
       artifact_building: "building artifact '%{name}'"
       git_artifact_clone: "cloning remote git_artifact '%{name}'"
       git_artifact_fetch: "fetching remote git_artifact '%{name}'"
-      berks_vendor: 'berks_vendor'
+      berks_vendor: 'vendoring cookbooks'
+      chef_cookbooks_stage_berks_vendor: 'vendoring cookbooks for chef cookbooks stage'
       gitartifact_container_loading: 'loading dappdeps/gitartifact container'
       chefdk_container_loading: 'loading dappdeps/chefdk container'
       system_shellout_container_loading: 'loading system shellout container'

data/lib/dapp/builder/chef.rb

@@ -21,8 +21,6 @@ module Dapp
         define_method("#{stage}") do |image|
           unless stage_empty?(stage)
             image.add_volumes_from(chefdk_container)
-            image.add_command "export DAPP_BUILD_STAGE=#{stage}"
-
             image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}:ro"
             image.add_command ['/.dapp/deps/chefdk/bin/chef-solo',
                                '--legacy-mode',
@@ -37,7 +35,7 @@ module Dapp
       end
 
       def chef_cookbooks(image)
-        image.add_volume "#{cookbooks_vendor_path}:#{application.container_dapp_path('chef_vendored_cookbooks')}"
+        image.add_volume "#{cookbooks_vendor_path(chef_cookbooks_stage: true)}:#{application.container_dapp_path('chef_vendored_cookbooks')}"
         image.add_command(
           'mkdir -p /usr/share/dapp/chef_repo',
           ["cp -a #{application.container_dapp_path('chef_vendored_cookbooks')} ",
@@ -155,41 +153,61 @@ module Dapp
       end
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      def install_cookbooks
+      def install_cookbooks(dest_path, chef_cookbooks_stage: false)
         volumes_from = chefdk_container
-        application.log_secondary_process(application.t(code: 'process.berks_vendor')) do
+        application.log_secondary_process(application.t(code: "process.#{chef_cookbooks_stage ? 'chef_cookbooks_stage_berks_vendor' : 'berks_vendor'}")) do
           ssh_auth_socket_path = nil
           ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
 
-          vendor_commands = [
+          before_berks_vendor = [
             'mkdir -p ~/.ssh',
             'echo "Host *" >> ~/.ssh/config',
             'echo "    StrictHostKeyChecking no" >> ~/.ssh/config',
-            'if [ ! -f Berksfile.lock ] ; then echo "Berksfile.lock not found" 1>&2 ; exit 1 ; fi',
-            'cp -a Berksfile.lock /tmp/Berksfile.lock.orig',
-            "/.dapp/deps/chefdk/bin/berks vendor /tmp/vendored_cookbooks",
-            'export LOCKDIFF=$(diff -u0 Berksfile.lock /tmp/Berksfile.lock.orig)',
-            ['if [ "$LOCKDIFF" != "" ] ; then ',
-             'cp -a /tmp/Berksfile.lock.orig Berksfile.lock ; ',
-             'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join,
+            ('if [ ! -f Berksfile.lock ] ; then echo "Berksfile.lock not found" 2>&2 ; exit 1 ; fi' unless chef_cookbooks_stage),
+            'if [ -f Berksfile.lock ] ; then cp -a Berksfile.lock /tmp/Berksfile.lock.orig ; fi'
+          ]
+
+          after_berks_vendor = []
+          if chef_cookbooks_stage
+            after_berks_vendor.concat [
+              'cp -a /tmp/Berksfile.lock.orig Berksfile.lock'
+            ]
+          else
+            after_berks_vendor.concat [
+              'export LOCKDIFF=$(diff -u0 Berksfile.lock /tmp/Berksfile.lock.orig)',
+              ['if [ "$LOCKDIFF" != "" ] ; then ',
+               'cp -a /tmp/Berksfile.lock.orig Berksfile.lock ; ',
+               'echo -e "Bad Berksfile.lock\n$LOCKDIFF" 1>&2 ; exit 1 ; fi'].join
+            ]
+          end
+
+          move_cookbooks = [
             ["find /tmp/vendored_cookbooks -type d -exec bash -ec '",
              "install -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) -d ",
-             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/^\\/tmp\\/vendored_cookbooks//\")' \\;"].join,
+             "#{dest_path}/$(echo {} | sed -e \"s/^\\/tmp\\/vendored_cookbooks//\")' \\;"].join,
             ["find /tmp/vendored_cookbooks -type f -exec bash -ec '",
              "install -o #{Process.uid} -g #{Process.gid} --mode $(stat -c %a {}) {} ",
-             "#{_cookbooks_vendor_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks//\")' \\;"].join
+             "#{dest_path}/$(echo {} | sed -e \"s/\\/tmp\\/vendored_cookbooks//\")' \\;"].join
+          ]
+
+          vendor_commands = [
+            *before_berks_vendor.compact,
+            "/.dapp/deps/chefdk/bin/berks vendor /tmp/vendored_cookbooks",
+            *after_berks_vendor.compact,
+            *move_cookbooks.compact
           ]
 
           application.shellout!(
             ['docker run --rm',
              ("--volume #{ssh_auth_socket_path}:#{ssh_auth_socket_path}" if ssh_auth_socket_path),
-             "--volume #{_cookbooks_vendor_path.tap(&:mkpath)}:#{_cookbooks_vendor_path}",
+             "--volume #{dest_path.tap(&:mkpath)}:#{dest_path}",
              *berksfile.local_cookbooks
                        .values
                        .map { |cookbook| "--volume #{cookbook[:path]}:#{cookbook[:path]}" },
              "--volumes-from #{volumes_from}",
              "--workdir #{berksfile_path.parent}",
              ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
+             ('--env DAPP_CHEF_COOKBOOKS_VENDORING=1' if chef_cookbooks_stage),
              "dappdeps/berksdeps:0.1.0 bash -ec '#{application.shellout_pack(vendor_commands.join(' && '))}'"].compact.join(' '),
             log_verbose: application.log_verbose?
           )
@@ -197,13 +215,18 @@ module Dapp
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      def _cookbooks_vendor_path
-        application.tmp_path(application.config._name, "cookbooks.#{cookbooks_checksum}")
+      def _cookbooks_vendor_path(chef_cookbooks_stage: false)
+        application.tmp_path(
+          application.config._name,
+          ['cookbooks',
+           chef_cookbooks_stage ? 'chef_cookbooks_stage' : nil,
+           cookbooks_checksum].compact.join('.')
+        )
       end
 
-      def cookbooks_vendor_path(*path)
-        _cookbooks_vendor_path.tap do |cookbooks_path|
-          install_cookbooks unless cookbooks_path.exist?
+      def cookbooks_vendor_path(*path, chef_cookbooks_stage: false)
+        _cookbooks_vendor_path(chef_cookbooks_stage: chef_cookbooks_stage).tap do |cookbooks_path|
+          install_cookbooks(cookbooks_path, chef_cookbooks_stage: chef_cookbooks_stage) unless cookbooks_path.exist?
         end.join(*path)
       end
 

data/lib/dapp/builder/shell.rb

@@ -9,8 +9,7 @@ module Dapp
         end
         define_method("#{stage}?") { !stage_empty?(stage) }
         define_method("#{stage}") do |image|
-          image.add_command("export DAPP_BUILD_STAGE=#{stage}",
-                            *stage_commands(stage)) unless stage_empty?(stage)
+          image.add_command(*stage_commands(stage)) unless stage_empty?(stage)
         end
       end
 

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.5.12'.freeze
+  VERSION = '0.5.13'.freeze
   BUILD_CACHE_VERSION = 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout