Skip to content

Commit 056451b

Browse files
kmayerkmayer
committed
Updating aruba to 2016 standards
1 parent 4b008c5 commit 056451b

10 files changed

+297
-116
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.bundle
2-
Gemfile.lock
32
doc
43
pkg
54
Thumbs.db

‎Gemfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ source 'https://rubygems.org'
44
gemspec
55

66
group :test do
7-
gem 'aruba'
7+
gem 'aruba', '~> 0.14.0'
88
gem 'bundler'
99
gem 'cucumber'
1010
gem 'godot'
1111
gem 'rails'
1212
gem 'rake'
1313
gem 'rspec'
14-
gem 'sqlite3'
15-
gem 'pg'
1614
end
1715

1816
group :development do

‎Gemfile.lock

+218
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
PATH
2+
remote: .
3+
specs:
4+
heroku_san (4.4.0)
5+
bundler
6+
heroku-api (>= 0.1.2)
7+
json
8+
rake
9+
10+
GEM
11+
remote: https://rubygems.org/
12+
specs:
13+
actionmailer (4.2.6)
14+
actionpack (= 4.2.6)
15+
actionview (= 4.2.6)
16+
activejob (= 4.2.6)
17+
mail (~> 2.5, >= 2.5.4)
18+
rails-dom-testing (~> 1.0, >= 1.0.5)
19+
actionpack (4.2.6)
20+
actionview (= 4.2.6)
21+
activesupport (= 4.2.6)
22+
rack (~> 1.6)
23+
rack-test (~> 0.6.2)
24+
rails-dom-testing (~> 1.0, >= 1.0.5)
25+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
26+
actionview (4.2.6)
27+
activesupport (= 4.2.6)
28+
builder (~> 3.1)
29+
erubis (~> 2.7.0)
30+
rails-dom-testing (~> 1.0, >= 1.0.5)
31+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
32+
activejob (4.2.6)
33+
activesupport (= 4.2.6)
34+
globalid (>= 0.3.0)
35+
activemodel (4.2.6)
36+
activesupport (= 4.2.6)
37+
builder (~> 3.1)
38+
activerecord (4.2.6)
39+
activemodel (= 4.2.6)
40+
activesupport (= 4.2.6)
41+
arel (~> 6.0)
42+
activesupport (4.2.6)
43+
i18n (~> 0.7)
44+
json (~> 1.7, >= 1.7.7)
45+
minitest (~> 5.1)
46+
thread_safe (~> 0.3, >= 0.3.4)
47+
tzinfo (~> 1.1)
48+
addressable (2.3.5)
49+
arel (6.0.3)
50+
aruba (0.14.0)
51+
childprocess (~> 0.5.6)
52+
contracts (~> 0.9)
53+
cucumber (>= 1.3.19)
54+
ffi (~> 1.9.10)
55+
rspec-expectations (>= 2.99)
56+
thor (~> 0.19)
57+
backports (3.3.5)
58+
builder (3.2.2)
59+
childprocess (0.5.9)
60+
ffi (~> 1.0, >= 1.0.11)
61+
coderay (1.0.9)
62+
colorize (0.5.8)
63+
concurrent-ruby (1.0.1)
64+
contracts (0.13.0)
65+
cucumber (2.3.2)
66+
builder (>= 2.1.2)
67+
cucumber-core (~> 1.4.0)
68+
cucumber-wire (~> 0.0.1)
69+
diff-lcs (>= 1.1.3)
70+
gherkin (~> 3.2.0)
71+
multi_json (>= 1.7.5, < 2.0)
72+
multi_test (>= 0.1.2)
73+
cucumber-core (1.4.0)
74+
gherkin (~> 3.2.0)
75+
cucumber-wire (0.0.1)
76+
diff-lcs (1.2.5)
77+
erubis (2.7.0)
78+
ethon (0.6.1)
79+
ffi (>= 1.3.0)
80+
mime-types (~> 1.18)
81+
excon (0.48.0)
82+
faraday (0.8.8)
83+
multipart-post (~> 1.2.0)
84+
faraday_middleware (0.9.0)
85+
faraday (>= 0.7.4, < 0.9)
86+
ffi (1.9.10)
87+
gh (0.13.0)
88+
addressable
89+
backports
90+
faraday (~> 0.8)
91+
multi_json (~> 1.0)
92+
net-http-persistent (>= 2.7)
93+
net-http-pipeline
94+
gherkin (3.2.0)
95+
git-smart (0.1.9)
96+
colorize
97+
globalid (0.3.6)
98+
activesupport (>= 4.1.0)
99+
godot (0.3.0)
100+
heroku-api (0.4.2)
101+
excon (~> 0.45)
102+
multi_json (~> 1.8)
103+
highline (1.6.20)
104+
i18n (0.7.0)
105+
json (1.8.3)
106+
launchy (2.3.0)
107+
addressable (~> 2.3)
108+
loofah (2.0.3)
109+
nokogiri (>= 1.5.9)
110+
mail (2.6.3)
111+
mime-types (>= 1.16, < 3)
112+
method_source (0.8.2)
113+
mime-types (1.25.1)
114+
mini_portile2 (2.0.0)
115+
minitest (5.8.4)
116+
multi_json (1.11.2)
117+
multi_test (0.1.2)
118+
multipart-post (1.2.0)
119+
net-http-persistent (2.9)
120+
net-http-pipeline (1.0.1)
121+
netrc (0.7.7)
122+
nokogiri (1.6.7.2)
123+
mini_portile2 (~> 2.0.0.rc2)
124+
pry (0.9.12.2)
125+
coderay (~> 1.0.5)
126+
method_source (~> 0.8)
127+
slop (~> 3.4)
128+
pusher-client (0.3.1)
129+
ruby-hmac (~> 0.4.0)
130+
websocket (~> 1.0.0)
131+
rack (1.6.4)
132+
rack-test (0.6.3)
133+
rack (>= 1.0)
134+
rails (4.2.6)
135+
actionmailer (= 4.2.6)
136+
actionpack (= 4.2.6)
137+
actionview (= 4.2.6)
138+
activejob (= 4.2.6)
139+
activemodel (= 4.2.6)
140+
activerecord (= 4.2.6)
141+
activesupport (= 4.2.6)
142+
bundler (>= 1.3.0, < 2.0)
143+
railties (= 4.2.6)
144+
sprockets-rails
145+
rails-deprecated_sanitizer (1.0.3)
146+
activesupport (>= 4.2.0.alpha)
147+
rails-dom-testing (1.0.7)
148+
activesupport (>= 4.2.0.beta, < 5.0)
149+
nokogiri (~> 1.6.0)
150+
rails-deprecated_sanitizer (>= 1.0.1)
151+
rails-html-sanitizer (1.0.3)
152+
loofah (~> 2.0)
153+
railties (4.2.6)
154+
actionpack (= 4.2.6)
155+
activesupport (= 4.2.6)
156+
rake (>= 0.8.7)
157+
thor (>= 0.18.1, < 2.0)
158+
rake (11.1.0)
159+
rspec (3.4.0)
160+
rspec-core (~> 3.4.0)
161+
rspec-expectations (~> 3.4.0)
162+
rspec-mocks (~> 3.4.0)
163+
rspec-core (3.4.4)
164+
rspec-support (~> 3.4.0)
165+
rspec-expectations (3.4.0)
166+
diff-lcs (>= 1.2.0, < 2.0)
167+
rspec-support (~> 3.4.0)
168+
rspec-mocks (3.4.1)
169+
diff-lcs (>= 1.2.0, < 2.0)
170+
rspec-support (~> 3.4.0)
171+
rspec-support (3.4.1)
172+
ruby-hmac (0.4.0)
173+
slop (3.4.6)
174+
sprockets (3.5.2)
175+
concurrent-ruby (~> 1.0)
176+
rack (> 1, < 3)
177+
sprockets-rails (3.0.4)
178+
actionpack (>= 4.0)
179+
activesupport (>= 4.0)
180+
sprockets (>= 3.0.0)
181+
terminal-notifier (1.5.1)
182+
thor (0.19.1)
183+
thread_safe (0.3.5)
184+
travis (1.5.6)
185+
backports
186+
faraday (~> 0.8.7)
187+
faraday_middleware (~> 0.9)
188+
gh (~> 0.13)
189+
highline (~> 1.6)
190+
launchy (~> 2.1)
191+
netrc (~> 0.7)
192+
pry (~> 0.9)
193+
pusher-client (~> 0.3, >= 0.3.1)
194+
terminal-notifier (>= 1.4.2)
195+
typhoeus (~> 0.6)
196+
typhoeus (0.6.5)
197+
ethon (~> 0.6.1)
198+
tzinfo (1.2.2)
199+
thread_safe (~> 0.1)
200+
websocket (1.0.7)
201+
202+
PLATFORMS
203+
ruby
204+
205+
DEPENDENCIES
206+
aruba (~> 0.14.0)
207+
bundler
208+
cucumber
209+
git-smart
210+
godot
211+
heroku_san!
212+
rails
213+
rake
214+
rspec
215+
travis (~> 1.5.6)
216+
217+
BUNDLED WITH
218+
1.11.2

‎features/issue_113.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@slow_process @announce-cmd @issue
1+
@slow_process @announce-command @issue
22
Feature: github issues
33
Given there are bugs
44
And everyone wants defect-free software

‎features/remote.feature

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@slow_process @announce-cmd
1+
@slow_process @announce-command
22
Feature: heroku_san can control a project on Heroku
33
WARNING: This WILL create apps on Heroku!
44
You must login with the heroku cli before starting
@@ -7,16 +7,13 @@ Feature: heroku_san can control a project on Heroku
77

88
Scenario: Installs a project
99
Given I have a new Rails project
10-
When I am in the project directory
1110
And I add heroku_san to the rails Gemfile
1211
Then rake reports that the heroku: tasks are available
1312

1413
Scenario: Manipulates a Rails app on Heroku
1514
Given I have a new Rails project
16-
When I am in the project directory
1715
And I commit any changes with "Initial commit"
1816
And I add heroku_san to the rails Gemfile
19-
And I run bundle install
2017
And I generate a new config file
2118
And I create my project on Heroku
2219
And I curl the app home page
@@ -33,10 +30,7 @@ Feature: heroku_san can control a project on Heroku
3330

3431
Scenario: Manipulates a Sinatra app on Heroku
3532
Given I have a new Sinatra project
36-
When I am in the project directory
37-
And I commit any changes with "Initial commit"
38-
And I add heroku_san to the sinatra Gemfile
39-
And I run bundle install
33+
When I commit any changes with "Initial commit"
4034
And I create a new config/heroku.yml file
4135
And I create my project on Heroku
4236
And I curl the app home page

‎features/shell_execution.feature

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
@slow_process @announce-cmd
1+
@slow_process @announce-command
22
Feature: heroku_san can shell out to heroku without errors
33

44
Scenario: Bundling a new project
5-
Given I run `mkdir -p ruby2test`
5+
Given a directory named "ruby2test"
66
And I cd to "ruby2test"
77
And I write to "Gemfile" with:
88
"""
99
source "https://rubygems.org"
1010
gem 'heroku_san', :path => '../../../.'
1111
"""
1212
And I run `gem install bundler`
13-
And I run bundle install
14-
And I write to "get_heroku_version.rb" with:
13+
And I run `bundle install`
14+
And the executable named "get_heroku_version.rb" with:
1515
"""
1616
#!/usr/bin/env ruby
17-
1817
require 'heroku_san'
19-
2018
api = HerokuSan::API.new
21-
2219
api.sh(nil, 'status')
2320
"""
24-
And I run `chmod +x get_heroku_version.rb`
25-
And I cleanly run `bundle exec ruby ./get_heroku_version.rb`
21+
And I run `bundle exec ruby ./get_heroku_version.rb`
2622
Then the output should contain "heroku-toolbelt"
2723
Then the output should contain "Production"
2824
Then the output should contain "Development"

0 commit comments

Comments
 (0)