dapp 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3dd77689ebc3d0f069edff07100a1ec9d135977
-  data.tar.gz: 09d0a2dd7f5f64acb00a2b1c58d3e48da0c9ce59
+  metadata.gz: ac903d46c75ee71f1711f2a080a716189ed2f98e
+  data.tar.gz: 70bb61f90a9766f85fdf80cf20fad99d35cbdee2
 SHA512:
-  metadata.gz: ae25b2ffc259b33c7ce576e8ad88e3f1312fa3c5031b238c60088afe80f90db7d294c33baeb9fbed2025e86c318c3ab9e9065bc3e579993c62940e91f4bee319
-  data.tar.gz: d148dca01afaac2a84468d5dbe01abb6d9d14092ecd6d86701d726eca46cb91bc4beb29d29d6737bdafed930b2190241f291183675a4d0bf97fc4e7d8d4229f8
+  metadata.gz: 615cf91696adb6ff687070cce23a2db2151df9d7d3c74934845444f879f246c5d8bc53e59759425be0b1f468cbd2e59593af8288cde1c11c50de1f228387af57
+  data.tar.gz: a8693e0f43ee95b3260903414515b884a6450ad9904eb7bf7999db9b5463feced29562fc7ade3867c60dc1e08d7ffa9a0ee6b9e9aae9756940fa103673306180

data/config/en/net_status.yml

@@ -24,7 +24,7 @@ en:
       dappfile_not_found: "Dappfile not found!"
       cannot_run_ssh_agent: "Cannot run ssh-agent"
       ssh_key_not_found: "Ssh key '%{path}' not exist!"
-      mrproper_required_option: "Expected command option '--all' or '--improper-cache-version-stages'!"
+      mrproper_required_option: "Expected command option '--improper-dev-mode-cache', '--improper-cache-version-stages' or '--all'!"
     config:
       builder_type_conflict: 'Conflict between builder types!'
       builder_type_unsupported: "Defined unsupported builder type `%{type}`!"

data/lib/dapp/application.rb

@@ -30,7 +30,7 @@ module Dapp
             begin
               last_stage.build!
             ensure
-              last_stage.save_in_cache! if last_stage.image.built? || project.dev_mode?
+              last_stage.save_in_cache! if last_stage.image.built? || dev_mode?
             end
           end
         end
@@ -126,6 +126,14 @@ module Dapp
       config._docker._from.nil?
     end
 
+    def dev_mode?
+      config._dev_mode || project.dev_mode?
+    end
+
+    def build_cache_version
+      [Dapp::BUILD_CACHE_VERSION, dev_mode? ? 1 : 0]
+    end
+
     protected
 
     def should_be_built?

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

@@ -80,6 +80,7 @@ module Dapp
           image_add_tmp_volumes(:build)
           image.add_service_change_label dapp: application.stage_dapp_label
           image.add_service_change_label 'dapp-cache-version'.to_sym => Dapp::BUILD_CACHE_VERSION
+          image.add_service_change_label 'dapp-dev-mode'.to_sym => true if application.dev_mode?
 
           if application.project.ssh_auth_sock
             image.add_volume "#{application.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
@@ -91,7 +92,7 @@ module Dapp
           (application.config.public_send("_#{type}_dir")._store +
             from_image.labels.select { |l, _| l == "dapp-#{type}-dir" }.map { |_, value| value.split(';') }.flatten).each do |path|
             absolute_path = File.expand_path(File.join('/', path))
-            tmp_path = application.send("#{type}_path", absolute_path[1..-1]).tap(&:mkpath)
+            tmp_path = application.send("#{type}_path", 'mount', absolute_path[1..-1]).tap(&:mkpath)
             image.add_volume "#{tmp_path}:#{absolute_path}"
           end
         end
@@ -112,7 +113,13 @@ module Dapp
           if empty?
             prev_stage.signature
           else
-            hashsum [prev_stage.signature, builder_checksum, *dependencies.flatten]
+            args = []
+            args << prev_stage.signature unless prev_stage.nil?
+            args << application.build_cache_version
+            args << builder_checksum
+            args.concat(dependencies.flatten)
+
+            hashsum args
           end
         end
 

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

@@ -3,12 +3,8 @@ module Dapp
     module Stage
       # From
       class From < Base
-        def signature
-          hashsum [*dependencies.flatten]
-        end
-
         def dependencies
