cf 5.0.0.rc3 → 5.0.0.rc4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWNjYmY2YzgzNDMyM2FmZDIyMmI2NDk4YzcxZWI1NmNmNTZmMzY0ZQ==
+  data.tar.gz: !binary |-
+    ZTlmOWVjYmJlMDdmNzQwZTk2ZGNjYWYxZTQ2MTZkZDNmYzg1NTdiYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWVhNmNiZmM4M2FiMzcxYmQ3NGY1ZDRmMzQ3MWRiYTQ5YmJhOWJmMTZjNTRi
+    ZDA3ZTI3NDZmM2YwYmE4NWQ1Y2ExZWYwMGEwMmJiMWM5Y2MwNTNmMzAwNTRl
+    YjQ0NjEyZjIzZDVhOGQ5MjkxNmM3ZWM3M2Y5MGYyYmVkNGE1MGM=
+  data.tar.gz: !binary |-
+    MGIxOTIyNjBjN2EyOTk3NzkwMmZjNzI3ZGEyNWUwMzkzYmQzYzdkOTJlZTEy
+    NTE0ZTA2ZWExZTE5OTM4YmU1NjhhOTIyMDFlNjM1NWM4NjZmODBmMDM4MjQ4
+    OGE3NDk1YjViOGY4M2NkY2Q4NTdmMjVmMWQ5MGQ3NGUxNmE5ZTk=

data/bin/cf

@@ -9,7 +9,7 @@ require "cf/plugin"
 $stdout.sync = true
 
 CF::Plugin.load_all
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("1.9.3")
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("1.9.3")
   warn "ERROR: \033[31mRuby version #{RUBY_VERSION} is not supported.\033[0m Please install 1.9.3 or later. (See http://docs.cloudfoundry.com/docs/common/install_ruby.html for more information)"
   exit 1
 end

data/lib/admin/service_broker/add.rb

@@ -9,11 +9,11 @@ module CFAdmin::ServiceBroker
     desc "Add a Service Broker."
     group :admin
     input :name, :argument => :optional,
-      :desc => "broker name"
+      :desc => "Broker name"
     input :url,
-      :desc => "broker url"
+      :desc => "Broker URL"
     input :token,
-      :desc => "broker token"
+      :desc => "Broker token"
 
     def add_service_broker
       broker = client.service_broker
@@ -32,15 +32,15 @@ module CFAdmin::ServiceBroker
 
     private
     def ask_name
-      ask("name")
+      ask("Name")
     end
 
     def ask_url
-      ask("url")
+      ask("URL")
     end
 
     def ask_token
-      ask("token")
+      ask("Token")
     end
   end
 end

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

@@ -9,13 +9,17 @@ module CF::Organization
           :alias => "-t", :default => true
     input :add_self, :desc => "Add yourself to the organization",
           :default => true
+    input :find_if_exists, :desc => "Use an existing organization if one already exists with the given name", :default => false
     def create_org
       org = client.organization
       org.name = input[:name]
       org.users = [client.current_user] if input[:add_self]
 
-      with_progress("Creating organization #{c(org.name, :name)}") do
-        org.create!
+      begin
+        with_progress("Creating organization #{c(org.name, :name)}") { org.create! }
+      rescue CFoundry::OrganizationNameTaken
+        raise unless input[:find_if_exists]
+        org = client.organization_by_name(input[:name])
       end
 
       if input[:target]

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

@@ -11,7 +11,7 @@ module CF
 
       def populate_and_save!
         obj = get_object
-        info[type] = obj.guid
+        info[type] = obj.guid unless obj.nil?
         save_target_info(info)
         invalidate_client
 
@@ -48,9 +48,7 @@ module CF
         object_choices = choices
 
         if object_choices.empty?
-          raise CF::UserFriendlyError.new(
-            "There are no #{type}s. You may want to create one with #{c("create-#{type == :organization ? "org" : type}", :good)}."
-          )
+          with_progress("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)

data/lib/cf/cli/space/create.rb

@@ -15,13 +15,19 @@ module CF
       input :manager, :desc => "Add yourself as manager", :default => true
       input :developer, :desc => "Add yourself as developer", :default => true
       input :auditor, :desc => "Add yourself as auditor", :default => false
-
+      input :find_if_exists, :desc => "Use an existing space if one already exists with the given name", :default => false
       def create_space
         space = client.space
         space.organization = org
         space.name = input[:name]
 
-        with_progress("Creating space #{c(space.name, :name)}") { space.create! }
+        begin
+          with_progress("Creating space #{c(space.name, :name)}") { space.create! }
+        rescue CFoundry::SpaceNameTaken
+          raise unless input[:find_if_exists]
+          space = client.space_by_name(input[:name])
+          already_exists = true
+        end
 
         if input[:manager]
           with_progress("Adding you as a manager") { space.add_manager client.current_user }
@@ -36,11 +42,17 @@ module CF
         end
 
         if input[:target]
-          invoke :target, :organization => space.organization, :space => space
+          invoke :target, :organization => org, :space => space
         else
-          line c("Space created!", :good)
-          line
-          line "#{b("cf switch-space #{space.name}")}    # targets new space"
+          if already_exists
+            line c("Space already exists!", :good)
+            line
+            line "#{b("cf switch-space #{space.name}")}    # targets existing space"
+          else    
+            line c("Space created!", :good)
+            line
+            line "#{b("cf switch-space #{space.name}")}    # targets new space"
+          end
         end
       end
 

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.0.0.rc3".freeze
+  VERSION = "5.0.0.rc4".freeze
 end

data/lib/tasks/gem_release.rake

@@ -10,7 +10,7 @@ namespace :gem do
     sh! "git add lib/cf/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"
-    generate_release_notes(old_version)
+    #generate_release_notes(old_version)
     sh!("git commit -m 'Bumping to version #{gem_version}.'")
     sh!("git push")
     sh!("gem release --tag")

data/spec/admin/service_broker/add_spec.rb

@@ -29,8 +29,8 @@ describe CFAdmin::ServiceBroker::Add do
   it "creates a service broker when only the name is provided" do
     service_broker.stub(:create!)
 
-    stub_ask("url").and_return("http://example.com")
-    stub_ask("token").and_return("token")
+    stub_ask("URL").and_return("http://example.com")
+    stub_ask("Token").and_return("token")
 
     cf %W[add-service-broker cf-mysql]
 
@@ -44,9 +44,9 @@ describe CFAdmin::ServiceBroker::Add do
   it "creates a service broker when no arguments are provided" do
     service_broker.stub(:create!)
 
-    stub_ask("name").and_return("cf-mysql")
-    stub_ask("url").and_return("http://example.com")
-    stub_ask("token").and_return("token")
+    stub_ask("Name").and_return("cf-mysql")
+    stub_ask("URL").and_return("http://example.com")
+    stub_ask("Token").and_return("token")
 
     cf %W[add-service-broker]
 

data/spec/cf/cli/organization/create_spec.rb

@@ -0,0 +1,121 @@
+require "spec_helper"
+
+module CF
+  module Organization
+    describe Create do
+      let(:client) { build(:client) }
+      before { stub_client_and_precondition }
+
+      describe "metadata" do
+        subject(:command) { Mothership.commands[:create_org] }
+
+        its(:description) { should == "Create an organization" }
+        it { expect(Mothership::Help.group(:organizations)).to include(command) }
+        its(:arguments) { should == [{type: :optional, value: nil, name: :name}] }
+
+        include_examples "inputs must have descriptions"
+      end
+
+      describe "running the command" do
+        let(:new_org) { build(:organization) }
+        let(:current_user) { build(:user) }
+
+        before do
+          client.stub(organization: new_org)
+          client.stub(current_user: current_user)
+
+          @command_args = ["create-org", new_org.name]
+        end
+
+        context "when the organization already exists" do
+          let(:existing_org) { build(:organization, name: new_org.name) }
+
+          before do
+            new_org.stub(:create!).and_raise(CFoundry::OrganizationNameTaken)
+          end
+
+          context "when --find-if-exists is given" do
+            before { @command_args << "--find-if-exists" }
+            before { client.stub(:organization_by_name).with(new_org.name).and_return(existing_org) }
+
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the existing organization" do
+                mock_invoke :target, organization: existing_org
+                cf @command_args
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "does not actively switch to the existing organization" do
+                dont_allow_invoke :target
+                cf @command_args
+              end
+            end
+          end
+
+          context "when --find-if-exists is NOT given" do
+            before { @command_args << "--target" }
+
+            context "when --target is given" do
+              it "raises an exception" do
+                expect { cf @command_args }.to raise_error(CFoundry::OrganizationNameTaken)
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "raises an exception" do
+                expect { cf @command_args }.to raise_error(CFoundry::OrganizationNameTaken)
+              end
+            end
+          end
+        end
+
+        context "when the organization DOES NOT already exist" do
+          before do
+            new_org.stub(:create!)
+          end
+
+          context "when --find-if-exists is given" do
+            before { @command_args << "--find-if-exists" }
+
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the new organization" do
+                mock_invoke :target, organization: new_org
+                cf @command_args
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "does not actively switch to the existing organization" do
+                dont_allow_invoke :target
+                cf @command_args
+              end
+            end
+          end
+
+          context "when --find-if-exists is NOT given" do
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the new organization" do
+                mock_invoke :target, organization: new_org
+                cf @command_args
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "does not actively switch to the existing organization" do
+                dont_allow_invoke :target
+                cf @command_args
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -155,8 +155,9 @@ module CF
                 write_token_file({})
               end
 
-              it "tells the user to create one by raising a UserFriendlyError" do
-                expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, "There are no organizations. You may want to create one with create-org.")
+              it "warns the user they should create one" do
+                execute_populate_and_save
+                expect(output).to say("There are no organizations. You may want to create one with create-org.")
               end
             end
 

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

