dpl 1.5.9.travis.368.1 → 1.5.9.travis.372.1

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
- N2Y3OTRkZjI1ZTEwMWQ1NmExZDdjM2ZiYjY1ZTUwODEwMWMzMTk2ZA==
4
+ Njk1Y2IwZDkxZmQ0YzVlZmU4MDRjMDQ0NzNkNDJhODIzZTEyMDcyNA==
5
5
  data.tar.gz: !binary |-
6
- YjA1NWI2NzVkYjFmYzBhMjRkYWZlYmYzMDAyZmNkZTlkZWYzYmEwZg==
6
+ YjJmZmJiOTIyMWQzODJjODg3MDgyYmZiYjY4ZTU5OTZlMzZlODlhZQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NzM1YzA1MjMxNmVkOWNkMTY4NTM4NzBmZDgyMDA2Y2IyZjgxNDkxYjRkZWJk
10
- NWViZDJhOTQ5ZWY2YzQwZDRmOWMyOTg4MTAxNmE4MWRjM2Q4MjM0OTZiYzFi
11
- NzU2MTMyNTc3YTc1MmRkYWQ3M2YyODEwOTI3ZGMxMzdlNGNlODE=
9
+ YTU5MTg4ZjMxMmU5ODZiOTBkNzVkYzA4NjBkMmFkOTBlYmExOTQyMWQ0ZmJj
10
+ OGU5N2M2M2M5OGZhM2MwMDNmN2E0NzlhZDJkMjA0MTk1YWJmMDE3MDAwNmE2
11
+ MzM0YWM2NDc5YWJhMDg0ZDA5YWRhZWRlZmM2ODQyMTdiMTIwM2Q=
12
12
  data.tar.gz: !binary |-
13
- Njc3MzU5NjBiNGU2ODRjZTczZDkwMmE0ODQ2MGI2ODU2OTZmZmY3NGQxMDAw
14
- YTBiYzNiMjEwODM0ZmZkMGE1ODgwZGZkZDAwMjNlNzU5OTVhYTIwZmJmNDcx
15
- ZjQzODJhMDhkMzA4ZDIxYjBlYTU1YjcwMGFiZTllYWMxOTA1ZjQ=
13
+ MzAwN2QwNmQwZThmOWZjNDExY2VhMjlhYTcxMjA1NDk5YTM5YTIxNzA3MDUy
14
+ ZWVhOTI5MDA1N2U5NjJmNGY1ZjQ3MGMzMjVjYzNiYmQ4NDk5MTU4YzhkYjk0
15
+ MWE4NDc3OGQ4MTRiY2IwMGI3NGJlNzM3OGNjY2MwMmNiMWRmZGE=
data/Gemfile CHANGED
@@ -1,10 +1,6 @@
1
1
  source 'https://rubygems.org'
2
2
  gemspec
3
3
 
4
- group :cloudfoundry do
5
- gem 'cf', '~> 5.4.5'
6
- end
7
-
8
4
  group :heroku do
9
5
  gem 'rendezvous', '~> 0.0.2'
10
6
  gem 'heroku-api', '= 0.3.16'
data/README.md CHANGED
@@ -228,12 +228,12 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
228
228
  * **username**: Cloud Foundry username.
229
229
  * **password**: Cloud Foundry password.
230
230
  * **organization**: Cloud Foundry target organization.
231
- * **target**: Cloud Foundry target cloud/URL
231
+ * **api**: Cloud Foundry api URL
232
232
  * **space**: Cloud Foundry target space
233
233
 
234
234
  #### Examples:
235
235
 
236
- dpl --provider=cloudfoundry --username=<username> --password=<password> --organization=<organization> --target=<target> --space=<space>
236
+ dpl --provider=cloudfoundry --username=<username> --password=<password> --organization=<organization> --api=<api> --space=<space>
237
237
 
238
238
  ### dotCloud:
239
239
 
@@ -1,11 +1,16 @@
1
1
  module DPL
2
2
  class Provider
3
3
  class CloudFoundry < Provider
4
- requires 'cf'
4
+
5
+ def initial_go_tools_install
6
+ context.shell 'wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb -qO temp.deb && sudo dpkg -i temp.deb'
7
+ context.shell 'rm temp.deb'
8
+ end
5
9
 
6
10
  def check_auth
7
- context.shell "cf target #{option(:target)}"
8
- context.shell "cf login --username #{option(:username)} --password #{option(:password)} --organization #{option(:organization)} --space #{option(:space)}"
11
+ initial_go_tools_install
12
+ context.shell "cf api #{option(:api)}"
13
+ context.shell "cf login --u #{option(:username)} --p #{option(:password)} --o #{option(:organization)} --s #{option(:space)}"
9
14
  end
10
15
 
11
16
  def check_app
@@ -0,0 +1,42 @@
1
+ require 'spec_helper'
2
+ require 'dpl/provider/cloud_foundry'
3
+
4
+ describe DPL::Provider::CloudFoundry do
5
+ subject :provider do
6
+ described_class.new(DummyContext.new, api: 'api.run.awesome.io', username: 'mallomar',
7
+ password: 'myreallyawesomepassword',
8
+ organization: 'myorg',
9
+ space: 'outer')
10
+ end
11
+
12
+ describe :check_auth do
13
+ example do
14
+ expect(provider.context).to receive(:shell).with('wget http://go-cli.s3-website-us-east-1.amazonaws.com/releases/latest/cf-cli_amd64.deb -qO temp.deb && sudo dpkg -i temp.deb')
15
+ expect(provider.context).to receive(:shell).with('rm temp.deb')
16
+ expect(provider.context).to receive(:shell).with('cf api api.run.awesome.io')
17
+ expect(provider.context).to receive(:shell).with('cf login --u mallomar --p myreallyawesomepassword --o myorg --s outer')
18
+ provider.check_auth
19
+ end
20
+ end
21
+
22
+ describe :check_app do
23
+ example do
24
+ expect{provider.check_app}.to raise_error('Application must have a manifest.yml for unattended deployment')
25
+ end
26
+ end
27
+
28
+ describe :needs_key? do
29
+ example do
30
+ expect(provider.needs_key?).to eq(false)
31
+ end
32
+ end
33
+
34
+ describe :push_app do
35
+ example do
36
+ expect(provider.context).to receive(:shell).with('cf push')
37
+ expect(provider.context).to receive(:shell).with('cf logout')
38
+ provider.push_app
39
+
40
+ end
41
+ end
42
+ 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.5.9.travis.368.1
4
+ version: 1.5.9.travis.372.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Konstantin Haase
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-08 00:00:00.000000000 Z
11
+ date: 2014-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -116,6 +116,7 @@ files:
116
116
  - spec/provider/cloud66_spec.rb
117
117
  - spec/provider/cloud_files_spec.rb
118
118
  - spec/provider/cloudcontrol_spec.rb
119
+ - spec/provider/cloudfoundry_spec.rb
119
120
  - spec/provider/divshot_spec.rb
120
121
  - spec/provider/dotcloud_spec.rb
121
122
  - spec/provider/heroku_anvil_spec.rb