dapp 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b22d79c413efd4110b588de5fe4314daca06e6c
-  data.tar.gz: fcdea90324c3ebdbb6aa88803fe742c8997cb5da
+  metadata.gz: 099323795c3915334ad78240e4aaaac9b76e0299
+  data.tar.gz: 23c70869e1cb2f25369af05d629e09692a349ae9
 SHA512:
-  metadata.gz: d6f63f947d2a92ee88d1aaeb8458e5405ae18bf1598146937c0744be7325657c8cc4f8ac0a80cfa46e16bc0389579bd648e61ce7ffe6654a6997924c0d523a38
-  data.tar.gz: e10bdaa68a350f8081d42fe2c2d80071779a9ef9db2c18d2795ffedb54771e389b277c93d9ab66cb732f6731fdf05970b9bb8963ae93ded87e17348181c426de
+  metadata.gz: afa7da11b4dc1c34e0817934c22cc8e2123f16e4c0c7c9c4ffec58b282c2c2d160301a5f6fa0a33adf6aa2df7df00b5b3f932b7f2254251fb2d6812836484632
+  data.tar.gz: 0c71e6fc8f2de0a7ca9378934e8d26c64c9e4055589d246a3b11c43a50ccd4b6b64cca3ccf60a0946e0228398b3e17e7fbb63b7ba39bcd00db6aa1e3b941391a

data/lib/dapp/builder/chef.rb

@@ -12,7 +12,9 @@ module Dapp
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.17.3-1'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
 
       [:infra_install, :infra_setup, :install, :setup].each do |stage|
-        define_method("#{stage}_checksum") { stage_cookbooks_checksum(stage) }
+        define_method("#{stage}_checksum") do
+          application.hashsum [stage_cookbooks_checksum(stage), *stage_cookbooks_runlist(stage)]
+        end
 
         define_method("#{stage}?") { !stage_empty?(stage) }
 
@@ -97,7 +99,6 @@ module Dapp
                        application.hashsum [
                          application.paths_content_hashsum(paths),
                          *paths.map { |p| p.relative_path_from(stage_cookbooks_path(stage)).to_s }.sort,
-                         *enabled_modules,
                          stage == :infra_install ? chefdk_image : nil
                        ].compact
                      end
@@ -255,7 +256,7 @@ module Dapp
                     else
                       [nil, *common_mdapp_paths]
                     end
-                  else
+                  elsif !is_mdapp
                     [['.', '.']]
                   end
 

data/lib/dapp/version.rb

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