dpl 1.8.15.travis.1375.4 → 1.8.15.travis.1378.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQwZGU5MzNjODMyNGRmYjRlOGM0YjJkNGUxNzYxM2M5OTA4YzQzMQ==
+    NWY5NWM2NDM0OWM4YzE4Zjg1NjY4MzVlMjE3MzFmY2FhZWZjODcwZQ==
   data.tar.gz: !binary |-
-    NzI4ZjU1MDA4ODM0YmFkNWE4MjFiMzYxNmNiMzBmZTJmMzY1NzkxZA==
+    MGJjYjU5NWUzOTUzM2U4MGNhM2M4YTE4ZTViOGM1MmZmOTIyOTA0Yw==
 SHA512:
   metadata.gz: !binary |-
-    YzMwMzYwMzRjZDZmZmU0YWEyMDcyNzM2OTBkMDlhOGNmMjYyMjU5MzE3ODBi
-    NjIxMWViMWZjODk1MDFmM2FhODk1MGE5NDBkNWZkMDI5OTFiN2ExZjk1ZTI5
-    ZDA4Y2M5MmY5MjEzYjc4ZDdhM2JlMDVlNjc2ZTJjMWE2YTRkNjA=
+    M2I3M2JmMjNmYzQ1NGVjNTU1OWVlYjFkZWU0NmI3ZmE4NDBhYTJhOGUxMWEw
+    ZTQwNWQ1MWFjMjY4YTg5NTExM2RmYzYxYmEwMzBlYjljMjRlMTUwYjQ3MzI2
+    NDE2ZDc4OTc1M2IxMzEwY2I0ZDkyODcxZTRiNDA4MGI5NmQxMTU=
   data.tar.gz: !binary |-
-    MWZmOTgzNjM0YTFkODA5YmE0YmJjY2I2YWQ0YjNhOGM2OWNkYTAxZTQzNGIw
-    ZDZmMWYxNmI0ODE1NWY2ODU3NzkwOTNlYTFkYjQxNDFlOWNiZWM2MGE4NmU3
-    OTYwYmE0OWM4MWI0ODk3YzQyYTkzYzY4N2FkYWRhNDYyMTQ1ZGI=
+    N2EyMzZlNGFlNWUwMGY1ZjQ5Y2EwODA1ZjMyNjJlNDliYTZjNTlmYTQxNzgx
+    ZDI3MzBlMzEyMzkxNTE3M2E1MzBhYTE0ODUxMGVhZGZhMTZkY2IzNmUwOGRj
+    MDkxNzgzMDA0YWY1MDU2OWMzODVjNTcwNmY4NTRjMDFlODM3MGU=

data/Gemfile

@@ -82,3 +82,7 @@ end
 group :chef_supermarket do
   gem 'chef'
 end
+
+group :deis do
+  gem 'git'
+end

data/lib/dpl/provider/deis.rb

@@ -1,6 +1,9 @@
 module DPL
   class Provider
     class Deis < Provider
+      
+      requires 'git'
+
       def install_deploy_dependencies
         context.shell "curl -sSL http://deis.io/deis-cli/install.sh | sh -s #{option(:cli_version)}"
       end
@@ -44,6 +47,31 @@ module DPL
         unless context.shell "./deis git:remote --app=#{option(:app)}"
           error 'Adding git remote failed.'
         end
+
+        wait_for_git_access
+      end
+
+      def wait_for_git_access()
+        retry_count=0
+        max_retries=30
+
+        #Get the deis git remote host and port
+        git=Git.open("./")
+        git_remote=git.remote("deis").url
+        remote_uri=git_remote.split("ssh://")[1].split("/")[0]
+        remote_host, remote_port = remote_uri.split(":")
+        puts "Git remote is #{remote_host} at port #{remote_port}"
+
+        #Try and connect to the github remote via ssh.
+        while retry_count < max_retries
+          puts "Waiting for ssh key to propagate..."
+          if context.shell "#{context.env['GIT_SSH']} #{remote_host} -p #{remote_port}  2>&1 | grep -c 'PTY allocation request failed' > /dev/null"
+            puts "SSH connection established."
+            break
+          end
+          retry_count += 1
+          sleep(1)
+        end
       end
 
       def remove_key

data/spec/provider/deis_spec.rb

@@ -67,6 +67,21 @@ describe DPL::Provider::Deis do
       expect(provider.context).to receive(:shell).with(
         './deis git:remote --app=example'
       ).and_return(true)
+
+      git_conf = double
+      git_remote = double
+      allow(Git).to receive(:open).and_return(git_conf)
+      allow(git_conf).to receive(:remote).and_return(git_remote)
+      allow(git_remote).to receive(:url).and_return("ssh://git@fake-git-repo.travis-ci.com:2222/dpl-test.git")
+
+      expect(provider.context).to receive(:shell).with(
+        /grep -c 'PTY allocation request failed'/
+      ).and_return(false)
+
+      expect(provider.context).to receive(:shell).with(
+        /grep -c 'PTY allocation request failed'/
+      ).and_return(true)
+
       provider.setup_git_ssh('foo', 'key_file')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.15.travis.1375.4
+  version: 1.8.15.travis.1378.4
 platform: ruby
 authors:
 - Konstantin Haase