dapp 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce2d9eae2b707e324a8fe198e8812da6342ced8
-  data.tar.gz: f2cfc51c7fc2aafc0372733f9ac2dbd53ca9d36f
+  metadata.gz: b8a256cc61e22e00c9abfc26ff0860c49382b926
+  data.tar.gz: 25358da2b7a4a8af4efb38b83bde69c13bb22673
 SHA512:
-  metadata.gz: a59386e6321d5dfc75498774ced2c066911b7b2ad34c5412effafcb167ade6f251460dbb3f5038659c4d9d0f7bb90e60ec0e65d3ac160d784d03668fd2e722a4
-  data.tar.gz: 24000f5eb37272682da2477cbda6eab34fe48bde926dbe1f1354dfca7500d78acbc3c4ae510416b6d8ee4d806f57dbc6348832d65b9cde750a16f80880d5d011
+  metadata.gz: fef0d8c1b13a04c091a163a7b22d0f56a747eddbcbfbfcc083b4e89abc69332a52bac3336ed5b2c2ff13818b0261a39407fa030ac16ee4f8708bf1c8c1bbb4f0
+  data.tar.gz: 5f268ddd3cbf112b663308dcfe1630ef4dbb4c37cdc314601e616b79e6024a28ae028c7ea6f43cc1eb75b14fb72caa13bf31c6858882e0cd5f99ddb153a2f06f

data/config/en/common.yml

@@ -9,23 +9,23 @@ en:
       commands: "commands:"
       instructions: "instructions:"
     container:
-      launched_command: "Launched command: '%{command}'"
+      launched_command: "Launched command: `%{command}`"
     system_shellout:
-      launched_command: "Launched system-shellout command: '%{command}'"
+      launched_command: "Launched system-shellout command: `%{command}`"
     process:
-      artifact_copy: "copying artifact '%{name}'"
-      artifact_building: "building artifact '%{name}'"
-      git_artifact_clone: "cloning remote git_artifact '%{name}'"
-      git_artifact_fetch: "fetching remote git_artifact '%{name}'"
+      artifact_copy: "copying artifact `%{name}`"
+      artifact_building: "building artifact `%{name}`"
+      git_artifact_clone: "cloning remote git_artifact `%{name}`"
+      git_artifact_fetch: "fetching remote git_artifact `%{name}`"
       berks_vendor: 'vendoring cookbooks'
       chef_cookbooks_stage_berks_vendor: 'vendoring cookbooks for chef cookbooks stage'
-      waiting_resouce_lock: "waiting for locked resource '%{name}'"
+      waiting_resouce_lock: "waiting for locked resource `%{name}`"
       gitartifact_container_creating: 'creating dappdeps/gitartifact container'
       base_container_creating: 'creating dappdeps/base container'
       chefdk_container_creating: 'creating dappdeps/chefdk container'
       system_shellout_container_starting: 'starting system-shellout container'
-      image_pull: "pulling image '%{name}'"
-      image_push: "pushing image '%{name}'"
+      image_pull: "pulling image `%{name}`"
+      image_push: "pushing image `%{name}`"
     status:
       process:
         pushing: '[PUSHING]'
@@ -47,12 +47,12 @@ en:
       pull: '[PULL]'
       tag: '[TAG]'
     warning:
-      wrong_using_base_directive: "WARNING: Directive '%{directive}' has declared after dimg_group|dimg|artifact!"
-      wrong_using_directive: "WARNING: Directive '%{directive}' has declared after dimg_group|dimg!"
-      excess_builder_instruction: "WARNING: Excessive use of the 'builder' instruction. Builder type will be automatically determined by the first use of any builder."
-      excess_name_instruction: "WARNING: Excessive use of the 'name' instruction. Given name corresponds to default name."
+      wrong_using_base_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg|artifact!"
+      wrong_using_directive: "WARNING: Directive `%{directive}` has declared after dimg_group|dimg!"
+      excess_builder_instruction: "WARNING: Excessive use of the `builder` instruction. Builder type will be automatically determined by the first use of any builder."
+      excess_name_instruction: "WARNING: Excessive use of the `name` instruction. Given name corresponds to default name."
       another_image_already_tagged: 'WARNING: image with other id already exist.'
