dpl 1.8.19.travis.1576.3 → 1.8.19.travis.1619.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +8 -8
  2. data/lib/dpl/provider/atlas.rb +17 -7
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- M2QzYjI1N2Q4M2FkYTBmZWQyZWFmYjk4YjJmYzNmNWNiODAxMWNiMQ==
4
+ OWQ5ZWVkZmJmZjc5MjdjZWEzMGNkNWViYmI3NzM4MGI0YzhlZmIwNg==
5
5
  data.tar.gz: !binary |-
6
- YWY1NjI3NTEzNjVjMDg4MGIzMTYzNmI3OWE0MDk1NzIyOTAzNWRkYw==
6
+ Yjg5Y2QzZTI5NjhlYjc1MTY5NGNlZjA2NzQ0MmJiN2QzYjUxMWRlNA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- ZTlmNGFjNTU5OGY1ZmJkYjQwYjIwODlmOTMyZGUzNDY4M2VlNzQ2ZjcwZTZh
10
- Y2ZiOGQ1MTYyNjM4N2I4Njg4OTkzZjIxNTIwOGRkNDBlNjg0YWQ3NmIwM2Fh
11
- Nzk5NjU3MTNkNjY3ZjUxNDJkNDc2NDM2M2RjYjU2NjZmMGY0MTI=
9
+ YmI4M2EzNTUzYjZhYTgwNDU3OGJhZjg4NDc4ZTczOTdkMmYzYzNiMTE5ZGZh
10
+ NGU0MTQ3NTljNTgzOTMyNjE0MDkzNjI2YzZlMTJjZjNkMTY4M2YyOTU5YTNl
11
+ NzYzZDAwMWI3MzNjZDRkMTFmNmE0MzI5YjBiMDQ3MmE3NWIwMWE=
12
12
  data.tar.gz: !binary |-
13
- NzA4N2Q2Y2UzYWRlYmY0ZTc1ZTEzNWZlZmMwMzRmOTZkMTJhNTg2M2ZhNzRm
14
- MWNlMjY1NjMxMDBiZDE1YmMxNDQ4N2FiZDk5NTEyZDFkMTIxZWZlMzk4MWRj
15
- NzY4MTUyY2ExMzY4OGU5ZTQzODMzNDM4NTFkMTM3MmM4YmEyYzU=
13
+ MDgxNGQwZTRlYjY5NmE0MWJmZDJkZjhjM2IzOWE1NDQ4NTExZDZiODU4ZWI5
14
+ N2ZlNmExNWQxNTZiZTQxZjQ0YzExMzQ3YjU0ZmFlZDQ1NDI2ZjIxOTc5MmRl
15
+ MzkxNzc1MDdhMTYwMWU4M2M5ZDg4NTI4YTI0ZDE1MGFjNjU4N2Y=
@@ -16,14 +16,15 @@ module DPL
16
16
  chmod +x $HOME/bin/gimme
17
17
  fi
18
18
 
19
- export GOPATH="$HOME/gopath:$GOPATH"
20
- eval "$(gimme 1.4.2)" &>/dev/null
19
+ if [ -z $GOPATH ]; then
20
+ export GOPATH="$HOME/gopath"
21
+ else
22
+ export GOPATH="$HOME/gopath:$GOPATH"
23
+ fi
24
+ eval "$(gimme 1.6)" &> /dev/null
21
25
 
22
26
  go get #{ATLAS_UPLOAD_CLI_GO_REMOTE}
23
- pushd $HOME/gopath/src/#{ATLAS_UPLOAD_CLI_GO_REMOTE} &>/dev/null
24
- make &>/dev/null
25
- cp bin/atlas-upload $HOME/bin/atlas-upload
26
- popd &>/dev/null
27
+ cp $HOME/gopath/bin/atlas-upload-cli $HOME/bin/atlas-upload
27
28
  fi
28
29
  EOF
29
30
 
@@ -59,7 +60,9 @@ module DPL
59
60
  private
60
61
 
61
62
  def install_atlas_upload
62
- context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
63
+ without_git_http_user_agent do
64
+ context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
65
+ end
63
66
  end
64
67
 
65
68
  def assert_app_present!
@@ -93,6 +96,13 @@ module DPL
93
96
  def atlas_app
94
97
  @atlas_app ||= options.fetch(:app).to_s
95
98
  end
99
+
100
+ def without_git_http_user_agent(&block)
101
+ git_http_user_agent = ENV.delete("GIT_HTTP_USER_AGENT")
102
+ yield
103
+ ENV["GIT_HTTP_USER_AGENT"] = git_http_user_agent
104
+ end
105
+
96
106
  end
97
107
  end
98
108
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dpl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.19.travis.1576.3
4
+ version: 1.8.19.travis.1619.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-16 00:00:00.000000000 Z
11
+ date: 2016-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec