diff --git a/.ruby-version b/.ruby-version index a4db534a..914ec967 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.3 \ No newline at end of file +2.6.0 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8b037716..77443edd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5.3 +FROM ruby:2.6.0 ENV LANG=C.UTF-8 diff --git a/Dockerfile-alpine b/Dockerfile-alpine index c4b78c05..5bd25afe 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM ruby:2.5.3-alpine +FROM ruby:2.6.0-alpine ENV LANG=C.UTF-8 diff --git a/Gemfile b/Gemfile index 4e34292d..31b57064 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.5.3' +ruby '2.6.0' gem 'rake' gem 'thor' diff --git a/Gemfile.lock b/Gemfile.lock index 9792f3f4..d968a27b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,19 +19,19 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.4) daemons (1.3.1) - erubi (1.7.1) - ethon (0.11.0) + erubi (1.8.0) + ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) exifr (1.3.5) - ffi (1.9.25) + ffi (1.10.0) fspath (3.1.0) highline (2.0.0) - html-pipeline (2.9.1) + html-pipeline (2.10.0) activesupport (>= 2) nokogiri (>= 1.4) - i18n (1.2.0) + i18n (1.5.2) concurrent-ruby (~> 1.0) image_optim (0.26.3) exifr (~> 1.2, >= 1.2.2) @@ -39,21 +39,21 @@ GEM image_size (>= 1.5, < 3) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.5.1.20181213) + image_optim_pack (0.5.1.20190105) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (2.0.0) - in_threads (1.5.0) + in_threads (1.5.1) method_source (0.9.2) mini_portile2 (2.4.0) minitest (5.11.3) multi_json (1.13.1) mustermann (1.0.3) - net-sftp (2.1.3.rc3) - net-ssh (>= 2.6.5, < 6.0.0) - net-ssh (5.0.2) - newrelic_rpm (5.6.0.349) - nokogiri (1.9.0) + net-sftp (3.0.0.beta1) + net-ssh (>= 5.0.0, < 6.0.0) + net-ssh (5.1.0) + newrelic_rpm (5.7.0.350) + nokogiri (1.10.1) mini_portile2 (~> 2.4.0) options (2.3.2) progress (3.5.0) @@ -64,7 +64,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) rack (2.0.6) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-ssl-enforcer (0.2.9) rack-test (1.1.0) @@ -74,23 +74,22 @@ GEM rb-inotify (0.10.0) ffi (~> 1.0) rr (1.2.1) - sass (3.7.2) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.0.4) + sinatra (2.0.5) mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.4) + rack-protection (= 2.0.5) tilt (~> 2.0) - sinatra-contrib (2.0.4) - activesupport (>= 4.0.0) + sinatra-contrib (2.0.5) backports (>= 2.8.2) multi_json mustermann (~> 1.0) - rack-protection (= 2.0.4) - sinatra (= 2.0.4) + rack-protection (= 2.0.5) + sinatra (= 2.0.5) tilt (>= 1.3, < 3) sprockets (3.7.2) concurrent-ruby (~> 1.0) @@ -121,7 +120,7 @@ GEM thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.0) + unicode-display_width (1.4.1) unicode_utils (1.4.0) unix_utils (0.0.15) yajl-ruby (1.4.1) @@ -163,7 +162,7 @@ DEPENDENCIES yajl-ruby RUBY VERSION - ruby 2.5.3p105 + ruby 2.6.0p0 BUNDLED WITH 1.17.2 diff --git a/README.md b/README.md index f7ff8c47..837b07ad 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Unless you wish to contribute to the project, we recommend using the hosted vers DevDocs is made of two pieces: a Ruby scraper that generates the documentation and metadata, and a JavaScript app powered by a small Sinatra app. -DevDocs requires Ruby 2.5.3, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands: +DevDocs requires Ruby 2.6.0, libcurl, and a JavaScript runtime supported by [ExecJS](https://github.com/rails/execjs#readme) (included in OS X and Windows; [Node.js](https://nodejs.org/en/) on Linux). Once you have these installed, run the following commands: ``` git clone https://github.com/freeCodeCamp/devdocs.git && cd devdocs diff --git a/lib/docs/core/requester.rb b/lib/docs/core/requester.rb index 2e7a8571..6c7f5b6a 100644 --- a/lib/docs/core/requester.rb +++ b/lib/docs/core/requester.rb @@ -22,7 +22,7 @@ module Docs def initialize(options = {}) @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {} options[:max_concurrency] ||= 20 - options[:pipelining] = false + options[:pipelining] = 0 super end diff --git a/lib/docs/core/url.rb b/lib/docs/core/url.rb index b2eaf658..398babf7 100644 --- a/lib/docs/core/url.rb +++ b/lib/docs/core/url.rb @@ -72,7 +72,7 @@ module Docs if base == dest '' - elsif dest.start_with? File.join(base, '') + elsif dest.start_with?(::File.join(base, '')) url.path[(path.length)..-1] end end