cfoundry 0.4.10 → 0.4.11

data/Rakefile

@@ -36,6 +36,6 @@ end
 
 namespace "test" do
   task "spec" do |t|
-    sh("cd spec && bundle exec rake spec")
+    sh("bundle exec rspec")
   end
 end

data/lib/cfoundry/spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path("../../../spec/spec_helper", __FILE__)

data/lib/cfoundry/version.rb

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

data/spec/cfoundry/uaaclient_spec.rb

@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+describe CFoundry::UAAClient do
+  let(:target) { "https://uaa.example.com" }
+  let(:uaa) { CFoundry::UAAClient.new(target) }
+
+  describe '#prompts' do
+    subject { uaa.prompts }
+
+    # GET (target)/login
+    it "receives the prompts from /login" do
+      stub_request(:get, "#{target}/login").to_return :status => 200,
+        :body => <<EOF
+          {
+            "timestamp": "2012-11-08T13:32:18+0000",
+            "commit_id": "ebbf817",
+            "app": {
+              "version": "1.2.6",
+              "artifact": "cloudfoundry-identity-uaa",
+              "description": "User Account and Authentication Service",
+              "name": "UAA"
+            },
+            "prompts": {
+              "username": [
+                "text",
+                "Email"
+              ],
+              "password": [
+                "password",
+                "Password"
+              ]
+            }
+          }
+EOF
+
+      expect(subject).to eq(
+        :username => ["text", "Email"],
+        :password => ["password", "Password"])
+    end
+  end
+
+  describe '#authorize' do
+    let(:username) { "foo@bar.com" }
+    let(:password) { "test" }
+
+    subject { uaa.authorize(:username => username, :password => password) }
+
+    it 'returns the token on successful authentication' do
+      stub_request(
+        :post,
+        "#{target}/oauth/authorize"
+      ).with(
+        :query => {
+          "client_id" => uaa.client_id,
+          "redirect_uri" => uaa.redirect_uri,
+          "response_type" => "token"
+        }
+      ).to_return(
+        :status => 302,
+        :headers => {
+          "Location" => "#{uaa.redirect_uri}#access_token=bar&token_type=foo&fizz=buzz&foo=bar"
+        }
+      )
+
+      expect(subject).to eq "foo bar"
+    end
+
+    it 'raises CFoundry::Denied if authentication fails' do
+      stub_request(
+        :post,
+        "#{target}/oauth/authorize"
+      ).with(
+        :query => {
+          "client_id" => uaa.client_id,
+          "redirect_uri" => uaa.redirect_uri,
+          "response_type" => "token"
+        }
+      ).to_return(
+        :status => 401,
+        :headers => {
+          "Location" => "#{uaa.redirect_uri}#access_token=bar&token_type=foo&fizz=buzz&foo=bar"
+        },
+        :body => <<EOF
+          {
+            "error": "unauthorized",
+            "error_description": "Bad credentials"
+          }
+EOF
+      )
+
+      expect { subject }.to raise_error(
+        CFoundry::Denied, "401: Bad credentials")
+    end
+  end
+
+  describe '#users' do
+    subject { uaa.users }
+
+    it 'requests /Users' do
+      req = stub_request(:get, "#{target}/Users").to_return(
+        :body => '{ "fake_data": "123" }')
+      expect(subject).to eq({ :fake_data => "123" })
+      expect(req).to have_been_requested
+    end
+  end
+
+  describe '#change_password' do
+    let(:guid) { "foo-bar-baz" }
+    let(:old) { "old-pass" }
+    let(:new) { "new-pass" }
+
+    subject { uaa.change_password(guid, new, old) }
+
+    it 'sends a password change request' do
+      req = stub_request(
+        :put,
+        "#{target}/User/#{guid}/password"
+      ).with(
+        :body => {
+          :schemas => ["urn:scim:schemas:core:1.0"],
+          :password => new,
+          :oldPassword => old
+        },
+        :headers => { "Content-Type" => "application/json" }
+      )
+
+      subject
+
+      expect(req).to have_been_requested
+    end
+  end
+end

data/spec/factories/app_factory.rb

@@ -0,0 +1,24 @@
+FactoryGirl.define do
+  factory :app, :class => CFoundry::V2::App do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+    memory 128
+    total_instances 0
+    production false
+    state "STOPPED"
+
+    ignore do
+      routes []
+      service_bindings []
+    end
+
+    initialize_with do
+      CFoundry::V2::App.new(nil, nil)
+    end
+
+    after_build do |app, evaluator|
+      RR.stub(app).routes { evaluator.routes }
+      RR.stub(app).service_bindings { evaluator.service_bindings }
+    end
+  end
+end

data/spec/factories/client_factory.rb

@@ -0,0 +1,25 @@
+FactoryGirl.define do
+  factory :client, :class => CFoundry::V2::Client do
+    ignore do
+      routes []
+      apps []
+      frameworks []
+      runtimes []
+      service_instances []
+      spaces []
+      organizations []
+      logged_in true
+    end
+
+    after_build do |client, evaluator|
+      RR.stub(client).logged_in? { evaluator.logged_in }
+      RR.stub(client).routes { evaluator.routes }
+      RR.stub(client).apps { evaluator.apps }
+      RR.stub(client).frameworks { evaluator.frameworks }
+      RR.stub(client).runtimes { evaluator.runtimes }
+      RR.stub(client).service_instances { evaluator.service_instances }
+      RR.stub(client).spaces { evaluator.spaces }
+      RR.stub(client).organizations { evaluator.organizations }
+    end
+  end
+end

data/spec/factories/domain_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :domain, :class => CFoundry::V2::Domain do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    initialize_with do
+      CFoundry::V2::Domain.new(nil, nil)
+    end
+  end
+end

data/spec/factories/factory.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  sequence(:random_string) {|n| "random_#{n}_string" }
+  sequence(:guid) {|n| "random_#{n}_guid" }
+end

data/spec/factories/framework_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :framework, :class => CFoundry::V2::Framework do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    initialize_with do
+      CFoundry::V2::Framework.new(nil, nil)
+    end
+  end
+end

data/spec/factories/organization_factory.rb

@@ -0,0 +1,23 @@
+FactoryGirl.define do
+  factory :organization, :class => CFoundry::V2::Organization do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    ignore do
+      spaces []
+      domains []
+    end
+
+    initialize_with do
+      CFoundry::V2::Organization.new(nil, nil)
+    end
+
+    after_build do |org, evaluator|
+      evaluator.spaces.each { |s| s.organization = org }
+      evaluator.domains.each { |s| s.owning_organization = org }
+
+      RR.stub(org).spaces { evaluator.spaces }
+      RR.stub(org).domains { evaluator.domains }
+    end
+  end
+end

data/spec/factories/route_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :route, :class => CFoundry::V2::Route do
+    guid { FactoryGirl.generate(:guid) }
+    host { FactoryGirl.generate(:random_string) }
+    association :domain, :factory => :domain, :strategy => :build
+
+    initialize_with do
+      CFoundry::V2::Route.new(nil, nil)
+    end
+  end
+end

data/spec/factories/runtime_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :runtime, :class => CFoundry::V2::Runtime do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    initialize_with do
+      CFoundry::V2::Runtime.new(nil, nil)
+    end
+  end
+end

data/spec/factories/service_binding_factory.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :service_binding, :class => CFoundry::V2::ServiceBinding do
+    guid { FactoryGirl.generate(:guid) }
+
+    initialize_with do
+      CFoundry::V2::ServiceBinding.new(nil, nil)
+    end
+  end
+end

data/spec/factories/service_factory.rb

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :service, :class => CFoundry::V2::Service do
+    guid { FactoryGirl.generate(:guid) }
+    label "redis"
+    provider "core"
+    url "http://example.com"
+    description "small key-value store"
+    version "2.8"
+    info_url "http://cloudfoundry.com/redis"
+    active true
+
+    initialize_with do
+      CFoundry::V2::Service.new(nil, nil)
+    end
+  end
+end

data/spec/factories/service_instance_factory.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    initialize_with do
+      CFoundry::V2::ServiceInstance.new(nil, nil)
+    end
+  end
+end

data/spec/factories/service_plan_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :service_plan, :class => CFoundry::V2::ServicePlan do
+    guid { FactoryGirl.generate(:guid) }
+    name "D100"
+    description "Filibuster plan"
+
+    initialize_with do
+      CFoundry::V2::ServicePlan.new(nil, nil)
+    end
+  end
+end

data/spec/factories/space_factory.rb

@@ -0,0 +1,25 @@
+FactoryGirl.define do
+  factory :space, :class => CFoundry::V2::Space do
+    guid { FactoryGirl.generate(:guid) }
+    name { FactoryGirl.generate(:random_string) }
+
+    ignore do
+      apps []
+      service_instances []
+      domains []
+    end
+
+    initialize_with do
+      CFoundry::V2::Space.new(nil, nil)
+    end
+
+    after_build do |org, evaluator|
+      evaluator.apps.each { |s| s.space = org }
+      evaluator.service_instances.each { |s| s.space = org }
+
+      RR.stub(org).apps { evaluator.apps }
+      RR.stub(org).service_instances { evaluator.service_instances }
+      RR.stub(org).domains { evaluator.domains }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require "rspec"
+require "cfoundry"
+require "factory_girl"
+require "webmock/rspec"
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
+  require file
+end
+
+FactoryGirl.definition_file_paths = File.expand_path("../factories", __FILE__)
+FactoryGirl.find_definitions
+
+RSpec.configure do |c|
+  c.mock_with :rr
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-11 00:00:00 -08:00
+date: 2012-12-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 13
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
         - 1
