cf 5.4.5 → 5.4.7.rc1

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.4.5".freeze
+  VERSION = "5.4.7.rc1".freeze
 end

data/spec/features/backspace_spec.rb

@@ -35,7 +35,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
           expect(runner).to say "Domain>"
           runner.send_return
 
-          expect(runner).to say /Binding #{app[0..-2]}\..* to #{app}.*OK/, 1
+          expect(runner).to say /Binding #{app[0..-2]}\..* to #{app}.*OK/
         end
       end
     end

data/spec/features/manifests_spec.rb

@@ -59,11 +59,11 @@ applications:
             expect(runner).to say /Creating service #{user_provided_name}.*OK/
             expect(runner).to say /Binding #{user_provided_name} to #{app}... OK/
 
-            expect(runner).to say "Uploading #{app}... OK", 180
-            expect(runner).to say "Preparing to start #{app}... OK", 180
-            expect(runner).to say "Checking status of app '#{app}'...", 180
+            expect(runner).to say "Uploading #{app}... OK"
+            expect(runner).to say "Preparing to start #{app}... OK"
+            expect(runner).to say "Checking status of app '#{app}'..."
             expect(runner).to say "1 of 1 instances running"
-            expect(runner).to say "Push successful! App '#{app}' available at #{subdomain}.cfapps.io", 30
+            expect(runner).to say "Push successful! App '#{app}' available at #{subdomain}.cfapps.io"
           end
         end
 

data/spec/features/org_spec.rb

@@ -37,7 +37,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       # end
 
       BlueShell::Runner.run("#{cf_bin} delete-org #{new_org_name} --force --recursive") do |runner|
-        expect(runner).to say "Deleting organization #{new_org_name}... OK", 15
+        expect(runner).to say "Deleting organization #{new_org_name}... OK"
       end
 
       BlueShell::Runner.run("#{cf_bin} target -o #{new_org_name}") do |runner|

data/spec/features/push_flow_spec.rb

@@ -111,18 +111,18 @@ if ENV["CF_V2_RUN_INTEGRATION"]
           expect(runner).to say "Create another service?> n"
           runner.send_keys "n"
 
-          if runner.expect "Bind other services to application?> n", 15
+          if runner.expect "Bind other services to application?> n"
             runner.send_return
           end
 
-          expect(runner).to say "Save configuration?> n", 20
+          expect(runner).to say "Save configuration?> n"
           runner.send_return
 
-          expect(runner).to say "Uploading #{app}... OK", 180
-          expect(runner).to say "Preparing to start #{app}... OK", 180
-          expect(runner).to say "Checking status of app '#{app}'...", 180
+          expect(runner).to say "Uploading #{app}... OK"
+          expect(runner).to say "Preparing to start #{app}... OK"
+          expect(runner).to say "Checking status of app '#{app}'..."
           expect(runner).to say "1 of 1 instances running"
-          expect(runner).to say "Push successful! App '#{app}' available at #{subdomain}.cfapps.io", 30
+          expect(runner).to say "Push successful! App '#{app}' available at #{subdomain}.cfapps.io"
         end
       end
 
@@ -138,7 +138,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       end
 
       BlueShell::Runner.run("#{cf_bin} unbind-service #{service_name} #{app}") do |runner|
-        expect(runner).to say "OK", 20
+        expect(runner).to say "OK"
       end
 
       BlueShell::Runner.run("#{cf_bin} set-env #{app} DEVELOP_ON_CLOUD_FOUNDRY all_day_erry_day") do |runner|

data/spec/features/services_spec.rb

@@ -73,7 +73,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
       let(:service_name) { "some-provided-instance-#{Time.now.to_i}" }
 
       it "can bind and unbind user-provided services to apps" do
-        push_app(app_folder, app_name, start_command: "'bundle exec ruby env_test.rb -p $PORT'", timeout: 90)
+        push_app(app_folder, app_name, start_command: "'bundle exec ruby env_test.rb -p $PORT'")
         create_service_instance("user-provided", service_name, credentials: { hostname: "myservice.com"} )
 
         BlueShell::Runner.run("#{cf_bin} bind-service") do |runner|

data/spec/features/space_spec.rb

@@ -71,14 +71,14 @@ if ENV['CF_V2_RUN_INTEGRATION']
       end
 
       it "can create an app in a space, then delete it recursively" do
