dapp 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d017933da4768131f34525742c26e604a39e3b
-  data.tar.gz: 121c7b049d68ca081245e026f68884f149f73a62
+  metadata.gz: 736bd0b9c90721b086654095099165858735d7b7
+  data.tar.gz: b35661d57687c80f77b802895e1b1266c03e0604
 SHA512:
-  metadata.gz: 88cf75c2621ccdaa2d7c80b93e9685c32bb422841e05c0a1e5443aa6827e79ad59a05796fe8e17b810c055d8b55eece239098e36026b093bef86634deb2305d5
-  data.tar.gz: 0120e75385c0043bb9d16e3a97b99f8f6a667a394d09f75bb738a430488b3fef91c4abfbc0693cd9ec3d600b46e9fe8b1c538063df6e2f98dfd759266d3fac07
+  metadata.gz: 46ccabca9ea0395b300257d38b010e9b0f00a158a403f8142b4c53c25c643520d88c2d080c6ea0d30f3b01e91136f4dfd304685cbd04ba81b71f942c8ba69d6c
+  data.tar.gz: 4009d71698dddb250b37bc0d14dccbd2632bcc28a207920aed6520b3830f5054f9f61474e21a4741ee26a31ec871beacf08b28e5588bfe3469ad09aeefdefaf0

data/config/en/net_status.yml

@@ -9,7 +9,7 @@ en:
       git_branch_without_name: "Application has specific revision that isn't associated with a branch name!"
       ci_environment_required: 'CI environment required (Travis or GitLab CI)!'
     dappfile:
-      incorrect: "Dappfile '%{path}' with '%{error}':\n%{message}"
+      incorrect: "Dappfile with '%{error}':\n%{message}"
     build:
       from_image_required: 'Missing from_image!'
       image_already_untagged: "Image `%{name}` already untagged!"
@@ -27,5 +27,6 @@ en:
       docker_from_not_defined: "Docker `from` not defined!"
       artifact_unexpected_attribute: "Artifact doesn't has attribute '%{attr}'!"
       git_artifact_unexpected_attribute: "'%{type}' git artifact doesn't has attribute '%{attr}'!"
+      app_name_incorrect: "Application has incorrect name '%{name}': doesn't match regex '%{reg}'!"
     chef:
       stage_path_overlap: "Cannot install '%{cookbook}' cookbook's path %{from} into %{to}: already exists"

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

@@ -76,7 +76,7 @@ module Dapp
           elsif application.dry_run?
             application.log_state(name, state: application.t(code: 'state.build'), styles: { status: :success })
           else
-            application.log_process(name, process: application.t(code: 'status.process.building'), short: should_be_not_detailed?) do
+            application.log_process(name, process: application.t(code: 'status.process.building'), short: should_not_be_detailed?) do
               image_do_build
             end
           end

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

@@ -51,12 +51,7 @@ module Dapp
             image.tagged? && !application.log_verbose? && application.cli_options[:introspect_stage].nil?
           end
 
-          def should_be_not_present?
-            return false if next_stage.nil?
-            next_stage.image.tagged? || next_stage.should_be_not_present?
-          end
-
-          def should_be_not_detailed?
+          def should_not_be_detailed?
             image.send(:bash_commands).empty?
           end
 

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

@@ -67,7 +67,7 @@ module Dapp
           end
         end
 
-        def should_be_not_detailed?
+        def should_not_be_detailed?
           true
         end
 

data/lib/dapp/config/application.rb

@@ -71,7 +71,10 @@ module Dapp
       end
 
       def _name
-        @_name || @_basename
+        (@_name || @_basename).tap do |name|
+          reg = '^[[[:alnum:]]_.-]*$'
+          raise Error::Config, code: :app_name_incorrect, data: { name: name, reg: reg } unless name =~ /#{reg}/
+        end
       end
 
       def _apps

data/lib/dapp/controller.rb

@@ -82,11 +82,10 @@ module Dapp
         begin
           conf.instance_eval File.read(dappfile_path), dappfile_path
         rescue SyntaxError, StandardError => e
-          message = case e
-                    when ArgumentError then "#{e.backtrace.first[/`.*'$/]}: #{e.message}"
-                    else e.message
-                    end
-          raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, path: dappfile_path, message: message }
+          backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }
+          message = e.is_a?(NoMethodError) ? e.message[/.*(?= for)/] : e.message
+          message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
+          raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
         end
       end
       config._apps.select { |app| app_filters.any? { |pattern| File.fnmatch(pattern, app._name) } }

data/lib/dapp/git_artifact.rb

@@ -92,7 +92,7 @@ module Dapp
     end
 
     def diff_command(from, to, quiet: false)
-      "diff #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true)}"
+      "diff --binary --full-index #{'--quiet' if quiet} #{from}..#{to} #{"--relative=#{cwd}" if cwd} -- #{paths(true)}"
     end
   end
 end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.5.4'.freeze
-  BUILD_CACHE_VERSION = 2
+  VERSION = '0.5.5'.freeze
+  BUILD_CACHE_VERSION = 3
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout