cf 5.3.1 → 5.4.0

data/lib/admin/service_broker/add.rb

@@ -12,8 +12,10 @@ module CFAdmin::ServiceBroker
       :desc => "Broker name"
     input :url,
       :desc => "Broker URL"
-    input :token,
-      :desc => "Broker token"
+    input :username,
+      :desc => "Broker basic authentication username"
+    input :password,
+      :desc => "Broker basic authentication password"
 
     def add_service_broker
       broker = client.service_broker
@@ -22,7 +24,9 @@ module CFAdmin::ServiceBroker
       finalize
       broker.broker_url = input[:url]
       finalize
-      broker.token = input[:token]
+      broker.auth_username = input[:username]
+      finalize
+      broker.auth_password = input[:password]
       finalize
 
       with_progress("Adding service broker #{c(broker.name, :name)}") do
@@ -39,8 +43,12 @@ module CFAdmin::ServiceBroker
       ask("URL")
     end
 
-    def ask_token
-      ask("Token")
+    def ask_username
+      ask("Username")
+    end
+
+    def ask_password
+      ask("Password")
     end
   end
 end

data/lib/admin/service_broker/update.rb

@@ -15,8 +15,10 @@ module CFAdmin::ServiceBroker
       :desc => "New name"
     input :url,
       :desc => "New URL"
-    input :token,
-      :desc => "New token"
+    input :username,
+      :desc => "New basic authentication username"
+    input :password,
+      :desc => "New basic authentication password"
 
     def update_service_broker
       @broker = input[:broker]
@@ -27,7 +29,9 @@ module CFAdmin::ServiceBroker
       finalize
       @broker.broker_url = input[:url]
       finalize
-      @broker.token = input[:token]
+      @broker.auth_username = input[:username]
+      finalize
+      @broker.auth_password = input[:password]
       finalize
 
       with_progress("Updating service broker #{old_name}") do
@@ -45,8 +49,12 @@ module CFAdmin::ServiceBroker
       ask("URL", :default => @broker.broker_url)
     end
 
-    def ask_token
-      ask("Token", :default => @broker.token)
+    def ask_username
+      ask("Username", :default => @broker.auth_username)
+    end
+
+    def ask_password
+      ask("Password", :default => @broker.auth_password)
     end
   end
 end

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.3.1".freeze
+  VERSION = "5.4.0".freeze
 end

data/spec/admin/service_broker/add_spec.rb

@@ -17,11 +17,12 @@ describe CFAdmin::ServiceBroker::Add do
   it "creates a service broker when arguments are provided on the command line" do
     service_broker.stub(:create!)
 
-    cf %W[add-service-broker --name cf-mysql --url http://cf-mysql.cfapp.io --token cfmysqlsecret]
+    cf %W[add-service-broker --name cf-mysql --url http://cf-mysql.cfapp.io --username cfmysqlusername --password cfmysqlsecret]
 
     service_broker.name.should == 'cf-mysql'
     service_broker.broker_url.should == 'http://cf-mysql.cfapp.io'
-    service_broker.token.should == 'cfmysqlsecret'
+    service_broker.auth_username.should == 'cfmysqlusername'
+    service_broker.auth_password.should == 'cfmysqlsecret'
 
     service_broker.should have_received(:create!)
   end
@@ -30,13 +31,15 @@ describe CFAdmin::ServiceBroker::Add do
     service_broker.stub(:create!)
 
     stub_ask("URL").and_return("http://example.com")
-    stub_ask("Token").and_return("token")
+    stub_ask("Username").and_return("username")
+    stub_ask("Password").and_return("password")
 
     cf %W[add-service-broker cf-mysql]
 
     service_broker.name.should == 'cf-mysql'
     service_broker.broker_url.should == 'http://example.com'
-    service_broker.token.should == 'token'
+    service_broker.auth_username.should == 'username'
+    service_broker.auth_password.should == 'password'
 
     service_broker.should have_received(:create!)
   end
@@ -46,13 +49,15 @@ describe CFAdmin::ServiceBroker::Add do
 
     stub_ask("Name").and_return("cf-mysql")
     stub_ask("URL").and_return("http://example.com")
-    stub_ask("Token").and_return("token")
+    stub_ask("Username").and_return("username")
+    stub_ask("Password").and_return("password")
 
     cf %W[add-service-broker]
 
     service_broker.name.should == 'cf-mysql'
     service_broker.broker_url.should == 'http://example.com'
-    service_broker.token.should == 'token'
+    service_broker.auth_username.should == 'username'
+    service_broker.auth_password.should == 'password'
 
     service_broker.should have_received(:create!)
   end

data/spec/admin/service_broker/update_spec.rb

@@ -11,7 +11,8 @@ describe CFAdmin::ServiceBroker::Update do
   before do
     service_broker.name = 'formername'
     service_broker.broker_url = 'http://former.example.com'
-    service_broker.token = 'formertoken'
+    service_broker.auth_username = 'formerusername'
+    service_broker.auth_password = 'formerpassword'
 
     CFAdmin::ServiceBroker::Update.client = client
     client.stub(:service_broker_by_name).with('formername').and_return(service_broker)
@@ -20,11 +21,12 @@ describe CFAdmin::ServiceBroker::Update do
   it "updates a service broker when arguments are provided on the command line" do
     service_broker.stub(:update!)
 
-    cf %W[update-service-broker --broker formername --name cf-othersql --url http://other.cfapp.io --token secret2]
+    cf %W[update-service-broker --broker formername --name cf-othersql --url http://other.cfapp.io --username username --password secret2]
 
     service_broker.name.should == 'cf-othersql'
     service_broker.broker_url.should == 'http://other.cfapp.io'
-    service_broker.token.should == 'secret2'
+    service_broker.auth_username.should == 'username'
+    service_broker.auth_password.should == 'secret2'
 
     service_broker.should have_received(:update!)
   end
@@ -34,13 +36,15 @@ describe CFAdmin::ServiceBroker::Update do
 
     stub_ask("Name", :default => 'formername').and_return("cf-othersql")
     stub_ask("URL", :default => 'http://former.example.com').and_return("http://other.example.com")
-    stub_ask("Token", :default => 'formertoken').and_return("token2")
+    stub_ask("Username", :default => 'formerusername').and_return("username2")
+    stub_ask("Password", :default => 'formerpassword').and_return("password2")
 
     cf %W[update-service-broker formername]
 
     service_broker.name.should == 'cf-othersql'
     service_broker.broker_url.should == 'http://other.example.com'
-    service_broker.token.should == 'token2'
+    service_broker.auth_username.should == 'username2'
+    service_broker.auth_password.should == 'password2'
 
     service_broker.should have_received(:update!)
   end

data/spec/features/service_brokers_spec.rb

@@ -70,7 +70,8 @@ end
 
 describe "Service Brokers" do
   let(:broker_url) { 'http://broker.example.com/' }
-  let(:broker_token) { 'opensesame' }
+  let(:auth_username) { 'me' }
+  let(:auth_password) { 'opensesame' }
   let(:last_request) { FakeCloudController.last_request }
 
   before do
@@ -121,7 +122,7 @@ http://127.0.0.1:8181:
   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|
+    BlueShell::Runner.run("env HOME=#{@homedir} #{cf_bin} add-service-broker --name my-custom-service --url #{broker_url} --username #{auth_username} --password #{auth_password}") do |runner|
       expect(runner).to say "Adding service broker my-custom-service... OK"
     end
 
@@ -130,7 +131,8 @@ http://127.0.0.1:8181:
     expect(JSON.load(last_request.body)).to eq(
       'name' => 'my-custom-service',
       'broker_url' => broker_url,
-      'token' => broker_token
+      'auth_username' => auth_username,
+      'auth_password' => auth_password,
     )
   end
 
@@ -155,11 +157,17 @@ http://127.0.0.1:8181:
   end
 
   it "allows an admin user to update a service broker" do
-    BlueShell::Runner.run("env HOME=#{@homedir} #{cf_bin} update-service-broker my-custom-service --name cf-othersql --url http://other.example.com/ --token othertoken") do |runner|
+    BlueShell::Runner.run("env HOME=#{@homedir} #{cf_bin} update-service-broker my-custom-service --name cf-othersql --url http://other.example.com/  --username newusername --password newpassword") do |runner|
       expect(runner).to say "Updating service broker my-custom-service... OK"
     end
 
     expect(last_request).to be_put
     expect(last_request.path).to eq('/v2/service_brokers/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
+    expect(JSON.load(last_request.body)).to eq(
+      'name' => 'cf-othersql',
+      'broker_url' => 'http://other.example.com/',
+      'auth_username' => 'newusername',
+      'auth_password' => 'newpassword',
+    )
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.9
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.9
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -677,21 +677,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1979987157650123631
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1979987157650123631
 requirements: []
 rubyforge_project: cf
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Friendly command-line interface for Cloud Foundry.