dpl 1.8.19.travis.1649.3 → 1.8.19.travis.1652.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- Nzc1ODRlYTE1NjdhYTU4Y2I0OTI1MzRhNjkyN2EzNjA5ODQ2MTQzMg==
4
+ OWQ5NjdjM2M5ZjZlNDliMzkzZjMxOWFmNGZlZGUwYmFkZmZiZjEzMA==
5
5
  data.tar.gz: !binary |-
6
- MGYxMWEwMTQ4MjIwNzAzZTc0NjFkNTc4N2VhNDk5Y2Q3NDAxYzQwZg==
6
+ NGUwODYxYTMwN2Y3ZWY2ZDdiNGY2M2ZjOGEwMGEwZDI5ZjA0ZWJlZA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- M2MzMjAyNzk1ZTA2ZTQxNWE5Y2FhZTUyODJhZmFmYTQwM2NmZDFkNzA1M2M3
10
- NmVkODRlM2M0ZTg5OTVkZmM0ZThiY2ZlZDA5NWUxZjBlMzBlMzA3OTA2NTk4
11
- MWNhYzU1ZmE3OTJlMzk4ZjFmNDA1YzFkYTE3YTExYWJkYzNlMTI=
9
+ NGJmZWMzNTg5MjljNTY5ODNhMmFiMTM2MmE1MjZjMDIxMGU1ZWI5MjZlNTk5
10
+ NmYxOWRlZWZkNGMxNWFiMDQ3NzNmZGRjM2VhMjEwMThkOWJiMDg4Yjk3NTNh
11
+ OTI1OTgxM2FiMTA1ZWRkNTU5ZjkyZDM4N2IzMGU0NzEyYzJmZTM=
12
12
  data.tar.gz: !binary |-
13
- MDZlZTIwYmZlMGU2NTJiMWFjNWQ2ZTA0ZjRmY2EyOTY0MWU2ZTlmZDNiM2Q2
14
- MWM1NWQzZTAxMDA1MDE2MDAzYThmYmM4ZDcxODMwZWQ1MTE2OWI0YWJlMmQ4
15
- OWNkYTI0ZDQzYWY5OGIyNWY3ZGYzZWNjNmEwNWNiMTIyMDg4NTI=
13
+ YWMyMjdkN2M3NTNmMWRkZjcyMjBhYzMzZjViMjg1N2VhODZlNGU2ZWU3MTU5
14
+ MWJmNDcyM2Y5YjMxODUwZWM1NWNmYzI5YmJlMjk0YWVhZDczMGQwYWJlMzYx
15
+ ZGZiZjUxYWU5MWM3YTYxYTkxODQxMzFlMzc5OWUyMzc4NTRhMmU=
data/Gemfile CHANGED
@@ -45,6 +45,7 @@ end
45
45
 
46
46
  group :cloud_files do
47
47
  gem 'fog-google', '< 0.1.1', platforms: :mri_19
48
+ gem 'fog-profitbricks', '< 2.0', platforms: :mri_19
48
49
  gem 'fog'
49
50
  end
50
51
 
data/README.md CHANGED
@@ -69,18 +69,18 @@ Running dpl in a terminal that saves history is insecure as your password/api ke
69
69
 
70
70
  #### Options:
71
71
  * **api-key**: Heroku API Key
72
- * **strategy[git/anvil]**: Deployment strategy for Dpl. Defaults to anvil.
72
+ * **strategy**: Deployment strategy for Dpl. Defaults to `api`. Other options are `git`, `git ssh`, and `git deploykey`.
73
73
  * **app**: Heroku app name. Defaults to the name of your git repo.
74
74
  * **username**: heroku username. Not necessary if api-key is used. Requires git strategy.
75
75
  * **password**: heroku password. Not necessary if api-key is used. Requires git strategy.
76
76
 
77
- #### Git vs Anvil Deploy:
78
- * Anvil will run the [buildpack](https://devcenter.heroku.com/articles/buildpacks) compilation step on the Travis CI VM, whereas the Git strategy will run it on a Heroku dyno, which provides the same environment the application will then run under and might be slightly faster.
77
+ #### API vs Git vs Anvil Deploy:
78
+ * API deploy will tar up the current directory (minus the git repo) and send it to Heroku.
79
+ * Git deploy will send the contents of the git repo only, so may not contain any local changes.
80
+ * Anvil deploys are no longer supported since Heroku shut down the Anvil service.
79
81
  * The Git strategy allows using *user* and *password* instead of *api-key*.
80
82
  * When using Git, Heroku might send you an email for every deploy, as it adds a temporary SSH key to your account.
81
83
 
82
- As a rule of thumb, you should switch to the Git strategy if you run into issues with Anvil or if you're using the [user-env-compile](https://devcenter.heroku.com/articles/labs-user-env-compile) plugin.
83
-
84
84
  #### Examples:
85
85
 
86
86
  dpl --provider=heroku --api-key=`heroku auth:token`
@@ -5,8 +5,7 @@ module DPL
5
5
  class CloudFiles < Provider
6
6
  requires 'net-ssh', load: 'net/ssh', version: '~> 2.9.2' # Anything higher requires Ruby 2.x
7
7
  requires 'mime-types', load: 'mime/types', version: '~> 2.6.2' # Anything higher requires Ruby 2.x
8
- requires 'fog-google', load: 'fog/google', version: '< 0.1.1' # Anything higher requires Ruby 2.x
9
- requires 'fog', version: '< 1.35.0' # Anything higher requires fog-google 0.1.1 and up, which, in turn, requires Ruby 2.x
8
+ requires 'fog-rackspace', load: 'fog/rackspace'
10
9
  experimental 'Rackspace Cloud Files'
11
10
 
12
11
  def needs_key?
@@ -81,7 +81,7 @@ module DPL
81
81
  end
82
82
 
83
83
  def push_app
84
- unless context.shell "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[1]}"
84
+ 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]}'"
85
85
  error 'Deploying application failed.'
86
86
  end
87
87
  end
@@ -98,7 +98,7 @@ describe DPL::Provider::Deis do
98
98
  describe "#push_app" do
99
99
  example do
100
100
  expect(provider.context).to receive(:shell).with(
101
- "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[1]}"
101
+ "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]}'"
102
102
  ).and_return(true)
103
103
  provider.push_app
104
104
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dpl
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.19.travis.1649.3
4
+ version: 1.8.19.travis.1652.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase