dapp 0.31.3 → 0.31.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1afd2b369ed8ab7aa8911fdc85cc152490ac4824dee599a4d9c4703124c69646
-  data.tar.gz: 524410a1caa1e9cb74c94b4ae054d707b7d08e5a5e17b0823d3856c9f5e9f259
+  metadata.gz: 92cbd45585608c2b3424c4db1e59b504beb8c1c90eced82f7b27a70eba995e3e
+  data.tar.gz: 8e5c680b2a63f6cf7869f72c35efac3dc19f32bce3afddfe64f13f2f96614563
 SHA512:
-  metadata.gz: 9e070869ffeee6790917554c796927136316862a47eec701cc445b3bc0aa77a6be3d6c5d5620a3a83221de4bc8216e7d6bb9ba30f1d0f96495bf6d8a1ff7c2fc
-  data.tar.gz: 2b0a31e22ffa7135ae2edeb63c2400bce67eb38667f1c878ab42ecfd5bc91f545ffe855e1853eb234bb800c616a4a44c4ce223250a434b33d9810aed81313bfd
+  metadata.gz: 0d307250a9a3cd29bc80528213685b55bed30cd4bd35c6925a78e8cd2187d3c4bebf00865d33acccf3240f834dd4eaf46baae408f0ba4c348a01aaf5cc167aa5
+  data.tar.gz: fff8cc2b739262c7f14a7684d56824295d9b4e4e99597d80450b7a6382cf4aaf8b64dba3802979a5807e1ddbd69cf0bda38753ebf39ba5f95a85b2efc8d33938

data/lib/dapp/dimg/build/stage/artifact_base.rb

@@ -23,7 +23,6 @@ module Dapp
             @artifacts ||= begin
               dimg.config.public_send("_#{name}").map do |artifact|
                 artifact_dimg = dimg.dapp.artifact_dimg(config: artifact._config,
-                                                        ignore_git_fetch: dimg.ignore_git_fetch,
                                                         ignore_signature_auto_calculation: dimg.ignore_signature_auto_calculation)
                 { options: artifact._artifact_options, dimg: artifact_dimg }
               end

data/lib/dapp/dimg/build/stage/from.rb

@@ -26,9 +26,9 @@ module Dapp
           def from_dimg
             @from_dimg ||= begin
               if !dimg.config._from_dimg.nil?
-                dimg.dapp.dimg_layer(config: dimg.config._from_dimg, ignore_git_fetch: dimg.ignore_git_fetch)
+                dimg.dapp.dimg_layer(config: dimg.config._from_dimg)
               elsif !dimg.config._from_dimg_artifact.nil?
-                dimg.dapp.artifact_dimg_layer(config: dimg.config._from_dimg_artifact, ignore_git_fetch: dimg.ignore_git_fetch)
+                dimg.dapp.artifact_dimg_layer(config: dimg.config._from_dimg_artifact)
               end
             end
           end

data/lib/dapp/dimg/dapp/command/build_context/export.rb

@@ -14,7 +14,7 @@ module Dapp
             def export_build_context_image_tar
               lock("#{name}.images", readonly: true) do
                 context_images_names = build_configs.map do |config|
-                  dimg(config: config, ignore_git_fetch: true).all_tagged_images.map(&:name)
+                  dimg(config: config).all_tagged_images.map(&:name)
                 end.flatten
 
                 log_secondary_process(:images, short: true) do

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

@@ -153,7 +153,7 @@ module Dapp
             validate_repo_name!(repo)
             build_configs.each do |config|
               log_dimg_name_with_indent(config) do
-                yield dimg(config: config, ignore_git_fetch: true, should_be_built: should_be_built)
+                yield dimg(config: config, should_be_built: should_be_built)
               end
             end
           end

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

@@ -6,7 +6,7 @@ module Dapp
           def run(stage_name, docker_options, command)
             one_dimg!
             setup_ssh_agent
-            dimg(config: build_configs.first, ignore_git_fetch: true, should_be_built: stage_name.nil?, ignore_signature_auto_calculation: true)
+            dimg(config: build_configs.first, should_be_built: stage_name.nil?, ignore_signature_auto_calculation: true)
               .run_stage(stage_name, docker_options, command)
           end
         end

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

@@ -5,7 +5,7 @@ module Dapp
         module StageImage
           def stage_image
             one_dimg!
-            puts dimg(config: build_configs.first, ignore_git_fetch: true).stage_image_name(options[:stage])
+            puts dimg(config: build_configs.first).stage_image_name(options[:stage])
           end
         end
       end

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

@@ -69,7 +69,7 @@ module Dapp
             def dapp_git_repositories
               @dapp_git_repositories ||= begin
                 {}.tap do |repositories|
-                  dimgs = build_configs.map { |config| dimg(config: config, ignore_git_fetch: true, ignore_signature_auto_calculation: true) }
+                  dimgs = build_configs.map { |config| dimg(config: config, ignore_signature_auto_calculation: true) }
                   dimgs.each do |dimg|
                     [dimg, dimg.artifacts]
                       .flatten

data/lib/dapp/dimg/dimg.rb

@@ -9,16 +9,14 @@ module Dapp
       include Helper::Trivia
 
       attr_reader :config
-      attr_reader :ignore_git_fetch
       attr_reader :ignore_signature_auto_calculation
       attr_reader :should_be_built
       attr_reader :dapp
 
-      def initialize(config:, dapp:, should_be_built: false, ignore_git_fetch: false, ignore_signature_auto_calculation: false)
+      def initialize(config:, dapp:, should_be_built: false, ignore_signature_auto_calculation: false)
         @config = config
         @dapp = dapp
 
-        @ignore_git_fetch                  = ignore_git_fetch
         @ignore_signature_auto_calculation = ignore_signature_auto_calculation
 
         @dapp._terminate_dimg_on_terminate(self)

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

@@ -19,7 +19,7 @@ module Dapp
         def remote_git_artifacts(omit_empty: true)
           @remote_git_artifact_list ||= [].tap do |artifacts|
             Array(config._git_artifact._remote).each do |ga_config|
-              repo = GitRepo::Remote.get_or_create(dapp, ga_config._name, url: ga_config._url, ignore_git_fetch: ignore_git_fetch)
+              repo = GitRepo::Remote.get_or_create(dapp, ga_config._name, url: ga_config._url)
               artifacts.concat(generate_git_artifacts(repo, omit_empty: omit_empty, **ga_config._artifact_options)) unless repo.empty?
             end
           end

data/lib/dapp/dimg/git_artifact.rb

@@ -72,7 +72,7 @@ module Dapp
         embedded_rel_path = embedded_params[:path]
         embedded_repo     = begin
           if embedded_params[:type] == :remote
-            GitRepo::Remote.get_or_create(repo.dapp, embedded_rel_path, url: embedded_params[:url], ignore_git_fetch: dimg.ignore_git_fetch)
+            GitRepo::Remote.get_or_create(repo.dapp, embedded_rel_path, url: embedded_params[:url])
           elsif embedded_params[:type] == :local
             embedded_path = File.join(repo.workdir_path, embedded_params[:path])
             GitRepo::Local.new(repo.dapp, embedded_rel_path, embedded_path)

data/lib/dapp/dimg/git_repo/remote.rb

@@ -7,19 +7,8 @@ module Dapp
         attr_reader :url
 
         class << self
-          def get_or_create(dapp, name, url:, ignore_git_fetch: false)
-            key         = [url, ignore_git_fetch]
-            inverse_key = [url, !ignore_git_fetch]
-
-            repositories[key] ||= begin
-              if repositories.key?(inverse_key)
-                repositories[inverse_key]
-              else
-                new(dapp, name, url: url)
-              end.tap do |repo|
-                repo.fetch! unless ignore_git_fetch
-              end
-            end
+          def get_or_create(dapp, name, url:)
+            repositories[url] ||= new(dapp, name, url: url).tap(&:fetch!)
           end
 
           def repositories

data/lib/dapp/kube/helm/values.rb

@@ -65,7 +65,7 @@ module Dapp
           end
 
           dimgs = dapp.build_configs.map do |config|
-            dapp.dimg(config: config, ignore_git_fetch: true, ignore_signature_auto_calculation: true)
+            dapp.dimg(config: config, ignore_signature_auto_calculation: true)
           end.uniq do |dimg|
             dimg.name
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.31.3"
+  VERSION = "0.31.4"
   BUILD_CACHE_VERSION = 30
 end

metadata

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