cfoundry 0.4.21 → 0.5.0

data/spec/cfoundry/v2/client_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe CFoundry::V2::Client do
+  let(:client) { CFoundry::V2::Client.new }
+
+  describe "#register" do
+    let(:uaa) { CFoundry::UAAClient.new }
+    let(:email) { 'test@test.com' }
+    let(:password) { 'secret' }
+
+    subject { client.register(email, password) }
+
+    it "creates the user in uaa and ccng" do
+      stub(client.base).uaa { uaa }
+      stub(uaa).add_user(email, password) { { "id" => "1234" } }
+
+      user = fake(:user)
+      stub(client).user { user }
+      stub(user).create!
+      subject
+      expect(user.guid).to eq "1234"
+    end
+  end
+
+  describe "#current_user" do
+    subject { client.current_user }
+    before { client.token = token }
+
+    context "when there is no access_token_data" do
+      let(:token) { CFoundry::AuthToken.new("bearer some-access-token", "some-refresh-token") }
+      it { should eq nil }
+    end
+
+    context "when there is access_token_data" do
+      let(:token_data) { { :user_id => "123", :email => "guy@example.com" } }
+      let(:auth_header) { Base64.encode64("{}#{MultiJson.encode(token_data)}") }
+      let(:token) do
+        CFoundry::AuthToken.new("bearer #{auth_header}", "some-refresh-token")
+      end
+
+      it { should be_a CFoundry::V2::User }
+      its(:guid) { should eq "123" }
+      its(:emails) { should eq [{ :value => "guy@example.com"}] }
+    end
+  end
+
+  describe "#version" do
+    its(:version) { should eq 2 }
+  end
+
+  describe "#login_prompts" do
+    include_examples "client login prompts"
+  end
+
+  describe "#login" do
+    include_examples "client login" do
+      it 'sets the current organization to nil' do
+        client.current_organization = "org"
+        expect { subject }.to change { client.current_organization }.from("org").to(nil)
+      end
+
+      it 'sets the current space to nil' do
+        client.current_space = "space"
+        expect { subject }.to change { client.current_space }.from("space").to(nil)
+      end
+    end
+  end
+end

data/spec/cfoundry/v2/model_magic_spec.rb

@@ -67,6 +67,55 @@ describe CFoundry::V2::ModelMagic do
           expect(subject.foo).to eq "foo"
         end
       end
+
+      context 'when the attribute has a custom json key' do
+        let(:mymodel) {
+          fake_model { attribute :foo, :object, :at => :not_foo }
+        }
+
+        subject { myobject.fake }
+
+        it 'retrieves the attribute using the custom key' do
+          stub(client.base).my_fake_model(guid) {
+            { :entity => { :not_foo => "fizz" } }
+          }
+
+          expect(myobject.foo).to eq "fizz"
+        end
+      end
+    end
+
+    describe 'writing' do
+      context 'when the attribute has a custom json key' do
+        let(:mymodel) {
+          fake_model { attribute :foo, :object, :at => :not_foo }
+        }
+
+        subject { myobject }
+
+        it "stores it in the diff under the json key" do
+          mock(client.base).update_my_fake_model(subject.guid, :not_foo => 123)
+          subject.foo = 123
+          subject.update!
+        end
+
+        it "stores it in the manifest under the json key" do
+          subject.foo = 123
+
+          mock(client.base).create_my_fake_model(:not_foo => 123) do
+            { :metadata => { :guid => guid },
+              :entity => { :not_foo => 123 }
+            }
+          end
+
+          subject.create!
+        end
+
+        it "is then readable via the attribute name" do
+          subject.foo = 123
+          expect(subject.foo).to eq 123
+        end
+      end
     end
   end
 

data/spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt

@@ -0,0 +1 @@
+file_in_ignored_dir

data/spec/fixtures/apps/with_vmcignore/ignored_file.txt

@@ -0,0 +1 @@
+ignored_file

data/spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt

@@ -0,0 +1 @@
+file_in_non_ignored_dir

data/spec/fixtures/apps/with_vmcignore/non_ignored_dir/ignored_file.txt

@@ -0,0 +1 @@
+ignored_file

data/spec/fixtures/apps/with_vmcignore/non_ignored_file.txt

@@ -0,0 +1 @@
+non_ignored_file

data/spec/spec_helper.rb

@@ -1,16 +1,16 @@
+SPEC_ROOT = File.dirname(__FILE__).freeze
+
 require "rspec"
 require "cfoundry"
 require "webmock/rspec"
