@@ -43,30 +43,36 @@ module PrototypeHelper end def self.require_sprockets - require_submodule('sprockets', "You'll need Sprockets to build Prototype") + require_submodule('Sprockets', 'sprockets') end def self.require_pdoc - require_submodule('pdoc', "You'll need PDoc to generate the documentation") + require_submodule('PDoc', 'pdoc') end def self.require_unittest_js - require_submodule('unittest_js', "You'll need UnittestJS to run the tests") + require_submodule('UnittestJS', 'unittest_js') end def self.require_caja_builder - require_submodule('caja_builder', "You'll need CajaBuilder to run cajoled tests") + require_submodule('CajaBuilder', 'caja_builder') end - def self.require_submodule(submodule, message) - message = message.strip.sub(/\.$/, '') + def self.require_submodule(name, path) begin - require submodule + require path rescue LoadError => e - puts "\n#{message}. Just run:\n\n" - puts " $ git submodule init" - puts " $ git submodule update vendor/#{submodule}" - puts "\nand you should be all set.\n\n" + missing_file = e.message.sub('no such file to load -- ', '') + if missing_file == path + puts "\nIt looks like you're missing #{name}. Just run:\n\n" + puts " $ git submodule init" + puts " $ git submodule update vendor/#{path}" + puts "\nand you should be all set.\n\n" + else + puts "\nIt looks like #{name} is missing the '#{missing_file}' gem. Just run:\n\n" + puts " $ gem install #{missing_file}" + puts "\nand you should be all set.\n\n" + end exit end end Rakefile f8cffdc80bbf4f56e1779486096c9b8fb7114f8a Tobie Langel tobie.langel@gmail.com http://github.com/staaky/prototype/commit/0a8cf9b6a38ef9ba9395a81993a6f342caf9373a 0a8cf9b6a38ef9ba9395a81993a6f342caf9373a 2009-09-02T09:38:31-07:00 2009-09-02T09:38:31-07:00 Prevent Rakefile from mishandling missing gem errors. 54a3a57a51e63fbc690ee6c71851fda5ffb15db2 Tobie Langel tobie.langel@gmail.com