-        - 4
-        - 0
-        version: 1.4.0
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 25
         segments: 
         - 0
         - 9
-        - 9
-        version: 0.9.9
+        version: "0.9"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,13 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 25
         segments: 
         - 0
         - 9
-        - 2
-        - 2
-        version: 0.9.2.2
+        version: "0.9"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -91,14 +86,58 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 21
         segments: 
         - 2
         - 11
-        - 0
-        version: 2.11.0
+        version: "2.11"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 9
+        version: "1.9"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 6
+        version: "2.6"
+  type: :development
+  version_requirements: *id008
 description: 
 email: 
 - asuraci@vmware.com
@@ -117,6 +156,7 @@ files:
 - lib/cfoundry/errors.rb
 - lib/cfoundry/validator.rb
 - lib/cfoundry/uaaclient.rb
+- lib/cfoundry/spec_helper.rb
 - lib/cfoundry/v2/service_binding.rb
 - lib/cfoundry/v2/service.rb
 - lib/cfoundry/v2/client.rb
@@ -148,9 +188,21 @@ files:
 - lib/cfoundry/v1/service_instance.rb
 - lib/cfoundry/zip.rb
 - lib/cfoundry/chatty_hash.rb
-- spec/helpers.rb
-- spec/Rakefile
-- spec/client_spec.rb
+- spec/factories/service_instance_factory.rb
+- spec/factories/service_binding_factory.rb
+- spec/factories/service_factory.rb
+- spec/factories/route_factory.rb
+- spec/factories/factory.rb
+- spec/factories/runtime_factory.rb
+- spec/factories/space_factory.rb
+- spec/factories/organization_factory.rb
+- spec/factories/framework_factory.rb
+- spec/factories/domain_factory.rb
+- spec/factories/client_factory.rb
+- spec/factories/app_factory.rb
+- spec/factories/service_plan_factory.rb
+- spec/spec_helper.rb
+- spec/cfoundry/uaaclient_spec.rb
 has_rdoc: true
 homepage: http://cloudfoundry.com/
 licenses: []
@@ -186,6 +238,18 @@ signing_key:
 specification_version: 3
 summary: High-level library for working with the Cloud Foundry API.
 test_files: 
-- spec/helpers.rb
-- spec/Rakefile
-- spec/client_spec.rb
+- spec/factories/service_instance_factory.rb
+- spec/factories/service_binding_factory.rb
+- spec/factories/service_factory.rb
+- spec/factories/route_factory.rb
+- spec/factories/factory.rb
+- spec/factories/runtime_factory.rb
+- spec/factories/space_factory.rb
+- spec/factories/organization_factory.rb
+- spec/factories/framework_factory.rb
+- spec/factories/domain_factory.rb
+- spec/factories/client_factory.rb
+- spec/factories/app_factory.rb
+- spec/factories/service_plan_factory.rb
+- spec/spec_helper.rb
+- spec/cfoundry/uaaclient_spec.rb

data/spec/Rakefile

@@ -1,14 +0,0 @@
-require 'rubygems'
-require 'bundler/setup'
-Bundler.require(:default, :development)
-
-require 'rake/dsl_definition'
-require 'rake'
-require 'rspec'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = "**/*_spec.rb"
-  t.rspec_opts = ["--format", "documentation", "--colour"]
-end
-

data/spec/client_spec.rb

