dapp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJjZGYxOTIyMWIwYTRiMTlkOTk5NTBlMDdiMjQ3NGY1ZTM1YmMxMw==
+    MmRiODBmZjM2MTk5NWQ5YmYwZjk4Yjg3OGEzOTVmNjc1M2VkOGQ4YQ==
   data.tar.gz: !binary |-
-    Y2VlYTUxMWU1MGMwYTIzZDM2NWRiNGI3YzczYTM1NTZjMDUyMTBjOA==
+    Zjg3MjhhMWRmOTUyZjYwNjNjODBkOWFiZGU3NjRhM2JiNDFlYTU3YQ==
 SHA512:
   metadata.gz: !binary |-
-    YmEwYmU2YjEzMmViNGEwYmM2MzFhNmMxM2Q2OTdmMDg4NThkMjVhY2M5Njhh
-    NzRjOGJkYzE3ZWEzYzEzZDI3YmFiZWEyMTg2Y2NiYjVlZDQwYzRiZDIxMDk2
-    YTRlNzJjZDU3NzkyZTU2MjBkN2I3ZTQ3YmY4N2I0MTI3M2M5ZTE=
+    ZjE2ODY2MDIyM2UxMGE5OGY4ZmYxNWI2ODk0ZWRjYTA2ODAzYmUzMjc2MDRl
+    MmI0NzM4MTZlNjk5ZTkwNjgxYjE0NjZiNDZkYzUxYTc3OTgzOGRkM2RiYzRl
+    MzJhNDU4ZmZmMzExZWJhMzdlMWJlZWEyZDNhNzU0ZTg5NmI5OGQ=
   data.tar.gz: !binary |-
-    YzUzZmRmNzMwYjE5NTg1MTI2NTVlMjg1ZWYwOWRlOGUyZGYzOThlM2FlN2Y1
-    MGEwZDE1YzhiNzAxYmVmODQ0YWVhY2JiM2ZmNjVmNzg3M2QwZTVkYWI5Njdl
-    ZDg4ZmNkZDEyYWJjNDVhN2QyZDUxOGVlOTY3M2Y3MTlhZjRlMTY=
+    NjRjYzk5MzExOTY3ZGNhYzJiNmI0NTg2ZGFlMDM2MWUwMWFkMTViNDFhZjI4
+    YWFlZmI2NDc2MzM3ZDMwMGNjYjIwNmM5MDk5ZmNlMjk1NTY2ZWMwMjhiYWVl
+    OTQ1ZWYwYTE1Mjc4NDc1ZjgzZDdmNDk3OTgwZTU4OWVmNWRiNjE=

data/lib/dapp/builder/chef.rb

@@ -12,8 +12,8 @@ module Dapp
         metadata.json
         recipes/%{stage}.rb
         recipes/*_%{stage}.rb
-        files/%{stage}/*
-        templates/%{stage}/*
+        files/default/%{stage}/*
+        templates/default/%{stage}/*
       ).freeze
 
       DEFAULT_CHEFDK_IMAGE = 'dappdeps/chefdk:0.15.16-3'.freeze # TODO: config, DSL, DEFAULT_CHEFDK_IMAGE
@@ -78,9 +78,11 @@ module Dapp
             to_runlist_entrypoint[name, stage]
           end.compact)
 
-          res.concat(application.config._app_runlist.map(&:_name).map do |name|
-            subname_parts = name.split(project_name, 2)[1].split('-')
-            to_runlist_entrypoint[project_name, [*subname_parts, stage].join('_')]
+          project_main_entry = to_runlist_entrypoint[project_name, stage]
+          res << project_main_entry if project_main_entry
+
+          res.concat(application.config._app_runlist.map do |app_component|
+            to_runlist_entrypoint[project_name, [app_component, stage].join('_')]
           end.compact)
         end
       end
@@ -164,13 +166,13 @@ module Dapp
         end
       end
 
-      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       def install_cookbooks
         @install_cookbooks ||= begin
           volumes_from = chefdk_container
           application.log_secondary_process(application.t(code: 'process.berks_vendor')) do
             ssh_auth_socket_path = nil
-            ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] and File.exist?(ENV['SSH_AUTH_SOCK'])
+            ssh_auth_socket_path = Pathname.new(ENV['SSH_AUTH_SOCK']).expand_path if ENV['SSH_AUTH_SOCK'] && File.exist?(ENV['SSH_AUTH_SOCK'])
 
             application.shellout!(
               ['docker run --rm',
@@ -189,8 +191,7 @@ module Dapp
                "--workdir #{berksfile_path.parent}",
                '--env BERKSHELF_PATH=/tmp/berkshelf',
                ("--env SSH_AUTH_SOCK=#{ssh_auth_socket_path}" if ssh_auth_socket_path),
-               "dappdeps/berksdeps:0.1.0 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"
-              ].compact.join(' '),
+               "dappdeps/berksdeps:0.1.0 /.dapp/deps/chefdk/bin/berks vendor #{cookbooks_vendor_path}"].compact.join(' '),
               log_verbose: application.log_verbose?
             )
 
@@ -198,7 +199,7 @@ module Dapp
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def install_stage_cookbooks(stage)
         stage_cookbooks_path(stage).mkpath

data/lib/dapp/config/application.rb

@@ -61,12 +61,21 @@ module Dapp
         @_apps.empty? ? [self] : @_apps.flatten
       end
 
+      def _app_chain
+        @_app_chain ||= (_parent ? _parent._app_chain : []) + [self]
+      end
+
       def _app_runlist
-        @_app_runlist ||= (_parent ? _parent._app_runlist : []) + [self]
+        _app_chain.map(&:_name).map do |name|
+          if subname = name.split("#{_root_app._name}-", 2)[1]
+            subname_parts = subname.split('-')
+            subname_parts.join('_') if subname_parts.any?
+          end
+        end.compact
       end
 
       def _root_app
-        _app_runlist.first
+        _app_chain.first
       end
 
       private

data/lib/dapp/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Dmitry Stolyarov