Added rake task for Travis CI

seejohnrun · Mar 16, 2012 · 1e0c438 · 1e0c438
1 parent dbac02a
commit 1e0c438
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 #Githug
-Git Your Game On
+Git Your Game On [![Build Status](https://secure.travis-ci.org/Gazler/githug.png?branch=master)](http://travis-ci.org/Gazler/githug)
 
 ##About
 Githug is designed to give you a practical way of learning git.  It has a series of levels, each utilizing git commands to ensure a correct answer.

diff --git a/Rakefile b/Rakefile
@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => [:spec]
diff --git a/lib/githug/level.rb b/lib/githug/level.rb
@@ -7,7 +7,6 @@ class Level
               "commit_ammend", "reset", "checkout_file", "remote", "remote_url",
               "remote_add", "diff", "blame", "branch", "checkout", "merge",
               "squash", "contribute"]
->>>>>>> dpick/squash_commits
 
     attr_accessor :level_no, :level_path