-      tag_ignored: "WARNING: tag '%{tag}' ignored."
+      tag_ignored: "WARNING: tag `%{tag}` ignored."
       dimg_not_found_in_registry: "WARNING: Dimg not found in registry."
       stage_artifact_rewritten: "WARNING: Artifact stage rewritten from %{conflict_stage} to %{stage}."
     group:

data/lib/dapp/cli/bp.rb

@@ -15,7 +15,7 @@ Options:
 BANNER
       option :tmp_dir_prefix,
              long: '--tmp-dir-prefix PREFIX',
-             description: 'Tmp directory prefix'
+             description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
       option :lock_timeout,
              long: '--lock-timeout TIMEOUT',

data/lib/dapp/cli/build.rb

@@ -14,7 +14,7 @@ Options:
 BANNER
       option :tmp_dir_prefix,
              long: '--tmp-dir-prefix PREFIX',
-             description: 'Tmp directory prefix'
+             description: 'Tmp directory prefix (/tmp by default). Used for build process service directories.'
 
       option :lock_timeout,
              long: '--lock-timeout TIMEOUT',

data/lib/dapp/dimg/path.rb

@@ -12,7 +12,7 @@ module Dapp
       end
 
       def tmp_path(*path)
-        @tmp_path ||= Dir.mktmpdir(project.cli_options[:tmp_dir_prefix] || 'dapp-')
+        @tmp_path ||= Dir.mktmpdir('dapp-', project.cli_options[:tmp_dir_prefix] || '/tmp')
         make_path(@tmp_path, *path).expand_path.tap { |p| p.parent.mkpath }
       end
 

data/lib/dapp/git_repo/own.rb

@@ -11,7 +11,14 @@ module Dapp
       end
 
       def path
-        @path ||= Pathname(git("-C #{dimg.home_path} rev-parse --git-dir").stdout.strip).expand_path
+        @path ||= begin
+          git_repo_path = Pathname(git("-C #{dimg.home_path} rev-parse --git-dir").stdout.strip)
+          if git_repo_path.relative?
+            File.join(dimg.home_path, git_repo_path)
+          else
+            git_repo_path
+          end
+        end
       end
 
       def latest_commit(branch = nil)

data/lib/dapp/image/stage.rb

@@ -72,8 +72,7 @@ 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_info(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container },
-                         quiet: !project.log_verbose?)
+        project.log_warning(desc: { code: :launched_command, data: { command: prepared_commands.join(' && ') }, context: :container })
 
         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

@@ -64,6 +64,7 @@ module Dapp
           kwargs[:style] = :warning
           kwargs[:desc] ||= {}
           kwargs[:desc][:context] ||= :warning
+          kwargs[:stream] ||= $stderr
           log(*args, **kwargs)
         end
 
@@ -72,13 +73,13 @@ module Dapp
           log_warning(*args, **kwargs)
         end
 
-        def log(message = '', desc: nil, inline: false, quiet: false, **kwargs)
-          return if quiet || log_quiet?
+        def log(message = '', desc: nil, inline: false, stream: $stdout, **kwargs)
+          return if log_quiet?
           unless desc.nil?
             (desc[:data] ||= {})[:msg] = message
             message = t(**desc)
           end
-          print "#{log_format_string(message, **kwargs)}#{"\n" unless inline}"
+          stream.print "#{log_format_string(message, **kwargs)}#{"\n" unless inline}"
         end
 
         def log_time

data/lib/dapp/project/system_shellout.rb

@@ -16,8 +16,7 @@ module Dapp
             log_warning(
               desc: { code: :launched_command,
                       data: { command: _to_system_shellout_command(command) },
-                      context: :system_shellout },
-              quiet: !log_verbose?
+                      context: :system_shellout }
             )
             raise
           end

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout