dapp 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7836539f8a917786c4db7778853720687f41b3dc80eaaddee4b7e9cf13a7e8f5
-  data.tar.gz: 84eec391c97ddebb98732b6dc8729f606a7cbbb2c5eaf1c4b398e4a22de30736
+  metadata.gz: e53bf1f4f23e9c9d6a142cf56aad7fefb1c704405b3e633da4c46a6848d00380
+  data.tar.gz: f7d77efca8a9921229699d9c80afa45464a2caf3ced3a201dc9c1c4c53a84386
 SHA512:
-  metadata.gz: e44e256557b647a045f379df38c06f88ad2911a49e691112e3ce3d970ccc4afcf8f09d2f0381478924f41560d50c58bd8fb66ce97951a4a68ae280548ef70e70
-  data.tar.gz: 37d984525171b58ba24a6ea18a208b87f4e50de784ed8098958c9df0c2eb9893cc3b12ec95b4f2d17ebde90c7785299dd563f1c9168dbc0f8e02aefda1d3b108
+  metadata.gz: efc034a6c62b2ece90d2d5bfa25d26f444249b10b7102fc9abe1b42fe6711417fa86faa18c999590070682839ebd0757130d6a0867e6c1f7bf9441fcb8903ca1
+  data.tar.gz: 7addc6c0444189fd08780cbb3bb009b1c16e6c09265b332c7c9bb10f37dc359a32a2c32202e3a21a1549a93bf5d32382cf2607e96b957f3ae56b489fec625a0a

data/lib/dapp/dimg/build/stage/from.rb

@@ -4,7 +4,7 @@ module Dapp
       module Stage
         class From < Base
           def dependencies
-            @dependencies ||= [from_image_name, dimg.config._docker._from_cache_version, config_mounts_dirs]
+            @dependencies ||= [from_image_name, dimg.config._docker._from_cache_version, config_mounts]
           end
 
           protected
@@ -48,8 +48,15 @@ module Dapp
                                        "#{dimg.dapp.mkdir_bin} -p %s"].map { |c| format(c, config_mounts_dirs.join(' ')) }
           end
 
+          def config_mounts
+            {}.tap do |mounts|
+              [:tmp_dir, :build_dir].map { |type| mounts[type] = config_mounts_by_type(type) }
+              config_custom_dir_mounts.each { |from, to| mounts[from] = to }
+            end
+          end
+
           def config_mounts_dirs
-            ([:tmp_dir, :build_dir].map { |type| config_mounts_by_type(type) } + config_custom_dir_mounts.map(&:last)).flatten.uniq
+            config_mounts.values.flatten.uniq
           end
 
           def adding_mounts_by_type(_type)

data/lib/dapp/dimg/git_repo/base.rb

@@ -56,8 +56,13 @@ module Dapp
         def submodule_params(submodule)
           {}.tap do |params|
             params[:path]   = submodule.path
-            params[:url]    = submodule_url(submodule.url)
-            params[:type]   = begin
+            params[:url]    = begin
+              params_url = submodule_url(submodule.url)
+              params_url = "#{params_url}.git" if url_protocol(params[:url]) != :noname && !params_url.end_with?('.git')
+              params_url
+            end # https://github.com/libgit2/rugged/issues/761
+
+            params[:type] = begin
               if url_protocol(params[:url]) == :noname
                 submodule_absolute_path = File.join(File.dirname(path), params[:path])
                 dapp.log_warning(desc: { code: :submodule_url_scheme_not_detected,

data/lib/dapp/dimg/git_repo/local.rb

@@ -38,6 +38,14 @@ module Dapp
           end.compact
         end
 
+        def submodules_git(commit)
+          if commit.nil?
+            git
+          else
+            super
+          end
+        end
+
         def raise_submodule_commit_not_found!(commit)
           raise Error::Rugged, code: :git_local_submodule_commit_not_found, data: { commit: commit, path: path }
         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.32.0"
+  VERSION = "0.32.1"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout