cf 5.2.1.rc4 → 5.2.1.rc5

data/spec/features/push_flow_spec.rb

@@ -28,7 +28,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       Interact::Progress::Dots.stop!
     end
 
-    it "attempts to change already processed choices" do
+    it "excercises the app workflow" do
       BlueShell::Runner.run("#{cf_bin} app #{app}") do |runner|
         expect(runner).to say "Unknown app '#{app}'."
       end
@@ -141,6 +141,22 @@ if ENV["CF_V2_RUN_INTEGRATION"]
         expect(runner).to say "OK", 20
       end
 
+      BlueShell::Runner.run("#{cf_bin} set-env #{app} DEVELOP_ON_CLOUD_FOUNDRY all_day_erry_day") do |runner|
+        expect(runner).to say "OK"
+      end
+
+      BlueShell::Runner.run("#{cf_bin} env #{app}") do |runner|
+        expect(runner).to say "DEVELOP_ON_CLOUD_FOUNDRY: all_day_erry_day"
+      end
+
+      BlueShell::Runner.run("#{cf_bin} unset-env #{app} DEVELOP_ON_CLOUD_FOUNDRY") do |runner|
+        expect(runner).to say "OK"
+      end
+
+      BlueShell::Runner.run("#{cf_bin} env #{app}") do |runner|
+        expect(runner).not_to say "DEVELOP_ON_CLOUD_FOUNDRY"
+      end
+
       BlueShell::Runner.run("#{cf_bin} delete #{app}") do |runner|
         expect(runner).to say "Really delete #{app}?>"
         runner.send_keys "y"

data/spec/features/service_brokers_spec.rb

@@ -58,6 +58,11 @@ class FakeCloudController < Sinatra::Base
     204
   end
 
+  put '/v2/service_brokers/:guid' do
+    self.class.requests << request
+    201
+  end
+
   get '/responsive' do
     200
   end
@@ -148,4 +153,13 @@ http://127.0.0.1:8181:
     expect(last_request).to be_delete
     expect(last_request.path).to eq('/v2/service_brokers/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa')
   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|
+      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')
+  end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,8 @@ require "ostruct"
 require "fakefs/safe"
 require "blue-shell"
 
+Dir.glob("support/mock_commands/*").each { |f| require f }
+
 TRAVIS_BUILD_ID = ENV["TRAVIS_BUILD_ID"]
 
 OriginalFile = File

data/spec/support/cli_helper.rb

@@ -47,6 +47,28 @@ module CliHelper
     $stdin = $real_stdin
   end
 
+  def capture_exceptional_output
+    $real_stdout = $stdout
+    $real_stderr = $stderr
+    $real_stdin = $stdin
+    $stdout = @stdout = StringIO.new
+    $stderr = @stderr = StringIO.new
+    $stdin = @stdin = StringIO.new
+    begin
+      @status = yield
+    rescue => e
+      @stderr.write(e.message)
+    end
+    @stdout.rewind
+    @stderr.rewind
+    @status
+  ensure
+    $stdout = $real_stdout
+    $stderr = $real_stderr
+    $stdin = $real_stdin
+  end
+
+
   def output
     @output ||= BlueShell::BufferedReaderExpector.new(stdout)
   end

data/spec/support/mock_commands/mock_restart.rb

@@ -0,0 +1,16 @@
+class MockRestartCommand
+  attr_reader :restarted_apps
+  attr_accessor :input
+
+  def initialize
+    @restarted_apps = []
+  end
+
+  def restart
+    @restarted_apps = input[:apps]
+  end
+
+  def run(_)
+    restart
+  end
+end

data/spec/support/mock_commands/mock_start.rb

@@ -0,0 +1,17 @@
+class MockStartCommand
+  attr_reader :started_apps
+  attr_accessor :input
+
+  def initialize
+    @started_apps = []
+  end
+
+  def start
+    raise 'If you wanna test using :all, you implement it!' if input[:all]
+    @started_apps = input[:apps]
+  end
+
+  def run(_)
+    start
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.2.1.rc4
+  version: 5.2.1.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-22 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
@@ -356,6 +340,7 @@ files:
 - lib/admin/service_broker/add.rb
 - lib/admin/service_broker/remove.rb
 - lib/admin/service_broker/service_brokers.rb
