Bump Ruby 2.4.0

Thibaut Courouble committed 9 years ago

Commit 94470251 parent a5a999d7 files · +32 −31Browse files

Unified · Split

7 files

.ruby-version +1 −1
Dockerfile +1 −1
Gemfile +2 −2
Gemfile.lock +25 −25
README.md +1 −1
lib/app.rb +1 −0
test/lib/docs/core/url_test.rb +1 −1

@@ -1 +1 @@
1		−2.3.3
	1	+2.4.0

Dockerfile+1−1

@@ -1,5 +1,5 @@
1	1
2		−FROM ruby:2.3.3
	2	+FROM ruby:2.4.0
3	3	MAINTAINER Conor Heine <conor.heine@gmail.com>
4	4
5	5	RUN apt-get update

Gemfile+2−2

@@ -1,10 +1,10 @@
1	1	source 'https://rubygems.org'
2		−ruby '2.3.3'
	2	+ruby '2.4.0'
3	3
4	4	gem 'rake'
5	5	gem 'thor'
6	6	gem 'pry', '~> 0.10.0'
7		−gem 'activesupport', '~> 4.2', require: false
	7	+gem 'activesupport', '~> 5.0', require: false
8	8	gem 'yajl-ruby', require: false
9	9
10	10	group :app do

Gemfile.lock+25−25

@@ -1,11 +1,10 @@
1	1	GEM
2	2	remote: https://rubygems.org/
3	3	specs:
4		− activesupport (4.2.7.1)
	4	+ activesupport (5.0.1)
	5	+ concurrent-ruby (~> 1.0, >= 1.0.2)
5	6	i18n (~> 0.7)
6		− json (~> 1.7, >= 1.7.7)
7	7	minitest (~> 5.1)
8		− thread_safe (~> 0.3, >= 0.3.4)
9	8	tzinfo (~> 1.1)
10	9	backports (3.6.8)
11	10	better_errors (2.1.1)
@@ -17,26 +16,25 @@ GEM · 5 unmodified lines
17	16	coffee-script (2.4.1)
18	17	coffee-script-source
19	18	execjs
20		− coffee-script-source (1.11.1)
21		− concurrent-ruby (1.0.2)
	19	+ coffee-script-source (1.12.2)
	20	+ concurrent-ruby (1.0.4)
22	21	daemons (1.2.4)
23	22	erubis (2.7.0)
24		− ethon (0.9.1)
	23	+ ethon (0.10.1)
25	24	ffi (>= 1.3.0)
26	25	eventmachine (1.2.1)
27	26	execjs (2.7.0)
28		− ffi (1.9.14)
	27	+ ffi (1.9.17)
29	28	highline (1.7.8)
30		− html-pipeline (2.4.2)
	29	+ html-pipeline (2.5.0)
31	30	activesupport (>= 2)
32	31	nokogiri (>= 1.4)
33	32	i18n (0.7.0)
34		− json (1.8.3)
35	33	method_source (0.8.2)
36	34	mini_portile2 (2.1.0)
37		− minitest (5.9.1)
	35	+ minitest (5.10.1)
38	36	multi_json (1.12.1)
39		− nokogiri (1.6.8.1)
	37	+ nokogiri (1.7.0.1)
40	38	mini_portile2 (~> 2.1.0)
41	39	options (2.3.2)
42	40	progress_bar (1.1.0)
@@ -51,9 +49,9 @@ GEM · 8 unmodified lines
51	49	rack
52	50	rack-test (0.6.3)
53	51	rack (>= 1.0)
54		− rake (11.3.0)
	52	+ rake (12.0.0)
55	53	rr (1.2.0)
56		− sass (3.4.22)
	54	+ sass (3.4.23)
57	55	sinatra (1.4.7)
58	56	rack (~> 1.5)
59	57	rack-protection (~> 1.4)
@@ -66,7 +64,7 @@ GEM · 6 unmodified lines
66	64	sinatra (~> 1.4.0)
67	65	tilt (>= 1.3, < 3)
68	66	slop (3.6.0)
69		− sprockets (3.7.0)
	67	+ sprockets (3.7.1)
70	68	concurrent-ruby (~> 1.0)
71	69	rack (> 1, < 3)
72	70	sprockets-helpers (1.2.1)
@@ -75,24 +73,26 @@ GEM · 2 unmodified lines
75	73	daemons (~> 1.0, >= 1.0.9)
76	74	eventmachine (~> 1.0, >= 1.0.4)
77	75	rack (>= 1, < 3)
78		− thor (0.19.3)
	76	+ thor (0.19.4)
79	77	thread_safe (0.3.5)
80	78	tilt (2.0.5)
81		− tty-pager (0.4.0)
	79	+ tty-pager (0.5.0)
82	80	tty-screen (~> 0.5.0)
83		− tty-which (~> 0.1.0)
84		− verse (~> 0.4.0)
	81	+ tty-which (~> 0.2.0)
	82	+ verse (~> 0.5.0)
85	83	tty-screen (0.5.0)
86		− tty-which (0.1.0)
87		− typhoeus (1.1.0)
	84	+ tty-which (0.2.1)
	85	+ typhoeus (1.1.2)
88	86	ethon (>= 0.9.0)
89	87	tzinfo (1.2.2)
90	88	thread_safe (~> 0.1)
91		− uglifier (3.0.3)
	89	+ uglifier (3.0.4)
92	90	execjs (>= 0.3.0, < 3)
	91	+ unicode-display_width (1.1.3)
93	92	unicode_utils (1.4.0)
94	93	unix_utils (0.0.15)
95		− verse (0.4.0)
	94	+ verse (0.5.0)
	95	+ unicode-display_width (~> 1.1.0)
96	96	unicode_utils (~> 1.4.0)
97	97	yajl-ruby (1.3.0)
98	98
@@ -100,7 +100,7 @@ PLATFORMS · 1 unmodified line
100	100	ruby
101	101
102	102	DEPENDENCIES
103		− activesupport (~> 4.2)
	103	+ activesupport (~> 5.0)
104	104	better_errors
105	105	browser
106	106	coffee-script
@@ -128,7 +128,7 @@ DEPENDENCIES · 21 unmodified lines
128	128	yajl-ruby
129	129
130	130	RUBY VERSION
131		− ruby 2.3.3p222
	131	+ ruby 2.4.0p0
132	132
133	133	BUNDLED WITH
134		− 1.13.6
	134	+ 1.14.1

README.md+1−1

@@ -20,7 +20,7 @@ Unless you wish to contribute to the project, I recommend using the hosted versi · 19 unmodified lines
20	20
21	21	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.
22	22
23		−DevDocs requires Ruby 2.3.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:
	23	+DevDocs requires Ruby 2.4.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:
24	24
25	25	```
26	26	git clone https://github.com/Thibaut/devdocs.git && cd devdocs

lib/app.rb+1−0

@@ -7,6 +7,7 @@ class App < Sinatra::Application · 6 unmodified lines
7	7	Bundler.require environment
8	8	require 'sinatra/cookies'
9	9	require 'tilt/erubis'
	10	+ require 'active_support/notifications'
10	11
11	12	Rack::Mime::MIME_TYPES['.webapp'] = 'application/x-web-app-manifest+json'
12	13

test/lib/docs/core/url_test.rb+1−1

@@ -197,7 +197,7 @@ class DocsUrlTest < MiniTest::Spec · 196 unmodified lines
197	197	end
198	198
199	199	it "returns nil with 'http://example.com'" do
200		− assert_equal nil, url.subpath_to('http://example.com')
	200	+ assert_nil url.subpath_to('http://example.com')
201	201	end
202	202	end
203	203