dapp 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e341435bff243138df9fb46bbdbfb1930e9ead52
-  data.tar.gz: fa8bd50f196de9bca32a9edab163cbefdeb89c92
+  metadata.gz: 63a283e9c26d03971a7ce417975d2769955bd352
+  data.tar.gz: 3dfee7cbdf9fcc6e15ecdde2ea46a757c4cad41b
 SHA512:
-  metadata.gz: fa31e7214e091a8dd0f8269d823cae3d709c153518b468306e05ae8b0dc9dc275ecb2d1f6e986132b0cccbf67538257bd472355b2c73c247648f1d79bafee56b
-  data.tar.gz: a88b713eff78dbee69b55fe62d51f456f51e0692bd94170938dccde4e3b51c596ccabbaea59af326fb4c93e0c959650252b12c01cf643fa248b806bc5267f2c9
+  metadata.gz: 9f6e76250e151bc3b531c3378762e95e48c771ca9f2d33b21176da294c8e80adedb1cfd3668cde383366d534239fadd83178c5b274585381c0d3476579f8d6c5
+  data.tar.gz: b9e3dd5df6248d14ec6a775280f6c52295d7f7f878b6441c76de4d90fdb082bbf65c1d65a2a29235e6b3cbd6414486bcc6b67fc243d16862073d49ae076dc6a5

data/lib/dapp/dimg/dapp/command/push.rb

@@ -4,6 +4,8 @@ module Dapp
       module Command
         module Push
           def push
+            #require 'ruby-prof'
+            #RubyProf.start
             repo = option_repo
             validate_repo_name!(repo)
             log_step_with_indent(:stages) { stages_push } if with_stages?
@@ -14,8 +16,13 @@ module Dapp
                 end
               end
             end
+            # FIXME: rework images cache, then profile
+            #result = RubyProf.stop
+            #printer = RubyProf::MultiPrinter.new(result)
+            #printer.print(path: '/tmp/testdapp.push.profile', profile: 'profile')
           end
 
+
           protected
 
           def with_stages?

data/lib/dapp/dimg/dimg.rb

@@ -83,7 +83,7 @@ module Dapp
           dapp.log_state(image_name, state: dapp.t(code: 'state.push'), styles: { status: :success })
         else
           dapp.lock("image.#{hashsum image_name}") do
-            ::Dapp::Dimg::Image::Stage.cache_reset(image_name)
+            ::Dapp::Dimg::Image::Stage.cache.delete(image_name)
             dapp.log_process(image_name, process: dapp.t(code: 'status.process.pushing')) do
               image.export!(image_name)
             end

data/lib/dapp/dimg/image/docker.rb

@@ -23,7 +23,7 @@ module Dapp
         def untag!
           raise Error::Build, code: :image_already_untagged, data: { name: name } unless tagged?
           dapp.shellout!("#{dapp.host_docker} rmi #{name}")
-          cache_reset
+          cache.delete(name)
         end
 
         def push!
@@ -89,7 +89,12 @@ module Dapp
 
           def tag!(id:, tag:, verbose: false, quiet: false)
             ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} tag #{id} #{tag}", verbose: verbose, quiet: quiet)
-            cache_reset
+
+            if cache_entry = cache.values.find {|v| v[:id] == id}
+              cache[tag] = cache_entry
+            else
+              cache_reset
+            end
           end
 
           def save!(image_or_images, file_path, verbose: false, quiet: false)
@@ -106,6 +111,8 @@ module Dapp
           end
 
           def cache_reset(name = '')
+            # FIXME: rework images cache, then delete time measure
+            #t = Time.now
             cache.delete(name)
             ::Dapp::Dapp.shellout!("#{::Dapp::Dapp.host_docker} images --format='{{.Repository}}:{{.Tag}};{{.ID}};{{.CreatedAt}};{{.Size}}' --no-trunc #{name}")
                         .stdout
@@ -132,6 +139,7 @@ module Dapp
               end
               cache[name] = { id: id, created_at: created_at, size: size }
             end
+            #p [:cache_reset, name, :took, Time.now - t]
           end
         end
       end # Docker

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.15.2'.freeze
+  VERSION = '0.16.0'.freeze
   BUILD_CACHE_VERSION = 19
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout