dapp 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6688aeaeb3fbb8ac79e79ebfb3a962fac517c837502baf782f63ba6ad0f66422
-  data.tar.gz: 51c4ec39d9f8a76d28e86d8c1b5c58003b62cb695759a8d2ea8fe059947bc5f0
+  metadata.gz: caa68d93baa4f34fd39023d92e84e77f87d71cc0218b6198b2527f7462244f12
+  data.tar.gz: 20b6b7ad98b9766e75a063359b0b138c3d118b84e3b548f2a204caea772df87e
 SHA512:
-  metadata.gz: d9a403972969a94073332d428d83d641bceb4e5b0c23b036dc28db0b7bcd65e11e7337e97a0dad7598b72e063eba32c2adf1396d1bc644e523f82996750fe77d
-  data.tar.gz: 0c17e98a0a94b63999cf00d620b60472f45064f7f8ca98c6f61a2a0206059df98e97a22842d15ed3d1007cbf5cdd5c6e04b758ffd55f78d384a3cf4adf382ab4
+  metadata.gz: cea36eaca547f72db729ea8e68917d70dc9badc3fd029bf026eaa88855fabf120f22912e2905e798e558aba4d6ad35b964bcf0e9b4e3dce0fbadd49002d7a10f
+  data.tar.gz: 68ba6167d3753d9a30e9792eaf9959ae18d3e2200683bbe72d00fcaa1e11f5b0a75c982c9e4db4898e88361341b424581e6d1fa320f2faaeb837ddfd3fd07f8b

data/lib/dapp/dimg/config/directive/git_artifact_remote.rb

@@ -7,7 +7,10 @@ module Dapp
 
           def initialize(url, **kwargs, &blk)
             @_url  = url
-            @_name = url.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
+
+            url_without_scheme = url.split("://", 2).last
+            url_without_creds = url_without_scheme.split(":", 2).last
+            @_name = url_without_creds.gsub(%r{.*?([^\/ ]+\/[^\/ ]+)\.git}, '\\1')
 
             super(**kwargs, &blk)
           end

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

@@ -9,19 +9,25 @@ module Dapp
 
           @url = url
 
-          dapp.log_secondary_process(dapp.t(code: 'process.git_artifact_clone', data: { url: url }), short: true) do
-            begin
-              if [:https, :ssh].include?(protocol) && !Rugged.features.include?(protocol)
-                raise Error::Rugged, code: :rugged_protocol_not_supported, data: { url: url, protocol: protocol }
-              end
+          _with_lock do
+            dapp.log_secondary_process(dapp.t(code: 'process.git_artifact_clone', data: { url: url }), short: true) do
+              begin
+                if [:https, :ssh].include?(protocol) && !Rugged.features.include?(protocol)
+                  raise Error::Rugged, code: :rugged_protocol_not_supported, data: { url: url, protocol: protocol }
+                end
 
-              Rugged::Repository.clone_at(url, path.to_s, bare: true, credentials: _rugged_credentials)
-            rescue Rugged::NetworkError, Rugged::SslError, Rugged::OSError => e
-              raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
+                Rugged::Repository.clone_at(url, path.to_s, bare: true, credentials: _rugged_credentials)
+              rescue Rugged::NetworkError, Rugged::SslError, Rugged::OSError => e
+                raise Error::Rugged, code: :rugged_remote_error, data: { message: e.message, url: url }
+              end
             end
           end unless path.directory?
         end
 
+        def _with_lock(&blk)
+          dapp.lock("remote_git_artifact.#{name}", default_timeout: 120, &blk)
+        end
+
         def _rugged_credentials
           @_rugged_credentials ||= begin
             if protocol == :ssh
@@ -33,14 +39,27 @@ module Dapp
         end
 
         def path
-          Pathname(dimg.build_path('git_repo_remote', name, Digest::MD5.hexdigest(url)).to_s)
+          Pathname(dimg.build_path('git_repo_remote', name).to_s)
         end
 
         def fetch!(branch = nil)
-          branch ||= self.branch
-          dapp.log_secondary_process(dapp.t(code: 'process.git_artifact_fetch', data: { url: url }), short: true) do
-            git.fetch('origin', [branch], credentials: _rugged_credentials)
-            raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
+          _with_lock do
+            branch ||= self.branch
+
+            cfg_path = path.join("config")
+            cfg = IniFile.load(cfg_path)
+            remote_origin_cfg = cfg['remote "origin"']
+
+            old_url = remote_origin_cfg["url"]
+            if old_url and old_url != url
+              remote_origin_cfg["url"] = url
+              cfg.write(filename: cfg_path)
+            end
+
+            dapp.log_secondary_process(dapp.t(code: 'process.git_artifact_fetch', data: { url: url }), short: true) do
+              git.fetch('origin', [branch], credentials: _rugged_credentials)
+              raise Error::Rugged, code: :branch_not_exist_in_remote_git_repository, data: { branch: branch, url: url } unless branch_exist?(branch)
+            end
           end unless dimg.ignore_git_fetch || dapp.dry_run?
         end
 

data/lib/dapp/kube/cli/command/kube/deploy.rb

@@ -12,6 +12,12 @@ BANNER
              long: '--namespace NAME',
              default: nil
 
+      option :image_version,
+             long: '--image-version TAG',
+             description: "Custom tag (alias for --tag)",
+             default: [],
+             proc: proc { |v| composite_options(:image_versions) << v }
+
       option :tag,
              long: '--tag TAG',
              description: 'Custom tag',
@@ -66,7 +72,10 @@ BANNER
       def run(argv = ARGV)
         self.class.parse_options(self, argv)
 
-        run_dapp_command(nil, options: cli_options) do |dapp|
+        options = cli_options
+        options[:tag] = [*options.delete(:tag), *options.delete(:image_version)]
+
+        run_dapp_command(nil, options: options) do |dapp|
           repo = if not cli_arguments[0].nil?
             self.class.required_argument(self, 'repo')
           else

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.21.2'.freeze
+  VERSION = '0.21.3'.freeze
   BUILD_CACHE_VERSION = 23
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout