cfoundry 1.5.3 → 2.0.0

data/lib/cfoundry/test_support.rb

@@ -1,3 +1,3 @@
-Dir[File.expand_path('../../../spec/{support,fakes}/**/*.rb', __FILE__)].each do |file|
-  require file
+Dir[File.expand_path('../../../spec/{support}/**/*.rb', __FILE__)].each do |file|
+  require file unless file =~ /factory_girl/
 end

data/lib/cfoundry/v2/app.rb

@@ -31,7 +31,7 @@ module CFoundry::V2
     attribute :debug,            :string,  :default => nil
     to_many   :service_bindings
     to_many   :routes
-    to_many   :app_events
+    to_many   :events, :as => :app_event
 
     scoped_to_space
 
@@ -47,11 +47,8 @@ module CFoundry::V2
 
     private :environment_json
 
-    alias :events :app_events
-    alias :events= :app_events=
-
-    def delete!
-      super({:recursive => true})
+    def delete!(opts = {})
+      super(opts.merge(:recursive => true))
     end
 
     def instances

data/lib/cfoundry/v2/model.rb

@@ -21,6 +21,7 @@ module CFoundry::V2
     end
 
     attr_accessor :guid, :cache, :changes
+    attr_reader :diff
 
     def initialize(guid, client, manifest = nil, partial = false)
       @guid = guid

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/client_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CFoundry::Client do
   before do

data/spec/cfoundry/rest_client_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CFoundry::RestClient do
   let(:token) { nil }

data/spec/cfoundry/trace_helpers_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CFoundry::TraceHelpers do
-  let(:fake_class) { Class.new { include CFoundry::TraceHelpers } }
+  let(:tracehelper_test_class) { Class.new { include CFoundry::TraceHelpers } }
   let(:request) do
     {
       :method => "GET",
@@ -21,7 +21,7 @@ describe CFoundry::TraceHelpers do
     before { response[:body] = response_body }
 
     it "traces the provided response" do
-      fake_class.new.response_trace(response).should == response_trace
+      tracehelper_test_class.new.response_trace(response).should == response_trace
     end
   end
 
@@ -30,7 +30,7 @@ describe CFoundry::TraceHelpers do
     let(:header_trace) { "REQUEST_HEADERS:\n  accept : */*\n  bb-foo : bar" }
     let(:body_trace) { "" }
 
-    subject { fake_class.new.request_trace(request) }
+    subject { tracehelper_test_class.new.request_trace(request) }
 
     context "without a request body" do
       include_examples "request_trace tests"
@@ -45,7 +45,7 @@ describe CFoundry::TraceHelpers do
     end
 
     it "returns nil if request is nil" do
-      fake_class.new.request_trace(nil).should == nil
+      tracehelper_test_class.new.request_trace(nil).should == nil
     end
   end
 
@@ -66,7 +66,7 @@ describe CFoundry::TraceHelpers do
     end
 
     it "returns nil if response is nil" do
-      fake_class.new.response_trace(nil).should == nil
+      tracehelper_test_class.new.response_trace(nil).should == nil
     end
   end
 end

data/spec/cfoundry/upload_helpers_spec.rb

@@ -1,194 +1,182 @@
 require "spec_helper"
 
-describe CFoundry::UploadHelpers do
-  describe '#upload' do
-    let(:base) { Object.new }
-    let(:guid) { "123" }
-    let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_cfignore" }
-    let(:check_resources) { false }
-    let(:tmpdir) { "#{SPEC_ROOT}/tmp/fake_tmpdir" }
-
-    let(:client) do
-      client = Object.new
-      stub(client).base { base }
-      client
-    end
+class TestModelWithUploadHelpers < CFoundry::V2::Model
+  include CFoundry::UploadHelpers
+end
 
-    let(:fake_model) do
-      class FakeModel
-        include CFoundry::UploadHelpers
+module CFoundry
+  describe UploadHelpers do
+    describe "#upload" do
+      def relative_glob(dir)
+        base_pathname = Pathname.new(dir)
+        Dir["#{dir}/**/{*,.[^\.]*}"].map do |file|
+          Pathname.new(file).relative_path_from(base_pathname).to_s
+        end
+      end
 
-        def initialize(client, guid)
-          @client = client
-          @guid = guid
+      def mock_zip(*args, &block)
+        if args.empty?
+          mock(CFoundry::Zip).pack.with_any_args(&block)
+        else
+          mock(CFoundry::Zip).pack(*args, &block)
         end
       end
 
-      FakeModel.new(client, guid)
-    end
+      let(:base) { Object.new }
+      let(:guid) { "123" }
+      let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_cfignore" }
+      let(:check_resources) { false }
+      let(:tmpdir) { "#{SPEC_ROOT}/tmp/fake_tmpdir" }
 
-    before do
-      FileUtils.rm_rf tmpdir
+      let(:client) { build(:client) }
 
-      stub(Dir).tmpdir do
-        FileUtils.mkdir_p tmpdir
-        tmpdir
-      end
+      let(:model) { TestModelWithUploadHelpers.new(guid, client) }
 
-      stub(base).upload_app.with_any_args
-    end
+      before do
+        stub(client).base { base }
+        stub(base).upload_app.with_any_args
 
-    subject { fake_model.upload(path, check_resources) }
-
-    def relative_glob(dir)
-      base_pathname = Pathname.new(dir)
-      Dir["#{dir}/**/{*,.[^\.]*}"].map do |file|
-        Pathname.new(file).relative_path_from(base_pathname).to_s
+        FileUtils.rm_rf tmpdir
+        stub(Dir).tmpdir do
+          FileUtils.mkdir_p tmpdir
+          tmpdir
+        end
       end
-    end
 
-    def mock_zip(*args, &block)
-      if args.empty?
-        mock(CFoundry::Zip).pack.with_any_args(&block)
-      else
-        mock(CFoundry::Zip).pack(*args, &block)
+      it "zips the app and uploads the zip file" do
+        zip_path = "#{tmpdir}/#{guid}.zip"
+        mock_zip(anything, zip_path) { true }
+        mock(base).upload_app(guid, zip_path, [])
+        model.upload(path, check_resources)
       end
-    end
-
-    it 'zips the app and uploads the zip file' do
-      zip_path = "#{tmpdir}/#{guid}.zip"
-      mock_zip(anything, zip_path) { true }
-      mock(base).upload_app(guid, zip_path, [])
-      subject
-    end
 
-    it 'uploads an app with the right guid' do
-      mock_zip
-      mock(base).upload_app(guid, anything, anything)
-      subject
-    end
+      it "uploads an app with the right guid" do
+        mock_zip
+        mock(base).upload_app(guid, anything, anything)
+        model.upload(path, check_resources)
+      end
 
-    it 'uses a unique directory name when it copies the app' do
-      mock_zip(/#{tmpdir}.*#{guid}.*/, anything)
-      subject
-    end
+      it "uses a unique directory name when it copies the app" do
+        mock_zip(/#{tmpdir}.*#{guid}.*/, anything)
+        model.upload(path, check_resources)
+      end
 
-    it 'cleans up after itself correctly' do
-      subject
-      expect(relative_glob(tmpdir)).to be_empty
-    end
+      it "cleans up after itself correctly" do
+        model.upload(path, check_resources)
+        expect(relative_glob(tmpdir)).to be_empty
+      end
 
-    it 'includes the source files of the app in the zip file' do
-      mock_zip do |src, _|
-        files = relative_glob(src)
-        expect(files).to include "non_ignored_dir"
-        expect(files).to include "non_ignored_file.txt"
-        expect(files).to include "non_ignored_dir/file_in_non_ignored_dir.txt"
+      it "includes the source files of the app in the zip file" do
+        mock_zip do |src, _|
+          files = relative_glob(src)
+          expect(files).to include "non_ignored_dir"
+          expect(files).to include "non_ignored_file.txt"
+          expect(files).to include "non_ignored_dir/file_in_non_ignored_dir.txt"
+        end
+        model.upload(path, check_resources)
       end
-      subject
-    end
 
-    it 'includes hidden files (though stager ignores them currently)' do
-      mock_zip do |src, _|
-        expect(relative_glob(src)).to include ".hidden_file"
+      it "includes hidden files (though stager ignores them currently)" do
+        mock_zip do |src, _|
+          expect(relative_glob(src)).to include ".hidden_file"
+        end
+        model.upload(path, check_resources)
       end
-      subject
-    end
 
-    it 'does not include files and directories specified in the cfignore' do
-      mock_zip do |src, _|
-        files = relative_glob(src)
-        expect(files).to match_array(%w[
+      it "does not include files and directories specified in the cfignore" do
+        mock_zip do |src, _|
+          files = relative_glob(src)
+          expect(files).to match_array(%w[
           .hidden_file .cfignore non_ignored_dir ambiguous_ignored
           non_ignored_dir/file_in_non_ignored_dir.txt non_ignored_file.txt
           non_ignored_dir/toplevel_ignored.txt
         ])
+        end
+        model.upload(path, check_resources)
       end
-      subject
-    end
 
-    %w(.git _darcs .svn).each do |source_control_dir_name|
-      context "when there is a #{source_control_dir_name} directory in the app" do
-        before { FileUtils.mkdir_p("#{path}/#{source_control_dir_name}") }
+      %w(.git _darcs .svn).each do |source_control_dir_name|
+        context "when there is a #{source_control_dir_name} directory in the app" do
+          before { FileUtils.mkdir_p("#{path}/#{source_control_dir_name}") }
 
-        it "ignores that directory" do
-          mock_zip do |src, _|
-            expect(relative_glob(src)).not_to include source_control_dir_name
+          it "ignores that directory" do
+            mock_zip do |src, _|
+              expect(relative_glob(src)).not_to include source_control_dir_name
+            end
+            model.upload(path, check_resources)
           end
-          subject
         end
       end
-    end
 
-    context 'when there are no files to zip' do
-      before { mock_zip { false } }
+      context "when there are no files to zip" do
+        before { mock_zip { false } }
 
-      it 'passes `false` to #upload_app' do
-        mock(base).upload_app(guid, false, [])
-        subject
+        it "passes `false` to #upload_app" do
+          mock(base).upload_app(guid, false, [])
+          model.upload(path, check_resources)
+        end
       end
-    end
 
-    context 'when all files match existing resources' do
-      context 'and there are directories' do
-        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_nested_directories" }
+      context "when all files match existing resources" do
+        context "and there are directories" do
+          let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_nested_directories" }
 
-        it 'prunes them before zipping' do
-          stub(fake_model).make_fingerprints(anything) do
-            [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
-          end
-
-          stub(base).resource_match(anything) do
-            %w{ xyz foo/bar/baz/fizz }.map do |path|
-              { :fn => "#{tmpdir}/.cf_#{guid}_files/#{path}" }
+          it "prunes them before zipping" do
+            stub(model).make_fingerprints(anything) do
+              [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
             end
-          end
 
-          mock(base).upload_app(anything, false, anything)
+            stub(base).resource_match(anything) do
+              %w{ xyz foo/bar/baz/fizz }.map do |path|
+                {:fn => "#{tmpdir}/.cf_#{guid}_files/#{path}"}
+              end
+            end
 
-          fake_model.upload(path)
+            mock(base).upload_app(anything, false, anything)
+            model.upload(path)
+          end
         end
       end
-    end
 
-    context "when only dotfiles don't match existing resources" do
-      let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_dotfiles" }
+      context "when only dotfiles don't match existing resources" do
+        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_dotfiles" }
 
-      it 'does not prune them' do
-        stub(fake_model).make_fingerprints(anything) do
-          [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
-        end
+        it "does not prune them" do
+          stub(model).make_fingerprints(anything) do
+            [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
+          end
 
-        stub(base).resource_match(anything) do
-          %w{ xyz }.map do |path|
-            { :fn => "#{tmpdir}/.cf_#{guid}_files/#{path}" }
+          stub(base).resource_match(anything) do
+            %w{ xyz }.map do |path|
+              {:fn => "#{tmpdir}/.cf_#{guid}_files/#{path}"}
+            end
           end
-        end
 
-        mock(base).upload_app(anything, anything, anything) do |_, zip, _|
-          expect(zip).to be_a(String)
-        end
+          mock(base).upload_app(anything, anything, anything) do |_, zip, _|
+            expect(zip).to be_a(String)
+          end
 
-        fake_model.upload(path)
+          model.upload(path)
+        end
       end
-    end
 
-    context "when there is a symlink pointing outside of the root" do
-      let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_external_symlink" }
+      context "when there is a symlink pointing outside of the root" do
+        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_external_symlink" }
 
-      it "blows up" do
-        expect {
-          fake_model.upload(path)
-        }.to raise_error(CFoundry::Error, /contains links.*that point outside/)
-      end
+        it "blows up" do
+          expect {
+            model.upload(path)
+          }.to raise_error(CFoundry::Error, /contains links.*that point outside/)
+        end
 
-      context "and it is cfignored" do
-        let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_ignored_external_symlink" }
+        context "and it is cfignored" do
+          let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_ignored_external_symlink" }
 
-        it "ignores it" do
-          expect { fake_model.upload(path) }.to_not raise_error
+          it "ignores it" do
+            expect { model.upload(path) }.to_not raise_error
+          end
         end
       end
     end
   end
-end
+end

data/spec/cfoundry/v2/app_event_spec.rb

@@ -1,77 +1,81 @@
 require "spec_helper"
 
-describe CFoundry::V2::AppEvent do
-  let(:client) { fake_client }
+module CFoundry
+  module V2
+    describe AppEvent do
+      let(:app) { build(:app) }
+      let(:app_event) { build(:app_event, :app => app) }
 
-  let(:app) { fake :app }
-
-  subject { described_class.new("app-event-1", client) }
-
-  it "has an app" do
-    subject.app = app
-    expect(subject.app).to eq(app)
-  end
+      it "has an app" do
+        expect(app_event.app).to eq(app)
+      end
 
-  describe "#instance_guid" do
-    it "has an instance guid" do
-      subject.instance_guid = "foo"
-      expect(subject.instance_guid).to eq("foo")
-    end
+      describe "#instance_guid" do
+        it "has an instance guid" do
+          app_event.instance_guid = "foo"
+          expect(app_event.instance_guid).to eq("foo")
+        end
 
-    context "when an invalid value is assigned" do
-      it "raises a Mismatch exception" do
-        expect {
-          subject.instance_guid = 123
-        }.to raise_error(CFoundry::Mismatch)
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              app_event.instance_guid = 123
+            }.to raise_error(Mismatch)
+          end
+        end
       end
-    end
-  end
 
-  describe "#instance_index" do
-    it "has an instance index" do
-      subject.instance_index = 123
-      expect(subject.instance_index).to eq(123)
-    end
+      describe "#instance_index" do
+        it "has an instance index" do
+          app_event.instance_index = 123
+          expect(app_event.instance_index).to eq(123)
+        end
 
-    context "when an invalid value is assigned" do
-      it "raises a Mismatch exception" do
-        expect {
-          subject.instance_index = "wrong"
-        }.to raise_error(CFoundry::Mismatch)
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              app_event.instance_index = "wrong"
+            }.to raise_error(Mismatch)
+          end
+        end
       end
-    end
-  end
 
-  describe "#exit_status" do
-    it "has an instance index" do
-      subject.exit_status = 123
-      expect(subject.exit_status).to eq(123)
-    end
+      describe "#exit_status" do
+        it "has an instance index" do
+          app_event.exit_status = 123
+          expect(app_event.exit_status).to eq(123)
+        end
 
-    context "when an invalid value is assigned" do
-      it "raises a Mismatch exception" do
-        expect {
-          subject.exit_status = "wrong"
-        }.to raise_error(CFoundry::Mismatch)
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              app_event.exit_status = "wrong"
+            }.to raise_error(Mismatch)
+          end
+        end
       end
-    end
-  end
 
-  describe "#exit_description" do
-    it "defaults to an empty string" do
-      expect(subject.fake.exit_description).to eq("")
-    end
+      describe "#exit_description" do
+        before do
+          stub_request(:get, /v2\/app_events\/.*/).to_return(:body => {:entity => {}}.to_json)
+        end
 
-    it "has an instance guid" do
-      subject.exit_description = "foo"
-      expect(subject.exit_description).to eq("foo")
-    end
+        it "defaults to an empty string" do
+          expect(app_event.exit_description).to eq("")
+        end
+
+        it "has an instance guid" do
+          app_event.exit_description = "foo"
+          expect(app_event.exit_description).to eq("foo")
+        end
 
-    context "when an invalid value is assigned" do
-      it "raises a Mismatch exception" do
-        expect {
-          subject.exit_description = 123
-        }.to raise_error(CFoundry::Mismatch)
+        context "when an invalid value is assigned" do
+          it "raises a Mismatch exception" do
+            expect {
+              app_event.exit_description = 123
+            }.to raise_error(Mismatch)
+          end
+        end
       end
     end
   end