dapp 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34654763ca898b862f3c4d10a4e66856533154d5
-  data.tar.gz: 3baa8bb73a33553f5292acd9b18d3edeb8c812fb
+  metadata.gz: b8a9ec9afc7917a8ecf1ba8d47e65defef16df8f
+  data.tar.gz: 50c22e22781a24115fc79514ad9c71410784a75e
 SHA512:
-  metadata.gz: ee7f50ac5f2d2253c398fd4501afc0316821fa4b060a951ebd4f9e487cde86cb7eac5864bb53f789371b978406740964390ede146ffb5655d6ba78af475b67d2
-  data.tar.gz: e7182830cb0cf44f4e3c93cecb5d0ef467c77be0f6249fae433eaa5a8cc7056446efd9fc00573cb43f6178ee44c70aaf72f28159255ed8f8111db0b86d91d28a
+  metadata.gz: 919231c2f8a6f6bf78780bcf969921472ddd416dee45fc46404cb9ff84f22848c780e8a76b342aa34d1024986fa651dd19e38d496328caa8610b297ac56d4c80
+  data.tar.gz: 929a790d85767cc510136ed9283b6ec86cb473e18cdee69fec205b0277dba81a11952930edf0e6ac28e0d725359156c76a7fea3d390e8b61a51bf02c550575aa

data/lib/dapp/application/path.rb

@@ -15,6 +15,16 @@ module Dapp
         make_path(@build_path, home_path.basename, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 
+      def project_path
+        @project_path ||= begin
+          if File.basename(expand_path(home_path, 1)) == '.dapps'
+            expand_path(home_path, 2)
+          else
+            home_path
+          end
+        end
+      end
+
       def container_dapp_path(*path)
         make_path('/.dapp', *path)
       end
@@ -28,6 +38,12 @@ module Dapp
       def make_path(base, *path)
         path.compact.map(&:to_s).inject(Pathname.new(base), &:+)
       end
+
+      def expand_path(path, number = 1)
+        path = File.expand_path(path)
+        number.times.each { path = File.dirname(path) }
+        path
+      end
     end # Path
   end # Application
 end # Dapp

data/lib/dapp/build/stage/mod/artifact.rb

@@ -68,7 +68,7 @@ module Dapp
             credentials += "-o #{owner} " if owner
             credentials += "-g #{group} " if group
 
-            copy_files = lambda do |from_, cwd_, path_ = ''|
+            copy_files = proc do |from_, cwd_, path_ = ''|
               cwd_ = File.expand_path(File.join('/', cwd_))
               "find #{File.join(from_, cwd_, path_)} -type f -exec bash -ec 'install -D #{credentials} {} " \
             "#{File.join(to, "$(echo {} | sed -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"

data/lib/dapp/build/stage/source_1_archive_dependencies.rb

@@ -7,6 +7,10 @@ module Dapp
           @prev_stage = InfraInstall.new(application, self)
           super
         end
+
+        def dependencies
+          [application.git_artifacts.map(&:paramshash).join]
+        end
       end # Source1ArchiveDependencies
     end # Stage
   end # Build

data/lib/dapp/build/stage/source_base.rb

@@ -22,8 +22,6 @@ module Dapp
         def image
           super do |image|
             image.add_volumes_from gitartifact_container
-            image.add_command 'export PATH=/.dapp/deps/gitartifact/bin:$PATH'
-
             application.git_artifacts.each do |git_artifact|
               image.add_volume "#{git_artifact.repo.path}:#{git_artifact.repo.container_path}:ro"
               image.add_command git_artifact.send(apply_command_method, self)
@@ -46,6 +44,10 @@ module Dapp
           end
         end
 
+        def git_dappdeps_path
+          '/.dapp/deps/gitartifact/bin/git'
+        end
+
         protected
 
         def gitartifact_container_name # FIXME: hashsum(image) or dockersafe()

data/lib/dapp/build/stage/source_dependencies_base.rb

@@ -18,7 +18,8 @@ module Dapp
         protected
 
         def dependencies_files_checksum(regs)
-          unless (files = regs.map { |reg| Dir[File.join(application.home_path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
+          regs.map! { |reg| File.directory?(File.join(application.project_path, reg)) ? File.join(reg, '**', '*') : reg }
+          unless (files = regs.map { |reg| Dir[File.join(application.project_path, reg)].map { |f| File.read(f) if File.file?(f) } }).empty?
             hashsum files
           end
         end

data/lib/dapp/builder/chef.rb

@@ -19,11 +19,10 @@ module Dapp
         define_method("#{stage}") do |image|
           unless stage_empty?(stage)
             image.add_volumes_from(chefdk_container)
-            image.add_command 'export PATH=/.dapp/deps/chefdk/bin:$PATH',
-                              "export DAPP_BUILD_STAGE=#{stage}"
+            image.add_command "export DAPP_BUILD_STAGE=#{stage}"
 
             image.add_volume "#{stage_build_path(stage)}:#{container_stage_build_path(stage)}:ro"
-            image.add_command ['chef-solo',
+            image.add_command [chef_solo_dappdeps_path,
                                '--legacy-mode',
                                "-c #{container_stage_config_path(stage)}",
                                "-o #{stage_cookbooks_runlist(stage).join(',')}"].join(' ')
@@ -167,7 +166,7 @@ module Dapp
             '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',
+            "#{berks_dappdeps_path} 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 ; ',
@@ -209,7 +208,7 @@ module Dapp
 
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_stage_cookbooks(stage)
-        select_existing_paths = ->(cookbook_path, paths) do
+        select_existing_paths = proc do |cookbook_path, paths|
           paths.select { |from, _| cookbook_path.join(from).exist? }
         end
 
@@ -305,11 +304,11 @@ module Dapp
         @stage_cookbooks_runlist[stage] ||= begin
           res = []
 
-          does_entry_exist = ->(cookbook, entrypoint) do
+          does_entry_exist = proc do |cookbook, entrypoint|
             stage_cookbooks_path(stage, cookbook, 'recipes', "#{entrypoint}.rb").exist?
           end
 
-          format_entry = ->(cookbook, entrypoint) do
+          format_entry = proc do |cookbook, entrypoint|
             entrypoint = 'void' if entrypoint.nil?
             "#{cookbook}::#{entrypoint}"
           end
@@ -382,6 +381,14 @@ module Dapp
       def container_stage_build_path(_stage, *path)
         path.compact.map(&:to_s).inject(Pathname.new('/.dapp/chef/build'), &:+)
       end
+
+      def chef_solo_dappdeps_path
+        '/.dapp/deps/chefdk/bin/chef-solo'
+      end
+
+      def berks_dappdeps_path
+        '/.dapp/deps/chefdk/bin/berks'
+      end
     end
   end
 end

data/lib/dapp/git_artifact.rb

@@ -15,6 +15,7 @@ module Dapp
       @branch = branch || repo.application.cli_options[:git_artifact_branch] || repo.branch
       @commit = commit
 
+      cwd = File.expand_path(File.join('/', cwd))[1..-1] unless cwd.nil? || cwd.empty?
       @cwd = cwd
       @paths = paths
       @owner = owner
@@ -26,7 +27,7 @@ module Dapp
       credentials = [:owner, :group].map { |attr| "--#{attr}=#{send(attr)}" unless send(attr).nil? }.compact
 
       ["install #{credentials.join(' ')} -d #{where_to_add}",
-       ["git --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths}",
+       ["#{stage.git_dappdeps_path} --git-dir=#{repo.container_path} archive #{stage.layer_commit(self)}:#{cwd} #{paths}",
         "#{sudo}tar -x -C #{where_to_add}"].join(' | ')]
     end
 
@@ -35,8 +36,8 @@ module Dapp
       prev_commit = stage.prev_source_stage.layer_commit(self)
 
       if prev_commit != current_commit || any_changes?(prev_commit, current_commit)
-        [["git --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
-          "#{sudo}git apply --whitespace=nowarn --directory=#{where_to_add} --unsafe-paths"].join(' | ')]
+        [["#{stage.git_dappdeps_path} --git-dir=#{repo.container_path} #{diff_command(prev_commit, current_commit)}",
+          "#{sudo}#{stage.git_dappdeps_path} apply --whitespace=nowarn --directory=#{where_to_add} --unsafe-paths"].join(' | ')]
       else
         []
       end
@@ -55,7 +56,7 @@ module Dapp
     end
 
     def paramshash
-      Digest::SHA256.hexdigest [cwd, paths, owner, group].map(&:to_s).join(':::')
+      Digest::SHA256.hexdigest [where_to_add, cwd, paths, owner, group].map(&:to_s).join(':::')
     end
 
     def paths(with_cwd = false)

data/lib/dapp/version.rb

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