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

Commit

Permalink
feat(ruby): Added support for ruby 2.4
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Ruby 2.4 is now a default Ruby interpreter
  • Loading branch information
ajgon committed Jan 16, 2017
1 parent a2789f0 commit a89451f
Show file tree
Hide file tree
Showing 21 changed files with 115 additions and 107 deletions.
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Style/Documentation:
Metrics/AbcSize:
Max: 25

Metrics/BlockLength:
Enabled: false

AllCops:
TargetRubyVersion: 2.3
DisplayCopNames: true
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.3.1
ruby-2.4.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker

rvm:
- 'ruby-2.3.1'
- 'ruby-2.4.0'

addons:
apt:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ end
group :chef do
gem 'berkshelf'
gem 'chefspec'
gem 'kitchen-vagrant'
gem 'kitchen-docker'
gem 'kitchen-vagrant'
gem 'rspec'
gem 'test-kitchen'
end
108 changes: 53 additions & 55 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
artifactory (2.5.0)
artifactory (2.5.1)
ast (2.3.0)
backports (3.6.8)
berkshelf (5.1.0)
berkshelf (5.3.0)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
buff-config (~> 2.0)
Expand All @@ -20,12 +20,12 @@ GEM
retryable (~> 2.0)
ridley (~> 5.0)
solve (> 2.0, < 4.0)
thor (~> 0.19)
thor (~> 0.19, < 0.19.2)
berkshelf-api-client (3.0.0)
faraday (~> 0.9)
httpclient (~> 2.7)
ridley (>= 4.5, < 6.0)
brakeman (3.4.0)
brakeman (3.4.1)
buff-config (2.0.0)
buff-extensions (~> 2.0)
varia_model (~> 0.6)
Expand All @@ -34,7 +34,7 @@ GEM
buff-ruby_engine (1.0.0)
buff-shell_out (1.1.0)
buff-ruby_engine (~> 1.0)
builder (3.2.2)
builder (3.2.3)
bundler-audit (0.5.0)
bundler (~> 1.2)
thor (~> 0.18)
Expand All @@ -43,10 +43,10 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (12.15.19)
chef (12.17.44)
addressable
bundler (>= 1.10)
chef-config (= 12.15.19)
chef-config (= 12.17.44)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
Expand All @@ -72,53 +72,52 @@ GEM
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
chef-config (12.15.19)
chef-config (12.17.44)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-zero (5.1.0)
chef-zero (5.1.1)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack (~> 2.0)
uuidtools (~> 2.1)
chefspec (5.2.0)
chefspec (5.3.0)
chef (>= 12.0)
fauxhai (~> 3.6)
rspec (~> 3.0)
childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11)
cleanroom (1.0.0)
colorize (0.8.1)
connection_pool (2.2.0)
coveralls (0.8.15)
coveralls (0.8.17)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (>= 1.6.0, < 2)
tins (~> 1.6)
cucumber-core (2.0.0)
backports (~> 3.6)
gherkin (~> 4.0)
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
ethon (0.9.1)
ethon (0.10.1)
ffi (>= 1.3.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
faraday_middleware (0.11.0)
faraday (>= 0.7.4, < 1.0)
fasterer (0.3.2)
colorize (~> 0.7)
ruby_parser (~> 3.7)
fauxhai (3.9.0)
fauxhai (3.10.0)
net-ssh
ffi (1.9.14)
ffi (1.9.17)
ffi-yajl (2.3.0)
libyajl2 (~> 1.2)
foodcritic (8.0.0)
foodcritic (8.2.0)
cucumber-core (>= 1.3)
erubis
nokogiri (>= 1.5, < 2.0)
Expand All @@ -127,26 +126,26 @@ GEM
treetop (~> 1.4)
yajl-ruby (~> 1.1)
fuzzyurl (0.9.0)
gh (0.14.0)
addressable
gh (0.15.0)
addressable (~> 2.4.0)
backports
faraday (~> 0.8)
multi_json (~> 1.0)
net-http-persistent (>= 2.7)
net-http-persistent (~> 2.9)
net-http-pipeline
gherkin (4.0.0)
hashie (3.4.6)
highline (1.7.8)
hitimes (1.2.4)
httpclient (2.8.2.4)
httpclient (2.8.3)
iniparse (1.4.2)
ipaddress (0.8.3)
json (2.0.2)
json (2.0.3)
kitchen-docker (2.6.0)
test-kitchen (>= 1.0.0)
kitchen-vagrant (0.20.0)
kitchen-vagrant (0.21.1)
test-kitchen (~> 1.4)
kramdown (1.12.0)
kramdown (1.13.2)
launchy (2.4.3)
addressable (~> 2.3)
libyajl2 (1.2.0)
Expand All @@ -162,19 +161,18 @@ GEM
mixlib-log
mixlib-cli (1.7.0)
mixlib-config (2.2.4)
mixlib-install (2.1.3)
mixlib-install (2.1.9)
artifactory
mixlib-shellout
mixlib-versioning
thor
mixlib-log (1.7.1)
mixlib-shellout (2.2.7)
mixlib-versioning (1.1.0)
molinillo (0.5.1)
molinillo (0.5.5)
multi_json (1.12.1)
multipart-post (2.0.0)
net-http-persistent (3.0.0)
connection_pool (~> 2.2)
net-http-persistent (2.9.4)
net-http-pipeline (1.0.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand All @@ -187,12 +185,12 @@ GEM
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (1.2.1)
nokogiri (1.6.8.1)
nio4r (2.0.0)
nokogiri (1.7.0.1)
mini_portile2 (~> 2.1.0)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
ohai (8.21.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (8.22.1)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
Expand All @@ -207,7 +205,7 @@ GEM
overcommit (0.37.0)
childprocess (~> 0.5.8)
iniparse (~> 1.4)
parser (2.3.1.4)
parser (2.3.3.1)
ast (~> 2.2)
plist (3.2.0)
polyglot (0.3.5)
Expand All @@ -217,8 +215,8 @@ GEM
json
websocket (~> 1.0)
rack (2.0.1)
rainbow (2.1.0)
rake (11.3.0)
rainbow (2.2.1)
rake (12.0.0)
retryable (2.0.4)
ridley (5.1.0)
addressable
Expand Down Expand Up @@ -257,22 +255,22 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.44.1)
parser (>= 2.3.1.1, < 3.0)
rubocop (0.47.0)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
ruby_parser (3.8.3)
ruby_parser (3.8.4)
sexp_processor (~> 4.1)
rufus-lru (1.1.0)
safe_yaml (1.0.4)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
serverspec (2.37.2)
serverspec (2.38.0)
multi_json
rspec (~> 3.0)
rspec-its
Expand All @@ -284,19 +282,19 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
solve (3.0.1)
molinillo (~> 0.4)
solve (3.1.0)
molinillo (>= 0.5)
semverse (>= 1.1, < 3.0)
specinfra (2.63.3)
specinfra (2.66.4)
net-scp
net-ssh (>= 2.7, < 4.0)
net-ssh (>= 2.7, < 5.0)
net-telnet
sfl
syslog-logger (1.6.8)
systemu (2.6.5)
term-ansicolor (1.4.0)
tins (~> 1.0)
test-kitchen (1.13.2)
test-kitchen (1.14.2)
mixlib-install (>= 1.2, < 3.0)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
Expand All @@ -307,8 +305,8 @@ GEM
thor (0.19.1)
timers (4.0.4)
hitimes
tins (1.12.0)
travis (1.8.2)
tins (1.13.0)
travis (1.8.5)
backports
faraday (~> 0.9)
faraday_middleware (~> 0.9, >= 0.9.1)
Expand All @@ -321,14 +319,14 @@ GEM
polyglot (~> 0.3)
typhoeus (0.8.0)
ethon (>= 0.8.0)
unicode-display_width (1.1.1)
unicode-display_width (1.1.3)
uuidtools (2.1.5)
varia_model (0.6.0)
buff-extensions (~> 2.0)
hashie (>= 2.0.2, < 4.0.0)
websocket (1.2.3)
wmi-lite (1.0.0)
yajl-ruby (1.2.1)
yajl-ruby (1.3.0)

PLATFORMS
ruby
Expand All @@ -351,4 +349,4 @@ DEPENDENCIES
travis

BUNDLED WITH
1.13.5
1.13.7
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ruby

default['build-essential']['compile_time'] = true
default['ruby-ng']['ruby_version'] = node['ruby'].try(:[], 'version') || '2.3'
default['ruby-ng']['ruby_version'] = node['ruby'].try(:[], 'version') || '2.4'
default['nginx']['source']['modules'] = %w(
nginx::http_ssl_module nginx::http_realip_module nginx::http_gzip_static_module nginx::headers_more_module
nginx::http_stub_status_module
Expand Down
9 changes: 9 additions & 0 deletions docs/source/attributes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ convention).
of an application, not included in this list - it will be skipped, as this list
takes precedence over anything else.

- ``node['ruby-ng']['ruby_version']``

- **Type:** string
- **Default:** ``2.4``
- Sets the Ruby version used through the system. See `ruby-ng cookbook documentation`_
for more details


Application attributes
----------------------

Expand Down Expand Up @@ -487,6 +495,7 @@ resque
- **Default:** ``*``
- Array of queues which should be processed by resque

.. _ruby-ng cookbook documentation: https://supermarket.chef.io/cookbooks/ruby-ng
.. _figaro: https://github.com/laserlemon/figaro
.. _dotenv: https://github.com/bkeepers/dotenv
.. |app['appserver']['backlog']| replace:: ``app['appserver']['backlog']``
Expand Down
3 changes: 1 addition & 2 deletions libraries/drivers_appserver_base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ def raw_out
).symbolize_keys
end

def validate_app_engine
end
def validate_app_engine; end

protected

Expand Down
3 changes: 1 addition & 2 deletions libraries/drivers_appserver_null.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ class Null < Drivers::Appserver::Base
allowed_engines :null
output filter: []

def configure
end
def configure; end
alias after_deploy configure
alias after_undeploy configure
end
Expand Down
Loading

0 comments on commit a89451f

Please sign in to comment.