dapp 0.31.17 → 0.31.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56078669b17f0c4c260030c78d1e5bab8d685932b57dda8dbcbb846e3dd713c1
-  data.tar.gz: 1ced7dac48869994788448b826a6cb6dd19e032f617b023bc27d8e28bf7d4298
+  metadata.gz: 2ec866c17582100f078aa0aef766fa3341380dd5453f8a038f19036d4e97ac32
+  data.tar.gz: c8f5fcd93d461e5b0dd195d2829a267ee78b70cfab8be34b0ed613d181eacb18
 SHA512:
-  metadata.gz: 937f880fdccf900637b9b2e008fbc3822c3411f082739863d40cd123736a91dfefa254d952602778a2ea95856cd8872f122e96540167811cd2b5ad4e88f998ce
-  data.tar.gz: 1c07196e67f4e0e5ee3917f8d2742df31e81d04fefeeba9fe2873071b1e4e188e8d9c7bb4ff6a81774cc364e6480d0a10078a2ff03d293b99ede4a1b3b5b65ce
+  metadata.gz: c3ea03e84af0b47ea84d997da83329794f575d648212426cc5dda2f7884be3bed81edbe71105dc602c907c33be189fb26377b537f80b5ac3b32bb28c0695cf84
+  data.tar.gz: 6c09b20c07770968d73a2c05fed1e71151c73ea3960ea47c7086941c35c0b2bbc8660081f3b9d1de41c4d894875bdbfb9f60c949072fb77a0e6a57f9de3fc45b

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -16,7 +16,7 @@ module Dapp
             protected
 
             def validate_scratch!
-              if _docker._from.nil?
+              if _docker._from.nil? && _from_dimg.nil?
                 validate_scratch_directives!
                 validate_scratch_artifacts!
               else

data/lib/dapp/dimg/git_artifact.rb

@@ -306,7 +306,11 @@ module Dapp
             elsif !branch.nil?
               repo.latest_branch_commit(branch)
             else
-              repo.head_commit
+              if local?
+                repo.head_commit
+              else
+                repo.latest_branch_commit(repo.branch)
+              end
             end
           end
         end.tap do |c|

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.17"
+  VERSION = "0.31.18"
   BUILD_CACHE_VERSION = 31
 end

metadata

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