cf 5.2.0 → 5.2.1.rc2

data/Rakefile

@@ -6,6 +6,12 @@ specfile, _ = Dir["*.gemspec"]
 SPEC = Gem::Specification.load(specfile)
 CURRENT_VERSION = SPEC.version.to_s.freeze
 
+namespace :spec do
+  RSpec::Core::RakeTask.new(:ci) do |t|
+    t.rspec_opts = '-t ~type:integration'
+  end
+end
+
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 

data/lib/admin/plugin.rb

@@ -3,4 +3,5 @@ require "admin/guid"
 require "admin/set_quota"
 require "admin/service_auth_token"
 require "admin/service_broker/add"
+require "admin/service_broker/remove"
 require "admin/service_broker/service_brokers"

data/lib/admin/service_broker/add.rb

@@ -6,7 +6,7 @@ module CFAdmin::ServiceBroker
       check_target
     end
 
-    desc "Add a Service Broker."
+    desc "Add a service broker"
     group :admin
     input :name, :argument => :optional,
       :desc => "Broker name"
@@ -25,7 +25,7 @@ module CFAdmin::ServiceBroker
       broker.token = input[:token]
       finalize
 
-      with_progress("") do
+      with_progress("Adding service broker #{broker.name}") do
         broker.create!
       end
     end

data/lib/admin/service_broker/remove.rb

@@ -0,0 +1,33 @@
+require "cf/cli"
+
+module CFAdmin::ServiceBroker
+  class Remove < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Remove a service broker"
+    group :admin
+    input :name, :argument => :required,
+      :desc => "Service broker to remove",
+      :from_given => by_name(:service_broker)
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+      :default => proc { force? || interact }
+
+    def remove_service_broker
+      broker = input[:name]
+      return unless input[:really, broker]
+
+      with_progress("Removing service broker #{broker.name}") do
+        broker.delete!
+      end
+    end
+
+    private
+
+    def ask_really(broker)
+      ask("Really remove #{c(broker.name, :name)}?", :default => false)
+    end
+
+  end
+end

data/lib/admin/service_broker/service_brokers.rb

@@ -6,13 +6,19 @@ module CFAdmin::ServiceBroker
       check_target
     end
 
-    desc "List Registered Service Brokers."
+    desc "List registered service brokers"
     group :admin
 
     def service_brokers
