dapp 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f2da7e934e3e3b6d9e08042e859d7614701c769
-  data.tar.gz: 1358edc575c90ad5b33be8dc024da8e660c241b8
+  metadata.gz: 753069f8c28bcede5ca0d3f6f5f5419135c7fab9
+  data.tar.gz: 88812ab9b681784bec6288903e34be896b78a861
 SHA512:
-  metadata.gz: 2443ae77043f7191132924f08848706514276b915e931dae425e630519a9feca503f22d86355e7c7cc17f6a9b936ae4b54d83d20d149740794d5e62f724453ed
-  data.tar.gz: 5e7326b71d8655d03100169fb492ed3c73f6b2580810dcd06711044eafc2ca002dc4322f2ebe1b6fde4402e1bd7d67eb482ceb8f94bb7c5c9c836c36a3a62482
+  metadata.gz: 0ceb1e79ce7906f40384410cab6d35098e3dffe2e591194e74e6b4a8beb01453a995634d037c6113a6c7aaf09c2868b0e5b8afd6e81b6f25d9f05dce851e8cb4
+  data.tar.gz: 2ab1fc615718fae7ffc543e84dd1979be9ca97e4b1c5f89c8ec5d10c64fcdb5209920e7842494f4fecd5afbad81c0359c21958236e1b8931c894f6e4e5282ff6

data/lib/dapp/config/dimg/instance_methods.rb

@@ -41,9 +41,9 @@ module Dapp
                            end
         end
 
-        def git(type_or_repo_url, &blk)
-          type = type_or_repo_url.to_sym == :local ? :local : :remote
-          _git_artifact.send(type, type_or_repo_url, &blk)
+        def git(url = nil, &blk)
+          type = url.nil? ? :local : :remote
+          _git_artifact.send(type, url, &blk)
         end
 
         def mount(to, &blk)

data/lib/dapp/dimg.rb

@@ -40,7 +40,7 @@ module Dapp
     end
 
     def tag!(tag)
-      project.lock("#{config._basename}.images", readonly: true) do
+      project.lock("#{project.name}.images", readonly: true) do
         dimg_name = config._name
         if project.dry_run?
           project.log_state(dimg_name, state: project.t(code: 'state.tag'), styles: { status: :success })

data/lib/dapp/image/stage.rb

@@ -72,7 +72,8 @@ module Dapp
         raise Error::Build, code: :built_id_not_defined if from.built_id.nil?
         project.shellout!("docker run #{prepared_options} #{from.built_id} -ec '#{prepared_bash_command}'", log_verbose: true)
       rescue Error::Shellout => error
-        project.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
+        project.log_info(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container },
+                         quiet: !project.log_verbose?)
 
         raise unless project.introspect_error? || project.introspect_before_error?
         built_id = project.introspect_error? ? commit! : from.built_id

data/lib/dapp/project/logging/base.rb

@@ -72,8 +72,8 @@ module Dapp
           log_warning(*args, **kwargs)
         end
 
-        def log(message = '', desc: nil, inline: false, **kwargs)
-          return if log_quiet?
+        def log(message = '', desc: nil, inline: false, quiet: false, **kwargs)
+          return if quiet || log_quiet?
           unless desc.nil?
             (desc[:data] ||= {})[:msg] = message
             message = t(**desc)

data/lib/dapp/project/logging/process.rb

@@ -40,9 +40,9 @@ module Dapp
 
           if log_verbose? && !short
             process ||= t(code: 'status.process.default')
-            log_process_verbose(message, process: process, style: style, status: status, &blk)
+            log_process_verbose(message.to_s, process: process, style: style, status: status, &blk)
           else
-            log_process_short(message, style: style, status: status, &blk)
+            log_process_short(message.to_s, style: style, status: status, &blk)
           end
         end
         # rubocop:enable Metrics/ParameterLists

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.10'.freeze
+  VERSION = '0.7.11'.freeze
   BUILD_CACHE_VERSION = 6
 end

metadata

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