@@ -1,206 +0,0 @@
-require "cfoundry"
-require "./helpers"
-
-RSpec.configure do |c|
-  c.include CFoundryHelpers
-end
-
-describe CFoundry::Client do
-  TARGET = ENV["CFOUNDRY_TEST_TARGET"] || "http://api.vcap.me"
-  USER = ENV["CFOUNDRY_TEST_USER"] || "dev@cloudfoundry.org"
-  PASSWORD = ENV["CFOUNDRY_TEST_PASSWORD"] || "test"
-
-  before(:all) do
-    @client = CFoundry::Client.new(TARGET)
-    @client.login(USER, PASSWORD)
-  end
-
-  describe :target do
-    it "returns the current API target" do
-      @client.target.should == TARGET
-    end
-  end
-
-  describe "metadata" do
-    describe :info do
-      it "returns the cloud meta-info" do
-        @client.info.should be_a(Hash)
-      end
-    end
-
-    describe :system_services do
-      it "returns the service vendors" do
-        @client.system_services.should be_a(Hash)
-      end
-
-      it "denies if not authenticated" do
-        without_auth do
-          proc {
-            @client.system_services
-          }.should raise_error(CFoundry::Denied)
-        end
-      end
-    end
-
-    describe :system_runtimes do
-      it "returns the supported runtime information" do
-        @client.system_runtimes.should be_a(Hash)
-      end
-
-      it "works if not authenticated" do
-        without_auth do
-          proc {
-            @client.system_runtimes
-          }.should_not raise_error(CFoundry::Denied)
-        end
-      end
-    end
-  end
-
-  describe :user do
-    it "creates a lazy User object" do
-      with_new_user do
-        @client.user(@user.email).should be_a(CFoundry::User)
-      end
-    end
-  end
-
-  describe :register do
-    it "registers an account and returns the User" do
-      email = random_user
-
-      user = @client.register(email, "test")
-
-      begin
-        @client.user(email).should satisfy(&:exists?)
-      ensure
-        user.delete!
-      end
-    end
-
-    it "fails if a user by that name already exists" do
-      proc {
-        @client.register(USER, PASSWORD)
-      }.should raise_error(CFoundry::Denied)
-    end
-  end
-
-  describe :login do
-    it "authenticates and sets the client token" do
-      client = CFoundry::Client.new(TARGET)
-      email = random_user
-      pass = random_str
-
-      client.register(email, pass)
-      begin
-        client.login(email, pass)
-        client.should satisfy(&:logged_in?)
-      ensure
-        @client.user(email).delete!
-      end
-    end
-
-    it "fails with invalid credentials" do
-      client = CFoundry::Client.new(TARGET)
-      email = random_user
-
-      client.register(email, "right")
-      begin
-        proc {
-          client.login(email, "wrong")
-        }.should raise_error(CFoundry::Denied)
-      ensure
-        @client.user(email).delete!
-      end
-    end
-  end
-
-  describe :logout do
-    it "clears the login token" do
-      client = CFoundry::Client.new(TARGET)
-      email = random_user
-      pass = random_str
-
-      client.register(email, pass)
-
-      begin
-        client.login(email, pass)
-        client.should satisfy(&:logged_in?)
-
-        client.logout
-        client.should_not satisfy(&:logged_in?)
-      ensure
-        @client.user(email).delete!
-      end
-    end
-  end
-
-  describe :app do
-    it "creates a lazy App object" do
-      @client.app("foo").should be_a(CFoundry::App)
-      @client.app("foo").name.should == "foo"
-    end
-  end
-
-  describe :apps do
-    it "returns an empty array if a user has no apps" do
-      with_new_user do
-        @client.apps.should == []
-      end
-    end
-
-    it "returns an array of App objects if a user has any" do
-      with_new_user do
-        name = random_str
-
-        new = @client.app(name)
-        new.total_instances = 1
-        new.urls = []
-        new.framework = "sinatra"
-        new.runtime = "ruby18"
-        new.memory = 64
-        new.create!
-
-        apps = @client.apps
-        apps.should be_a(Array)
-        apps.size.should == 1
-        apps.first.should be_a(CFoundry::App)
-        apps.first.name.should == name
-      end
-    end
-  end
-
-  describe :service do
-    it "creates a lazy Service object" do
-      @client.service("foo").should be_a(CFoundry::Service)
-      @client.service("foo").name.should == "foo"
-    end
-  end
-
-  describe :services do
-    it "returns an empty array if a user has no apps" do
-      with_new_user do
-        @client.services.should == []
-      end
-    end
-
-    it "returns an array of Service objects if a user has any" do
-      with_new_user do
-        name = random_str
-
-        new = @client.service(name)
-        new.type = "key-value"
-        new.vendor = "redis"
-        new.version = "2.2"
-        new.tier = "free"
-        new.create!
-
-        svcs = @client.services
-        svcs.should be_a(Array)
-        svcs.size.should == 1
-        svcs.first.should be_a(CFoundry::Service)
-        svcs.first.name.should == name
-      end
-    end
-  end
-end

data/spec/helpers.rb

@@ -1,29 +0,0 @@
-module CFoundryHelpers
-  def random_str
-    format("%x", rand(1000000))
-  end
-
-  def random_user
-    "#{random_str}@cfoundry-spec.com"
-  end
-
-  def without_auth
-    proxy = @client.proxy
-    @client.logout
-    @client.proxy = nil
-    yield
-  ensure
-    @client.login(USER, PASSWORD)
-    @client.proxy = proxy
-  end
-
-  def with_new_user
-    @user = @client.register(random_user, "test")
-    @client.proxy = @user.email
-    yield
-  ensure
-    @client.proxy = nil
-    @user.delete!
-    @user = nil
-  end
-end