cf 4.1.4 → 4.1.5.rc1

data/lib/cf/cli/populators/organization.rb

@@ -13,7 +13,12 @@ module CF
       private
 
       def choices
-        client.organizations(:depth => 0)
+        organization_response = client.organizations_first_page(:depth => 0)
+        if organization_response[:next_page]
+          "Login successful. Too many organizations (>50) to list. Remember to set your target organization using 'target -o [ORGANIZATION]'."
+        else
+          organization_response[:results]
+        end
       end
 
       def valid?(organization)

data/lib/cf/cli/populators/populator_methods.rb

@@ -51,6 +51,8 @@ module CF
           raise CF::UserFriendlyError.new(
             "There are no #{type}s. You may want to create one with #{c("create-#{type == :organization ? "org" : type}", :good)}."
           )
+        elsif object_choices.is_a?(String)
+          raise CF::UserFriendlyError.new(object_choices)
         elsif object_choices.size == 1 && !input.interactive?(type)
           object_choices.first
         else

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.1.4".freeze
+  VERSION = "4.1.5.rc1".freeze
 end

data/spec/cf/cli/populators/organization_spec.rb

@@ -116,7 +116,7 @@ module CF
 
             context "but that organization doesn't exist anymore (not valid)" do
               before do
-                client.stub(:organizations).and_return(organizations)
+                client.stub(:organizations_first_page).and_return({:results => organizations})
                 organization.stub(:users).and_raise(CFoundry::APIError)
               end
 
@@ -130,7 +130,7 @@ module CF
           context "without an organization in the config file" do
             context "when the user has organizations" do
               before do
-                client.stub(:organizations).and_return(organizations)
+                client.stub(:organizations_first_page).and_return({:results => organizations})
                 write_token_file({})
               end
 
@@ -151,7 +151,7 @@ module CF
 
             context "when the user has no organizations" do
               before do
-                client.stub(:organizations).and_return([])
+                client.stub(:organizations_first_page).and_return({:results => []})
                 write_token_file({})
               end
 
@@ -159,6 +159,17 @@ module CF
                 expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, "There are no organizations. You may want to create one with create-org.")
               end
             end
+
+            context "when the user has too many organizations" do
+              before do
+                client.stub(:organizations_first_page).and_return({:results => organizations, :next_page => true})
+                write_token_file({})
+              end
+
+              it "tells the user to set their target" do
+                expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, "Login successful. Too many organizations (>50) to list. Remember to set your target organization using 'target -o [ORGANIZATION]'.")
+              end
+            end
           end
         end
       end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.1.4
-  prerelease: 
+  version: 4.1.5.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -62,7 +62,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.3.7.rc1
     - - <
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -617,16 +617,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2711379081338960177
+      hash: 1032550194868071774
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2711379081338960177
+      version: 1.3.1
 requirements: []
 rubyforge_project: cf
 rubygems_version: 1.8.25