dapp 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc6a29dd7b243dc8d6f5432442b085926c05ce7
-  data.tar.gz: 771c938cc250204bc86e50ee796952bbe14d02b4
+  metadata.gz: ccc9bcb7c5c18e275f571a8d61bc1cab29f9000b
+  data.tar.gz: b222fdf8b55c8592b4c64cb6081edefb6b707d8c
 SHA512:
-  metadata.gz: 5ce285874f213efc4f28908cf22d9f7a32c71aa0d0f5554ff89740c6308418a74ccd5c4f050f999077aaf40f7d68022712ebb00458c3d176c4595ae0c4bee35d
-  data.tar.gz: b8f9bc10ec5e3cd36d6e80dc6fc0aceac8bc3fc0c4afaf884da4941f641f2e099e608d0aab82b40163c9c990de22ea6a9a3dc22d4592c45fef1a833cc25e05dd
+  metadata.gz: fcf8a7f80e2e02ae5e234940e8c600f90eb0483f93749d4b64394f6fe8b1266127c9c509b490b3f95f1e626080daba99157e7a1cc4496d527aafeed93065cb2b
+  data.tar.gz: f4748cee47bb3b584774028c8393218274a1886921703e859e29bc42813910d6526bec762d7765894d592b3dbf079ac96e94177bd85066ad3518ea8a89bd485e

data/config/en/common.yml

@@ -28,6 +28,4 @@ en:
       using_cache: '[USING CACHE]'
       not_present: '[NOT PRESENT]'
       build: '[BUILD]'
-      push: '[PUSH]'
-    introspect:
-      stage: "Introspect stage '%{name}'"
+      push: '[PUSH]'

data/lib/dapp/application.rb

@@ -32,8 +32,10 @@ module Dapp
     end
 
     def build!
-      last_stage.build!
-      last_stage.save_in_cache!
+      with_introspection do
+        last_stage.build!
+        last_stage.save_in_cache!
+      end
     ensure
       FileUtils.rm_rf(tmp_path)
     end
@@ -73,6 +75,18 @@ module Dapp
 
     protected
 
+    def with_introspection
+      yield
+    rescue Exception::IntrospectImage => e
+      data = e.net_status[:data]
+      cmd = "docker run -ti --rm --entrypoint /bin/bash #{data[:options]} #{data[:built_id]}"
+      system(cmd).tap do |res|
+        shellout!("docker rmi #{data[:built_id]}") if data[:rmi]
+        res || raise(Error::Application, code: :application_not_run)
+      end
+      exit 0
+    end
+
     attr_reader :last_stage
   end # Application
 end # Dapp

data/lib/dapp/build/stage/base.rb

@@ -22,9 +22,7 @@ module Dapp
           return if should_be_skipped?
           prev_stage.build! if prev_stage
           image_build
-          raise Exception::IntrospectImage,
-                message: application.t(code: 'introspect.stage', data: { name: name }),
-                data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
+          raise Exception::IntrospectImage, data: { built_id: image.built_id, options: image.send(:prepared_options) } if should_be_introspected?
         end
 
         def save_in_cache!

data/lib/dapp/build/stage/mod/artifact.rb

@@ -59,7 +59,7 @@ module Dapp
                               '--entrypoint /bin/bash']
             commands = safe_cp(where_to_add, app.container_tmp_path(artifact_name), Process.uid, Process.gid)
             application.log_secondary_process(application.t(code: 'process.artifact_copy', data: { name: artifact_name }), short: true) do
-              app.run(docker_options, [%{-ec '#{application.shellout_pack(commands)}'}])
+              app.run(docker_options, [%(-ec '#{application.shellout_pack(commands)}')])
             end
 
             commands = safe_cp(application.container_tmp_path('artifact', artifact_name), where_to_add, owner, group, cwd, paths)

data/lib/dapp/builder/chef.rb

@@ -44,9 +44,7 @@ module Dapp
       private
 
       def enabled_modules
-        application.config._chef._modules.map do |mod|
-          mod.start_with?('mdapp-') ? mod.split('mdapp-')[1] : mod
-        end
+        application.config._chef._modules
       end
 
       def enabled_recipes
@@ -83,13 +81,13 @@ module Dapp
 
       def local_cookbook_paths_for_checksum
         @local_cookbook_paths_for_checksum ||= berksfile
-          .local_cookbooks
-          .values
-          .map { |cookbook| cookbook[:path] }
-          .product(LOCAL_COOKBOOK_CHECKSUM_PATTERNS)
-          .map { |cb, dir| Dir[cb.join(dir)] }
-          .flatten
-          .map(&Pathname.method(:new))
+                                               .local_cookbooks
+                                               .values
+                                               .map { |cookbook| cookbook[:path] }
+                                               .product(LOCAL_COOKBOOK_CHECKSUM_PATTERNS)
+                                               .map { |cb, dir| Dir[cb.join(dir)] }
+                                               .flatten
+                                               .map(&Pathname.method(:new))
       end
 
       def stage_cookbooks_paths_for_checksum(stage)
@@ -214,47 +212,45 @@ module Dapp
         @install_stage_cookbooks[stage] ||= true.tap do
           common_paths = proc do |cookbook_path|
             [['metadata.json', 'metadata.json'],
-             ["attributes/common", 'attributes'],
+             ['attributes/common', 'attributes'],
              ["attributes/#{stage}", 'attributes'],
              ["files/#{stage}", 'files/default'],
-             ["templates/#{stage}", 'templates/default']
-            ].select { |from, _| cookbook_path.join(from).exist? }
+             ["templates/#{stage}", 'templates/default']].select { |from, _| cookbook_path.join(from).exist? }
           end
 
           install_paths = Dir[cookbooks_vendor_path('*')]
