Merge branch 'master' into abstract-erd

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb

diff --git a/Gemfile b/Gemfile
index f73bc3edac18f0ed5de2a0ca548ddc4681b39871..e4f65f8c900a351e8ce24bcfcea39af5eb4ede63 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -12,4 +12,5 @@ group :development do
   gem "rake"
   gem "graph.njae"
   gem "porter2stemmer"
+  gem 'simplecov', :require => false, :group => :test
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index 8d44c452abb6e42cf6b926b422b2bf2067c7d10b..0a4459e6557a79649e653742171ab8a41dab22b8 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,6 +4,8 @@ GEM
     diff-lcs (1.1.3)
     graph.njae (0.2.4)
     json (1.6.5)
+    multi_json (1.3.6)
+    porter2stemmer (1.0.0)
     porter2stemmer (1.0.1)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -16,6 +18,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
@@ -27,3 +33,4 @@ DEPENDENCIES
   rake
   rdoc
   rspec
+  simplecov

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d10b8b13acb00391dffa4511889f7185687be39f..b54e9f5ce10e24e397be2c9244293cf9f2862fd1 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1 +1,4 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'erd_handler'