From 76e1bb4c068e2c3485bd6f2d2dac7af6711c003a Mon Sep 17 00:00:00 2001 From: Bryan Woods Date: Sun, 13 Feb 2011 12:37:08 -0500 Subject: [PATCH 1/2] Checks to see if jison is installed before attempting to run it in Rakefile --- Rakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index d78f1acb..ebb03bd6 100644 --- a/Rakefile +++ b/Rakefile @@ -2,8 +2,12 @@ require "rubygems" require "bundler/setup" file "lib/handlebars/parser.js" => ["src/handlebars.yy","src/handlebars.l"] do - system "jison src/handlebars.yy src/handlebars.l" - sh "mv handlebars.js lib/handlebars/parser.js" + if ENV['PATH'].split(':').any? {|folder| File.exists?(folder+'/jison')} + system "jison src/handlebars.yy src/handlebars.l" + sh "mv handlebars.js lib/handlebars/parser.js" + else + puts "Jison is not installed. Try running `npm install jison`." + end end task :compile => "lib/handlebars/parser.js" From 935053cc3365b9032fbc3ec47dd4042b66d8fbfe Mon Sep 17 00:00:00 2001 From: Alan Johnson Date: Tue, 15 Feb 2011 16:44:48 -0500 Subject: [PATCH 2/2] Added .DS_Store to gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 078df04a..d622804e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dist lib/handlebars/parser.js vendor .rvmrc +.DS_Store