-            .map(&Pathname.method(:new))
-            .map do |cookbook_path|
-              cookbook_name = File.basename cookbook_path
-              is_project = (cookbook_name == project_name)
-              is_mdapp = cookbook_name.start_with? 'mdapp-'
-              mdapp_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
-              mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
-
-              paths = if is_project
-                recipe_paths = enabled_recipes
-                  .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
-                  .select { |from, _| cookbook_path.join(from).exist? }
-
-                if recipe_paths.any?
-                  [*recipe_paths, *common_paths[cookbook_path]]
-                else
-                  [nil, *common_paths[cookbook_path]]
-                end
-              elsif is_mdapp && mdapp_enabled
-                recipe_path = "recipes/#{stage}.rb"
-
-                if cookbook_path.join(recipe_path).exist?
-                  [[recipe_path, recipe_path], *common_paths[cookbook_path]]
-                else
-                  [nil, *common_paths[cookbook_path]]
-                end
-              else
-                [['.', '.']]
-              end
+                          .map(&Pathname.method(:new))
+                          .map do |cookbook_path|
+            cookbook_name = File.basename cookbook_path
+            is_project = (cookbook_name == project_name)
+            is_mdapp = cookbook_name.start_with? 'mdapp-'
+            mdapp_name = (is_mdapp ? cookbook_name.split('mdapp-')[1] : nil)
+            mdapp_enabled = is_mdapp && enabled_modules.include?(mdapp_name)
+
+            paths = if is_project
+                      recipe_paths = enabled_recipes
+                                     .map { |recipe| ["recipes/#{stage}/#{recipe}.rb", "recipes/#{recipe}.rb"] }
+                                     .select { |from, _| cookbook_path.join(from).exist? }
+
+                      if recipe_paths.any?
+                        [*recipe_paths, *common_paths[cookbook_path]]
+                      else
+                        [nil, *common_paths[cookbook_path]]
+                      end
+                    elsif is_mdapp && mdapp_enabled
+                      recipe_path = "recipes/#{stage}.rb"
+
+                      if cookbook_path.join(recipe_path).exist?
+                        [[recipe_path, recipe_path], *common_paths[cookbook_path]]
+                      else
+                        [nil, *common_paths[cookbook_path]]
+                      end
+                    else
+                      [['.', '.']]
+                    end
 
-              [cookbook_path, paths] if paths && paths.any?
-            end
-            .compact
+            [cookbook_path, paths] if paths && paths.any?
+          end.compact
 
           stage_cookbooks_path(stage).mkpath
           install_paths.each do |cookbook_path, paths|
@@ -277,8 +273,7 @@ module Dapp
                                    data: { stage: stage,
                                            cookbook: cookbook,
                                            from: from_subpath.relative_path_from(cookbook_path),
-                                           to: to_subpath.relative_path_from(stage_cookbooks_path(stage, cookbook)),
-                                         } if to_subpath.exist?
+                                           to: to_subpath.relative_path_from(stage_cookbooks_path(stage, cookbook)) } if to_subpath.exist?
 
                       to_subpath.parent.mkpath
                       FileUtils.cp_r from_subpath, to_subpath

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

@@ -1,6 +1,7 @@
 module Dapp
   module Builder
     class Chef < Base
+      # Error
       class Error < ::Dapp::Error::Base
         def initialize(**net_status)
           super(context: :chef, **net_status)

data/lib/dapp/cli/build.rb

@@ -43,17 +43,6 @@ BANNER
              proc: proc { |v| v.to_sym },
              in: [nil, :from, :infra_install, :source_1_archive, :source_1, :install, :source_2,
                   :infra_setup, :source_3, :chef_cookbooks, :setup, :source_4, :source_5]
-
-      def run(*args)
-        super
-      rescue Exception::IntrospectImage => e
-        $stderr.puts(e.net_status[:message])
-        data = e.net_status[:data]
-        system("docker run -ti --rm --entrypoint /bin/bash #{data[:options]} #{data[:built_id]}").tap do |res|
-          shellout("docker rmi #{data[:built_id]}") if data[:rmi]
-          res || raise(Dapp::Error::Application, code: :application_not_run)
-        end
-      end
     end
   end
 end

data/lib/dapp/error/base.rb

@@ -3,7 +3,7 @@ module Dapp
     # Base
     class Base < NetStatus::Exception
       def initialize(net_status = {})
-        super({context: self.class.to_s.split('::').last.downcase}.merge(net_status))
+        super({ context: self.class.to_s.split('::').last.downcase }.merge(net_status))
       end
     end
   end

data/lib/dapp/image/stage.rb

@@ -49,11 +49,10 @@ module Dapp
         raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
         shellout!("docker run #{prepared_options} --entrypoint /bin/bash --name=#{container_name} #{from.built_id} -ec '#{prepared_bash_command}'",
                   log_verbose: log_verbose, log_time: log_time)
-      rescue Error::Shellout => e
+      rescue Error::Shellout => _e
         raise unless introspect_error || introspect_before_error
         built_id = introspect_error ? commit! : from.built_id
-        raise Exception::IntrospectImage, message: Dapp::Helper::NetStatus.message(e),
-                                          data: { built_id: built_id, options: prepared_options, rmi: introspect_error }
+        raise Exception::IntrospectImage, data: { built_id: built_id, options: prepared_options, rmi: introspect_error }
       end
 
       def commit!

data/lib/dapp/version.rb

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

metadata

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