@@ -143,8 +143,9 @@ module CF
                 organization.stub(:spaces).and_return([])
               end
 
-              it "tells the user to create one by raising a UserFriendlyError" do
-                expect { execute_populate_and_save }.to raise_error(CF::UserFriendlyError, /There are no spaces/)
+              it "warns the user they should create one" do
+                execute_populate_and_save
+                expect(output).to say("There are no spaces. You may want to create one with create-space.")
               end
             end
           end

data/spec/cf/cli/space/create_spec.rb

@@ -21,8 +21,8 @@ module CF
           subject { command.arguments }
           it "has the correct argument order" do
             should eq([
-              {:type => :optional, :value => nil, :name => :name},
-              {:type => :optional, :value => nil, :name => :organization}
+              {type: :optional, value: nil, name: :name},
+              {type: :optional, value: nil, name: :organization}
             ])
           end
         end
@@ -30,33 +30,112 @@ module CF
 
       describe "running the command" do
         let(:new_space) { build(:space) }
-        let(:organization) { build(:organization, :spaces => [new_space]) }
 
         before do
-          client.stub(:space).and_return(new_space)
-          new_space.stub(:create!)
-          new_space.stub(:add_manager)
-          new_space.stub(:add_developer)
-          new_space.stub(:add_auditor)
-          CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
-          CF::Populators::Organization.any_instance.stub(:choices).and_return([organization])
+          client.stub(space: new_space)
+          CF::Populators::Organization.any_instance.stub(populate_and_save!: organization)
+
+          @command_args = ["create-space", new_space.name]
         end
 
