dapp 0.35.9 → 0.35.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f580bf383e4b07e491cb75f22906262bae4610897e414e3026eadbac2d69147d
-  data.tar.gz: 10779775e0563815a1da1c2cf20748864d38deec3277de137c35536f1acee452
+  metadata.gz: 93fc2053b4bfda93025e3bdcbd110f9159a2f38f341a7e922130ce2e432ec173
+  data.tar.gz: d1f855f7fd71e5b4d03034e7cb2e434b3deb0a951d48527cf8a5ed7f55aaa767
 SHA512:
-  metadata.gz: e21db3e15a5551e9700ec2d6e90cf29c9cd044c4be3b6368580b31309503b9f25cd121662f36b0473ec29e0239543501522045c1c90c719ec613aa70c2770ac7
-  data.tar.gz: 2b9641ed486716218d8240d0711acb3255171d659d0f60f5e77f4718fd13bfd114adb5f4643b08000268417bdf37458b1590f6df0516baeaafbb3f2151c83fa3
+  metadata.gz: ba0c2aa229a3f24caca6feba765a39a41073abaf0919017edbc3b2eb80410681b86bf807d7334b601db5d567082767f52e07d4ee7bc80399912489d1388916f1
+  data.tar.gz: 820901b1d3f6e20fe10b07bc27cfeccfc6786a4c04e826defa41bff313890c85bc5052b91250b108aa845f818096e71937043d041099ee888343dbe58b8cc3f8

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

@@ -4,11 +4,23 @@ module Dapp
       module Command
         module FlushLocal
           def flush_local
-            lock("#{name}.images") do
-              log_step_with_indent(:flush) do
-                remove_project_images(dapp_project_dimgs, force: true)
-                stages_flush_local if with_stages?
-              end
+            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_local_options)
+          end
+
+          def ruby2go_cleanup_flush_local_options
+            {
+              common_project_options: {
+                project_name: name,
+                common_options: {
+                  dry_run: dry_run?,
+                  force: true
+                }
+              },
+              with_dimgs: true,
+              with_stages: with_stages?,
+              only_repo: false,
+            }.tap do |json|
+              break JSON.dump(json)
             end
           end
         end

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

@@ -4,12 +4,21 @@ module Dapp
       module Command
         module FlushRepo
           def flush_repo
-            lock_repo(repo = option_repo) do
-              log_step_with_indent(option_repo) do
-                registry = dimg_registry(repo)
-                repo_dimgs_images(registry).each { |repo_image| delete_repo_image(registry, repo_image) }
-                stages_flush_repo if with_stages?
-              end
+            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_repo_options)
+          end
+
+          def ruby2go_cleanup_flush_repo_options
+            {
+              common_repo_options: {
+                repository: option_repo,
+                dimg_names: dimgs_names,
+                dry_run: dry_run?
+              },
+              with_dimgs: true,
+              with_stages: with_stages?,
+              only_repo: true,
+            }.tap do |json|
+              break JSON.dump(json)
             end
           end
         end

data/lib/dapp/dimg/dapp/command/stages/flush_local.rb

@@ -5,12 +5,24 @@ module Dapp
         module Stages
           module FlushLocal
             def stages_flush_local
-              lock("#{name}.images") do
-                log_step_with_indent('flush stages') { remove_project_images(dapp_project_dimgstages, force: true) }
-              end
+              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_local_options)
+            end
 
-              dapp_containers_flush_by_label("dapp=#{name}")
-              dapp_dangling_images_flush_by_label("dapp=#{name}")
+            def ruby2go_cleanup_stages_flush_local_options
+              {
+                common_project_options: {
+                  project_name: name,
+                  common_options: {
+                    dry_run: dry_run?,
+                    force: true
+                  }
+                },
+                with_dimgs: false,
+                with_stages: true,
+                only_repo: false,
+              }.tap do |json|
+                break JSON.dump(json)
+              end
             end
           end
         end

data/lib/dapp/dimg/dapp/command/stages/flush_repo.rb

@@ -5,11 +5,21 @@ module Dapp
         module Stages
           module FlushRepo
             def stages_flush_repo
-              lock_repo(repo = option_repo) do
-                log_step_with_indent("#{repo} stages") do
-                  registry = dimg_registry(repo)
-                  repo_dimgstages_images(registry).each { |repo_image| delete_repo_image(registry, repo_image) }
-                end
+              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_repo_options)
+            end
+
+            def ruby2go_cleanup_stages_flush_repo_options
+              {
+                common_repo_options: {
+                  repository: option_repo,
+                  dimg_names: dimgs_names,
+                  dry_run: dry_run?
+                },
+                with_dimgs: false,
+                with_stages: true,
+                only_repo: true,
+              }.tap do |json|
+                break JSON.dump(json)
               end
             end
           end

data/lib/dapp/dimg/docker_registry/dimg.rb

@@ -3,30 +3,17 @@ module Dapp
     module DockerRegistry
       class Dimg < Base
         def dimgstages_tags
-          tags_wrapper do
-            ruby2go_docker_registry_command(command: :dimgstage_tags, options: { reference: tag_reference })
-          end
+          ruby2go_docker_registry_command(command: :dimgstage_tags, options: { reference: tag_reference })
         end
 
         def dimg_tags(dimg_name)
-          tags_wrapper do
-            with_dimg_repository(dimg_name.to_s) do
-              ruby2go_docker_registry_command(command: :dimg_tags, options: { reference: tag_reference })
-            end
-          end
-        end
-
-        def nameless_dimg_tags
-          tags_wrapper do
+          with_dimg_repository(dimg_name.to_s) do
             ruby2go_docker_registry_command(command: :dimg_tags, options: { reference: tag_reference })
           end
         end
 
-        def tags_wrapper
-          yield || []
-        rescue Error::Registry => e
-          raise unless e.net_status[:data][:message].include?("NAME_UNKNOWN")
-          []
+        def nameless_dimg_tags
+          ruby2go_docker_registry_command(command: :dimg_tags, options: { reference: tag_reference })
         end
 
         def image_id(tag, dimg_repository = nil)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.9"
+  VERSION = "0.35.10"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.9
+  version: 0.35.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout