dpl 1.8.26.travis.1771.3 → 1.8.26.travis.1775.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30db4c1eee1527f7983ec1f084f8c197dd8c3d14
-  data.tar.gz: 951a4dd80439324b439fab0629b3766d0adf120e
+  metadata.gz: 442f26b778bea17923fc71d68890ca09edd01fa5
+  data.tar.gz: c123a7b359513699f94335e1b25fb37ce87d1f04
 SHA512:
-  metadata.gz: 57d82a6988355a09c8ee3ebbc5c5659cdb010f50429e7ebb6057fb983c97de782d3aa418a8547e2515cebc57a2439d04eaebb12d3309888ecdf39a5ca8218fe9
-  data.tar.gz: 5f573656bcfcc2354a2fb43165232a97ab9042d17399b63212e7da977275406baf99f8e1297ecf03f0d663bccee1b5951b988924552298b041f06f51da05082b
+  metadata.gz: e9bfb2f9e1c71fc5cfd6ab0b2e5908b442b21f6cb09621920d44e8dd33e52a5990665482e9ee2b9ef4269dedd96e52a3a4d5a8f5e0413e1283489c94a7885a4a
+  data.tar.gz: 9a5acc56187d8c68e17063ce3ef4a60207f7077ffe2e0358f254591a9e2ccdf0728311f471698c60d71a79e21ec907f8bac15e0eb010f664c7eee7f95b8abc22

data/lib/dpl/provider/deis.rb

@@ -2,8 +2,6 @@ module DPL
   class Provider
     class Deis < Provider
       
-      requires 'git'
-
       def install_deploy_dependencies
         install_url = determine_install_url
         context.shell "curl -sSL #{install_url} | bash -x -s #{option(:cli_version)}"
@@ -59,10 +57,6 @@ module DPL
         chmod(0740, path)
         context.env['GIT_SSH'] = path
 
-        unless context.shell "./deis git:remote --app=#{option(:app)}"
-          error 'Adding git remote failed.'
-        end
-
         wait_for_git_access
       end
 
@@ -71,9 +65,7 @@ module DPL
         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_uri=repository_url.split("ssh://")[1].split("/")[0]
         remote_host, remote_port = remote_uri.split(":")
         puts "Git remote is #{remote_host} at port #{remote_port}"
 
@@ -95,14 +87,28 @@ module DPL
         end
       end
 
+      def repository_url
+        "ssh://git@#{builder_hostname}:2222/#{option(:app)}.git"
+      end
+
+      def builder_hostname
+        host_tokens = controller_host.split(".")
+        host_tokens[0] = [host_tokens[0], "builder"].join("-")
+        host_tokens.join(".")
+      end
+
+      def controller_host
+        option(:controller).gsub(/https?:\/\//, "").split(":")[0]
+      end
+
       def push_app
-        unless context.shell "bash -c 'git push #{verbose_flag} deis HEAD:refs/heads/master -f 2>&1 | tr -dc \"[:alnum:][:space:][:punct:]\" | sed -E \"s/remote: (\\[1G)+//\" | sed \"s/\\[K$//\"; exit ${PIPESTATUS[0]}'"
+        unless context.shell "bash -c 'git push #{verbose_flag} #{repository_url} HEAD:refs/heads/master -f 2>&1 | tr -dc \"[:alnum:][:space:][:punct:]\" | sed -E \"s/remote: (\\[1G)+//\" | sed \"s/\\[K$//\"; exit ${PIPESTATUS[0]}'"
           error 'Deploying application failed.'
         end
       end
 
       def run(command)
-        unless context.shell "./deis run -- #{command}"
+        unless context.shell "./deis run -a #{option(:app)} -- #{command}"
           error 'Running command failed.'
         end
       end

data/spec/provider/deis_spec.rb

@@ -64,16 +64,6 @@ describe DPL::Provider::Deis do
 
   describe "#setup_git_ssh" do
     example 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)
@@ -98,7 +88,7 @@ describe DPL::Provider::Deis do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with(
-        "bash -c 'git push  deis HEAD:refs/heads/master -f 2>&1 | tr -dc \"[:alnum:][:space:][:punct:]\" | sed -E \"s/remote: (\\[1G)+//\" | sed \"s/\\[K$//\"; exit ${PIPESTATUS[0]}'"
+        "bash -c 'git push  ssh://git@deis-builder.deisapps.com:2222/example.git HEAD:refs/heads/master -f 2>&1 | tr -dc \"[:alnum:][:space:][:punct:]\" | sed -E \"s/remote: (\\[1G)+//\" | sed \"s/\\[K$//\"; exit ${PIPESTATUS[0]}'"
       ).and_return(true)
       provider.push_app
     end
@@ -107,7 +97,7 @@ describe DPL::Provider::Deis do
   describe "#run" do
     example do
       expect(provider.context).to receive(:shell).with(
-        './deis run -- shell command'
+        './deis run -a example -- shell command'
       ).and_return(true)
       provider.run('shell command')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.26.travis.1771.3
+  version: 1.8.26.travis.1775.3
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec