dapp 0.35.8 → 0.35.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33bab5acf415233033262234c2d2598088a72ca24d18232334eacf07d8c2977e
-  data.tar.gz: 59c997eff632e0ee05fb08b16e9eff632818ffee48a7c2bd79eae1f75f8b367c
+  metadata.gz: f580bf383e4b07e491cb75f22906262bae4610897e414e3026eadbac2d69147d
+  data.tar.gz: 10779775e0563815a1da1c2cf20748864d38deec3277de137c35536f1acee452
 SHA512:
-  metadata.gz: 41bbb70dd7c36c03586a1440a7a619b4c9fd8e19fa9ee9dcea2973b8c41bca94d85b054a92d393ef1925d23ad76a52426d8fd8da46c6454689e33843f9cca5d0
-  data.tar.gz: a0b79ff5ee6aa51da64a46e388b2639e53d79a26ac510cb762aa755b8760522dc514eee3a299dc210e15103eced837f720df0fb0c304290cbe57c51f01a5d229
+  metadata.gz: e21db3e15a5551e9700ec2d6e90cf29c9cd044c4be3b6368580b31309503b9f25cd121662f36b0473ec29e0239543501522045c1c90c719ec613aa70c2770ac7
+  data.tar.gz: 2b9641ed486716218d8240d0711acb3255171d659d0f60f5e77f4718fd13bfd114adb5f4643b08000268417bdf37458b1590f6df0516baeaafbb3f2151c83fa3

data/lib/dapp.rb

@@ -251,6 +251,7 @@ require 'dapp/dimg/dapp/command/push'
 require 'dapp/dimg/dapp/command/run'
 require 'dapp/dimg/dapp/command/spush'
 require 'dapp/dimg/dapp/command/tag'
+require 'dapp/dimg/dapp/command/ruby2go_cleanup'
 require 'dapp/dimg/dapp/command/stages/common'
 require 'dapp/dimg/dapp/command/stages/cleanup_local'
 require 'dapp/dimg/dapp/command/stages/cleanup_repo'

data/lib/dapp/dapp/ruby2go.rb

@@ -25,6 +25,10 @@ module Dapp
         _ruby2go("git-repo", args_hash)
       end
 
+      def ruby2go_cleanup(args_hash)
+        _ruby2go("cleanup", args_hash)
+      end
+
       def ruby2go_init
         @_call_after_before_terminate << proc {
           FileUtils.rmtree(@_ruby2go_tmp_dir) if @_ruby2go_tmp_dir

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

@@ -3,73 +3,25 @@ module Dapp
     module Dapp
       module Command
         module Mrproper
-          # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
           def mrproper
-            log_step_with_indent(:mrproper) do
-              raise ::Dapp::Error::Command, code: :mrproper_required_option if mrproper_command_without_any_option?
-
-              if proper_all?
-                proper_all
-              elsif proper_dev_mode_cache?
-                proper_dev_mode_cache
-              elsif proper_cache_version?
-                proper_cache_version
-              end
-
-              dapp_dangling_images_flush_by_label('dapp')
-              dapp_tagless_images_flush
+            ruby2go_cleanup_command(:reset, ruby2go_cleanup_reset_options)
+          end
+
+          def ruby2go_cleanup_reset_options
+            {
+              mode: {
+                all: !!options[:proper_all],
+                dev_mode_cache: !!options[:proper_dev_mode_cache],
+                cache_version: proper_cache_version?
+              },
+              cache_version: ::Dapp::BUILD_CACHE_VERSION.to_s,
+              common_options: {
+                dry_run: dry_run?
+              },
+            }.tap do |json|
+              break JSON.dump(json)
             end
           end
-          # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-
-          protected
-
-          def mrproper_command_without_any_option?
-            !(proper_all? || proper_dev_mode_cache? || proper_cache_version?)
-          end
-
-          def proper_all?
-            !!options[:proper_all]
-          end
-
-          def proper_dev_mode_cache?
-            !!options[:proper_dev_mode_cache]
-          end
-
-          def proper_all
-            flush_by_label('dapp')
-          end
-
-          def proper_dev_mode_cache
-            flush_by_label('dapp-dev-mode')
-          end
-
-          def flush_by_label(label)
-            dapp_containers_flush_by_label(label)
-            dapp_images_flush_by_label(label)
-          end
-
-          def dapp_images_flush_by_label(label)
-            log_step_with_indent('proper images') do
-              remove_images(dapp_images_names_by_label(label), force: true)
-            end
-          end
-
-          def proper_cache_version
-            log_proper_cache do
-              proper_cache_all_images_names.tap do |proper_cache_images|
-                remove_images(dapp_images_names_by_label('dapp').select { |image_name| !proper_cache_images.include?(image_name) }, force: true)
-              end
-            end
-          end
-
-          def proper_cache_all_images_names
-            ruby2go_image_images([{ label: "dapp" }, { label: "dapp-cache-version=#{::Dapp::BUILD_CACHE_VERSION}" }], ignore_tagless: true).map { |i| i["RepoTags"].empty? ? i["Id"] : i["RepoTags"] }.flatten
-          end
-
-          def dapp_images_names_by_label(label)
-            ruby2go_image_images([{ label: "dapp" }, { label: label }], ignore_tagless: true).map { |i| i["RepoTags"].empty? ? i["Id"] : i["RepoTags"] }.flatten
-          end
         end
       end
     end

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

@@ -0,0 +1,21 @@
+module Dapp
+  module Dimg
+    module Dapp
+      module Command
+        module Ruby2GoCleanup
+          def ruby2go_cleanup_command(command, command_options)
+            options = {
+              command: command,
+              command_options: command_options,
+              options: { host_docker_config_dir: self.class.host_docker_config_dir }
+            }
+
+            ruby2go_cleanup(options).tap do |res|
+              raise Error::Build, code: :ruby2go_cleanup_command_failed_unexpected_error, data: { command: command, message: res["error"] } unless res["error"].nil?
+            end
+          end
+        end
+      end
+    end
+  end # Dimg
+end # Dapp

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

@@ -30,6 +30,8 @@ module Dapp
         include Command::BuildContext::Import
         include Command::BuildContext::Export
         include Command::BuildContext::Common
+
+        include Command::Ruby2GoCleanup
       end
     end
   end

data/lib/dapp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.8
+  version: 0.35.9
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -606,6 +606,7 @@ files:
 - lib/dapp/dimg/dapp/command/list.rb
 - lib/dapp/dimg/dapp/command/mrproper.rb
 - lib/dapp/dimg/dapp/command/push.rb
+- lib/dapp/dimg/dapp/command/ruby2go_cleanup.rb
 - lib/dapp/dimg/dapp/command/run.rb
 - lib/dapp/dimg/dapp/command/spush.rb
 - lib/dapp/dimg/dapp/command/stage_image.rb