cfoundry 0.5.3.rc3 → 0.5.3.rc4

data/lib/cfoundry/baseclient.rb

@@ -24,9 +24,7 @@ module CFoundry
 
     def uaa
       @uaa ||= begin
-        endpoint =
-          info[:token_endpoint] || \
-            info[:authorization_endpoint]
+        endpoint = info[:authorization_endpoint]
 
         if endpoint
           uaa = CFoundry::UAAClient.new(endpoint)

data/lib/cfoundry/client.rb

@@ -9,8 +9,6 @@ require "cfoundry/v1/service"
 require "cfoundry/v1/service_plan"
 require "cfoundry/v1/service_instance"
 require "cfoundry/v1/user"
-require "cfoundry/v1/base"
-require "cfoundry/v1/client"
 
 require "cfoundry/v2/app"
 require "cfoundry/v2/framework"
@@ -25,6 +23,10 @@ require "cfoundry/v2/organization"
 require "cfoundry/v2/space"
 require "cfoundry/v2/domain"
 require "cfoundry/v2/route"
+require "cfoundry/v2/stack"
+
+require "cfoundry/v1/base"
+require "cfoundry/v1/client"
 require "cfoundry/v2/base"
 require "cfoundry/v2/client"
 

data/lib/cfoundry/uaaclient.rb

@@ -44,7 +44,7 @@ module CFoundry
 
     def password_score(password)
       wrap_uaa_errors do
-        response = CF::UAA::Misc.password_strength(target, password)
+        response = CF::UAA::Misc.password_strength(uaa_url, password)
 
         required_score = response[:requiredScore] || 0
         case (response[:score] || 0)
@@ -98,11 +98,15 @@ module CFoundry
 
     def scim
       auth_header = token && token.auth_header
-      scim = CF::UAA::Scim.new(target, auth_header)
+      scim = CF::UAA::Scim.new(uaa_url, auth_header)
       scim.logger.level = @trace ? Logger::Severity::TRACE : 1
       scim
     end
 
+    def uaa_url
+      @uaa_url ||= CF::UAA::Misc.discover_uaa(target)
+    end
+
     def wrap_uaa_errors
       yield
     rescue CF::UAA::BadResponse

data/lib/cfoundry/v2/app.rb

@@ -30,6 +30,7 @@ module CFoundry::V2
     attribute :command,          :string,  :default => nil
     attribute :console,          :boolean, :default => false
     attribute :buildpack,        :string,  :default => nil
+    to_one    :stack,                      :default => nil
     attribute :debug,            :string,  :default => nil
     to_many   :service_bindings
     to_many   :routes

data/lib/cfoundry/v2/stack.rb

@@ -0,0 +1,9 @@
+require "cfoundry/v2/model"
+
+module CFoundry::V2
+  class Stack < Model
+    attribute :name, :string
+
+    queryable_by :name
+  end
+end

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/baseclient_spec.rb

@@ -103,7 +103,7 @@ describe CFoundry::BaseClient do
 
   describe "UAAClient" do
     context "with a valid uaa endpoint" do
-      let(:info) { { :token_endpoint => "http://uaa.example.com" } }
+      let(:info) { { :authorization_endpoint => "http://uaa.example.com" } }
 
       before do
         stub(subject).info { info }
@@ -172,7 +172,7 @@ describe CFoundry::BaseClient do
   describe "#password_score" do
     context "with a uaa" do
       before do
-        stub(subject).info { { :token_endpoint => "http://uaa.example.com" } }
+        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
       end
 
       it "delegates to the uaa's password strength method" do

data/spec/cfoundry/uaaclient_spec.rb

@@ -8,6 +8,14 @@ describe CFoundry::UAAClient do
   before do
     uaa.token = CFoundry::AuthToken.new(auth_header)
     CF::UAA::Util.default_logger.level = 1
+    stub_request(:get, "#{target}/login").
+      to_return :status => 200, :headers => {'Content-Type' => 'application/json'},
+        :body => <<EOF
+          {
+            "timestamp": "2012-11-08T13:32:18+0000",
+            "commit_id": "ebbf817", "prompts": {}
+          }
+EOF
   end
 
   shared_examples "UAA wrapper" do

data/spec/support/v1_fake_helper.rb

@@ -80,7 +80,7 @@ module CFoundry::V1
 
 
   class FakeClient < Client
-    include Fake
+    include V1Fake
 
     def initialize(target = "http://example.com", token = nil)
       @base = FakeBase.new(target, token)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 1230613173
+  hash: -577135546
   prerelease: 6
   segments: 
   - 0
   - 5
   - 3
   - rc
-  - 3
-  version: 0.5.3.rc3
+  - 4
+  version: 0.5.3.rc4
 platform: ruby
 authors: 
 - Cloud Foundry Team
@@ -18,12 +18,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 Z
+date: 2013-03-12 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: 
     - - ~>
@@ -33,12 +31,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: 
     - - ~>
@@ -48,12 +46,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: 
     - - ~>
@@ -63,28 +61,28 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: rubyzip
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: cf-uaa-lib
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 11
         segments: 
         - 1
         - 3
-        - 3
-        version: 1.3.3
+        - 8
+        version: 1.3.8
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  name: cf-uaa-lib
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +92,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  name: rake
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +107,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
+  prerelease: false
   type: :development
-  version_requirements: *id006
+  name: rspec
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,12 +122,12 @@ dependencies:
         - 1
         - 9
         version: "1.9"
+  prerelease: false
   type: :development
-  version_requirements: *id007
+  name: webmock
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -139,12 +137,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  name: rr
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: gem-release
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -153,12 +151,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: gem-release
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: timecop
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,8 +165,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  name: timecop
+  requirement: *id010
 description: 
 email: 
 - vcap-dev@googlegroups.com
@@ -234,6 +234,7 @@ files:
 - lib/cfoundry/v2/service_instance.rb
 - lib/cfoundry/v2/service_plan.rb
 - lib/cfoundry/v2/space.rb
+- lib/cfoundry/v2/stack.rb
 - lib/cfoundry/v2/user.rb
 - lib/cfoundry/validator.rb
 - lib/cfoundry/version.rb