cfoundry 0.5.3.rc4 → 0.5.3.rc5

data/lib/cfoundry/v1/base.rb

@@ -1,4 +1,5 @@
 require "multi_json"
+require "tmpdir"
 
 require "cfoundry/baseclient"
 require "cfoundry/uaaclient"
@@ -50,22 +51,40 @@ module CFoundry::V1
     end
 
     def upload_app(name, zipfile = nil, resources = [])
-      payload = {
-        :_method => "put",
-        :resources => MultiJson.dump(resources),
-        :application =>
-          UploadIO.new(
-            if zipfile.is_a? File
-              zipfile
-            elsif zipfile.is_a? String
-              File.new(zipfile, "rb")
-            end,
-            "application/zip")
-      }
-
-      post("apps", name, "application", :payload => payload)
+      use_or_create_empty_zipfile(zipfile) do |zipfile|
+        payload = {
+          :_method => "put",
+          :resources => MultiJson.dump(resources),
+          :application =>
+            UploadIO.new(
+              if zipfile.is_a? File
+                zipfile
+              elsif zipfile.is_a? String
+                File.new(zipfile, "rb")
+              end,
+              "application/zip")
+        }
+
+        post("apps", name, "application", :payload => payload)
+      end
     rescue EOFError
       retry
     end
+
+    private
+
+    def use_or_create_empty_zipfile(zipfile)
+      Dir.mktmpdir do |working_dir|
+        zip_path = "#{working_dir}/empty_zip.zip"
+
+        zipfile ||= Dir.mktmpdir do |zip_dir|
+          File.new("#{zip_dir}/.__empty_file", "wb").close
+          CFoundry::Zip.pack(zip_dir, zip_path)
+          zip_path
+        end
+
+        yield zipfile
+      end
+    end
   end
 end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/v1/base_spec.rb

@@ -55,4 +55,42 @@ describe CFoundry::V1::Base do
       end
     end
   end
+
+  describe "#upload_app" do
+    let!(:stubbed_request) do
+      stub_request(:post, 'https://api.cloudfoundry.com/apps/app_name/application').to_return(:status => 200).with(:body => /#{expected_zipfile}/)
+    end
+
+    subject { base.upload_app("app_name", zipfile)}
+
+    context "when passed a falsy zipfile" do
+      let(:zipfile) { false }
+      let(:expected_zipfile) { "empty.zip" }
+
+      it "creates a temporary empty zipfile" do
+        subject
+
+        stubbed_request.should have_been_requested
+      end
+    end
+
+    context "when passed a valid zipfile" do
+      let(:zipfile) { "proper-zipfile.zip" }
+      let(:expected_zipfile) { zipfile }
+
+      before do
+        File.new(zipfile, "wb")
+      end
+
+      after do
+        FileUtils.rm(zipfile)
+      end
+
+      it "uses that zipfile" do
+        subject
+
+        stubbed_request.should have_been_requested
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: -577135546
+  hash: -2049338452
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 4
-  version: 0.5.3.rc4
+  - 5
+  version: 0.5.3.rc5
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-12 00:00:00 Z
+date: 2013-03-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement