dapp 0.35.14 → 0.35.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b79f74ea56e3fa0b73cf59ffcf7575c03ed24c570b6340a29e87080144e89be
-  data.tar.gz: d0a49cdf9540c200d2d3a3c511ac5d983aed2bc74212b289f074d2042ccae029
+  metadata.gz: a76a8e1160f0bf6bcff177579f7123ff532b5d786dbdd0ea09942bb430a31ef4
+  data.tar.gz: 573fcf1833ac0edb462d03de45faaaeea4e3eac39324d5765ed6103b97f18137
 SHA512:
-  metadata.gz: 55790f11cd30cd2f1ed9de5ba581369a76bdd06c9475f64f06aa17163ce9fe6b77fc09e25167ac0f2bcff9385a12f1b8856611f2ff38a1c02e668fba9d42c0af
-  data.tar.gz: eeaac232968bf0a80d1748b14f48e8a6eeb9ab156fc5d721eddbe6a1bc53b34ebf5536cc378f7716249493b210381cab2cc74e995d93b8a2b30e5b298d096276
+  metadata.gz: 77c32211ccfc6af89e259efed8c6bbe10b4a6729c8e07b00a709e9c1fd97164ba558bcc135d2896303a7cc15ae47a8e62a48cf9a1d16c6c5e202ab0faa13f9df
+  data.tar.gz: 3ffe02529fdc005b85baeeb912b25d98c1ad06d790daf94729b4ffa81add2a53dd2a80565a294570fbea10b8f6d8b05f30729e6e271080eea9d8ce57cb003ecb

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

@@ -4,24 +4,17 @@ module Dapp
       module Command
         module FlushLocal
           def flush_local
-            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_local_options)
+            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_local_options_dump)
           end
 
-          def ruby2go_cleanup_flush_local_options
-            {
-              common_project_options: {
-                project_name: name,
-                common_options: {
-                  dry_run: dry_run?,
-                  force: true
-                }
-              },
+          def ruby2go_cleanup_flush_local_options_dump
+            ruby2go_cleanup_common_project_options(force: true).merge(
               mode: {
                 with_dimgs: true,
                 with_stages: with_stages?,
                 only_repo: false,
               },
-            }.tap do |json|
+            ).tap do |json|
               break JSON.dump(json)
             end
           end

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

@@ -4,22 +4,17 @@ module Dapp
       module Command
         module FlushRepo
           def flush_repo
-            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_repo_options)
+            ruby2go_cleanup_command(:flush, ruby2go_cleanup_flush_repo_options_dump)
           end
 
-          def ruby2go_cleanup_flush_repo_options
-            {
-              common_repo_options: {
-                repository: option_repo,
-                dimg_names: dimgs_names,
-                dry_run: dry_run?
-              },
+          def ruby2go_cleanup_flush_repo_options_dump
+            ruby2go_cleanup_common_repo_options.merge(
               mode: {
                 with_dimgs: true,
                 with_stages: with_stages?,
                 only_repo: true,
-              },
-            }.tap do |json|
+              }
+            ).tap do |json|
               break JSON.dump(json)
             end
           end

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

@@ -4,21 +4,20 @@ module Dapp
       module Command
         module Mrproper
           def mrproper
-            ruby2go_cleanup_command(:reset, ruby2go_cleanup_reset_options)
+            ruby2go_cleanup_command(:reset, ruby2go_cleanup_reset_options_dump)
           end
 