+require "ostruct"
 
 Dir[File.expand_path('../{support,fakes}/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
-def random_string(tag = "random")
-  sprintf("%s-%x", tag, rand(10 ** 6))
-end
-
 RSpec.configure do |c|
   c.include Fake::FakeMethods
+  c.include V1Fake::FakeMethods
   c.mock_with :rr
 end

data/spec/support/randoms.rb

@@ -0,0 +1,3 @@
+def random_string(tag = "random")
+  sprintf("%s-%x", tag, rand(10 ** 6))
+end

data/spec/support/shared_examples/client_login_examples.rb

@@ -0,0 +1,46 @@
+shared_examples_for 'client login prompts' do
+  let(:uaa) { CFoundry::UAAClient.new }
+  let(:prompts) do
+    {
+      :user_id => ["text", "User ID"],
+      :pin => ["password", "Your 8-digit Pin #"]
+    }
+  end
+
+  before do
+    stub(client.base).uaa { uaa }
+    stub(uaa).prompts { prompts }
+  end
+
+  subject { client.login_prompts }
+
+  it 'returns the prompts provided by UAA' do
+    expect(subject).to eq(prompts)
+  end
+end
+
+shared_examples_for 'client login' do
+  let(:email) { 'test@test.com' }
+  let(:password) { 'secret' }
+  let(:uaa) { CFoundry::UAAClient.new }
+  let(:access_token) { "some-access-token" }
+  let(:token_info) { CF::UAA::TokenInfo.new({ :access_token => access_token, :token_type => "bearer" }) }
+
+  before do
+    stub(client.base).uaa { uaa }
+    stub(uaa).authorize(email, password) { token_info }
+  end
+
+  subject { client.login(email, password) }
+
+  it 'returns a UAA token' do
+    expect(subject).to be_a(CFoundry::AuthToken)
+    expect(subject.auth_header).to eq("bearer #{access_token}")
+  end
+
+  it 'saves the data as the token' do
+    subject
+    expect(client.token).to be_a(CFoundry::AuthToken)
+    expect(client.token.auth_header).to eq("bearer #{access_token}")
+  end
+end

data/spec/support/v1_fake_helper.rb

@@ -0,0 +1,144 @@
+module V1Fake
+  module FakeMethods
+    def v1_fake_client(attributes = {})
+      CFoundry::V1::FakeClient.new.fake(attributes)
+    end
+
+    def v1_fake(what, attributes = {})
+      v1_fake_client.send(what).fake(attributes)
+    end
+
+    def v1_fake_list(what, count, attributes = {})
+      objs = []
+
+      count.times do
+        objs << fake(what, attributes)
+      end
+
+      objs
+    end
+
+    def v1_fake_model(name = :my_fake_model, &init)
+      # There is a difference between ruby 1.8.7 and 1.8.8 in the order that
+      # the inherited callback gets called. In 1.8.7 the inherited callback
+      # is called after the block; in 1.8.8 and later it's called before.
+      # The upshot for us is we need a failproof way of getting the name
+      # to klass. So we're using a global variable to hand off the value.
+      # Please don't shoot us. - ESH & MMB
+      $object_name = name
+      klass = Class.new(CFoundry::V1::FakeModel) do
+        self.object_name = name
+      end
+
+      klass.class_eval(&init) if init
+
+      klass.define_client_methods
+
+      klass
+    end
+  end
+
+  def fake(attributes = {})
+    fake_attributes(attributes).each do |k, v|
+      send(:"#{k}=", v)
+      setup_reverse_relationship(v)
+    end
+
+    self
+  end
+
+  def setup_reverse_relationship(v)
+    # assign relationship for 'v' pointing back to this object
+  end
+end
+
+module CFoundry::V1
+  class Model
+    include V1Fake
+
+    attr_writer :client
+
+    private
+
+    def get_many(plural)
+      @cache[plural]
+    end
+
+    def fake_attributes(attributes)
+      default_fakes.merge(attributes)
+    end
+
+    # override this to provide basic attributes (like name) dynamically
+    def default_fakes
+      {}
+    end
+  end
+
+
+  class FakeBase < Base
+  end
+
+
+  class FakeClient < Client
+    include Fake
+
+    def initialize(target = "http://example.com", token = nil)
+      @base = FakeBase.new(target, token)
+    end
+
+    private
+
+    def get_many(plural)
+      instance_variable_get(:"@#{plural}")
+    end
+
+    def fake_attributes(attributes)
+      attributes
+    end
+
+    def setup_reverse_relationship(v)
+      if v.is_a?(Model)
+        v.client = self
+      elsif v.is_a?(Array)
+        v.each do |x|
+          setup_reverse_relationship(x)
+        end
+      end
+    end
+  end
+
+
+  class FakeModel < CFoundry::V1::Model
+    attr_reader :diff
+
+    def self.inherited(klass)
+      class << klass
+        attr_writer :object_name
+      end
+
+      # There is a difference between ruby 1.8.7 and 1.8.8 in the order that
+      # the inherited callback gets called. In 1.8.7 the inherited callback
+      # is called after the block; in 1.8.8 and later it's called before.
+      # The upshot for us is we need a failproof way of getting the name
+      # to klass. So we're using a global variable to hand off the value.
+      # Please don't shoot us. - ESH & MMB
+      klass.object_name = $object_name
+      super
+    end
+
+    class << self
+      attr_writer :object_name
+    end
+  end
+
+
+  module ModelMagic
+    def self.on_client(&blk)
+      FakeClient.module_eval(&blk)
+    end
+
+    def self.on_base_client(&blk)
+      FakeBase.module_eval(&blk)
+    end
+  end
+end

metadata

@@ -1,26 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 21
-  version: 0.4.21
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
+- Cloud Foundry Team
 - Alex Suraci
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-02-08 00:00:00 Z
+date: 2013-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: multipart-post
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +29,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: multipart-post
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: multi_json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +44,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  name: multi_json
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyzip
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +59,28 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: rubyzip
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
+        version: 1.3.3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: cf-uaa-lib
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +90,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :development
-  version_requirements: *id004
+  name: rake
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +105,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  name: rspec
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +120,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  name: webmock
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,11 +135,27 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
+  type: :development
+  name: rr
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  name: gem-release
+  requirement: *id009
 description: 
 email: 
-- asuraci@vmware.com
+- vcap-dev@googlegroups.com
 executables: []
 
 extensions: []
@@ -134,11 +165,14 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
+- lib/cfoundry/auth_token.rb
 - lib/cfoundry/baseclient.rb
 - lib/cfoundry/chatty_hash.rb
 - lib/cfoundry/client.rb
+- lib/cfoundry/concerns/login_helpers.rb
 - lib/cfoundry/errors.rb
-- lib/cfoundry/spec_helper.rb
+- lib/cfoundry/rest_client.rb
+- lib/cfoundry/test_support.rb
 - lib/cfoundry/trace_helpers.rb
 - lib/cfoundry/uaaclient.rb
 - lib/cfoundry/upload_helpers.rb
@@ -173,12 +207,18 @@ files:
 - lib/cfoundry/version.rb
 - lib/cfoundry/zip.rb
 - lib/cfoundry.rb
+- spec/cfoundry/auth_token_spec.rb
 - spec/cfoundry/baseclient_spec.rb
 - spec/cfoundry/errors_spec.rb
+- spec/cfoundry/rest_client_spec.rb
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
+- spec/cfoundry/upload_helpers_spec.rb
 - spec/cfoundry/v1/base_spec.rb
+- spec/cfoundry/v1/client_spec.rb
+- spec/cfoundry/v1/model_magic_spec.rb
 - spec/cfoundry/v2/base_spec.rb
+- spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/space_spec.rb
@@ -193,10 +233,19 @@ files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
+- spec/fixtures/apps/with_vmcignore/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_file.txt
+- spec/fixtures/empty_file
 - spec/spec_helper.rb
 - spec/support/fake_helper.rb
-- spec/support/summaries.rb
-homepage: http://cloudfoundry.com/
+- spec/support/randoms.rb
+- spec/support/shared_examples/client_login_examples.rb
+- spec/support/shared_examples/model_summary_examples.rb
+- spec/support/v1_fake_helper.rb
+homepage: http://github.com/cloudfoundry/vmc-lib
 licenses: []
 
 post_install_message: 
@@ -230,12 +279,18 @@ signing_key:
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files: 
+- spec/cfoundry/auth_token_spec.rb
 - spec/cfoundry/baseclient_spec.rb
 - spec/cfoundry/errors_spec.rb
+- spec/cfoundry/rest_client_spec.rb
 - spec/cfoundry/trace_helpers_spec.rb
 - spec/cfoundry/uaaclient_spec.rb
+- spec/cfoundry/upload_helpers_spec.rb
 - spec/cfoundry/v1/base_spec.rb
+- spec/cfoundry/v1/client_spec.rb
+- spec/cfoundry/v1/model_magic_spec.rb
 - spec/cfoundry/v2/base_spec.rb
+- spec/cfoundry/v2/client_spec.rb
 - spec/cfoundry/v2/model_magic_spec.rb
 - spec/cfoundry/v2/organization_spec.rb
 - spec/cfoundry/v2/space_spec.rb
@@ -250,6 +305,15 @@ test_files:
 - spec/fakes/service_plan_fake.rb
 - spec/fakes/space_fake.rb
 - spec/fakes/user_fake.rb
+- spec/fixtures/apps/with_vmcignore/ignored_dir/file_in_ignored_dir.txt
+- spec/fixtures/apps/with_vmcignore/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/file_in_non_ignored_dir.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_dir/ignored_file.txt
+- spec/fixtures/apps/with_vmcignore/non_ignored_file.txt
+- spec/fixtures/empty_file
 - spec/spec_helper.rb
 - spec/support/fake_helper.rb
-- spec/support/summaries.rb
+- spec/support/randoms.rb
+- spec/support/shared_examples/client_login_examples.rb
+- spec/support/shared_examples/model_summary_examples.rb
+- spec/support/v1_fake_helper.rb