Swap out progress bars for turn

mendicant-original · Feb 18, 2013 · 515ce6c · 515ce6c
1 parent 57ebf60
commit 515ce6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 ########
 # Core #
@@ -60,7 +60,7 @@ end
 group 'test' do
   gem 'capybara',  '~> 1.1.1'
   gem 'factory_girl_rails', '~> 4.1.0'
-  gem 'colorific', '~> 1.0.0'
+  gem 'turn'
   gem 'test_notifier', '~> 1.0.0'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.12)
       actionpack (= 3.2.12)
@@ -30,6 +30,7 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.3)
       rails (~> 3.0)
+    ansi (1.4.3)
     arel (3.0.2)
     builder (3.0.4)
     capistrano (2.14.2)
@@ -59,9 +60,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    colorific (1.0.2)
-      minitest (~> 2.8.0)
-      ruby-progressbar (~> 0.0.10)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -135,7 +133,6 @@ GEM
       rails (>= 3.1.0)
       redcarpet (>= 2.0.0)
     mime-types (1.21)
-    minitest (2.8.1)
     multi_json (1.6.1)
     multipart-post (1.1.5)
     net-scp (1.0.4)
@@ -193,7 +190,6 @@ GEM
     redcarpet (2.1.0)
     ref (1.0.2)
     ruby-hmac (0.4.0)
-    ruby-progressbar (0.0.10)
     rubyzip (0.9.9)
     sass (3.2.5)
     sass-rails (3.2.6)
@@ -220,6 +216,8 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.9.6)
+      ansi
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
@@ -239,7 +237,6 @@ DEPENDENCIES
   carrierwave
   cocoon
   coffee-rails (~> 3.2.0)
-  colorific (~> 1.0.0)
   compass-rails
   daemons
   delayed_job_active_record
@@ -264,5 +261,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.0)
   test_notifier (~> 1.0.0)
   therubyracer
+  turn
   uglifier
   will_paginate (~> 3.0)
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -7,6 +7,7 @@
 require 'test_notifier/runner/minitest'
 
 TestNotifier.silence_no_notifier_warning = true
+Turn.config.natural                      = true
 
 class ActiveSupport::TestCase
   def build_puzzle