-          def ruby2go_cleanup_reset_options
-            {
+          def ruby2go_cleanup_reset_options_dump
+            cleanup_repo_proper_cache_version_options.merge(
               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|
+            ).tap do |json|
               break JSON.dump(json)
             end
           end

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

@@ -15,29 +15,29 @@ module Dapp
             end
           end
 
-          def ruby2go_cleanup_sync_common_project_options
+          def ruby2go_cleanup_common_project_options(force: false)
             {
               common_project_options: {
                 project_name: name,
                 common_options: {
                   dry_run: dry_run?,
-                  force: true
+                  force: force
                 }
               },
             }
           end
 
-          def ruby2go_cleanup_sync_cache_version_option
+          def ruby2go_cleanup_cache_version_options
             {
               cache_version: ::Dapp::BUILD_CACHE_VERSION.to_s
             }
           end
 
-          def ruby2go_cleanup_sync_common_repo_options
+          def ruby2go_cleanup_common_repo_options
             {
               common_repo_options: {
                 repository: option_repo,
-                dimg_names: dimgs_names,
+                dimgs_names: nameless_dimg? ? [] : dimgs_names,
                 dry_run: dry_run?
               }
             }

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

@@ -8,22 +8,22 @@ module Dapp
               raise ::Dapp::Error::Command, code: :stages_cleanup_required_option unless stages_cleanup_option?
 
               if proper_cache_version?
-                ruby2go_cleanup_command(:sync, cleanup_local_proper_cache_version_options)
+                ruby2go_cleanup_command(:sync, cleanup_local_proper_cache_version_options_dump)
               end
 
               if proper_repo_cache?
-                ruby2go_cleanup_command(:sync, cleanup_local_proper_repo_cache_options)
+                ruby2go_cleanup_command(:sync, cleanup_local_proper_repo_cache_options_dump)
               end
             end
 
-            def cleanup_local_proper_cache_version_options
-              ruby2go_cleanup_sync_common_project_options.merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
+            def cleanup_local_proper_cache_version_options_dump
+              ruby2go_cleanup_common_project_options.merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
                 break JSON.dump(data)
               end
             end
 
-            def cleanup_local_proper_repo_cache_options
-              ruby2go_cleanup_sync_common_project_options.merge(ruby2go_cleanup_sync_common_repo_options).tap do |data|
+            def cleanup_local_proper_repo_cache_options_dump
+              ruby2go_cleanup_common_project_options.merge(ruby2go_cleanup_common_repo_options).tap do |data|
                 break JSON.dump(data)
               end
             end

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

@@ -18,13 +18,22 @@ module Dapp
             end
 
             def cleanup_repo_proper_cache_version_options
-              ruby2go_cleanup_sync_common_repo_options.merge({ mode: { sync_repo: true, only_cache_version: true } }).merge(ruby2go_cleanup_sync_cache_version_option).tap do |data|
+              ruby2go_cleanup_common_repo_options.merge(ruby2go_cleanup_cache_version_options).merge(
+                mode: {
+                  sync_repo: true,
+                  only_cache_version: true
+               }
+              ).tap do |data|
                 break JSON.dump(data)
               end
             end
 
             def cleanup_repo_proper_repo_cache_options
-              ruby2go_cleanup_sync_common_repo_options.merge({ sync_repo: true }).tap do |data|
+              ruby2go_cleanup_common_repo_options.merge(
+                mode: {
+                  sync_repo: true
+                }
+              ).tap do |data|
                 break JSON.dump(data)
               end
             end

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

@@ -5,24 +5,17 @@ module Dapp
         module Stages
           module FlushLocal
             def stages_flush_local
-              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_local_options)
+              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_local_options_dump)
             end
 
-            def ruby2go_cleanup_stages_flush_local_options
-              {
-                common_project_options: {
-                  project_name: name,
-                  common_options: {
-                    dry_run: dry_run?,
-                    force: true
-                  }
-                },
+            def ruby2go_cleanup_stages_flush_local_options_dump
+              ruby2go_cleanup_common_project_options(force: true).merge(
                 mode: {
                   with_dimgs: false,
                   with_stages: true,
                   only_repo: false,
-                },
-              }.tap do |json|
+                }
+              ).tap do |json|
                 break JSON.dump(json)
               end
             end

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

@@ -5,22 +5,17 @@ module Dapp
         module Stages
           module FlushRepo
             def stages_flush_repo
-              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_repo_options)
+              ruby2go_cleanup_command(:flush, ruby2go_cleanup_stages_flush_repo_options_dump)
             end
 
-            def ruby2go_cleanup_stages_flush_repo_options
-              {
-                common_repo_options: {
-                  repository: option_repo,
-                  dimg_names: dimgs_names,
-                  dry_run: dry_run?
-                },
+            def ruby2go_cleanup_stages_flush_repo_options_dump
+              ruby2go_cleanup_common_repo_options.merge(
                 mode: {
                   with_dimgs: false,
                   with_stages: true,
                   only_repo: true,
                 },
-              }.tap do |json|
+              ).tap do |json|
                 break JSON.dump(json)
               end
             end

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

@@ -13,7 +13,7 @@ module Dapp
 
         def one_dimg!
           return if build_configs.one?
-          raise ::Dapp::Error::Command, code: :command_unexpected_dimgs_number, data: { dimgs_names: build_configs.map(&:_name).join('`, `') }
+          raise ::Dapp::Error::Command, code: :command_unexpected_dimgs_number, data: { dimgs_names: dimgs_names.join('`, `') }
         end
 
         def dimgs_names

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.14"
+  VERSION = "0.35.15"
   BUILD_CACHE_VERSION = 31
 end

metadata

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