cfoundry 4.3.5.rc1 → 4.3.5

data/lib/cc_api_stub/helper.rb

@@ -91,7 +91,7 @@ module CcApiStub
     end
 
     def succeed_to_load(options={})
-      response_body = options[:response] || CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name}", options)
+      response_body = response_from_options(options.reverse_merge!({:fixture => "fake_cc_#{object_name}"}))
       stub_get(object_endpoint(options[:id]), {}, response(200, response_body))
     end
 
@@ -100,7 +100,7 @@ module CcApiStub
     end
 
     def succeed_to_load_many(options={})
-      response_body = options[:response] || CcApiStub::Helper.load_fixtures(options.delete(:fixture) || "fake_cc_#{object_name.pluralize}", options)
+      response_body = response_from_options(options.reverse_merge!({:fixture => "fake_cc_#{object_name.pluralize}"}))
       stub_get(collection_endpoint, {}, response(200, response_body))
     end
 
@@ -119,7 +119,7 @@ module CcApiStub
     end
 
     def succeed_to_update(options = {})
-      stub_put(object_endpoint(options[:id]), nil, response(200, {}))
+      stub_put(object_endpoint(options[:id]), nil, response(200, response_from_options(options)))
     end
 
     def fail_to_update(options = {})
@@ -135,5 +135,14 @@ module CcApiStub
     def fixture_prefix
       "_cc"
     end
+
+    private
+
+    def response_from_options(options)
+      fixture = options.delete(:fixture)
+      return options[:response] if options[:response]
+      return CcApiStub::Helper.load_fixtures(fixture, options) if fixture
+      {}
+    end
   end
 end

data/lib/cc_api_stub/spaces.rb

@@ -23,6 +23,11 @@ module CcApiStub
         stub_get(%r{/v2/spaces/[^/]+/summary$}, {}, response(200, response_body))
       end
 
+      def succeed_to_load_apps(options={})
+        response = response_from_options(options.reverse_merge!({:fixture => "fake_cc_space_apps"}))
+        stub_get(%r{/v2/spaces/[^/]+/apps\?inline-relations-depth=1}, {}, response(200, response))
+      end
+
       def space_fixture_hash
         {
           :metadata => {

data/lib/cfoundry/uaaclient.rb

@@ -60,14 +60,15 @@ module CFoundry
       end
     end
 
-    def add_user(email, password)
+    def add_user(email, password, options = {})
       wrap_uaa_errors do
         scim.add(
           :user,
           {:userName => email,
             :emails => [{:value => email}],
             :password => password,
-            :name => {:givenName => email, :familyName => email}
+            :name => {:givenName => options[:givenName] || email,
+                      :familyName => options[:familyName] || email}
           }
         )
       end

data/lib/cfoundry/v2/client.rb

@@ -50,8 +50,8 @@ module CFoundry::V2
       super
     end
 
-    def register(email, password)
-      uaa_user = @base.uaa.add_user(email, password)
+    def register(email, password, options = {})
+      uaa_user = @base.uaa.add_user(email, password, options)
       cc_user = user
       cc_user.guid = uaa_user[:id]
       cc_user.create!

data/lib/cfoundry/version.rb

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

data/lib/tasks/gem_release.rake

@@ -1,3 +1,4 @@
+require 'active_support/time'
 require 'active_support/core_ext'
 
 namespace :gem do
@@ -7,6 +8,11 @@ namespace :gem do
     old_version = gem_version
 
     sh! "gem bump --version #{version} --no-commit"
+
+    print "About to bump version to #{gem_version}, continue? (Y): "
+    answer = STDIN.gets.strip
+    exit unless answer.length == 0 || answer.upcase.start_with?("Y")
+
     sh! "git add lib/cfoundry/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"

data/spec/cfoundry/uaaclient_spec.rb

@@ -255,11 +255,12 @@ EOF
     let(:email) { 'test@test.com' }
     let(:password) { 'secret' }
 
-    subject { uaa.add_user(email, password) }
+    context "without given/family name" do
+      subject { uaa.add_user(email, password) }
 
-    context 'with valid data' do
-      it "should add a user" do
-        req =
+      context 'with valid data' do
+        it "should add a user" do
+          req =
           stub_request(:post, "https://uaa.example.com/Users").with(
             :body =>
               { :userName => email,
@@ -267,16 +268,45 @@ EOF
                 :password => password,
                 :name => { :givenName => email, :familyName => email }
               }
-          ).to_return(
-            :status => 200,
-            :body => '{ "id" : "id" }',
-            :headers => { "Content-Type" => 'application/json' }
-          )
+            ).to_return(
+              :status => 200,
+              :body => '{ "id" : "id" }',
+              :headers => { "Content-Type" => 'application/json' }
+            )
+
+          expect(subject).to eq({:id => "id"})
+          expect(req).to have_been_requested
+        end
+      end
+    end
 
-        expect(subject).to eq({:id => "id"})
-        expect(req).to have_been_requested
+    context "with given/family name" do
+      let(:givenName) { 'givenName' }
+      let(:familyName) { 'familyName' }
+      subject { uaa.add_user(email, password, givenName: givenName, familyName: familyName) }
+
+      context 'with valid data' do
+        it "should add a user" do
+          req =
+            stub_request(:post, "https://uaa.example.com/Users").with(
+              :body =>
+                { :userName => email,
+                  :emails => [{ :value => email }],
+                  :password => password,
+                  :name => { :givenName => givenName, :familyName => familyName }
+                }
+            ).to_return(
+              :status => 200,
+              :body => '{ "id" : "id" }',
+              :headers => { "Content-Type" => 'application/json' }
+            )
+
+          expect(subject).to eq({:id => "id"})
+          expect(req).to have_been_requested
+        end
       end
     end
+
   end
 
   describe "#delete_user" do

data/spec/cfoundry/v2/client_spec.rb

@@ -14,7 +14,7 @@ module CFoundry
 
         it "creates the user in uaa and ccng" do
           client.base.stub(:uaa) { uaa }
-          uaa.stub(:add_user).with(email, password) { {:id => "1234"} }
+          uaa.stub(:add_user).with(email, password, {}) { {:id => "1234"} }
 
           user = build(:user)
           client.stub(:user) { user }

data/spec/fixtures/fake_cc_space_apps.json

@@ -0,0 +1,49 @@
+{
+  "total_results": 2,
+  "total_pages": 1,
+  "prev_url": null,
+  "next_url": null,
+  "resources": [
+    {
+      "metadata": {
+        "guid": "application-id-1",
+        "url": "/v2/apps/application-id-1",
+        "created_at": "2012-08-13 12:48:41 -0700",
+        "updated_at": "2012-08-13 12:55:10 -0700"
+      },
+      "entity": {
+        "name": "app-name-1",
+        "space_guid": "space-id-1",
+        "environment_json": null,
+        "memory": 2048,
+        "instances": 1,
+        "file_descriptors": 100,
+        "disk_quota": 500,
+        "state": "STARTED",
+        "service_bindings_url": "/v2/service_bindings?q=app_guid:application-id-1",
+        "space_url": "/v2/spaces/space-id-1"
+      }
+    },
+    {
+      "metadata": {
+        "guid": "application-id-2",
+        "url": "/v2/apps/application-id-2",
+        "created_at": "2012-08-13 12:48:41 -0700",
+        "updated_at": "2012-08-13 12:55:10 -0700"
+      },
+      "entity": {
+        "name": "app-name-2",
+        "space_guid": "space-id-1",
+        "environment_json": null,
+        "memory": 2048,
+        "instances": 1,
+        "file_descriptors": 100,
+        "disk_quota": 500,
+        "state": "STARTED",
+        "service_bindings_url": "/v2/service_bindings?q=app_guid:application-id-2",
+        "space_url": "/v2/spaces/space-id-1"
+      }
+    }
+
+  ]
+}

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 4.3.5.rc1
-  prerelease: 6
+  version: 4.3.5
+  prerelease: 
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -421,6 +421,7 @@ files:
 - spec/fixtures/fake_cc_service_instances.json
 - spec/fixtures/fake_cc_services.json
 - spec/fixtures/fake_cc_space.json
+- spec/fixtures/fake_cc_space_apps.json
 - spec/fixtures/fake_cc_space_summary.json
 - spec/fixtures/fake_cc_spaces.json
 - spec/fixtures/fake_cc_stats.json
@@ -450,13 +451,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3354893909310482905
+      hash: 1950247728872914231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1950247728872914231
 requirements: []
 rubyforge_project: cfoundry
 rubygems_version: 1.8.25
@@ -556,6 +560,7 @@ test_files:
 - spec/fixtures/fake_cc_service_instances.json
 - spec/fixtures/fake_cc_services.json
 - spec/fixtures/fake_cc_space.json
+- spec/fixtures/fake_cc_space_apps.json
 - spec/fixtures/fake_cc_space_summary.json
 - spec/fixtures/fake_cc_spaces.json
 - spec/fixtures/fake_cc_stats.json