+- lib/admin/service_broker/update.rb
 - lib/admin/set_quota.rb
 - lib/cf/cli/app/app.rb
 - lib/cf/cli/app/apps.rb
@@ -471,6 +456,7 @@ files:
 - spec/admin/service_broker/add_spec.rb
 - spec/admin/service_broker/remove_spec.rb
 - spec/admin/service_broker/service_brokers_spec.rb
+- spec/admin/service_broker/update_spec.rb
 - spec/admin/set_quota_spec.rb
 - spec/assets/env/env_test.rb
 - spec/assets/env/Gemfile
@@ -480,6 +466,7 @@ files:
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
+- spec/assets/hello-sinatra/manifest.yml
 - spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
@@ -530,6 +517,7 @@ files:
 - spec/assets/rails328_ruby187_app/test/test_helper.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
+- spec/cf/cli/app/env_spec.rb
 - spec/cf/cli/app/events_spec.rb
 - spec/cf/cli/app/help_spec.rb
 - spec/cf/cli/app/instances_spec.rb
@@ -584,7 +572,6 @@ files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/cf/object_extensions_spec.rb
 - spec/console/console_spec.rb
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
@@ -626,6 +613,8 @@ files:
 - spec/support/features_helper.rb
 - spec/support/interact_helper.rb
 - spec/support/matchers.rb
+- spec/support/mock_commands/mock_restart.rb
+- spec/support/mock_commands/mock_start.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
 - spec/tunnel/plugin_spec.rb
@@ -646,7 +635,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2008180272161412010
+      hash: -2638009255464879430
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -665,6 +654,7 @@ test_files:
 - spec/admin/service_broker/add_spec.rb
 - spec/admin/service_broker/remove_spec.rb
 - spec/admin/service_broker/service_brokers_spec.rb
+- spec/admin/service_broker/update_spec.rb
 - spec/admin/set_quota_spec.rb
 - spec/assets/env/env_test.rb
 - spec/assets/env/Gemfile
@@ -674,6 +664,7 @@ test_files:
 - spec/assets/hello-sinatra/Gemfile
 - spec/assets/hello-sinatra/Gemfile.lock
 - spec/assets/hello-sinatra/main.rb
+- spec/assets/hello-sinatra/manifest.yml
 - spec/assets/rails328_ruby187_app/app/assets/images/rails.png
 - spec/assets/rails328_ruby187_app/app/assets/javascripts/application.js
 - spec/assets/rails328_ruby187_app/app/assets/stylesheets/application.css
@@ -724,6 +715,7 @@ test_files:
 - spec/assets/rails328_ruby187_app/test/test_helper.rb
 - spec/cf/cli/app/base_spec.rb
 - spec/cf/cli/app/delete_spec.rb
+- spec/cf/cli/app/env_spec.rb
 - spec/cf/cli/app/events_spec.rb
 - spec/cf/cli/app/help_spec.rb
 - spec/cf/cli/app/instances_spec.rb
@@ -778,7 +770,6 @@ test_files:
 - spec/cf/cli/user/passwd_spec.rb
 - spec/cf/cli/user/register_spec.rb
 - spec/cf/cli_spec.rb
-- spec/cf/object_extensions_spec.rb
 - spec/console/console_spec.rb
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
@@ -820,6 +811,8 @@ test_files:
 - spec/support/features_helper.rb
 - spec/support/interact_helper.rb
 - spec/support/matchers.rb
+- spec/support/mock_commands/mock_restart.rb
+- spec/support/mock_commands/mock_start.rb
 - spec/support/shared_examples/errors.rb
 - spec/support/shared_examples/input.rb
 - spec/tunnel/plugin_spec.rb

data/spec/cf/object_extensions_spec.rb

@@ -1,24 +0,0 @@
-require "spec_helper"
-
-describe "#try" do
-  it "calls through with arguments on non-nil objects" do
-    "hi".try(:sub, 'i', 'o').should == "ho"
-  end
-
-  it "yields to a provided block" do
-    hash = {key: "value"}
-    retrieved_key = nil
-    retrieved_value = nil
-    hash.try(:each) do |k, v|
-      retrieved_key = k
-      retrieved_value = v
-    end
-
-    retrieved_key.should == :key
-    retrieved_value.should == "value"
-  end
-
-  it "returns nil for nil" do
-    nil.try(:sub, 'i', 'o').should == nil
-  end
-end