Merged in SimpleCov from master#

diff --git a/.gitignore b/.gitignore
index 63a685ebda4ffd6d68cfe485ed1f4555856f6b98..094d6947a37c51ed7c5ef80e6fd58f151af2eb34 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,9 @@ doc
 # jeweler generated
 pkg
 
+# simplecov generated
+coverage
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore

diff --git a/Gemfile b/Gemfile
index df7f77956a3304619972aaaace75c1f412918a07..85b0c68a30b9164e79bcd4c75b8f531501bc3811 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,8 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.0"
+  gem "rspec" # , "~> 2.8.0"
+  gem "bundler" # , "~> 1.0.0"
+  gem "jeweler" # , "~> 1.8.0"
+  gem 'simplecov', :require => false, :group => :test
 end

diff --git a/Gemfile.lock b/Gemfile.lock
index 65179b581c8739a7b66545fc841406fe83edffe0..a0879642329a9d4df4f3e3419dc88310de1b7ca5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,28 +3,34 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.5)
+    json (1.7.3)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.8.0)
-  rspec (~> 2.8.0)
+  bundler
+  jeweler
+  rspec
+  simplecov

diff --git a/lib/graph.njae/vertex.rb b/lib/graph.njae/vertex.rb
index 4ac903c2bea7f9424ab34ecb9c6a8b42a57cab88..def0b66d79a81ff2b0348655d1459cab1720aefe 100644 (file)
--- a/lib/graph.njae/vertex.rb
+++ b/lib/graph.njae/vertex.rb
@@ -38,7 +38,7 @@ module GraphNjae
     end
     
     def to_s
-      '<V: ' + self.name + '>'
+      '<V: ' + self.name.to_s + '>'
     end
     
     def to_dot(opts = {})

diff --git a/spec/graph/edge_spec.rb b/spec/graph/edge_spec.rb
index 938890fcb251f1e333a5305968fd2d2f391d2df6..23537560ba40be5ce0ef39d277710951b8f43081 100644 (file)
--- a/spec/graph/edge_spec.rb
+++ b/spec/graph/edge_spec.rb
@@ -29,8 +29,18 @@ module GraphNjae
       end
     end # adds attributes
     
-    describe '#<<' do
-      it 'adds a new vertex to an edge (with a connection)' do
+    describe "#to_s" do
+      it "returns the string form of an edge" do
+        v1 = Vertex.new :name => :v1
+        v2 = Vertex.new :name => :v2
+        e.type = :test
+        e << v1 << v2
+        e.to_s.should == '<E: test [<V: v1>, <V: v2>] >'
+      end
+    end
+    
+    describe "#<<" do
+      it "adds a new vertex to an edge (with a connection)" do
         e.connections.should be_empty
         e << v1
         e.should have(1).connections

diff --git a/spec/graph/vertex_spec.rb b/spec/graph/vertex_spec.rb
index 9d109db3aced26dfdb072fdea7eed4ca9439985b..ca9f7eb715687d7ee3ec69e16463c3f9327f4342 100644 (file)
--- a/spec/graph/vertex_spec.rb
+++ b/spec/graph/vertex_spec.rb
@@ -25,6 +25,14 @@ module GraphNjae
         v.score.should == 15
       end
     end # adds attributes
+
+    describe "#to_s" do
+      it "returns the string form of a vertex" do
+        v.name = :v1
+        v.to_s.should == '<V: v1>'
+      end
+    end
+
     
     describe '#<<' do
       it 'adds a single edge between vertices' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index eacf13a1111c5deca2597a36531cac6a943090b7..608ead7b893277f3dafb59144be0775ccc12172b 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,4 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'graph.njae'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+require 'simplecov'
+SimpleCov.start
 
-RSpec.configure do |config|
-  
-end
+require 'graph.njae'