-        BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") { |runner| runner.wait_for_exit(30) }
-        BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") { |runner| runner.wait_for_exit(30) }
+        BlueShell::Runner.run("#{cf_bin} create-space #{new_space}") { |runner| runner.wait_for_exit }
+        BlueShell::Runner.run("#{cf_bin} switch-space #{new_space}") { |runner| runner.wait_for_exit }
 
         push_app("hello-sinatra", app)
 
         BlueShell::Runner.run("#{cf_bin} delete-space #{new_space} --force") do |runner|
           expect(runner).to say("If you want to delete the space along with all dependent objects, rerun the command with the '--recursive' flag.")
-          runner.wait_for_exit(30)
+          runner.wait_for_exit
         end.should_not be_successful
 
         BlueShell::Runner.run("#{cf_bin} spaces") do |runner|

data/spec/features/switching_targets_spec.rb

@@ -50,17 +50,17 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           expect(runner).to say(/Switching to space #{space_2}/)
 
-          runner.wait_for_exit 15
+          runner.wait_for_exit
         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
         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
         end
       end
     end

data/spec/spec_helper.rb

@@ -46,6 +46,7 @@ RSpec.configure do |c|
 
   c.before(:all) do
     WebMock.disable_net_connect!(:allow_localhost => true)
+    BlueShell.timeout = 90
   end
 
   c.before do

data/spec/support/features_helper.rb

@@ -11,20 +11,20 @@ module FeaturesHelper
     cmd = "#{cf_bin} login #{username} --password #{password} -o #{organization}"
     cmd += " -s #{space}"
     BlueShell::Runner.run(cmd) do |runner|
-      runner.wait_for_exit 60
+      runner.wait_for_exit
     end
   end
 
   def logout
     BlueShell::Runner.run("#{cf_bin} logout") do |runner|
-      runner.wait_for_exit 60
+      runner.wait_for_exit
     end
   end
 
   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
     end
   end
 
@@ -61,38 +61,40 @@ module FeaturesHelper
     push_cmd += " --command #{opts[:start_command]}" if opts[:start_command]
 
     Dir.chdir("#{SPEC_ROOT}/assets/#{app_folder}") do
-      BlueShell::Runner.run(push_cmd) do |runner|
-        expect(runner).to say "Name>"
-        runner.send_keys deployed_app_name
+      BlueShell.with_timeout 180 do
+        BlueShell::Runner.run(push_cmd) do |runner|
+          expect(runner).to say "Name>"
+          runner.send_keys deployed_app_name
 
-        expect(runner).to say "Instances> 1", 15
-        runner.send_return
-
-        expect(runner).to say "Memory Limit>"
-        runner.send_keys "128M"
+          expect(runner).to say "Instances> 1"
+          runner.send_return
 
-        expect(runner).to say "Creating #{deployed_app_name}... OK"
+          expect(runner).to say "Memory Limit>"
+          runner.send_keys "128M"
 
-        expect(runner).to say "Subdomain> #{deployed_app_name}"
-        runner.send_return
+          expect(runner).to say "Creating #{deployed_app_name}... OK"
 
-        expect(runner).to say "1:"
-        expect(runner).to say "Domain>"
-        runner.send_keys "1"
+          expect(runner).to say "Subdomain> #{deployed_app_name}"
+          runner.send_return
 
-        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 "1:"
+          expect(runner).to say "Domain>"
+          runner.send_keys "1"
 
-        expect(runner).to say "Create services for application?> n"
-        runner.send_return
+          expect(runner).to say(/Creating route #{deployed_app_name}\..*\.\.\. OK/)
+          expect(runner).to say(/Binding #{deployed_app_name}\..* to #{deployed_app_name}\.\.\. OK/)
 
-        if runner.expect "Bind other services to application?> n", 15
+          expect(runner).to say "Create services for application?> n"
           runner.send_return
-        end
 
-        expect(runner).to say "Push successful!"
+          if runner.expect "Bind other services to application?> n"
+            runner.send_return
+          end
+
+          expect(runner).to say "Push successful!"
 
-        runner.wait_for_exit opts[:timeout] || 30
+          runner.wait_for_exit
+        end
       end
     end
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 5.4.5
-  prerelease: 
+  version: 5.4.7.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.1.rc1
+        version: 4.7.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.1.rc1
+        version: 4.7.2.rc1
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -680,9 +680,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 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: 1.8.23