-        context "when --target is given" do
-          subject { cf %W[create-space #{new_space.name} --target] }
+        context "when the space already exists" do
+          let(:existing_space) { build(:space, name: new_space.name) }
+          let(:organization) { build(:organization, spaces: [existing_space]) }
+          let(:current_user) { build(:user) }
+
+          before do
+            client.stub(current_user: current_user)
+            new_space.stub(:create!).and_raise(CFoundry::SpaceNameTaken)
+          end
+          
+          context "when --find-if-exists is given" do
+            before do
+              @command_args << "--find-if-exists"
+              client.stub(:space_by_name).with(new_space.name).and_return(existing_space)
+              existing_space.stub(:add_manager).with(current_user)
+              existing_space.stub(:add_developer).with(current_user)
+            end
+
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the existing space" do
+                mock_invoke :target, organization: organization, space: existing_space
+                cf @command_args
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "tells the user how they can switch to the existing space" do
+                cf @command_args
+                expect(output).to say("Space already exists!\n\ncf switch-space #{existing_space.name}    # targets existing space")
+              end
+            end
+          end
+
+          context "when --find-if-exists is NOT given" do
+            before { @command_args << "--target" }
 
-          it "switches them to the new space" do
-            mock_invoke :target, :organization => organization, :space => new_space
-            subject
+            context "when --target is given" do
+              it "raises an exception" do
+                expect { cf @command_args }.to raise_error(CFoundry::SpaceNameTaken)
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "raises an exception" do
+                expect { cf @command_args }.to raise_error(CFoundry::SpaceNameTaken)
+              end
+            end
           end
         end
 
-        context "when --target is NOT given" do
-          subject { cf %W[create-space #{new_space.name}] }
+        context "when the space DOES NOT already exist" do
+          let(:organization) { build(:organization, spaces: []) }
+
+          before do
+            new_space.stub(:create!)
+            new_space.stub(:add_manager)
+            new_space.stub(:add_developer)
+            new_space.stub(:add_auditor)
+          end          
+          
+          context "when --find-if-exists is given" do
+            before { @command_args << "--find-if-exists" }
+
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the new space" do
+                mock_invoke :target, organization: organization, space: new_space
+                cf @command_args
+              end
+            end
+
+            context "when --target is NOT given" do
+              it "tells the user how they can switch to the new space" do
+                cf @command_args
+                expect(output).to say("Space created!\n\ncf switch-space #{new_space.name}    # targets new space")
+              end
+            end
+          end
+
+          context "when --find-if-exists is NOT given" do
+            context "when --target is given" do
+              before { @command_args << "--target" }
+
+              it "switches them to the new space" do
+                mock_invoke :target, organization: organization, space: new_space
+                cf @command_args
+              end
+            end
 
-          it "tells the user how they can switch to the new space" do
-            subject
-            expect(output).to say("Space created!\n\ncf switch-space #{new_space.name}    # targets new space")
+            context "when --target is NOT given" do
+              it "tells the user how they can switch to the new space" do
+                cf @command_args
+                expect(output).to say("Space created!\n\ncf switch-space #{new_space.name}    # targets new space")
+              end
+            end
           end
         end
       end

data/spec/features/org_spec.rb

@@ -1,14 +1,9 @@
 require "spec_helper"
 
 if ENV["CF_V2_RUN_INTEGRATION"]
-  describe "creating and deleting orgs", :ruby19 => true do
-    before(:all) do
-      WebMock.allow_net_connect!
-    end
-
-    after(:all) do
-      WebMock.disable_net_connect!
-    end
+  describe "creating and deleting orgs", ruby19: true do
+    before(:all) { WebMock.allow_net_connect! }
+    after(:all) { WebMock.disable_net_connect! }
 
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     let(:new_org_name) { "new-org-#{run_id}" }
@@ -25,27 +20,31 @@ if ENV["CF_V2_RUN_INTEGRATION"]
 
     it "can create and recursively delete an org" do
       BlueShell::Runner.run("#{cf_bin} create-org #{new_org_name}") do |runner|
-        runner.should say "Creating organization #{new_org_name}... OK"
-        runner.should say "Switching to organization #{new_org_name}... OK"
-        runner.should say "There are no spaces. You may want to create one with create-space."
+        expect(runner).to say "Creating organization #{new_org_name}... OK"
+        expect(runner).to say "Switching to organization #{new_org_name}... OK"
+        expect(runner).to say "There are no spaces. You may want to create one with create-space."
       end
 
       BlueShell::Runner.run("#{cf_bin} create-space new-space") do |runner|
-        runner.should say "Creating space new-space... OK"
+        expect(runner).to say "Creating space new-space... OK"
       end
 
-      # pending until cc change 442f08e72c0808baf85b948a8b56e58f025edf72 is on a1
-      #BlueShell::Runner.run("cf delete-org #{new_org_name} --force") do |runner|
-      #  runner.should say "If you want to delete the organization along with all dependent objects, rerun the command with the '--recursive' flag."
-      #end
+      # TODO: pending until cc change 442f08e72c0808baf85b948a8b56e58f025edf72 is on a1
+      #
+      # BlueShell::Runner.run("cf delete-org #{new_org_name} --force") do |runner|
+      #   expect(runner).to say "If you want to delete the organization along with" +
+      #     " all dependent objects, rerun the command with the '--recursive' flag."
+      # end
 
       BlueShell::Runner.run("#{cf_bin} delete-org #{new_org_name} --force --recursive") do |runner|
-        runner.should say("Deleting organization #{new_org_name}... OK")
+        expect(runner).to say "Deleting organization #{new_org_name}... OK", 15
       end
 
       BlueShell::Runner.run("#{cf_bin} orgs") do |runner|
-        runner.should_not say("#{new_org_name}")
+        expect(runner).to_not say new_org_name
       end
     end
   end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
 end

data/spec/features/push_flow_spec.rb

@@ -103,7 +103,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
           runner.send_keys "uri"
 
           expect(runner).to say "uri>"
-          runner.send_keys "mysql://u:p@example.com:port/db"
+          runner.send_keys "mysql://u:p@example.com:3306/db"
 
           expect(runner).to say /Creating service #{user_provided_name}.*OK/
           expect(runner).to say /Binding .+ to .+ OK/

data/spec/features/switching_targets_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 if ENV['CF_V2_RUN_INTEGRATION']
-  describe 'A new user tries to use CF against v2 production', :ruby19 => true do
+  describe 'A new user tries to use CF against v2 production', ruby19: true do
 
     let(:target) { ENV['CF_V2_TEST_TARGET'] }
     let(:space) { ENV['CF_V2_TEST_SPACE'] }
@@ -14,6 +14,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
     before do
       Interact::Progress::Dots.start!
     end
+
     after do
       logout
       Interact::Progress::Dots.stop!
@@ -37,23 +38,23 @@ if ENV['CF_V2_RUN_INTEGRATION']
         login
 
         BlueShell::Runner.run("#{cf_bin} target -o #{organization_2}") do |runner|
-          expect(runner).to say("Switching to organization #{organization_2}")
-          expect(runner).to say("Space>")
+          expect(runner).to say "Switching to organization #{organization_2}"
+          expect(runner).to say "Space>"
           runner.send_keys space_2
 
           expect(runner).to say(/Switching to space #{space_2}/)
 
-          runner.wait_for_exit
+          runner.wait_for_exit 15
         end
 
         BlueShell::Runner.run("#{cf_bin} target -s #{space}") do |runner|
           expect(runner).to say("Switching to space #{space}")
-          runner.wait_for_exit(15)
+          runner.wait_for_exit 15
         end
 
         BlueShell::Runner.run("#{cf_bin} target -s #{space_2}") do |runner|
           expect(runner).to say("Switching to space #{space_2}")
-          runner.wait_for_exit(15)
+          runner.wait_for_exit 15
         end
       end
     end

data/spec/support/features_helper.rb

@@ -24,7 +24,7 @@ module FeaturesHelper
   def set_target
     target = ENV['CF_V2_TEST_TARGET']
     BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
-      runner.wait_for_exit(20)
+      runner.wait_for_exit 20
     end
   end
 
@@ -80,8 +80,8 @@ module FeaturesHelper
         expect(runner).to say "Domain>"
         runner.send_keys "1"
 
-        expect(runner).to say(/Creating route #{deployed_app_name}\..*\.\.\. OK/)
-        expect(runner).to say(/Binding #{deployed_app_name}\..* to #{deployed_app_name}\.\.\. OK/)
+        expect(runner).to say /Creating route #{deployed_app_name}\..*\.\.\. OK/
+        expect(runner).to say /Binding #{deployed_app_name}\..* to #{deployed_app_name}\.\.\. OK/
 
         expect(runner).to say "Create services for application?> n"
         runner.send_return

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc3
-  prerelease: 6
+  version: 5.0.0.rc4
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,23 +42,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -106,7 +94,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -117,7 +104,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,7 +111,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,7 +118,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -141,7 +125,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -149,7 +132,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,7 +139,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -165,7 +146,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -173,7 +153,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,7 +160,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -189,7 +167,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -197,7 +174,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -205,7 +181,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -213,7 +188,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -221,7 +195,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -229,7 +202,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -237,7 +209,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -245,7 +216,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -253,7 +223,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -261,7 +230,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -269,7 +237,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -277,7 +244,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -285,7 +251,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -293,7 +258,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -301,7 +265,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -309,7 +272,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -317,7 +279,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -325,7 +286,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -333,7 +293,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -341,7 +300,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -349,7 +307,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -357,7 +314,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -365,7 +321,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -373,7 +328,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: anchorman
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -381,7 +335,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -590,6 +543,7 @@ files:
 - spec/cf/cli/domain/map_spec.rb
 - spec/cf/cli/domain/unmap_spec.rb
 - spec/cf/cli/help_spec.rb
+- spec/cf/cli/organization/create_spec.rb
 - spec/cf/cli/organization/delete_spec.rb
 - spec/cf/cli/organization/help_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb
@@ -677,30 +631,26 @@ files:
 homepage: http://github.com/cloudfoundry/cf
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4338688848602713526
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
@@ -780,6 +730,7 @@ test_files:
 - spec/cf/cli/domain/map_spec.rb
 - spec/cf/cli/domain/unmap_spec.rb
 - spec/cf/cli/help_spec.rb
+- spec/cf/cli/organization/create_spec.rb
 - spec/cf/cli/organization/delete_spec.rb
 - spec/cf/cli/organization/help_spec.rb
 - spec/cf/cli/organization/orgs_spec.rb