cf 5.2.1.rc3 → 5.2.1.rc4

data/Rakefile

@@ -6,12 +6,6 @@ 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/service_broker/add.rb

@@ -25,7 +25,7 @@ module CFAdmin::ServiceBroker
       broker.token = input[:token]
       finalize
 
-      with_progress("Adding service broker #{broker.name}") do
+      with_progress("Adding service broker #{c(broker.name, :name)}") do
         broker.create!
       end
     end

data/lib/admin/service_broker/remove.rb

@@ -18,7 +18,7 @@ module CFAdmin::ServiceBroker
       broker = input[:name]
       return unless input[:really, broker]
 
-      with_progress("Removing service broker #{broker.name}") do
+      with_progress("Removing service broker #{c(broker.name, :name)}") do
         broker.delete!
       end
     end

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

@@ -1,4 +1,4 @@
-require "active_support/core_ext"
+require 'active_support/core_ext/object/try'
 
 class TargetPrettifier
   def self.prettify(client, outputter)
@@ -15,4 +15,4 @@ class TargetPrettifier
       outputter.c('N/A', :bad)
     end
   end
-end
+end

data/lib/cf/version.rb

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

data/lib/manifests/manifests.rb

@@ -236,7 +236,6 @@ module CFManifests
 
   def warn_reset_changes
     line c("Not applying manifest changes without --reset", :warning)
-    line "See `cf diff` for more details."
     line
   end
 

data/spec/features/service_brokers_spec.rb

