Skip to content
This repository was archived by the owner on Dec 31, 2022. It is now read-only.

Commit a89451f

Browse files
committed
feat(ruby): Added support for ruby 2.4
BREAKING CHANGE: Ruby 2.4 is now a default Ruby interpreter
1 parent a2789f0 commit a89451f

File tree

21 files changed

+115
-107
lines changed

21 files changed

+115
-107
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ Style/Documentation:
88
Metrics/AbcSize:
99
Max: 25
1010

11+
Metrics/BlockLength:
12+
Enabled: false
13+
1114
AllCops:
1215
TargetRubyVersion: 2.3
1316
DisplayCopNames: true

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.3.1
1+
ruby-2.4.0

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
- docker
55

66
rvm:
7-
- 'ruby-2.3.1'
7+
- 'ruby-2.4.0'
88

99
addons:
1010
apt:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ end
1616
group :chef do
1717
gem 'berkshelf'
1818
gem 'chefspec'
19-
gem 'kitchen-vagrant'
2019
gem 'kitchen-docker'
20+
gem 'kitchen-vagrant'
2121
gem 'rspec'
2222
gem 'test-kitchen'
2323
end

Gemfile.lock

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
artifactory (2.5.0)
5+
artifactory (2.5.1)
66
ast (2.3.0)
77
backports (3.6.8)
8-
berkshelf (5.1.0)
8+
berkshelf (5.3.0)
99
addressable (~> 2.3, >= 2.3.4)
1010
berkshelf-api-client (>= 2.0.2, < 4.0)
1111
buff-config (~> 2.0)
@@ -20,12 +20,12 @@ GEM
2020
retryable (~> 2.0)
2121
ridley (~> 5.0)
2222
solve (> 2.0, < 4.0)
23-
thor (~> 0.19)
23+
thor (~> 0.19, < 0.19.2)
2424
berkshelf-api-client (3.0.0)
2525
faraday (~> 0.9)
2626
httpclient (~> 2.7)
2727
ridley (>= 4.5, < 6.0)
28-
brakeman (3.4.0)
28+
brakeman (3.4.1)
2929
buff-config (2.0.0)
3030
buff-extensions (~> 2.0)
3131
varia_model (~> 0.6)
@@ -34,7 +34,7 @@ GEM
3434
buff-ruby_engine (1.0.0)
3535
buff-shell_out (1.1.0)
3636
buff-ruby_engine (~> 1.0)
37-
builder (3.2.2)
37+
builder (3.2.3)
3838
bundler-audit (0.5.0)
3939
bundler (~> 1.2)
4040
thor (~> 0.18)
@@ -43,10 +43,10 @@ GEM
4343
celluloid-io (0.16.2)
4444
celluloid (>= 0.16.0)
4545
nio4r (>= 1.1.0)
46-
chef (12.15.19)
46+
chef (12.17.44)
4747
addressable
4848
bundler (>= 1.10)
49-
chef-config (= 12.15.19)
49+
chef-config (= 12.17.44)
5050
chef-zero (>= 4.8)
5151
diff-lcs (~> 1.2, >= 1.2.4)
5252
erubis (~> 2.7)
@@ -72,53 +72,52 @@ GEM
7272
specinfra (~> 2.10)
7373
syslog-logger (~> 1.6)
7474
uuidtools (~> 2.1.5)
75-
chef-config (12.15.19)
75+
chef-config (12.17.44)
7676
addressable
7777
fuzzyurl
7878
mixlib-config (~> 2.0)
7979
mixlib-shellout (~> 2.0)
80-
chef-zero (5.1.0)
80+
chef-zero (5.1.1)
8181
ffi-yajl (~> 2.2)
8282
hashie (>= 2.0, < 4.0)
8383
mixlib-log (~> 1.3)
8484
rack (~> 2.0)
8585
uuidtools (~> 2.1)
86-
chefspec (5.2.0)
86+
chefspec (5.3.0)
8787
chef (>= 12.0)
8888
fauxhai (~> 3.6)
8989
rspec (~> 3.0)
9090
childprocess (0.5.9)
9191
ffi (~> 1.0, >= 1.0.11)
9292
cleanroom (1.0.0)
9393
colorize (0.8.1)
94-
connection_pool (2.2.0)
95-
coveralls (0.8.15)
94+
coveralls (0.8.17)
9695
json (>= 1.8, < 3)
9796
simplecov (~> 0.12.0)
9897
term-ansicolor (~> 1.3)
9998
thor (~> 0.19.1)
100-
tins (>= 1.6.0, < 2)
99+
tins (~> 1.6)
101100
cucumber-core (2.0.0)
102101
backports (~> 3.6)
103102
gherkin (~> 4.0)
104103
diff-lcs (1.2.5)
105104
docile (1.1.5)
106105
erubis (2.7.0)
107-
ethon (0.9.1)
106+
ethon (0.10.1)
108107
ffi (>= 1.3.0)
109108
faraday (0.9.2)
110109
multipart-post (>= 1.2, < 3)
111-
faraday_middleware (0.10.0)
112-
faraday (>= 0.7.4, < 0.10)
110+
faraday_middleware (0.11.0)
111+
faraday (>= 0.7.4, < 1.0)
113112
fasterer (0.3.2)
114113
colorize (~> 0.7)
115114
ruby_parser (~> 3.7)
116-
fauxhai (3.9.0)
115+
fauxhai (3.10.0)
117116
net-ssh
118-
ffi (1.9.14)
117+
ffi (1.9.17)
119118
ffi-yajl (2.3.0)
120119
libyajl2 (~> 1.2)
121-
foodcritic (8.0.0)
120+
foodcritic (8.2.0)
122121
cucumber-core (>= 1.3)
123122
erubis
124123
nokogiri (>= 1.5, < 2.0)
@@ -127,26 +126,26 @@ GEM
127126
treetop (~> 1.4)
128127
yajl-ruby (~> 1.1)
129128
fuzzyurl (0.9.0)
130-
gh (0.14.0)
131-
addressable
129+
gh (0.15.0)
130+
addressable (~> 2.4.0)
132131
backports
133132
faraday (~> 0.8)
134133
multi_json (~> 1.0)
135-
net-http-persistent (>= 2.7)
134+
net-http-persistent (~> 2.9)
136135
net-http-pipeline
137136
gherkin (4.0.0)
138137
hashie (3.4.6)
139138
highline (1.7.8)
140139
hitimes (1.2.4)
141-
httpclient (2.8.2.4)
140+
httpclient (2.8.3)
142141
iniparse (1.4.2)
143142
ipaddress (0.8.3)
144-
json (2.0.2)
143+
json (2.0.3)
145144
kitchen-docker (2.6.0)
146145
test-kitchen (>= 1.0.0)
147-
kitchen-vagrant (0.20.0)
146+
kitchen-vagrant (0.21.1)
148147
test-kitchen (~> 1.4)
149-
kramdown (1.12.0)
148+
kramdown (1.13.2)
150149
launchy (2.4.3)
151150
addressable (~> 2.3)
152151
libyajl2 (1.2.0)
@@ -162,19 +161,18 @@ GEM
162161
mixlib-log
163162
mixlib-cli (1.7.0)
164163
mixlib-config (2.2.4)
165-
mixlib-install (2.1.3)
164+
mixlib-install (2.1.9)
166165
artifactory
167166
mixlib-shellout
168167
mixlib-versioning
169168
thor
170169
mixlib-log (1.7.1)
171170
mixlib-shellout (2.2.7)
172171
mixlib-versioning (1.1.0)
173-
molinillo (0.5.1)
172+
molinillo (0.5.5)
174173
multi_json (1.12.1)
175174
multipart-post (2.0.0)
176-
net-http-persistent (3.0.0)
177-
connection_pool (~> 2.2)
175+
net-http-persistent (2.9.4)
178176
net-http-pipeline (1.0.1)
179177
net-scp (1.2.1)
180178
net-ssh (>= 2.6.5)
@@ -187,12 +185,12 @@ GEM
187185
net-ssh (>= 2.6.5)
188186
net-ssh-gateway (>= 1.2.0)
189187
net-telnet (0.1.1)
190-
nio4r (1.2.1)
191-
nokogiri (1.6.8.1)
188+
nio4r (2.0.0)
189+
nokogiri (1.7.0.1)
192190
mini_portile2 (~> 2.1.0)
193-
octokit (4.3.0)
194-
sawyer (~> 0.7.0, >= 0.5.3)
195-
ohai (8.21.0)
191+
octokit (4.6.2)
192+
sawyer (~> 0.8.0, >= 0.5.3)
193+
ohai (8.22.1)
196194
chef-config (>= 12.5.0.alpha.1, < 13)
197195
ffi (~> 1.9)
198196
ffi-yajl (~> 2.2)
@@ -207,7 +205,7 @@ GEM
207205
overcommit (0.37.0)
208206
childprocess (~> 0.5.8)
209207
iniparse (~> 1.4)
210-
parser (2.3.1.4)
208+
parser (2.3.3.1)
211209
ast (~> 2.2)
212210
plist (3.2.0)
213211
polyglot (0.3.5)
@@ -217,8 +215,8 @@ GEM
217215
json
218216
websocket (~> 1.0)
219217
rack (2.0.1)
220-
rainbow (2.1.0)
221-
rake (11.3.0)
218+
rainbow (2.2.1)
219+
rake (12.0.0)
222220
retryable (2.0.4)
223221
ridley (5.1.0)
224222
addressable
@@ -257,22 +255,22 @@ GEM
257255
rspec_junit_formatter (0.2.3)
258256
builder (< 4)
259257
rspec-core (>= 2, < 4, != 2.12.0)
260-
rubocop (0.44.1)
261-
parser (>= 2.3.1.1, < 3.0)
258+
rubocop (0.47.0)
259+
parser (>= 2.3.3.1, < 3.0)
262260
powerpack (~> 0.1)
263261
rainbow (>= 1.99.1, < 3.0)
264262
ruby-progressbar (~> 1.7)
265263
unicode-display_width (~> 1.0, >= 1.0.1)
266264
ruby-progressbar (1.8.1)
267-
ruby_parser (3.8.3)
265+
ruby_parser (3.8.4)
268266
sexp_processor (~> 4.1)
269267
rufus-lru (1.1.0)
270268
safe_yaml (1.0.4)
271-
sawyer (0.7.0)
272-
addressable (>= 2.3.5, < 2.5)
273-
faraday (~> 0.8, < 0.10)
269+
sawyer (0.8.1)
270+
addressable (>= 2.3.5, < 2.6)
271+
faraday (~> 0.8, < 1.0)
274272
semverse (2.0.0)
275-
serverspec (2.37.2)
273+
serverspec (2.38.0)
276274
multi_json
277275
rspec (~> 3.0)
278276
rspec-its
@@ -284,19 +282,19 @@ GEM
284282
json (>= 1.8, < 3)
285283
simplecov-html (~> 0.10.0)
286284
simplecov-html (0.10.0)
287-
solve (3.0.1)
288-
molinillo (~> 0.4)
285+
solve (3.1.0)
286+
molinillo (>= 0.5)
289287
semverse (>= 1.1, < 3.0)
290-
specinfra (2.63.3)
288+
specinfra (2.66.4)
291289
net-scp
292-
net-ssh (>= 2.7, < 4.0)
290+
net-ssh (>= 2.7, < 5.0)
293291
net-telnet
294292
sfl
295293
syslog-logger (1.6.8)
296294
systemu (2.6.5)
297295
term-ansicolor (1.4.0)
298296
tins (~> 1.0)
299-
test-kitchen (1.13.2)
297+
test-kitchen (1.14.2)
300298
mixlib-install (>= 1.2, < 3.0)
301299
mixlib-shellout (>= 1.2, < 3.0)
302300
net-scp (~> 1.1)
@@ -307,8 +305,8 @@ GEM
307305
thor (0.19.1)
308306
timers (4.0.4)
309307
hitimes
310-
tins (1.12.0)
311-
travis (1.8.2)
308+
tins (1.13.0)
309+
travis (1.8.5)
312310
backports
313311
faraday (~> 0.9)
314312
faraday_middleware (~> 0.9, >= 0.9.1)
@@ -321,14 +319,14 @@ GEM
321319
polyglot (~> 0.3)
322320
typhoeus (0.8.0)
323321
ethon (>= 0.8.0)
324-
unicode-display_width (1.1.1)
322+
unicode-display_width (1.1.3)
325323
uuidtools (2.1.5)
326324
varia_model (0.6.0)
327325
buff-extensions (~> 2.0)
328326
hashie (>= 2.0.2, < 4.0.0)
329327
websocket (1.2.3)
330328
wmi-lite (1.0.0)
331-
yajl-ruby (1.2.1)
329+
yajl-ruby (1.3.0)
332330

333331
PLATFORMS
334332
ruby
@@ -351,4 +349,4 @@ DEPENDENCIES
351349
travis
352350

353351
BUNDLED WITH
354-
1.13.5
352+
1.13.7

attributes/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ruby
44

55
default['build-essential']['compile_time'] = true
6-
default['ruby-ng']['ruby_version'] = node['ruby'].try(:[], 'version') || '2.3'
6+
default['ruby-ng']['ruby_version'] = node['ruby'].try(:[], 'version') || '2.4'
77
default['nginx']['source']['modules'] = %w(
88
nginx::http_ssl_module nginx::http_realip_module nginx::http_gzip_static_module nginx::headers_more_module
99
nginx::http_stub_status_module

docs/source/attributes.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ convention).
3434
of an application, not included in this list - it will be skipped, as this list
3535
takes precedence over anything else.
3636

37+
- ``node['ruby-ng']['ruby_version']``
38+
39+
- **Type:** string
40+
- **Default:** ``2.4``
41+
- Sets the Ruby version used through the system. See `ruby-ng cookbook documentation`_
42+
for more details
43+
44+
3745
Application attributes
3846
----------------------
3947

@@ -487,6 +495,7 @@ resque
487495
- **Default:** ``*``
488496
- Array of queues which should be processed by resque
489497

498+
.. _ruby-ng cookbook documentation: https://supermarket.chef.io/cookbooks/ruby-ng
490499
.. _figaro: https://github.com/laserlemon/figaro
491500
.. _dotenv: https://github.com/bkeepers/dotenv
492501
.. |app['appserver']['backlog']| replace:: ``app['appserver']['backlog']``

libraries/drivers_appserver_base.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ def raw_out
3333
).symbolize_keys
3434
end
3535

36-
def validate_app_engine
37-
end
36+
def validate_app_engine; end
3837

3938
protected
4039

libraries/drivers_appserver_null.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ class Null < Drivers::Appserver::Base
66
allowed_engines :null
77
output filter: []
88

9-
def configure
10-
end
9+
def configure; end
1110
alias after_deploy configure
1211
alias after_undeploy configure
1312
end

0 commit comments

Comments
 (0)