cf 4.2.0 → 4.2.1.rc1

Sign up to get free protection for your applications and to get access to all the features.
@@ -110,7 +110,7 @@ module CF::App
110
110
  indented { print_instances_summary(instances) }
111
111
 
112
112
  if all_instances_running?(instances)
113
- line "#{c("Push successful! App '#{app.name}' available at http://#{app.name}.#{app.domain}", :good)}"
113
+ line "#{c("Push successful! App '#{app.name}' available at http://#{app.subdomain}.#{app.domain}", :good)}"
114
114
  return
115
115
  end
116
116
  rescue CFoundry::NotStaged
@@ -69,7 +69,7 @@ module CF
69
69
  redraw_input(state)
70
70
  end
71
71
 
72
- state.clear_default!
72
+ state.clear_default! if(event != :up)
73
73
 
74
74
  # tab with a default accepts it and moves to the end
75
75
  if event == :tab
@@ -1,3 +1,3 @@
1
1
  module CF
2
- VERSION = "4.2.0".freeze
2
+ VERSION = "4.2.1.rc1".freeze
3
3
  end
@@ -12,6 +12,7 @@ module CF
12
12
 
13
13
  app.stub(:host).and_return("some_host")
14
14
  app.stub(:domain).and_return("some_domain")
15
+ app.stub(:subdomain).and_return("some_subdomain")
15
16
  end
16
17
 
17
18
  def execute_start_app
@@ -7,6 +7,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
7
7
 
8
8
  let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
9
9
  let(:app) { "hello-sinatra-#{run_id}" }
10
+ let(:subdomain) { "hello-sinatra-subdomain-#{run_id}" }
10
11
  let(:service_name) { "dummy-service-#{run_id}" }
11
12
 
12
13
  before do
@@ -52,14 +53,14 @@ if ENV["CF_V2_RUN_INTEGRATION"]
52
53
 
53
54
  runner.send_up_arrow
54
55
  expect(runner).not_to say "Memory Limit>"
55
- runner.send_return
56
+ runner.send_keys subdomain
56
57
 
57
58
  expect(runner).to say "1:"
58
59
  expect(runner).to say "Domain>"
59
60
  runner.send_keys "1"
60
61
 
61
- expect(runner).to say(/Creating route #{app}\..*\.\.\. OK/)
62
- expect(runner).to say(/Binding #{app}\..* to #{app}\.\.\. OK/)
62
+ expect(runner).to say(/Creating route #{subdomain}\..*\.\.\. OK/)
63
+ expect(runner).to say(/Binding #{subdomain}\..* to #{app}\.\.\. OK/)
63
64
 
64
65
  expect(runner).to say "Create services for application?> n"
65
66
  runner.send_up_arrow
@@ -94,11 +95,11 @@ if ENV["CF_V2_RUN_INTEGRATION"]
94
95
  runner.send_return
95
96
 
96
97
  expect(runner).to say "Uploading #{app}... OK", 180
97
- expect(runner).to say "Starting #{app}... OK", 180
98
+ expect(runner).to say "Preparing to start #{app}... OK", 180
98
99
  expect(runner).to say "Checking status of app '#{app}'...", 180
99
100
  expect(runner).to say "0 of 1 instances running (1 starting)"
100
101
  expect(runner).to say "1 of 1 instances running"
101
- expect(runner).to say "Push successful! App '#{app}' available at http://#{app}.a1-app.cf-app.com", 30
102
+ expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.a1-app.cf-app.com", 30
102
103
  end
103
104
  end
104
105
 
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cf
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0
5
- prerelease:
4
+ version: 4.2.1.rc1
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Cloud Foundry Team
@@ -619,18 +619,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
619
619
  - - ! '>='
620
620
  - !ruby/object:Gem::Version
621
621
  version: '0'
622
- segments:
623
- - 0
624
- hash: -3067736144323404377
625
622
  required_rubygems_version: !ruby/object:Gem::Requirement
626
623
  none: false
627
624
  requirements:
628
- - - ! '>='
625
+ - - ! '>'
629
626
  - !ruby/object:Gem::Version
630
- version: '0'
631
- segments:
632
- - 0
633
- hash: -3067736144323404377
627
+ version: 1.3.1
634
628
  requirements: []
635
629
  rubyforge_project: cf
636
630
  rubygems_version: 1.8.25