dapp 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e684e6f7f3c0d642a883702a304127a101d52438
-  data.tar.gz: 124cd8bfd2d196d7437cd9915508ae105670612d
+SHA256:
+  metadata.gz: 79ca9f7c30f7695a0cb5298c9ef7584902ad4611fd53fc8eb2496c05de55d128
+  data.tar.gz: 316750d9cf5ba400323ebca768f4522f986c27f45947402c4dfe4ba97475f8eb
 SHA512:
-  metadata.gz: e7fab37354c67bc541acd52ebab95733b3d99add85a8e6a6424a6f606f0f86874cc6f1d79df5732fa7d6ed286329c68b4ad2c10d6707e2df3d445d80f77c9486
-  data.tar.gz: 6e44da6bfc5a7a4206e036149a671c243f8caf9be74efc3a3a859c033f370218f1bb1c057eed32b820dfd4bab1063f1ab2baea60693c30c381a20bc5d41b2b7a
+  metadata.gz: 2d4a59f6f6a821c2c31770578c04a1fa768f4b90a35e5c2163a164deaf1024f6618b82acfe7f1a1be66c5f0f34ed63e4d4d2932f5846a7085fc1bf959ecca20c
+  data.tar.gz: ab9c7b396f37ee8835d83b0f5f878ad363041c7c0c3bf1da09f68543151553cb063530a23b1be7ea8fbb0a848413313ad4718604fd9f2dbaaf647af5ae570302

data/lib/dapp/dimg/git_artifact.rb

@@ -125,31 +125,23 @@ module Dapp
         commit = dev_mode? ? nil : latest_commit
 
         stage_dependencies_key = [stage.name, commit]
-        @stage_dependencies_checksums ||= {}
-        @stage_dependencies_checksums[stage_dependencies_key] = begin
-          if @stage_dependencies_checksums.key?(stage_dependencies_key)
-            @stage_dependencies_checksums[stage_dependencies_key]
-          else
-            if (entries = repo_entries(commit, paths: paths)).empty?
-              repo.dimg.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
-                                                 data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
-                                                         dependencies: stage_dependencies.join(', ') } })
-            end
 
-            entries
-              .sort_by {|root, entry| File.join(root, entry[:name])}
-              .reduce(nil) {|prev_hash, (root, entry)|
-                content = nil
-                content = repo.lookup_object(entry[:oid]).content if entry[:type] == :blob
-
-                Digest::SHA256.hexdigest [
-                  prev_hash,
-                  File.join(root, entry[:name]),
-                  entry[:filemode].to_s,
-                  content
-                ].compact.join(':::')
-              }
+        @stage_dependencies_checksums ||= {}
+        @stage_dependencies_checksums[stage_dependencies_key] ||= begin
+          if (entries = repo_entries(commit, paths: paths)).empty?
+            repo.dimg.dapp.log_warning(desc: { code: :stage_dependencies_not_found,
+                                               data: { repo: repo.respond_to?(:url) ? repo.url : 'local',
+                                                       dependencies: stage_dependencies.join(', ') } })
           end
+
+          entries
+            .sort_by {|root, entry| File.join(root, entry[:name])}
+            .reduce(nil) {|prev_hash, (root, entry)|
+              content = nil
+              content = repo.lookup_object(entry[:oid]).content if entry[:type] == :blob
+
+              hexdigest prev_hash, File.join(root, entry[:name]), entry[:filemode].to_s, content
+            }
         end
       end
 
@@ -173,9 +165,7 @@ module Dapp
       def dev_patch_hash(stage)
         return unless dev_mode?
 
-        Digest::SHA256.hexdigest(diff_patches(latest_commit, nil).map do |patch|
-          change_patch_new_file_path(stage, patch)
-        end.join(':::'))
+        hexdigest *diff_patches(latest_commit, nil).map {|patch| change_patch_new_file_path(stage, patch)}
       end
 
       def latest_commit
@@ -183,7 +173,7 @@ module Dapp
       end
 
       def paramshash
-        Digest::SHA256.hexdigest [full_name, to, cwd, *include_paths, *exclude_paths, owner, group].map(&:to_s).join(':::')
+        hexdigest full_name, to, cwd, *include_paths, *exclude_paths, owner, group
       end
 
       def full_name
@@ -200,6 +190,10 @@ module Dapp
 
       protected
 
+      def hexdigest(*args)
+        Digest::SHA256.hexdigest args.compact.map {|arg| arg.to_s.force_encoding("ASCII-8BIT")}.join(":::")
+      end
+
       attr_reader :to
       attr_reader :commit
       attr_reader :branch

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.17.0'.freeze
+  VERSION = '0.17.1'.freeze
   BUILD_CACHE_VERSION = 20
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -706,7 +706,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell