update dependencies 2

sas1ni69 · Jul 4, 2014 · 82463fe · 82463fe
1 parent a84c076
commit 82463fe
Show file tree

Hide file tree

Showing 57 changed files with 103 additions and 106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ db/*sqlite
 
 # sass
 .sass-cache/
+
+# github access tokens
+.access_tokens
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+exercism
diff --git a/Gemfile b/Gemfile
@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 ruby "2.1.1"
 
-gem 'activesupport', '~> 4.0.4'
-gem 'activerecord', '~> 4.0.4'
+gem 'activesupport', '~> 4.1.4'
+gem 'activerecord', '~> 4.1.4'
 
 gem 'bugsnag'
 gem 'faraday'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
-      builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
     approvals (0.0.16)
       nokogiri (~> 1.6)
       thor (~> 0.18)
-    arel (4.0.2)
-    atomic (1.1.16)
+    arel (5.0.1.20140414130214)
     bugsnag (2.1.0)
       httparty (>= 0.6, < 1.0)
       multi_json (~> 1.0)
-    builder (3.1.4)
-    capybara (2.1.0)
+    builder (3.2.2)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -40,13 +37,15 @@ GEM
       term-ansicolor
       thor
     database_cleaner (1.3.0)
-    docile (1.1.1)
-    dotenv (0.9.0)
+    docile (1.1.5)
+    dotenv (0.11.1)
+      dotenv-deployment (~> 0.0.2)
+    dotenv-deployment (0.0.2)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
+    foreman (0.74.0)
+      dotenv (~> 0.11.1)
+      thor (~> 0.19.1)
     haml (4.0.5)
       tilt
     httparty (0.13.1)
@@ -58,36 +57,33 @@ GEM
       addressable (~> 2.3)
     loofah (2.0.0)
       nokogiri (>= 1.5.9)
-    mail (2.2.7)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.2)
+    mime-types (2.3)
     mini_portile (0.6.0)
-    minitest (4.7.5)
-    minitest-capybara (0.5.0)
-      capybara (~> 2.1.0)
-      minitest (~> 4.0)
+    minitest (5.3.5)
+    minitest-capybara (0.7.1)
+      capybara (~> 2.2)
+      minitest (~> 5.0)
       rake
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    newrelic_rpm (3.8.1.221)
+    newrelic_rpm (3.9.0.229)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     petroglyph (0.0.7)
       tilt
     pg (0.17.1)
-    polyglot (0.3.4)
-    pony (1.8)
+    pony (1.9)
       mail (>= 2.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     puma (2.8.2)
       rack (>= 1.1, < 2.0)
@@ -112,21 +108,18 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.4.7)
+    slop (3.5.0)
     sqlite3 (1.3.9)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
+    thread_safe (0.3.4)
     tilt (1.4.1)
     timecop (0.7.1)
-    tins (0.13.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
-    will_paginate (3.0.5)
+    tins (1.3.0)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+    will_paginate (3.0.7)
     will_paginate-bootstrap (1.0.0)
       will_paginate (>= 3.0.3)
     xpath (2.0.0)
@@ -136,8 +129,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.0.4)
-  activesupport (~> 4.0.4)
+  activerecord (~> 4.1.4)
+  activesupport (~> 4.1.4)
   approvals
   bugsnag
   coveralls

diff --git a/config/database.yml b/config/database.yml
@@ -9,4 +9,4 @@ development:
   pool: 5
   host: localhost
   username: exercism
-  password:
+  password: apples
diff --git a/lib/exercism/stats/snapshot.rb b/lib/exercism/stats/snapshot.rb
@@ -74,7 +74,7 @@ def execute(sql)
     end
 
     def time_of(timestamp)
-      Time.strptime(timestamp.gsub(/\.\d+$/, '') + " UTC", "%Y-%m-%d %H:%M:%S %Z")
+      Time.strptime(timestamp.gsub(/\.\d+$/, '') + " UTC", "%Y-%m-%d %H:%M:%S %Z").iso8601
     end
   end
 end
diff --git a/test/acceptance/acceptance_test_case.rb b/test/acceptance/acceptance_test_case.rb
@@ -1,4 +1,4 @@
-class AcceptanceTestCase < MiniTest::Unit::TestCase
+class AcceptanceTestCase < MiniTest::Test
   include Capybara::DSL
   include Capybara::Assertions
   include DBCleaner

diff --git a/test/api/assignments_test.rb b/test/api/assignments_test.rb
@@ -1,7 +1,7 @@
 require_relative '../api_helper'
 require 'mocha/setup'
 
-class AssignmentsApiTest < MiniTest::Unit::TestCase
+class AssignmentsApiTest < MiniTest::Test
   include Rack::Test::Methods
   include DBCleaner
 

diff --git a/test/api/exercises_test.rb b/test/api/exercises_test.rb
@@ -1,6 +1,6 @@
 require_relative '../api_helper'
 
-class ExercisesApiTest < MiniTest::Unit::TestCase
+class ExercisesApiTest < MiniTest::Test
   include Rack::Test::Methods
   include DBCleaner
 

diff --git a/test/api/iterations_test.rb b/test/api/iterations_test.rb
@@ -1,6 +1,6 @@
 require_relative '../api_helper'
 
-class ItertaionsApiTest < MiniTest::Unit::TestCase
+class ItertaionsApiTest < MiniTest::Test
   include Rack::Test::Methods
   include DBCleaner
 

diff --git a/test/api/stats_test.rb b/test/api/stats_test.rb
@@ -1,7 +1,7 @@
 require_relative '../api_helper'
 require 'timecop'
 
-class StatsApiTest < MiniTest::Unit::TestCase
+class StatsApiTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/api_test.rb b/test/api_test.rb
@@ -11,7 +11,7 @@ class Legacy < Core
   end
 end
 
-class ApiTest < MiniTest::Unit::TestCase
+class ApiTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/app/exercises_test.rb b/test/app/exercises_test.rb
@@ -1,6 +1,6 @@
 require_relative '../app_helper'
 
-class AppExercisesTest < MiniTest::Unit::TestCase
+class AppExercisesTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/app/helpers/fuzzy_time_test.rb b/test/app/helpers/fuzzy_time_test.rb
@@ -1,7 +1,7 @@
 require_relative '../../test_helper'
 require 'app/helpers/fuzzy_time'
 
-class FuzzyTimeHelperTest < MiniTest::Unit::TestCase
+class FuzzyTimeHelperTest < MiniTest::Test
 
   def helper
     return @helper if @helper

diff --git a/test/app/helpers/markdown_test.rb b/test/app/helpers/markdown_test.rb
@@ -2,7 +2,7 @@
 require 'exercism/converts_markdown_to_html'
 require 'app/helpers/markdown'
 
-class MarkdownHelperTest < MiniTest::Unit::TestCase
+class MarkdownHelperTest < MiniTest::Test
   def helper
     return @helper if @helper
     @helper = Object.new

diff --git a/test/app/helpers/site_title_helper_test.rb b/test/app/helpers/site_title_helper_test.rb
@@ -1,7 +1,7 @@
 require_relative '../../test_helper'
 require 'app/helpers/site_title_helper'
 
-class SiteTitleHelperTest < MiniTest::Unit::TestCase
+class SiteTitleHelperTest < MiniTest::Test
 
   def helper
     return @helper if @helper

diff --git a/test/app/helpers/submissions_helper_test.rb b/test/app/helpers/submissions_helper_test.rb
@@ -1,7 +1,7 @@
 require_relative '../../integration_helper'
 require 'app/helpers/submissions_helper'
 
-class SubmissionsHelperTest < MiniTest::Unit::TestCase
+class SubmissionsHelperTest < MiniTest::Test
   include DBCleaner
 
   def setup

diff --git a/test/app/nitpick_test.rb b/test/app/nitpick_test.rb
@@ -1,6 +1,6 @@
 require_relative '../app_helper'
 
-class NitpickAppTest < MiniTest::Unit::TestCase
+class NitpickAppTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/app/notifications_test.rb b/test/app/notifications_test.rb
@@ -1,6 +1,6 @@
 require './test/app_helper'
 
-class AppNotificationsTest < MiniTest::Unit::TestCase
+class AppNotificationsTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/app/presenters/languages_test.rb b/test/app/presenters/languages_test.rb
@@ -1,7 +1,7 @@
 require_relative '../../test_helper'
 require 'app/presenters/languages'
 
-class PresentersLanguagesTest < MiniTest::Unit::TestCase
+class PresentersLanguagesTest < MiniTest::Test
   def test_one_language
     assert_equal "Python", ExercismWeb::Presenters::Languages.new(['Python']).to_s
   end

diff --git a/test/app/presenters/profile_test.rb b/test/app/presenters/profile_test.rb
@@ -2,7 +2,7 @@
 require 'app/presenters/profile.rb'
 require 'mocha/setup'
 
-class ProfileTest < MiniTest::Unit::TestCase
+class ProfileTest < MiniTest::Test
 
   def setup
     super

diff --git a/test/app/presenters/setup_test.rb b/test/app/presenters/setup_test.rb
@@ -2,7 +2,7 @@
 require 'app/presenters/setup'
 require 'exercism/config'
 
-class SetupPresenterTest < MiniTest::Unit::TestCase
+class SetupPresenterTest < MiniTest::Test
   def with_stubbed_languages(&block)
     Exercism::Config.stub(:languages, {:ruby => 'Ruby'}) do
       Exercism::Config.stub(:upcoming, ["PHP"]) do

diff --git a/test/app/presenters/sharing_test.rb b/test/app/presenters/sharing_test.rb
@@ -1,7 +1,7 @@
 require_relative '../../test_helper'
 require 'app/presenters/sharing.rb'
 
-class SharingTest < MiniTest::Unit::TestCase
+class SharingTest < MiniTest::Test
 
   def submission
     submission = Object.new

diff --git a/test/app/presenters/workload_test.rb b/test/app/presenters/workload_test.rb
@@ -4,7 +4,7 @@
 require 'exercism/submission'
 require 'app/presenters/workload'
 
-class WorkloadTest < MiniTest::Unit::TestCase
+class WorkloadTest < MiniTest::Test
   include Rack::Test::Methods
   include DBCleaner
 

diff --git a/test/app/submissions_test.rb b/test/app/submissions_test.rb
@@ -1,7 +1,7 @@
 require_relative '../app_helper'
 require 'mocha/setup'
 
-class SubmissionsTest < MiniTest::Unit::TestCase
+class SubmissionsTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/app/teams_test.rb b/test/app/teams_test.rb
@@ -1,7 +1,7 @@
 require_relative '../app_helper'
 require 'mocha/setup'
 
-class TeamsTest < MiniTest::Unit::TestCase
+class TeamsTest < MiniTest::Test
   include Rack::Test::Methods
   include AppTestHelper
   include DBCleaner

diff --git a/test/db/config_test.rb b/test/db/config_test.rb
@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'db/config'
 
-class DB::ConfigTest < MiniTest::Unit::TestCase
+class DB::ConfigTest < MiniTest::Test
   def relative_to_root(*paths)
     File.expand_path(File.join(__FILE__, '..', '..', '..', *paths))
   end

diff --git a/test/exercism/code_test.rb b/test/exercism/code_test.rb
@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'exercism/code'
 
-class CodeTest < MiniTest::Unit::TestCase
+class CodeTest < MiniTest::Test
 
   def test_extension
     code = Code.new('/path/to/file.rb')

diff --git a/test/exercism/cohort_test.rb b/test/exercism/cohort_test.rb
@@ -1,6 +1,6 @@
 require_relative '../integration_helper'
 
-class CohortTest < MiniTest::Unit::TestCase
+class CohortTest < MiniTest::Test
   include DBCleaner
 
   def test_team_members_and_managers