dapp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzAxNjZmMWU3YzMyNTU5YjdkZmUxNmVhZDc2NGUxZjc2MWYzNTYwOQ==
+    MmJjZGYxOTIyMWIwYTRiMTlkOTk5NTBlMDdiMjQ3NGY1ZTM1YmMxMw==
   data.tar.gz: !binary |-
-    NTQyN2ExNTg1MmE3YzM1YzMzMDQ3OGRlZDBlYmFjZGUwY2E0MTdiZQ==
+    Y2VlYTUxMWU1MGMwYTIzZDM2NWRiNGI3YzczYTM1NTZjMDUyMTBjOA==
 SHA512:
   metadata.gz: !binary |-
-    ZjBmZTg0YzI2NzVmYWQ1NDg4NjdlOWQ4YWNmN2VjNTMzODdkNzMxMTFhYjk2
-    ZGMzOGUxYmI4ODY5NGM0NWY5MTY5YzQ2YTEyZTg4MzI2OGZkNmE0ZjI1NDA0
-    ZTkzOTQ4NzE3OGMyZWM4Yjg2ZWU2Nzg2MWZkNTVkNDhjNDNlYmU=
+    YmEwYmU2YjEzMmViNGEwYmM2MzFhNmMxM2Q2OTdmMDg4NThkMjVhY2M5Njhh
+    NzRjOGJkYzE3ZWEzYzEzZDI3YmFiZWEyMTg2Y2NiYjVlZDQwYzRiZDIxMDk2
+    YTRlNzJjZDU3NzkyZTU2MjBkN2I3ZTQ3YmY4N2I0MTI3M2M5ZTE=
   data.tar.gz: !binary |-
-    ZTJiNDNmNTBiZDlmYWFlMWQxYmYxMmFkZTA2NGFlNTY1YTFjMTYyNDEyMWM5
-    YmIzYjA4NzVjOGE2YzQyZWI4Y2JiMzA5NzdjZjkyYzc2MzMyMjM3YTViZWVh
-    OGUzZjIxZTUwMzY0YTQ1N2Y2MDE4MGNlOWQzNzBhYWEzYzdjYzU=
+    YzUzZmRmNzMwYjE5NTg1MTI2NTVlMjg1ZWYwOWRlOGUyZGYzOThlM2FlN2Y1
+    MGEwZDE1YzhiNzAxYmVmODQ0YWVhY2JiM2ZmNjVmNzg3M2QwZTVkYWI5Njdl
+    ZDg4ZmNkZDEyYWJjNDVhN2QyZDUxOGVlOTY3M2Y3MTlhZjRlMTY=

data/lib/dapp/builder/chef.rb

@@ -9,6 +9,7 @@ module Dapp
       ).freeze
 
       STAGE_LOCAL_COOKBOOK_PATTERNS = %w(
+        metadata.json
         recipes/%{stage}.rb
         recipes/*_%{stage}.rb
         files/%{stage}/*
@@ -87,17 +88,17 @@ module Dapp
 
       def local_cookbook_paths
         @local_cookbook_paths ||= berksfile.local_cookbooks
-                                  .values
-                                  .map { |cookbook| cookbook[:path] }
-                                  .product(LOCAL_COOKBOOK_PATTERNS)
-                                  .map { |cb, dir| Dir[cb.join(dir)] }
-                                  .flatten
-                                  .map(&Pathname.method(:new))
+                                           .values
+                                           .map { |cookbook| cookbook[:path] }
+                                           .product(LOCAL_COOKBOOK_PATTERNS)
+                                           .map { |cb, dir| Dir[cb.join(dir)] }
+                                           .flatten
+                                           .map(&Pathname.method(:new))
       end
 
       def stage_cookbooks_vendored_paths(stage, with_files: false)
         Dir[cookbooks_vendor_path('*')]
-          .map do|cookbook_path|
+          .map do |cookbook_path|
             if ['mdapp-*', project_name].any? { |pattern| File.fnmatch(pattern, File.basename(cookbook_path)) }
               STAGE_LOCAL_COOKBOOK_PATTERNS.map do |pattern|
                 Dir[File.join(cookbook_path, pattern % { stage: stage })]
@@ -124,7 +125,7 @@ module Dapp
 
           application.hashsum([_paths_checksum(stage_cookbooks_vendored_paths(stage, with_files: true)),
                                *application.config._chef._modules,
-                               (stage == :infra_install) ? chefdk_image : nil].compact).tap do |checksum|
+                               stage == :infra_install ? chefdk_image : nil].compact).tap do |checksum|
             stage_cookbooks_checksum_path(stage).write "#{checksum}\n"
           end
         end
@@ -148,7 +149,7 @@ module Dapp
 
       def chefdk_container
         @chefdk_container ||= begin
-          if application.shellout("docker inspect #{chefdk_container_name}").exitstatus != 0
+          if application.shellout("docker inspect #{chefdk_container_name}").exitstatus.nonzero?
             application.log_secondary_process(application.t(code: 'process.chefdk_loading'), short: true) do
               application.shellout(
                 ['docker run',
@@ -251,8 +252,8 @@ module Dapp
         application.hashsum [
           *paths.map(&:to_s).sort,
           *paths.reject(&:directory?)
-            .sort
-            .reduce(nil) { |a, e| application.hashsum [a, e.read].compact }
+                .sort
+                .reduce(nil) { |a, e| application.hashsum [a, e.read].compact }
         ]
       end
     end

data/lib/dapp/builder/chef/berksfile.rb

@@ -14,8 +14,10 @@ module Dapp
             @berksfile.add_local_cookbook_path(name, path) if path
           end
 
+          # rubocop:disable Style/MethodMissing
           def method_missing(*_a, &_blk)
           end
+          # rubocop:enable Style/MethodMissing
 
           private
 

data/lib/dapp/builder/chef/cookbook_metadata.rb

@@ -18,6 +18,11 @@ module Dapp
             @cookbook_metadata.version = version
           end
 
+          # rubocop:disable Style/MethodMissing
+          def method_missing(*_a, &_blk)
+          end
+          # rubocop:enable Style/MethodMissing
+
           private
 
           def parse

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
   BUILD_CACHE_VERSION = 1
 end

metadata

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