dapp 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5421a51c8a7e4aa97dd4366da97409289c335b88
-  data.tar.gz: 29d5b0434a33f376ce6809a5c32bfada6ab19528
+  metadata.gz: 8d611af62545ae4ad1322d6534e2ecb72f8e9ff5
+  data.tar.gz: 2df141836542876fb905510294f9ccdc1349f5c0
 SHA512:
-  metadata.gz: 557da43530e8da7dd3051ce4e47de1e20bb3b4bb9d68b7c16e3dca37beebb334fe2be645b07e06a15113f79fc2d58ccb6e7e49383f46f7ffd18636a7d586d3b7
-  data.tar.gz: 9db7eea346c214b0990d7c823d7c95fcb179fc948e623ae17d3f09cc5f759f0fdb88cfd401e6bc4f70738f6acf4266f5620bafdb0cd112f24f21034617b5abf3
+  metadata.gz: 268e5c5c069fb04af95505e33c835cc7c305a55756944444ee5964b34407e1a5b05b8c4bff0e3d7f3f0bca8d26e70ddba99e995e659935a740074d38adcd76d6
+  data.tar.gz: 406cadcaa4493ed0b6654651281ee0a31b71a9281bfb061239fc8731805cbf0e8ada7a99008e4026b827dc9a3e3523b307c84cf8197930ca2a3b929f75546a50

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:
       dimg_name_required: 'Dimg name required!'
       dimg_name_incorrect: "Dimg has incorrect name '%{name}': doesn't match regex '%{reg}'!"

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

@@ -79,6 +79,7 @@ module Dapp
           image_add_volumes
           image.add_service_change_label dapp: dimg.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 dimg.dev_mode?
 
           if dimg.project.ssh_auth_sock
             image.add_volume "#{dimg.project.ssh_auth_sock}:/tmp/dapp-ssh-agent"
@@ -124,7 +125,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 << dimg.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, dimg.config._docker._from_cache_version, Dapp::BUILD_CACHE_VERSION]
+          [from_image_name, dimg.config._docker._from_cache_version]
         end
 
         protected

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/dimg/instance_methods.rb

@@ -7,6 +7,10 @@ module Dapp
         attr_reader :_chef, :_shell, :_docker, :_git_artifact, :_mount, :_artifact
         attr_reader :_install_dependencies, :_setup_dependencies
 
+        def dev_mode
+          @_dev_mode = true
+        end
+
         def install_depends_on(*args)
           @_install_dependencies.concat(args)
         end
@@ -46,6 +50,10 @@ module Dapp
           _mount << Directive::Mount.new(to, &blk)
         end
 
+        def _dev_mode
+          !!@_dev_mode
+        end
+
         def _builder
           @_builder || :none
         end
@@ -147,6 +155,7 @@ module Dapp
 
         def directive_eval(directive, &blk)
           directive.instance_eval(&blk) if block_given?
+          directive
         end
 
         def pass_to_default(dimg)
@@ -171,7 +180,7 @@ module Dapp
         end
 
         def passed_directives
-          [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact, :@_builder]
+          [:@_chef, :@_shell, :@_docker, :@_git_artifact, :@_mount, :@_artifact, :@_builder, :@_dev_mode]
         end
       end
     end

data/lib/dapp/config/dimg_group_base.rb

@@ -11,6 +11,10 @@ module Dapp
         super(project: project)
       end
 
+      def dev_mode
+        @_dev_mode = true
+      end
+
       def dimg(name = nil, &blk)
         Config::Dimg.new(name, project: project).tap do |dimg|
           before_dimg_eval(dimg)
@@ -29,7 +33,8 @@ module Dapp
 
       protected
 
-      def before_dimg_eval(_dimg)
+      def before_dimg_eval(dimg)
+        dimg.instance_variable_set(:@_dev_mode, @_dev_mode)
       end
     end
   end

data/lib/dapp/dimg.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/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/project/dappfile.rb

@@ -42,7 +42,16 @@ module Dapp
             conf.instance_eval File.read(dappfile_path), dappfile_path
           rescue SyntaxError, StandardError => e
             backtrace = e.backtrace.find { |line| line.start_with?(dappfile_path) }
-            message = [NoMethodError, NameError].any? { |err| e.is_a?(err) } ? e.message[/.*(?= for)/] : e.message
+            message = begin
+              case e
+              when NoMethodError
+                e.message =~ /`.*'/
+                "undefined method #{Regexp.last_match}"
+              when NameError then e.message[/.*(?= for)/]
+              else
+                e.message
+              end
+            end
             message = "#{backtrace[/.*(?=:in)/]}: #{message}" if backtrace
             raise Error::Dappfile, code: :incorrect, data: { error: e.class.name, message: message }
           end

data/lib/dapp/version.rb

@@ -1,5 +1,5 @@
 # Version
 module Dapp
-  VERSION = '0.7.1'.freeze
-  BUILD_CACHE_VERSION = 5
+  VERSION = '0.7.2'.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.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout