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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y3OTRkZjI1ZTEwMWQ1NmExZDdjM2ZiYjY1ZTUwODEwMWMzMTk2ZA==
+    Njk1Y2IwZDkxZmQ0YzVlZmU4MDRjMDQ0NzNkNDJhODIzZTEyMDcyNA==
   data.tar.gz: !binary |-
-    YjA1NWI2NzVkYjFmYzBhMjRkYWZlYmYzMDAyZmNkZTlkZWYzYmEwZg==
+    YjJmZmJiOTIyMWQzODJjODg3MDgyYmZiYjY4ZTU5OTZlMzZlODlhZQ==
 SHA512:
   metadata.gz: !binary |-
-    NzM1YzA1MjMxNmVkOWNkMTY4NTM4NzBmZDgyMDA2Y2IyZjgxNDkxYjRkZWJk
-    NWViZDJhOTQ5ZWY2YzQwZDRmOWMyOTg4MTAxNmE4MWRjM2Q4MjM0OTZiYzFi
-    NzU2MTMyNTc3YTc1MmRkYWQ3M2YyODEwOTI3ZGMxMzdlNGNlODE=
+    YTU5MTg4ZjMxMmU5ODZiOTBkNzVkYzA4NjBkMmFkOTBlYmExOTQyMWQ0ZmJj
+    OGU5N2M2M2M5OGZhM2MwMDNmN2E0NzlhZDJkMjA0MTk1YWJmMDE3MDAwNmE2
+    MzM0YWM2NDc5YWJhMDg0ZDA5YWRhZWRlZmM2ODQyMTdiMTIwM2Q=
   data.tar.gz: !binary |-
-    Njc3MzU5NjBiNGU2ODRjZTczZDkwMmE0ODQ2MGI2ODU2OTZmZmY3NGQxMDAw
-    YTBiYzNiMjEwODM0ZmZkMGE1ODgwZGZkZDAwMjNlNzU5OTVhYTIwZmJmNDcx
-    ZjQzODJhMDhkMzA4ZDIxYjBlYTU1YjcwMGFiZTllYWMxOTA1ZjQ=
+    MzAwN2QwNmQwZThmOWZjNDExY2VhMjlhYTcxMjA1NDk5YTM5YTIxNzA3MDUy
+    ZWVhOTI5MDA1N2U5NjJmNGY1ZjQ3MGMzMjVjYzNiYmQ4NDk5MTU4YzhkYjk0
+    MWE4NDc3OGQ4MTRiY2IwMGI3NGJlNzM3OGNjY2MwMmNiMWRmZGE=

data/Gemfile

@@ -1,10 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
-group :cloudfoundry do
-  gem 'cf', '~> 5.4.5'
-end
-
 group :heroku do
   gem 'rendezvous', '~> 0.0.2'
   gem 'heroku-api', '= 0.3.16'

data/README.md

@@ -228,12 +228,12 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **username**: Cloud Foundry username.
 * **password**: Cloud Foundry password.
 * **organization**: Cloud Foundry target organization.
-* **target**: Cloud Foundry target cloud/URL
+* **api**: Cloud Foundry api URL
 * **space**: Cloud Foundry target space
 
 #### Examples:
 
-    dpl --provider=cloudfoundry --username=<username> --password=<password> --organization=<organization> --target=<target> --space=<space>
+    dpl --provider=cloudfoundry --username=<username> --password=<password> --organization=<organization> --api=<api> --space=<space>
 
 ### dotCloud:
 

data/lib/dpl/provider/cloud_foundry.rb

@@ -1,11 +1,16 @@
 module DPL
   class Provider
     class CloudFoundry < Provider
-      requires 'cf'
+
+      def initial_go_tools_install
+        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'
+        context.shell 'rm temp.deb'
+      end
 
       def check_auth
-        context.shell "cf target #{option(:target)}"
-        context.shell "cf login --username #{option(:username)} --password #{option(:password)} --organization #{option(:organization)} --space #{option(:space)}"
+        initial_go_tools_install
+        context.shell "cf api #{option(:api)}"
+        context.shell "cf login --u #{option(:username)} --p #{option(:password)} --o #{option(:organization)} --s #{option(:space)}"
       end
 
       def check_app

data/spec/provider/cloudfoundry_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'dpl/provider/cloud_foundry'
+
+describe DPL::Provider::CloudFoundry do
+  subject :provider do
+    described_class.new(DummyContext.new, api: 'api.run.awesome.io', username: 'mallomar',
+                        password: 'myreallyawesomepassword',
+                        organization: 'myorg',
+                        space: 'outer')
+  end
+
+  describe :check_auth do
+    example do
+      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')
+      expect(provider.context).to receive(:shell).with('rm temp.deb')
+      expect(provider.context).to receive(:shell).with('cf api api.run.awesome.io')
+      expect(provider.context).to receive(:shell).with('cf login --u mallomar --p myreallyawesomepassword --o myorg --s outer')
+      provider.check_auth
+    end
+  end
+
+  describe :check_app do
+    example do
+      expect{provider.check_app}.to raise_error('Application must have a manifest.yml for unattended deployment')
+    end
+  end
+
+  describe :needs_key? do
+    example do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe :push_app do
+    example do
+      expect(provider.context).to receive(:shell).with('cf push')
+      expect(provider.context).to receive(:shell).with('cf logout')
+      provider.push_app
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.9.travis.368.1
+  version: 1.5.9.travis.372.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,6 +116,7 @@ files:
 - spec/provider/cloud66_spec.rb
 - spec/provider/cloud_files_spec.rb
 - spec/provider/cloudcontrol_spec.rb
+- spec/provider/cloudfoundry_spec.rb
 - spec/provider/divshot_spec.rb
 - spec/provider/dotcloud_spec.rb
 - spec/provider/heroku_anvil_spec.rb