-      brokers = client.service_brokers
+      brokers = nil
+      with_progress('Getting service brokers') do
+        brokers = client.service_brokers
+      end
+
+      line unless quiet?
+
       table(
-        %w(name url),
+        %w(Name URL),
         brokers.collect { |broker|
           [c(broker.name, :name), broker.broker_url]
         }

data/lib/cf.rb

@@ -1,7 +1,5 @@
 require "cf/version"
 
-require "cf/object_extensions"
-
 require "cf/cli"
 
 command_files = "../cf/cli/{app,route,domain,organization,space,service,start,user}/*.rb"

data/lib/cf/cli/app/push/interactions.rb

@@ -5,8 +5,12 @@ module CF::App
     end
 
     def ask_host(name)
-      ask "Subdomain", :choices => [name, "none"],
-        :default => name,
+      # Use .dup here because when we pass app.name deep into interactive,
+      # it needs an unfrozen String because the cli allows people to change
+      # this value.
+      host = name.dup
+      ask "Subdomain", :choices => [host, "none"],
+        :default => host,
         :allow_other => true
     end
 

data/lib/cf/cli/interactive.rb

@@ -56,7 +56,6 @@ module CF
 
     def handler(event, state)
       ans = state.answer
-      pos = state.position
 
       exit if event == :eof
 
@@ -69,7 +68,7 @@ module CF
           redraw_input(state)
         end
 
-        state.clear_default! if(event != :up)
+        state.clear_default! if event != :up
 
         # tab with a default accepts it and moves to the end
         if event == :tab

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

@@ -18,13 +18,12 @@ module CF::Organization
       return unless input[:really, org]
 
       is_current = org == client.current_organization
-      @orgs ||= client.organizations(:depth => 0)
       with_progress("Deleting organization #{c(org.name, :name)}") do
-        deleted = org.delete!(:recursive => !!input[:recursive])
-        @orgs.delete(org) if deleted
+        org.delete!(:recursive => !!input[:recursive])
       end
 
-      if @orgs.empty?
+      orgs = client.organizations_first_page(:depth => 0)
+      if orgs.empty?
         return unless input[:warn]
 
         line

data/lib/cf/cli/start/target_prettifier.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext"
+
 class TargetPrettifier
   def self.prettify(client, outputter)
     outputter.line("Target Information (where will apps be pushed):")

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.2.0".freeze
+  VERSION = "5.2.1.rc2".freeze
 end

data/lib/tasks/gem_release.rake

@@ -17,12 +17,12 @@ namespace :gem do
   end
 
   private
-  def generate_release_notes(old_version)
-    print_with_purpose "Generating release notes..."
-    file_name = "release_#{gem_version}"
-    sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
-    sh!("git add release_notes")
-  end
+  #def generate_release_notes(old_version)
+  #  print_with_purpose "Generating release notes..."
+  #  file_name = "release_#{gem_version}"
+  #  sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
+  #  sh!("git add release_notes")
+  #end
 
   def sh!(cmd)
     `#{cmd}`

data/spec/admin/service_broker/remove_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe CFAdmin::ServiceBroker::Remove do
+
+  describe 'command metadata' do
+    let(:command) { Mothership.commands[:remove_service_broker] }
+    subject { command }
+    its(:description) { should eq 'Remove a service broker' }
+    it { expect(Mothership::Help.group(:admin)).to include(subject) }
+
+    include_examples 'inputs must have descriptions'
+  end
+
+  describe 'running the command' do
+    let(:client) { build(:client) }
+    before do
+      CFAdmin::ServiceBroker::Remove.client = client
+    end
+
+    describe 'successful behavior' do
+      let(:service_broker) { build(:service_broker, :name => 'somebroker') }
+      before do
+        client.stub(:service_broker_by_name).with('somebroker').and_return(service_broker)
+        service_broker.should_receive(:delete!)
+      end
+
+      it 'removes the service broker' do
+        should_ask('Really remove somebroker?', {:default => false}) { true }
+
+        capture_output { cf %W[remove-service-broker somebroker] }
+        expect(output).to say("Removing service broker #{service_broker.name}... OK")
+      end
+    end
+
+    describe 'error conditions' do
+      context 'when the service broker does not exist' do
+        it 'provides a helpful error message' do
+          client.stub(:service_broker_by_name).with('doesnotexist').and_return(nil)
+
+          capture_output { cf %W[remove-service-broker doesnotexist] }
+          expect(error_output).to say("Unknown service_broker 'doesnotexist'.")
+        end
+      end
+    end
+  end
+end

data/spec/admin/service_broker/service_brokers_spec.rb

@@ -15,8 +15,9 @@ describe CFAdmin::ServiceBroker::ServiceBrokers do
     let(:brokers_data) { [] }
     it "says there are no brokers" do
       client.should_receive(:service_brokers).and_return(brokers_data)
+      mock_with_progress("Getting service brokers")
       cf %W[service-brokers]
-      expect(stdout.string).to eq("name   url\n")
+      expect(stdout.string).to eq("\nName   URL\n")
     end
   end
 
@@ -25,8 +26,9 @@ describe CFAdmin::ServiceBroker::ServiceBrokers do
 
     it "lists the brokers" do
       client.should_receive(:service_brokers).and_return(brokers_data)
+      mock_with_progress("Getting service brokers")
       cf %W[service-brokers]
-      expect(stdout.string).to match(/mysql.*mysql.example.com/)
+      expect(stdout.string).to match(/\nName.*URL.*\nmysql.*mysql.example.com/)
     end
   end
 end

data/spec/cf/cli/app/push/create_spec.rb

@@ -192,7 +192,7 @@ module CF
       end
 
       describe "#map_url" do
-        let(:app) { double(:app, :space => space).as_null_object }
+        let(:app) { double(:app, :space => space, name: "app-name").as_null_object }
         let(:space) { double(:space, :domains => domains) }
         let(:domains) { [double(:domain, :name => "foo.com")] }
         let(:hosts) { [app.name] }

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

@@ -29,6 +29,7 @@ module CF
           CF::Populators::Organization.any_instance.stub(:populate_and_save!).and_return(organization)
           organization.stub(:delete!).and_return(true)
           client.stub(:organizations).and_return(organizations)
+          client.stub(:organizations_first_page).and_return(organizations)
         end
 
         context "without the force parameter" do
@@ -43,6 +44,10 @@ module CF
         end
 
         context "when deleting the last organization" do
+          before do
+            client.stub(:organizations_first_page).and_return([])
+          end
+
           it "warns the user what they've done" do
             subject
             expect(output).to say("There are no longer any organizations.")

data/spec/factories/cfoundry/v2/service_brokers_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :service_broker, :class => CFoundry::V2::ServiceBroker do
+    sequence(:guid) { |n| "service-broker-guid-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/features/backspace_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV['CF_V2_RUN_INTEGRATION']
+  describe "A user pushing a new sinatra app", :ruby19 => true do
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+
+    before do
+      FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
+      login
+    end
+
+    after do
+      `#{cf_bin} delete #{app} -f --routes --no-script`
+    end
+
+    it "attempts to use the backspace key" do
+      Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        FileUtils.rm("manifest.yml", force: true)
+        BlueShell::Runner.run("#{cf_bin} push #{app}") do |runner|
+          expect(runner).to say "Instances> 1"
+          runner.send_return
+
+          expect(runner).to say "Memory Limit>"
+          runner.send_keys "128M"
+
+          expect(runner).to say "Creating #{app}... OK"
+
+          expect(runner).to say "Subdomain> #{app}"
+          app.length.times { runner.send_right_arrow }
+          runner.send_backspace
+          runner.send_return
+
+          expect(runner).to say "Domain>"
+          runner.send_return
+
+          expect(runner).to say /Binding #{app[0..-2]}\..* to #{app}.*OK/, 1
+        end
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide environment variables'
+end
+

data/spec/features/create_user_spec.rb

@@ -23,7 +23,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       client
     end
 
-    let(:new_user) { Faker::Internet.email }
+    let(:new_user) { Faker::Internet.disposable_email("cf-test-user-#{Time.now.to_i}") }
 
     before do
       Interact::Progress::Dots.start!
@@ -66,11 +66,6 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       BlueShell::Runner.run("#{cf_bin} login #{new_user} --password #{password}") do |runner|
         expect(runner).to say "Authenticating... OK"
-
-        expect(runner).to say "Space>"
-        runner.send_keys "1"
-
-        expect(runner).to say /Switching to space.*OK/
       end
     end
   end

data/spec/features/manifests_spec.rb

@@ -35,7 +35,7 @@ applications:
   memory: 256M
   instances: 1
   host: #{subdomain}
-  domain: a1-app.cf-app.com
+  domain: cfapps.io
   path: .
   services:
     #{user_provided_name}:
@@ -63,7 +63,7 @@ applications:
             expect(runner).to say "Preparing to start #{app}... OK", 180
             expect(runner).to say "Checking status of app '#{app}'...", 180
             expect(runner).to say "1 of 1 instances running"
-            expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.a1-app.cf-app.com", 30
+            expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.cfapps.io", 30
           end
         end
 

data/spec/features/org_spec.rb

@@ -40,8 +40,8 @@ if ENV["CF_V2_RUN_INTEGRATION"]
         expect(runner).to say "Deleting organization #{new_org_name}... OK", 15
       end
 
-      BlueShell::Runner.run("#{cf_bin} orgs") do |runner|
-        expect(runner).to_not say new_org_name
+      BlueShell::Runner.run("#{cf_bin} target -o #{new_org_name}") do |runner|
+        expect(runner).to say "Unknown organization '#{new_org_name}'."
       end
     end
   end

data/spec/features/push_flow_spec.rb

@@ -122,7 +122,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
           expect(runner).to say "Preparing to start #{app}... OK", 180
           expect(runner).to say "Checking status of app '#{app}'...", 180
           expect(runner).to say "1 of 1 instances running"
-          expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.a1-app.cf-app.com", 30
+          expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.cfapps.io", 30
         end
       end
 

data/spec/features/services_spec.rb

@@ -99,6 +99,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       after do
         delete_app(app_name)
+        delete_service(service_name)
       end
     end
 

data/spec/integration/service_broker_spec.rb

@@ -1,10 +1,13 @@
 require "spec_helper"
 
-describe "Service Broker Management", components: [:nats, :uaa, :ccng] do
+describe "Service Broker Management", components: [:nats, :uaa, :ccng, :fake_service_broker] do
   let(:username) { 'admin' }
   let(:password) { 'the_admin_pw' }
   let(:target) { 'http://127.0.0.1:8181' }
 
+  let(:broker_url) { 'http://127.0.0.1:54329' }
+  let(:broker_token) { 'opensesame' }
+
   before do
     create_user_in_ccng
     logout
@@ -24,21 +27,33 @@ describe "Service Broker Management", components: [:nats, :uaa, :ccng] do
   end
 
   it "allows an admin user to add a service broker" do
-    BlueShell::Runner.run("#{cf_bin} add-service-broker --name cf-mysql --url http://cf-mysql.cfapp.io --token cfmysqlsecret") do |runner|
-      expect(runner).to say "... OK"
+    BlueShell::Runner.run("#{cf_bin} add-service-broker --name my-custom-service --url #{broker_url} --token #{broker_token}") do |runner|
+      expect(runner).to say "Adding service broker my-custom-service... OK"
     end
   end
 
-  context "with some service brokers already registered" do
+  context "with a service broker already registered" do
     before do
-      BlueShell::Runner.run("#{cf_bin} add-service-broker --name cf-mysql --url http://cf-mysql.cfapp.io --token cfmysqlsecret") do |runner|
-        expect(runner).to say "... OK"
+      BlueShell::Runner.run("#{cf_bin} add-service-broker --name my-custom-service --url #{broker_url} --token #{broker_token}") do |runner|
+        expect(runner).to say "Adding service broker my-custom-service... OK"
       end
     end
 
     it "allows an admin user to list service brokers" do
       BlueShell::Runner.run("#{cf_bin} service-brokers") do |runner|
-        expect(runner).to say /cf-mysql.*cf-mysql.cfapp.io/
+        expect(runner).to say /my-custom-service.*#{broker_url}/
+      end
+    end
+
+    it "allows an admin user to remove a service broker" do
+      BlueShell::Runner.run("#{cf_bin} remove-service-broker my-custom-service") do |runner|
+        expect(runner).to say "Really remove my-custom-service?> n"
+        runner.send_keys("y")
+        expect(runner).to say "Removing service broker my-custom-service... OK"
+      end
+
+      BlueShell::Runner.run("#{cf_bin} service-brokers") do |runner|
+        expect(runner).to_not say /my-custom-service/
       end
     end
   end

data/spec/support/features_helper.rb

@@ -3,10 +3,10 @@ module FeaturesHelper
     set_target
     logout
 
-    space = ENV['CF_V2_TEST_SPACE']
-    organization = ENV['CF_V2_TEST_ORGANIZATION']
     username = ENV['CF_V2_TEST_USER']
     password = ENV['CF_V2_TEST_PASSWORD']
+    organization = ENV['CF_V2_TEST_ORGANIZATION']
+    space = ENV['CF_V2_TEST_SPACE']
 
     cmd = "#{cf_bin} login #{username} --password #{password} -o #{organization}"
     cmd += " -s #{space}"

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1.rc2
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,11 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: caldecott-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,20 +63,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.5.rc1
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +103,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mothership
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,6 +122,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +133,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +141,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +149,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +157,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +165,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +173,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,20 +181,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blue-shell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +205,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +213,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,6 +221,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,6 +229,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -195,6 +237,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -202,6 +245,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,6 +253,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,6 +261,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -223,6 +269,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,6 +277,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -237,6 +285,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -244,6 +293,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -251,6 +301,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -258,6 +309,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -265,6 +317,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -272,6 +325,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -279,6 +333,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -286,6 +341,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -293,6 +349,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -300,6 +357,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -307,6 +365,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -314,6 +373,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -321,20 +381,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: anchorman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -355,6 +402,7 @@ files:
 - lib/admin/README.md
 - lib/admin/service_auth_token.rb
 - lib/admin/service_broker/add.rb
+- lib/admin/service_broker/remove.rb
 - lib/admin/service_broker/service_brokers.rb
 - lib/admin/set_quota.rb
 - lib/cf/cli/app/app.rb
@@ -432,7 +480,6 @@ files:
 - lib/cf/cli.rb
 - lib/cf/constants.rb
 - lib/cf/errors.rb
-- lib/cf/object_extensions.rb
 - lib/cf/plugin.rb
 - lib/cf/spacing.rb
 - lib/cf/spec_helper.rb
@@ -470,6 +517,7 @@ files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/service_broker/add_spec.rb
+- spec/admin/service_broker/remove_spec.rb
 - spec/admin/service_broker/service_brokers_spec.rb
 - spec/admin/set_quota_spec.rb
 - spec/assets/env/env_test.rb
@@ -594,13 +642,14 @@ files:
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_brokers_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
 - spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
-- spec/features/account_lifecycle_spec.rb
+- spec/features/backspace_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/delete_orphaned_service_spec.rb
 - spec/features/login_spec.rb
@@ -633,31 +682,33 @@ 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: cf
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.
 test_files:
 - spec/admin/curl_spec.rb
 - spec/admin/guid_spec.rb
 - spec/admin/service_broker/add_spec.rb
+- spec/admin/service_broker/remove_spec.rb
 - spec/admin/service_broker/service_brokers_spec.rb
 - spec/admin/set_quota_spec.rb
 - spec/assets/env/env_test.rb
@@ -782,13 +833,14 @@ test_files:
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
+- spec/factories/cfoundry/v2/service_brokers_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
 - spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
-- spec/features/account_lifecycle_spec.rb
+- spec/features/backspace_spec.rb
 - spec/features/create_user_spec.rb
 - spec/features/delete_orphaned_service_spec.rb
 - spec/features/login_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NmFhZTUzZjQ0MTg5MDViOTc2M2M0MDdjNDVmYWE0Mzk0N2UwODdmOQ==
-  data.tar.gz: !binary |-
-    MWQ2ODZiYTZjMTdhYTQ0YjRmMTA3ZWE4Mjc4MGE2NzVmMjQ4Mzg5Mg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWUzNWFmODc2NDc1NDNkMjRjYzA0MDUyZGVjYjBhZWI3ODNmNzJhNTVlODNl
-    OGMwOWE0ZWQ3OWRhMWM4NTM0NzhjMGY2ODE4ZTFhZjA2ZjE1OTY5YmVmMmEz
-    ZDJkYTUyN2I1OTM2ODRjYjk5MmMyZTQ5OTNkN2JhOGQ5MGM4Y2E=
-  data.tar.gz: !binary |-
-    ZWJjZDZlZGE2ZTA2ZTNmZjcwNWI0MDY1YzNmMDBiNjVlMTJiNmFjNTY4OTBl
-    YTY2OTEyNDg5MzQ1NTllNTQ0NWQ0YWQ4MDBlMjU3NzI1YzkzZGIzNGViODc2
-    M2Y3YmVhYzdmMzhkMjlkOTEyNTI3ZmE5ZjQ2N2Y2YzY3MWVhYjU=

data/lib/cf/object_extensions.rb

@@ -1,15 +0,0 @@
-class Object
-  def try(*a, &b)
-    if a.empty? && block_given?
-      yield self
-    else
-      __send__(*a, &b)
-    end
-  end
-end
-
-class NilClass
-  def try(*a, &b)
-    nil
-  end
-end

data/spec/features/account_lifecycle_spec.rb

@@ -1,70 +0,0 @@
-require "spec_helper"
-require "webmock/rspec"
-require "ffaker"
-
-if ENV['CF_V2_RUN_INTEGRATION']
-  describe 'A new user tries to use CF against v2 production', :ruby19 => true do
-    before(:all) do
-      WebMock.allow_net_connect!
-    end
-
-    after(:all) do
-      WebMock.disable_net_connect!
-    end
-
-    let(:target) { ENV['CF_V2_TEST_TARGET'] }
-    let(:username) { ENV['CF_V2_TEST_USER'] }
-    let(:password) { ENV['CF_V2_TEST_PASSWORD'] }
-
-    before do
-      Interact::Progress::Dots.start!
-      login
-    end
-
-    after do
-      logout
-      Interact::Progress::Dots.stop!
-    end
-
-    it "registers a new account and deletes it" do
-      email = Faker::Internet.email
-
-      BlueShell::Runner.run("#{cf_bin} register #{email} --password #{password}") do |runner|
-        expect(runner).to say "Confirm Password>"
-        runner.send_keys password
-        expect(runner).to say "Your password strength is: good"
-        expect(runner).to say "Creating user... OK"
-        expect(runner).to say "Authenticating... OK"
-      end
-
-      # TODO: do this when cf delete-user is implemented
-      #BlueShell::Runner.run("#{cf_bin} delete-user #{email}") do |runner|
-      #  expect(runner).to say "Really delete user #{email}?>"
-      #  runner.send_keys "y"
-      #  expect(runner).to say "Deleting #{email}... OK"
-      #end
-
-      # TODO: not this.
-      client = CFoundry::V2::Client.new("https://#{target}")
-      client.login(:username => email, :password => password)
-      user = client.current_user
-      guid = user.guid
-      client.login(:username => username, :password => password)
-      user.delete!
-
-      BlueShell::Runner.run("#{cf_bin} login #{email} --password #{password}") do |runner|
-        expect(runner).to say "Authenticating... FAILED"
-
-        expect(runner).to say "Password>"
-        runner.send_keys "another_password"
-        expect(runner).to say "Password>"
-        runner.send_keys "passwords_for_everyone!"
-        expect(runner).to say "FAILED"
-        runner.output.should_not =~ /CFoundry::/
-        runner.output.should_not =~ %r{~/\.cf/crash}
-      end
-    end
-  end
-else
-  $stderr.puts 'Skipping v2 integration specs; please provide environment variables'
-end