Merge pull request #776 from tricknotes/ruby-2.2

Support Ruby 2.2.0

Merge pull request #776 from tricknotes/ruby-2.2
Support Ruby 2.2.0
Stephen Crosby
2 parents bd3eb276 d38f038c
Showing 4 changed files with 10 additions and 3 deletions Show diff stats
.travis.yml
Gemfile
Gemfile.lock
docs/ENV-VARIABLES.md
@@ -2,6 +2,7 @@ language: ruby
  
 rvm:
   - 2.1
+  - 2.2
   - rbx-2
   - ruby-head
  
@@ -83,6 +83,7 @@ group :test do
   gem 'database_cleaner'
   gem 'email_spec'
   gem 'timecop'
+  gem 'test-unit', require: 'test/unit'
   gem 'coveralls', require: false
 end
  
@@ -149,7 +149,7 @@ GEM
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.8.1)
+    kgio (2.9.2)
     launchy (2.3.0)
       addressable (~> 2.3)
     mail (2.6.3)
@@ -219,6 +219,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
+    power_assert (0.2.2)
     premailer (1.7.3)
       css_parser (>= 1.1.9)
       htmlentities (>= 4.0.0)
@@ -257,7 +258,7 @@ GEM
       activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.12.0)
+    raindrops (0.13.0)
     rake (10.4.2)
     rdoc (4.1.2)
       json (~> 1.4)
@@ -312,6 +313,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
+    test-unit (3.0.8)
+      power_assert
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -323,7 +326,7 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.5.2)
-    unicorn (4.6.3)
+    unicorn (4.8.3)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -389,6 +392,7 @@ DEPENDENCIES
   rspec-rails
   rushover
   sass-rails
+  test-unit
   timecop
   uglifier
   underscore-rails
@@ -13,6 +13,7 @@ We test it on :
  * 1.9.3
  * 2.0.0
  * 2.1.0
+ * 2.2.0
  
 ## Use configuration by ENV
...	...	@@ -2,6 +2,7 @@ language: ruby
2	2
3	3	rvm:
4	4	- 2.1
	5	+ - 2.2
5	6	- rbx-2
6	7	- ruby-head
7	8
...	...
...	...	@@ -83,6 +83,7 @@ group :test do
83	83	gem 'database_cleaner'
84	84	gem 'email_spec'
85	85	gem 'timecop'
	86	+ gem 'test-unit', require: 'test/unit'
86	87	gem 'coveralls', require: false
87	88	end
88	89
...	...
...	...	@@ -149,7 +149,7 @@ GEM
149	149	kaminari (0.14.1)
150	150	actionpack (>= 3.0.0)
151	151	activesupport (>= 3.0.0)
152		- kgio (2.8.1)
	152	+ kgio (2.9.2)
153	153	launchy (2.3.0)
154	154	addressable (~> 2.3)
155	155	mail (2.6.3)
...	...	@@ -219,6 +219,7 @@ GEM
219	219	cliver (~> 0.3.1)
220	220	multi_json (~> 1.0)
221	221	websocket-driver (>= 0.2.0)
	222	+ power_assert (0.2.2)
222	223	premailer (1.7.3)
223	224	css_parser (>= 1.1.9)
224	225	htmlentities (>= 4.0.0)
...	...	@@ -257,7 +258,7 @@ GEM
257	258	activesupport (= 4.1.8)
258	259	rake (>= 0.8.7)
259	260	thor (>= 0.18.1, < 2.0)
260		- raindrops (0.12.0)
	261	+ raindrops (0.13.0)
261	262	rake (10.4.2)
262	263	rdoc (4.1.2)
263	264	json (~> 1.4)
...	...	@@ -312,6 +313,8 @@ GEM
312	313	sprockets (>= 2.8, < 4.0)
313	314	term-ansicolor (1.2.2)
314	315	tins (~> 0.8)
	316	+ test-unit (3.0.8)
	317	+ power_assert
315	318	thor (0.19.1)
316	319	thread_safe (0.3.4)
317	320	tilt (1.4.1)
...	...	@@ -323,7 +326,7 @@ GEM
323	326	execjs (>= 0.3.0)
324	327	json (>= 1.8.0)
325	328	underscore-rails (1.5.2)
326		- unicorn (4.6.3)
	329	+ unicorn (4.8.3)
327	330	kgio (~> 2.6)
328	331	rack
329	332	raindrops (~> 0.7)
...	...	@@ -389,6 +392,7 @@ DEPENDENCIES
389	392	rspec-rails
390	393	rushover
391	394	sass-rails
	395	+ test-unit
392	396	timecop
393	397	uglifier
394	398	underscore-rails
...	...
...	...	@@ -13,6 +13,7 @@ We test it on :
13	13	* 1.9.3
14	14	* 2.0.0
15	15	* 2.1.0
	16	+ * 2.2.0
16	17
17	18	## Use configuration by ENV
18	19
...	...