Merge branch 'aekym-master' into development

Closes #31

* aekym-master:
  Upgrade simplecov so it is resilient to mathn being loaded
  fix progress format when core lib mathn is loaded

Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 1.0.0)
     json (1.7.7)
+    json (1.7.7-java)
     multi_json (1.7.3)
     rake (10.0.4)
     rspec (2.13.0)
@@ -27,8 +28,8 @@ GEM
       fuubar (~> 1.0)
       rspec (~> 2.12)
     ruby-prof (0.13.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
+    simplecov (0.8.0.pre)
+      multi_json
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     timecop (0.6.1)
@@ -44,5 +45,5 @@ DEPENDENCIES
   rspectacular (~> 0.13)
   ruby-prof (~> 0.13.0)
   ruby-progressbar!
-  simplecov (~> 0.7)
+  simplecov (~> 0.8pre)
   timecop (~> 0.6)

lib/progress_bar/components/progressable.rb

@@ -66,7 +66,7 @@ def percentage_completed
         # Doing this way so we can avoid converting each
         # number to a float and then back to an integer.
         #
-        self.progress * 100 / total
+        (self.progress * 100 / total).to_i
       end
 
       def percentage_completed_with_precision

ruby-progressbar.gemspec

@@ -35,5 +35,5 @@ THEDOCTOR
   s.add_development_dependency('rspec',         '~> 2.13')
   s.add_development_dependency('rspectacular',  '~> 0.13')
   s.add_development_dependency('timecop',       '~> 0.6')
-  s.add_development_dependency('simplecov',     '~> 0.7')
+  s.add_development_dependency('simplecov',     '~> 0.8pre')
 end

spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'mathn'
 require 'rspec'
 
 Dir[File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-progressbar.rb')].each {|f| require f}