Merge pull request #157 from grosser/gemfile

Gemfile
vmg · Sep 24, 2012 · 197f05f · 197f05f
2 parents cfb7e0f + f8e8ccd
commit 197f05f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,5 @@ rvm:
   - ruby-head
   - ree
 
-gemfile: Gemfile.ci
-
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,2 @@
+source :rubygems
+gemspec
diff --git a/Gemfile.ci b/Gemfile.ci
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    redcarpet (2.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    nokogiri (1.5.5)
+    rake (0.9.2.2)
+    rake-compiler (0.8.1)
+      rake
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  nokogiri
+  rake-compiler
+  redcarpet!
diff --git a/README.markdown b/README.markdown
@@ -311,6 +311,10 @@ that's a maintance nightmare and won't work.
 On a related topic: if your Markdown gem has a `lib/markdown.rb` file that
 monkeypatches the Markdown class, you're a terrible human being. Just saying.
 
+Testing
+-------
+Tests run a lot faster without `bundle exec` :)
+
 Boring legal stuff
 ------------------
 

diff --git a/redcarpet.gemspec b/redcarpet.gemspec
@@ -47,5 +47,6 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/redcarpet/extconf.rb"]
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
+  s.add_development_dependency "nokogiri"
   s.add_development_dependency "rake-compiler"
 end