@@ -0,0 +1,151 @@
+require "spec_helper"
+require "sinatra"
+
+class FakeCloudController < Sinatra::Base
+  @requests = []
+
+  class << self
+    attr_accessor :requests
+
+    def last_request
+      requests.last
+    end
+
+    def reset
+      requests.clear
+    end
+  end
+
+  get '/v2/service_brokers' do
+    self.class.requests << request
+
+    broker_guid = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+    body = {
+      'total_results' => 1,
+      'total_pages' => 1,
+      'prev_url' => nil,
+      'next_url' => nil,
+      'resources' => [{
+        'metadata' => {
+          'guid' => broker_guid,
+          'url' => "http://cc.example.com/v2/service_brokers/#{broker_guid}",
+          'created_at' => Time.now,
+          'updated_at' => Time.now,
+        },
+        'entity' => {
+          'name' => 'my-custom-service',
+          'broker_url' => 'http://broker.example.com/',
+        }
+      }]
+    }.to_json
+    [200, {}, body]
+  end
+
+  post '/v2/service_brokers' do
+    self.class.requests << request
+
+    body = {
+      metadata: {
+        guid: SecureRandom.uuid
+      }
+    }.to_json
+
+    [200, {}, body]
+  end
+
+  delete '/v2/service_brokers/:guid' do
+    self.class.requests << request
+    204
+  end
+
+  get '/responsive' do
+    200
+  end
+end
+
+describe "Service Brokers" do
+  let(:broker_url) { 'http://broker.example.com/' }
+  let(:broker_token) { 'opensesame' }
+  let(:last_request) { FakeCloudController.last_request }
+
+  before do
+    thr = Thread.new do
+      Rack::Handler::WEBrick.run(FakeCloudController, :Port => 12345, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+    end
+
+    def responsive?
+      begin
+        resp = Net::HTTP.start('localhost', 12345) { |http| http.get('/responsive') }
+        resp.is_a? Net::HTTPSuccess
+      rescue Errno::ECONNREFUSED
+        false
+      end
+    end
+
+    Timeout.timeout(60) { thr.join(0.1) until responsive? }
+
+    @homedir = File.join(File.dirname(__FILE__), '..', '..', 'tmp')
+    FileUtils.mkdir_p(File.join(@homedir, '.cf'))
+
+    # cf target
+    File.open(File.join(@homedir, '.cf', 'target'), 'w') do |f|
+      f.puts 'http://127.0.0.1:12345'
+    end
+
+    # cf login
+    File.open(File.join(@homedir, '.cf', 'tokens.yml'), 'w') do |f|
+      f.puts <<-YAML
+http://127.0.0.1:8181:
+  :version: 2
+  :token: bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI0MGE0YWJlOS0yYTgxLTQyZGYtODVjNS1kNDdlMzRiOTA0YTEiLCJ1c2VyX2lkIjoiMzI5YmIzYmYtMWU3NS00MGQ3LThhMDItMjI3Y2FjY2IyZGU3Iiwic3ViIjoiMzI5YmIzYmYtMWU3NS00MGQ3LThhMDItMjI3Y2FjY2IyZGU3IiwidXNlcl9uYW1lIjoiYWRtaW4iLCJlbWFpbCI6ImFkbWluIiwic2NvcGUiOlsiY2xvdWRfY29udHJvbGxlci5hZG1pbiIsImNsb3VkX2NvbnRyb2xsZXIucmVhZCIsImNsb3VkX2NvbnRyb2xsZXIud3JpdGUiLCJvcGVuaWQiLCJwYXNzd29yZC53cml0ZSIsInNjaW0ucmVhZCIsInNjaW0ud3JpdGUiXSwiY2xpZW50X2lkIjoiY2YiLCJjaWQiOiJjZiIsImlhdCI6MTM3NjU5MzI3NiwiZXhwIjoxMzc2NjAwNDc2LCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvdWFhL29hdXRoL3Rva2VuIiwiYXVkIjpbInNjaW0iLCJvcGVuaWQiLCJjbG91ZF9jb250cm9sbGVyIiwicGFzc3dvcmQiXX0.VSPhFetKLDvZal8bOK38uTBbkrDD2_IdSjHqluk1WIY
+  :refresh_token: eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI1MzA3ZGJmNC1iMTE1LTQ0MzgtOWRkNi00ZGVlMDVkZjgwN2IiLCJzdWIiOiIzMjliYjNiZi0xZTc1LTQwZDctOGEwMi0yMjdjYWNjYjJkZTciLCJ1c2VyX25hbWUiOiJhZG1pbiIsInNjb3BlIjpbImNsb3VkX2NvbnRyb2xsZXIuYWRtaW4iLCJjbG91ZF9jb250cm9sbGVyLnJlYWQiLCJjbG91ZF9jb250cm9sbGVyLndyaXRlIiwib3BlbmlkIiwicGFzc3dvcmQud3JpdGUiLCJzY2ltLnJlYWQiLCJzY2ltLndyaXRlIl0sImlhdCI6MTM3NjU5MzI3NiwiZXhwIjoxMzc3ODAyODc2LCJjaWQiOiJjZiIsImlzcyI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODA4MC91YWEvb2F1dGgvdG9rZW4iLCJhdWQiOlsiY2xvdWRfY29udHJvbGxlci5hZG1pbiIsImNsb3VkX2NvbnRyb2xsZXIucmVhZCIsImNsb3VkX2NvbnRyb2xsZXIud3JpdGUiLCJvcGVuaWQiLCJwYXNzd29yZC53cml0ZSIsInNjaW0ucmVhZCIsInNjaW0ud3JpdGUiXX0.7wlsnXoBuE-jSYTBZboy1U26NWs4-VHBEYYGMLz5YFQ
+  :space: 671847d5-9754-49b2-bc9f-977ee42c7e4c
+  :organization: 57944537-4f45-424d-a8af-b41ab6b4f0a0
+      YAML
+    end
+  end
+
+  after do
+    crash_log = File.join(@homedir, '.cf', 'crash')
+    if File.exists?(crash_log)
+      puts `cat #{crash_log}`
+      FileUtils.rm(crash_log)
+    end
+
+    FakeCloudController.reset
+  end
+
+  it "allows an admin user to add a service broker" do
+    BlueShell::Runner.run("env HOME=#{@homedir} #{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
+
+    expect(last_request).to be_post
+    expect(last_request.path).to eq('/v2/service_brokers')
+    expect(JSON.load(last_request.body)).to eq(
+      'name' => 'my-custom-service',
+      'broker_url' => broker_url,
+      'token' => broker_token
+    )
+  end
+
+  it "allows an admin user to list service brokers" do
+    BlueShell::Runner.run("env HOME=#{@homedir} #{cf_bin} service-brokers") do |runner|
+      expect(runner).to say /my-custom-service.*#{broker_url}/
+    end
+
+    expect(last_request).to be_get
+    expect(last_request.path).to eq('/v2/service_brokers')
+  end
+
+  it "allows an admin user to remove a service broker" do
+    BlueShell::Runner.run("env HOME=#{@homedir} #{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
+
+    expect(last_request).to be_delete
+    expect(last_request.path).to eq('/v2/service_brokers/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+  end
+end

data/spec/spec_helper.rb

@@ -10,7 +10,6 @@ require "webmock/rspec"
 require "ostruct"
 require "fakefs/safe"
 require "blue-shell"
-require_relative '../vendor/integration-test-support/support/integration_example_group.rb'
 
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
@@ -30,10 +29,6 @@ Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |file|
   require file
 end
 
-tmp_dir = File.expand_path('../tmp', File.dirname(__FILE__))
-FileUtils.mkdir_p(tmp_dir)
-IntegrationExampleGroup.tmp_dir = tmp_dir
-
 RSpec.configure do |c|
   c.include BlueShell::Matchers
 
@@ -46,7 +41,6 @@ RSpec.configure do |c|
   c.include InteractHelper
   c.include ConfigHelper
   c.include FeaturesHelper
-  c.include IntegrationExampleGroup, type: :integration, :example_group => {:file_path => /\/integration\//}
 
   c.before(:all) do
     WebMock.disable_net_connect!(:allow_localhost => true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.2.1.rc3
+  version: 5.2.1.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -307,55 +307,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nats
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -371,21 +323,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 description: 
 email:
 - vcap-dev@googlegroups.com
@@ -656,10 +608,10 @@ files:
 - spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/service_brokers_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
-- spec/integration/service_broker_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb
@@ -694,7 +646,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1035576781016714598
+      hash: -2008180272161412010
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -850,10 +802,10 @@ test_files:
 - spec/features/manifests_spec.rb
 - spec/features/org_spec.rb
 - spec/features/push_flow_spec.rb
+- spec/features/service_brokers_spec.rb
 - spec/features/services_spec.rb
 - spec/features/space_spec.rb
 - spec/features/switching_targets_spec.rb
-- spec/integration/service_broker_spec.rb
 - spec/manifests/errors_spec.rb
 - spec/manifests/loader/builder_spec.rb
 - spec/manifests/loader/normalizer_spec.rb

data/spec/integration/service_broker_spec.rb

@@ -1,77 +0,0 @@
-require "spec_helper"
-
-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
-
-    BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
-      runner.wait_for_exit
-      expect(runner).to be_successful
-    end
-
-    BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
-      expect(runner).to say "Authenticating... OK"
-    end
-  end
-
-  after do
-    logout
-  end
-
-  it "allows an admin user to add a service broker" do
-    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 a service broker already registered" do
-    before do
-      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 /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
-
-  def create_user_in_ccng
-    ccng_post "/v2/users", {
-      guid: user_guid
-    }
-  end
-
-  def user_guid
-    uaa_port = component!(:uaa).port
-    token_issuer = CF::UAA::TokenIssuer.new("http://localhost:#{uaa_port}", 'cf')
-    auth_header = token_issuer.owner_password_grant(username, password).auth_header
-    response = Typhoeus::Request.new(
-      "http://localhost:#{uaa_port}/Users?filter=userName+eq+'#{username}'",
-      headers: {'Authorization' => auth_header}
-    ).run
-    JSON.parse(response.body).fetch("resources").first.fetch('id')
-  end
-end