screw_server 0.1.9 → 0.1.10

data/bundler_version.rb

@@ -1 +1 @@
-SCREW_SERVER_BUNDLER_VERSION = "~> 1.2.0"
+SCREW_SERVER_BUNDLER_VERSION = "~> 1.2"

data/lib/screw_server/app.rb

@@ -1,7 +1,7 @@
 require 'sinatra/base'
 require "json"
 
-require 'screw_server/jslint_suite'
+require 'screw_server/jshint_suite'
 require "screw_server/spec_file"
 
 module ScrewServer
@@ -13,6 +13,13 @@ module ScrewServer
 
     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
@@ -74,12 +81,12 @@ module ScrewServer
         "#{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
@@ -127,7 +134,7 @@ module ScrewServer
 
       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
@@ -177,7 +184,7 @@ module ScrewServer
       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
 

data/lib/screw_server/{jslint_suite.rb → jshint_suite.rb}

@@ -1,22 +1,15 @@
 module ScrewServer
-  class JslintSuite
+  class JshintSuite
 
+    # All options see http://www.jshint.com/docs/
     DEFAULT_OPTIONS = {
       "bitwise" => true,
       "browser" => true,
+      "jquery" => true,
       "eqeqeq" => true,
       "immed" => true,
       "newcap" => true,
-      "nomen" => true,
-      "regexp" => true,
       "undef" => true,
-      "white" => true,
-      "sloppy" => true,
-      "vars" => true,
-      "nomen" => true,
-      "regexp" => true,
-      "plusplus" => true,
-      "indent" => true,
     }
 
     attr_accessor :name, :file_list, :options
@@ -41,8 +34,8 @@ module ScrewServer
 
     private
 
-    def self.jslint(name)
-      suite = JslintSuite.new(name)
+    def self.jshint(name)
+      suite = JshintSuite.new(name)
       yield suite
       @suites << suite
     end

data/screw_server.gemspec

@@ -2,7 +2,7 @@ require File.expand_path("../bundler_version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = %q{screw_server}
-  s.version = '0.1.9'
+  s.version = '0.1.10'
   s.authors = ["Kristian Hanekamp", "Infopark AG"]
   s.description = %q{Screw Server - easy javascript unit tests}
   s.email = %q{kristian.hanekamp@infopark.de}

data/views/run_spec.haml

@@ -14,7 +14,7 @@
 
     %script{:type => "text/javascript"}
       = "fixture_container = #{fixture_html.to_json}"
-      = "Screw.jslint_suites = #{jslint_suites.to_json};"
+      = "Screw.jshint_suites = #{jshint_suites.to_json};"
   %body
     %h3#screw_server_loading{:class => "status"}
       Loading...
@@ -22,7 +22,7 @@
     - @specs.each do |spec|
       %script{:type => "text/javascript", :src => cache_busting_url(url_for_spec(spec.full_name))}
 
-    %script{:type => "text/javascript", :src => url_for_screw_asset("screw-jslint.js")}
+    %script{:type => "text/javascript", :src => url_for_screw_asset("screw-jshint.js")}
 
     :javascript
       $("#screw_server_loading").remove();

metadata

@@ -1,169 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: screw_server
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.1.10
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 9
-  version: 0.1.9
 platform: ruby
-authors: 
+authors:
 - Kristian Hanekamp
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70307345188540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 6
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345188540
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &70307345187620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 3
-        - 0
-        - 13
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 3.0.13
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345187620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70307345185580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345185580
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70307345183220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345183220
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70307345198180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345198180
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &70307345197380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345197380
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70307345196580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 12
-        - 6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.12.6
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70307345196580
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70307345195520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 2
-        - 7
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70307345195520
 description: Screw Server - easy javascript unit tests
 email: kristian.hanekamp@infopark.de
-executables: 
+executables:
 - screw_server
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/screw_server/app.rb
 - lib/screw_server/base.rb
 - lib/screw_server/fixture_file.rb
-- lib/screw_server/jslint_suite.rb
+- lib/screw_server/jshint_suite.rb
 - lib/screw_server/spec_file.rb
 - lib/screw_server.rb
-- assets/screw-jslint.js
+- assets/screw-jshint.js
 - assets/screw-server.js
 - assets/screw.css
+- assets/vendor/jshint.js
 - assets/vendor/jslint/init_ui.js
 - assets/vendor/jslint/intercept.js
 - assets/vendor/jslint/jslint.html
@@ -225,39 +178,29 @@ files:
 - Gemfile.run.lock
 - screw_server.gemspec
 - bundler_version.rb
-has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Screw Server
 test_files: []
-
+has_rdoc: