Permalink
Browse files

Merge branch 'master' into sinatra

Conflicts:
	spec/spec_helper.rb
  • Loading branch information...
2 parents 9e68e4d + b58301a commit cdd49717eefda3edab72cef15381b434201a52ed @winton committed Nov 24, 2010
Showing with 5 additions and 5 deletions.
  1. +1 −1 README.md
  2. +1 −1 Rakefile
  3. +3 −3 spec/spec_helper.rb
View
@@ -7,7 +7,7 @@ Requirements
------------
<pre>
-sudo gem install stencil
+gem install stencil
</pre>
Setup the template
View
@@ -92,8 +92,8 @@ task :rename do
camelize = lambda do |str|
str.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
end
+ dir = Dir['**/gem_template*']
begin
- dir = Dir['**/gem_template*']
from = dir.pop
if from
to = from.split('/')
View
@@ -5,12 +5,12 @@
require 'rack/test'
+require "#{$root}/lib/gem_template"
+require 'pp'
+
Spec::Runner.configure do |config|
end
-require "#{Bundler.root}/lib/gem_template"
-require 'pp'
-
# For use with rspec textmate bundle
def debug(object)
puts "<pre>"

0 comments on commit cdd4971

Please sign in to comment.