-          [from_image_name, application.config._docker._from_cache_version, Dapp::BUILD_CACHE_VERSION]
+          [from_image_name, application.config._docker._from_cache_version]
         end
 
         protected

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.dev_mode?),
+            (berksfile_lock_checksum unless application.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.dev_mode? || chef_cookbooks_stage
+            unless application.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.dev_mode?
+            if application.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.dev_mode?
+              install_cookbooks(_cookbooks_path, chef_cookbooks_stage: chef_cookbooks_stage) unless _cookbooks_path.join('.created_at').exist? && !application.dev_mode?
               true
             end
           end

data/lib/dapp/cli/mrproper.rb

@@ -17,6 +17,10 @@ BANNER
       option :proper_cache_version,
              long: '--improper-cache-version-stages',
              boolean: true
+
+      option :proper_dev_mode_cache,
+             long: '--improper-dev-mode-cache',
+             boolean: true
     end
   end
 end

data/lib/dapp/config/application.rb

@@ -81,6 +81,10 @@ module Dapp
         @_build_dir
       end
 
+      def dev_mode
+        @_dev_mode = true
+      end
+
       def _name
         (@_name || @_basename).tap do |name|
           reg = '^[[[:alnum:]]_.-]*$'
@@ -88,6 +92,10 @@ module Dapp
         end
       end
 
+      def _dev_mode
+        !!@_dev_mode
+      end
+
       def _apps
         @_apps.empty? ? [self] : @_apps.flatten
       end

data/lib/dapp/project/command/mrproper.rb

@@ -8,12 +8,13 @@ module Dapp
         def mrproper
           log_step_with_indent(:mrproper) do
             if proper_all?
-              log_step_with_indent(:containers) { dapp_containers_flush }
-              log_step_with_indent(:images) { dapp_images_flush }
+              flush_by_label('dapp')
+            elsif proper_dev_mode_cache?
+              flush_by_label('dapp-dev-mode')
             elsif proper_cache_version?
               log_proper_cache do
                 proper_cache_images = proper_cache_all_images
-                remove_images(dapp_images.lines.select { |id| !proper_cache_images.lines.include?(id) }.map(&:strip))
+                remove_images(dapp_images_by_label('dapp').lines.select { |id| !proper_cache_images.lines.include?(id) }.map(&:strip))
               end
             else
               raise Error::Project, code: :mrproper_required_option
@@ -23,25 +24,34 @@ module Dapp
 
         protected
 
+        def flush_by_label(label)
+          log_step_with_indent(:containers) { dapp_containers_flush_by_label(label) }
+          log_step_with_indent(:images) { dapp_images_flush_be_label(label) }
+        end
+
         def proper_all?
           !!cli_options[:proper_all]
         end
 
-        def dapp_containers_flush
-          remove_containers_by_query('docker ps -a -f "label=dapp" -q', force: true)
+        def proper_dev_mode_cache?
+          !!cli_options[:proper_dev_mode_cache]
+        end
+
+        def dapp_containers_flush_by_label(label)
+          remove_containers_by_query(%(docker ps -a -f "label=#{label}" -q), force: true)
         end
 
-        def dapp_dangling_images_flush
-          remove_images_by_query('docker images -f "dangling=true" -f "label=dapp" -q', force: true)
+        def dapp_dangling_images_flush_by_label(label)
+          remove_images_by_query(%(docker images -f "dangling=true" -f "label=#{label}" -q), force: true)
         end
 
-        def dapp_images_flush
-          dapp_dangling_images_flush
-          remove_images(dapp_images.lines.map(&:strip), force: true)
+        def dapp_images_flush_be_label(label)
+          dapp_dangling_images_flush_by_label(label)
+          remove_images(dapp_images_by_label(label).lines.map(&:strip), force: true)
         end
 
-        def dapp_images
-          @dapp_images ||= shellout!('docker images -f "dangling=false" --format="{{.Repository}}:{{.Tag}}" -f "label=dapp"').stdout.strip
+        def dapp_images_by_label(label)
+          @dapp_images ||= shellout!(%(docker images -f "dangling=false" --format="{{.Repository}}:{{.Tag}}" -f "label=#{label}")).stdout.strip
         end
 
         def proper_cache_all_images

data/lib/dapp/version.rb

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

metadata

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