lib/screw_server/app.rb in screw_server-0.1.9 vs lib/screw_server/app.rb in screw_server-0.1.10

@@ -1,9 +1,9 @@
 require 'sinatra/base'
 require "json"
 
-require 'screw_server/jslint_suite'
+require 'screw_server/jshint_suite'
 require "screw_server/spec_file"
 
 module ScrewServer
   class App < Sinatra::Base
 
@@ -11,10 +11,17 @@
     ASSET_BASE_URL = "___screw_assets___"
     VIEW_PATH = File.join(File.dirname(__FILE__), "..", "..", "views")
 
     set :views, VIEW_PATH
 
+    before do
+      jslint_file = File.join(Base.spec_base_dir, "jslint.rb")
+      if File.exists?(jslint_file)
+        raise "jslint.rb is no longer supported. Please use jshint.rb."
+      end
+    end
+
     get "/run/:name" do
       run_specs([SpecFile.new(params[:name])])
     end
 
     get "/run" do
@@ -72,16 +79,16 @@
     helpers do
       def cache_busting_url(url)
         "#{url}?#{rand}"
       end
 
-      def jslint_suites
-        jslint_file = File.join(Base.spec_base_dir, "jslint.rb")
-        if !File.exists?(jslint_file)
+      def jshint_suites
+        jshint_file = File.join(Base.spec_base_dir, "jshint.rb")
+        if !File.exists?(jshint_file)
           []
         else
-          JslintSuite.suites_from(jslint_file).map do |suite|
+          JshintSuite.suites_from(jshint_file).map do |suite|
             {
               :file_list => suite.file_list.map { |file| url_for_source_file(file) },
               :options => suite.options_with_defaults
             }
           end
@@ -125,11 +132,11 @@
       EOS
       end
 
       def screw_assets
         %w{
-          vendor/jslint/jslint.js
+          vendor/jshint.js
           vendor/screw-unit/lib/jquery.fn.js
           vendor/screw-unit/lib/jquery.print.js
           vendor/screw-unit/lib/screw.builder.js
           vendor/screw-unit/lib/screw.matchers.js
           vendor/screw-unit/lib/screw.events.js
@@ -175,10 +182,10 @@
       if file.start_with?(Base.code_base_dir.to_s)
         file[Base.code_base_dir.to_s.length..-1]
       elsif file.start_with?(Base.spec_base_dir.to_s)
         url_for_spec(file[(Base.spec_base_dir.to_s.length + 1)..-1])
       else
-        raise "file #{file} cannot be checked by jslint since it it not inside the spec or code path: #{Base.code_base_dir} or #{Base.spec_base_dir}"
+        raise "file #{file} cannot be checked by jshint since it it not inside the spec or code path: #{Base.code_base_dir} or #{Base.spec_base_dir}"
       end
     end
 
     def run_specs(specs)
       if SpecFile.spec_helper_files.length > 0