cfoundry 4.3.8 → 4.3.9

data/lib/cfoundry/v2/base.rb

@@ -30,10 +30,12 @@ module CFoundry::V2
 
       response = put("v2", "apps", guid, "bits",
         :payload => payload,
-        :params => {"async" => "true"},
-        :accept => :json)
+        :params => {"async" => "true"})
 
-      poll_upload_until_finished(response[:metadata][:guid])
+      if response.present?
+        response_json = JSON.parse(response)
+        poll_upload_until_finished(response_json['metadata']['guid'])
+      end
     rescue EOFError
       retry
     end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "4.3.8".freeze
+  VERSION = "4.3.9".freeze
 end

data/spec/cfoundry/v2/base_spec.rb

@@ -249,21 +249,52 @@ describe CFoundry::V2::Base do
     let(:fake_zipfile) { File.new("#{SPEC_ROOT}/fixtures/empty_file") }
     let(:upload_response) { %Q({"metadata":{"guid":"#{job_guid}"}}) }
 
-    before do
-      base.should_receive(:poll_upload_until_finished).with(job_guid)
+    def stub_upload
+      stub_request(:put, "https://api.example.com/v2/apps/#{guid}/bits?async=true"
+      ).to_return(
+          :body => upload_response
+      )
+    end
+
+    def stub_poll
+      base.stub(:poll_upload_until_finished)
     end
 
     it "makes a PUT request to the app bits endpoint with the correct payload" do
-      stub = stub_request(:put, "https://api.example.com/v2/apps/#{guid}/bits?async=true"
-      ).to_return(
-        :body => upload_response
-      )
+      upload_stub = stub_upload
+      stub_poll
       base.upload_app(guid, fake_zipfile)
-      expect(stub).to have_been_requested
+      expect(upload_stub).to have_been_requested
+    end
+
+    context "when async is supported" do
+      it "polls the job until finished" do
+        stub_upload
+        status_stub = stub_request(:get, "https://api.example.com/v2/jobs/#{job_guid}"
+        ).to_return(
+            {:body => {:entity => {:status => 'queued'}}.to_json},
+            {:body => {:entity => {:status => 'finished'}}.to_json}
+        )
+
+        base.upload_app(guid, fake_zipfile)
+        expect(status_stub).to have_been_requested.twice
+      end
+    end
+
+    context "when async is not supported" do
+      let(:upload_response) { "" }
+
+      it "does not explode" do
+        stub_upload
+        expect {
+          base.upload_app(guid, fake_zipfile)
+        }.not_to raise_exception
+      end
     end
 
     context "when there is no file to upload" do
       it "does not include 'application' in the request hash" do
+        stub_poll
         stub =
           stub_request(
             :put,

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.3.8
+  version: 4.3.9
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -24,6 +26,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -34,6 +37,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +45,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +53,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +61,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +69,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +77,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +85,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +93,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +101,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +109,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +117,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +125,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +141,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +157,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +165,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +173,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +181,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,6 +189,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,6 +197,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,6 +205,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,6 +213,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -195,6 +221,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,6 +229,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -209,6 +237,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -216,6 +245,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: putsinator
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -223,6 +253,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -419,26 +450,33 @@ files:
 homepage: http://github.com/cloudfoundry/cfoundry
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1033216815776519906
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1033216815776519906
 requirements: []
 rubyforge_project: cfoundry
-rubygems_version: 2.0.7
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files:
 - spec/cc_api_stub/applications_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjBmNGMzMDM1NTMwMzVmZGY2MjIyMzA5NDBkZDdiODEzZjY4OGM5MA==
-  data.tar.gz: !binary |-
-    NDM3ZWQ1MmJhZjIwN2M2ZjIwZTVkYWM1Zjc4ZmVhYmVhNWZlMzBlMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZGI3N2Y4YjY4NTAwZWExMDZlYmQwNGI3YjI4Y2E4NGMxNzIzOWMzZTY5YzQ0
-    NzQ4NWVhMjg3NDE5MjVkNzNhN2FmNGI0ZWMyNjVmYTE0MThlYzJlYzUxMDA3
-    ZDA2YjQ1ZGE5YTRlZmRiZmI3ZjY4NmFkZGEzNzMzZGFmYWFiNTM=
-  data.tar.gz: !binary |-
-    YzkyN2JmMDRmNWQxZDVhMmZlMzJmNzVlODM0ZTM2NGFkN2FhNzlmNDQ1YmM5
-    ZTJlMjcxNWZkNmY5YzE1M2IyZmU2M2U3MDYyYWNiN2IxMWU5NjdmZDBmMzYx
-    MjM5MTFiZGMyODMxM2RhNzgyMTQ0ODQ0ZjMwMDQ4ODM0N2U5MDc=