dapp 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc6a68fd3d125233e595953664e147e4a209091
-  data.tar.gz: 369287b73a66da2d400db0ce1db3602e1d395f55
+  metadata.gz: c3dd77689ebc3d0f069edff07100a1ec9d135977
+  data.tar.gz: 09d0a2dd7f5f64acb00a2b1c58d3e48da0c9ce59
 SHA512:
-  metadata.gz: 01ae25ee3031a89f7dff9990307286acb747f08f469eba7524c5ec558b3fe06a5dd96ed0d9b628a14217dba0a00634b533ea18bac56d00141a847912b1997af3
-  data.tar.gz: bb3d48378904ff32abecd2efbbefe05c1e3143ee2bcc49698d398b313e59489e01a46fafa7166b1c25bcaa1e930dc515785ebcbe79ea153f804ac7e1f27721a0
+  metadata.gz: ae25b2ffc259b33c7ce576e8ad88e3f1312fa3c5031b238c60088afe80f90db7d294c33baeb9fbed2025e86c318c3ab9e9065bc3e579993c62940e91f4bee319
+  data.tar.gz: d148dca01afaac2a84468d5dbe01abb6d9d14092ecd6d86701d726eca46cb91bc4beb29d29d6737bdafed930b2190241f291183675a4d0bf97fc4e7d8d4229f8

data/lib/dapp/application.rb

@@ -27,8 +27,11 @@ module Dapp
       with_introspection do
         project.lock("#{config._basename}.images", readonly: true) do
           last_stage.build_lock! do
-            last_stage.build!
-            last_stage.save_in_cache!
+            begin
+              last_stage.build!
+            ensure
+              last_stage.save_in_cache! if last_stage.image.built? || project.dev_mode?
+            end
           end
         end
       end

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

@@ -38,10 +38,12 @@ module Dapp
 
           copy_files = proc do |from_, cwd_, path_ = ''|
             cwd_ = File.expand_path(File.join('/', cwd_))
+            "if [[ -d #{File.join(from_, cwd_, path_)} ]]; then " \
             "#{application.project.find_path} #{File.join(from_, cwd_, path_)} #{excludes} -type f -exec " \
             "#{application.project.bash_path} -ec '#{application.project.install_path} -D #{credentials} {} " \
-            "#{File.join(to, "$(echo {} | " \
-            "#{application.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\;"
+            "#{File.join(to, '$(echo {} | ' \
+            "#{application.project.sed_path} -e \"s/#{File.join(from_, cwd_).gsub('/', '\\/')}//g\")")}' \\; ;" \
+            'fi'
           end
 
           commands = []

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

@@ -134,7 +134,7 @@ module Dapp
         end
 
         def should_be_tagged?
-          !(empty? || image.tagged? || should_be_not_present?)
+          !(empty? || image.tagged? || should_be_not_present?) && image.built?
         end
 
         def should_be_not_present?

data/lib/dapp/builder/chef.rb

@@ -156,7 +156,7 @@ module Dapp
           application.hashsum [
             application.paths_content_hashsum(paths),
             *paths.map { |p| p.relative_path_from(berksfile.home_path).to_s }.sort,
-            (berksfile_lock_checksum unless application.project.cli_options[:dev]),
+            (berksfile_lock_checksum unless application.project.dev_mode?),
             *enabled_recipes,
             *enabled_modules
           ].compact
@@ -197,7 +197,7 @@ module Dapp
 
         application.project.log_secondary_process(application.project.t(code: process_code)) do
           before_vendor_commands = [].tap do |commands|
-            unless application.project.cli_options[:dev] || chef_cookbooks_stage
+            unless application.project.dev_mode? || chef_cookbooks_stage
               commands.push(
                 ['if [ ! -f Berksfile.lock ] ; then ',
                  "echo \"Berksfile.lock not found\" 1>&2 ; ",
@@ -208,7 +208,7 @@ module Dapp
           end
 
           after_vendor_commands = [].tap do |commands|
-            if application.project.cli_options[:dev]
+            if application.project.dev_mode?
               commands.push(
                 ["#{application.project.install_path} -o #{Process.uid} -g #{Process.gid} ",
                  "--mode $(#{application.project.stat_path} -c %a Berksfile.lock) ",
@@ -287,7 +287,7 @@ module Dapp
           application.project.lock(lock_name, default_timeout: 120) do
             @install_cookbooks ||= {}
             @install_cookbooks[chef_cookbooks_stage] ||= begin
-              install_cookbooks(_cookbooks_path, chef_cookbooks_stage: chef_cookbooks_stage) unless _cookbooks_path.join('.created_at').exist? && !application.project.cli_options[:dev]
+              install_cookbooks(_cookbooks_path, chef_cookbooks_stage: chef_cookbooks_stage) unless _cookbooks_path.join('.created_at').exist? && !application.project.dev_mode?
               true
             end
           end

data/lib/dapp/image/stage.rb

@@ -28,6 +28,10 @@ module Dapp
         project.shellout("docker rm #{container_name}")
       end
 
+      def built?
+        !@built_id.nil?
+      end
+
       def export!(name)
         image = self.class.new(name: name, project: project, built_id: built_id)
         image.tag!

data/lib/dapp/project.rb

@@ -86,5 +86,9 @@ module Dapp
     def stage_dapp_label_format
       '%{application_name}'
     end
+
+    def dev_mode?
+      !!cli_options[:dev]
+    end
   end # Project
 end # Dapp

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.6.11'.freeze
+  VERSION = '0.6.12'.freeze
   BUILD_CACHE_VERSION = 4
 end

metadata

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