screw_server 0.1.10 → 0.1.11

data/assets/screw-jshint.js

@@ -36,7 +36,7 @@ $("script").map(function() {
 
 if (Screw.jshint_suites.length > 0) {
   Screw.Unit(function(){
-    describe("JSHINT check", function() {
+    describe("JSHint check", function() {
       it("should succeed", function() {
         var message = "";
         var ajax = Screw.ajax;
@@ -51,7 +51,7 @@ if (Screw.jshint_suites.length > 0) {
               if (e) {
                 var line = parseInt(e.line, 10);
                 var character = parseInt(e.character, 10);
-                message += 'Lint at ' + name + ":" + line + ' character ' +
+                message += 'JSHint at ' + name + ":" + line + ' character ' +
                   character + ': ' + e.reason + "\n";
                 message += (e.evidence || '').
                   replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1") + "\n";

data/bin/screw_server

@@ -30,6 +30,8 @@ begin
 rescue Errno::ENOENT
 end
 
+require 'optparse'
+
 OptionParser.new do |opt|
   opt.on('--port -p ', Integer, 'port to start screw_server on (default is 3210)') do |port|
     options[:port] = port

data/lib/screw_server/app.rb

@@ -179,10 +179,10 @@ module ScrewServer
 
     def url_for_source_file(filename)
       file = File.expand_path(filename)
-      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)
+      if file.start_with?(Base.spec_base_dir.to_s)
         url_for_spec(file[(Base.spec_base_dir.to_s.length + 1)..-1])
+      elsif file.start_with?(Base.code_base_dir.to_s)
+        file[Base.code_base_dir.to_s.length..-1]
       else
         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

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.10'
+  s.version = '0.1.11'
   s.authors = ["Kristian Hanekamp", "Infopark AG"]
   s.description = %q{Screw Server - easy javascript unit tests}
   s.email = %q{kristian.hanekamp@infopark.de}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screw_server
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70307345188540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70307345188540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70307345187620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *70307345187620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.13
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70307345185580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,62 +54,92 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70307345185580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70307345183220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307345183220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70307345198180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307345198180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70307345197380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70307345197380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70307345196580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.12.6
   type: :runtime
   prerelease: false
-  version_requirements: *70307345196580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.6
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70307345195520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70307345195520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 description: Screw Server - easy javascript unit tests
 email: kristian.hanekamp@infopark.de
 executables:
@@ -117,12 +157,6 @@ files:
 - 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
-- assets/vendor/jslint/jslint.js
-- assets/vendor/jslint/lint.html
-- assets/vendor/jslint/README
 - assets/vendor/screw-unit/CHANGES
 - assets/vendor/screw-unit/example/models/cat.js
 - assets/vendor/screw-unit/example/models/man.js
@@ -198,9 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Screw Server
 test_files: []
-has_rdoc: 

data/assets/vendor/jslint/README

@@ -1,41 +0,0 @@
-JSLint, The JavaScript Code Quality Tool
-
-Douglas Crockford
-douglas@crockford.com
-
-2011-04-17
-
-jslint.js contains the fully commented JSLINT function.
-
-jslint.html runs the JSLINT function in a web page. The page also depends
-on adsafe.js [www.ADsafe.org] and json2.js [www.JSON.org] (which are not
-included in this project) and intercept.js and init_ui.js (which are). The
-js files should all be minified, and all except init_ui.js are concatenated
-together to form web_jslint.js.
-
-intercept.js augments ADsafe, giving widgets access to the clock, cookies,
-and the JSLINT function.
-
-init_ui.js hooks the HTML ui components to ADsafe.
-
-lint.html describes JSLint's usage.
-
-Direct questions and comments to http://tech.groups.yahoo.com/group/jslint_com/.
-
-JSLint can be run anywhere that JavaScript (or Java) can run. See for example
-http://tech.groups.yahoo.com/group/jslint_com/database?method=reportRows&tbl=1
-
-The place to express yourself in programming is in the quality of your ideas,
-and the efficiency of execution. The role of style is the same as in
-literature. A great writer doesn't express himself by putting the spaces
-before his commas instead of after, or by putting extra spaces inside his
-parentheses. A great writer will slavishly conform to some rules of style,
-and that in no way constrains his power to express himself creatively.
-See for example William Strunk's The Elements of Style
-[http://www.crockford.com/wrrrld/style.html].
-
-This applies to programming as well. Conforming to a consistent style
-improves readability, and frees you to express yourself in ways that matter.
-JSLint here plays the part of a stern but benevolent editor, helping you to
-get the style right so that you can focus your creative energy where it is
-most needed.

data/assets/vendor/jslint/init_ui.js

@@ -1,178 +0,0 @@
-// init_ui.js
-// 2011-07-19
-
-// This is the web browser companion to fulljslint.js. It is an ADsafe
-// lib file that implements a web ui by adding behavior to the widget's
-// html tags.
-
-// It stores a function in lib.init_ui. Calling that function will
-// start up the JSLint widget ui.
-
-// option = {adsafe: true, fragment: false}
-
-/*properties check, cookie, each, edition, get, getCheck, getTitle, getValue,
-    has, indent, isArray, join, jslint, length, lib, maxerr, maxlen, on,
-    predef, push, q, select, set, split, stringify, style, target, tree, value
-*/
-
-
-ADSAFE.lib("init_ui", function (lib) {
-    "use strict";
-
-    return function (dom) {
-        var table = dom.q('#JSLINT_TABLE'),
-            boxes = table.q('span'),
-            indent = dom.q('#JSLINT_INDENT'),
-            input = dom.q('#JSLINT_INPUT'),
-            jslintstring = dom.q('#JSLINT_JSLINTSTRING'),
-            maxerr = dom.q('#JSLINT_MAXERR'),
-            maxlen = dom.q('#JSLINT_MAXLEN'),
-            option = lib.cookie.get(),
-            output = dom.q('#JSLINT_OUTPUT'),
-            tree = dom.q('#JSLINT_TREE'),
-            predefined = dom.q('#JSLINT_PREDEF');
-
-        function show_jslint_control() {
-
-// Build and display a /*jslint*/ control comment.
-// The comment can be copied into a .js file.
-
-            var a = [];
-
-            boxes.each(function (bunch) {
-                var name = bunch.getTitle(),
-                    value = ADSAFE.get(option, name);
-                if (typeof value === 'boolean') {
-                    a.push(name + ': ' + value);
-                    bunch.style('backgroundColor', value ? 'black' : 'white');
-                } else {
-                    bunch.style('backgroundColor', 'gainsboro');
-                }
-            });
-            if (typeof option.maxerr === 'number' && option.maxerr >= 0) {
-                a.push('maxerr: ' + String(option.maxerr));
-            }
-            if (typeof option.maxlen === 'number' && option.maxlen >= 0) {
-                a.push('maxlen: ' + String(option.maxlen));
-            }
-            if (typeof option.indent === 'number' && option.indent >= 0) {
-                a.push('indent: ' + String(option.indent));
-            }
-            jslintstring.value('/*jslint ' + a.join(', ') + ' */');
-
-// Make a JSON cookie of the option object.
-
-            lib.cookie.set(option);
-        }
-
-        function show_options() {
-            indent.value(String(option.indent));
-            maxlen.value(String(option.maxlen || ''));
-            maxerr.value(String(option.maxerr));
-            predefined.value(ADSAFE.isArray(option.predef) ? option.predef.join(',') : '');
-            show_jslint_control();
-        }
-
-        function update_box(event) {
-
-//  Boxes are tristate, cycling true, false, undefined.
-
-            var title = event.target.getTitle();
-            if (title) {
-                ADSAFE.set(option, title,
-                    ADSAFE.get(option, title) === true ? false :
-                    ADSAFE.get(option, title) === false ? undefined : true);
-            }
-            show_jslint_control();
-        }
-
-        function update_number(event) {
-            var value = event.target.getValue();
-            if (value.length === 0 || +value < 0 || !isFinite(value)) {
-                value = '';
-                ADSAFE.set(option, event.target.getTitle(), undefined);
-            } else {
-                ADSAFE.set(option, event.target.getTitle(), +value);
-            }
-            event.target.value(String(value));
-            show_jslint_control();
-        }
-
-        function update_list(event) {
-            var value = event.target.getValue().split(/\s*,\s*/);
-            ADSAFE.set(option, event.target.getTitle(), value);
-            event.target.value(value.join(', '));
-            show_jslint_control();
-        }
-
-
-// Restore the options from a JSON cookie.
-
-        if (!option || typeof option !== 'object') {
-            option = {
-                indent: 4,
-                maxerr: 50
-            };
-        } else {
-            option.indent =
-                typeof option.indent === 'number' && option.indent >= 0 ?
-                option.indent : 4;
-            option.maxerr =
-                typeof option.maxerr === 'number' && option.maxerr >= 0 ?
-                option.maxerr : 50;
-        }
-        show_options();
-
-
-// Display the edition.
-
-        dom.q('#JSLINT_EDITION').value('Edition ' + lib.edition());
-
-// Add click event handlers to the [JSLint] and [clear] buttons.
-
-        dom.q('input&jslint').on('click', function () {
-            tree.value('');
-
-// Call JSLint and display the report.
-
-            tree.value(String(lib.jslint(input.getValue(), option, output) / 1000) + ' seconds.');
-            input.select();
-            return false;
-        });
-
-        dom.q('input&tree').on('click', function () {
-            output.value('Tree:');
-            tree.value(JSON.stringify(lib.tree(), [
-                'label', 'id', 'string', 'number', 'arity', 'name', 'first',
-                'second', 'third', 'block', 'else', 'quote', 'type'
-            ], 4));
-            input.select();
-        });
-
-        dom.q('input&clear').on('click', function () {
-            output.value('');
-            tree.value('');
-            input.value('').select();
-        });
-
-
-        dom.q('#JSLINT_CLEARALL').on('click', function () {
-            option = {
-                indent: 4,
-                maxerr: 50
-            };
-            show_options();
-        });
-
-        table.on('click', update_box);
-        indent.on('change', update_number);
-        maxerr.on('change', update_number);
-        maxlen.on('change', update_number);
-        predefined.on('change', update_list);
-        input
-            .on('change', function () {
-                output.value('');
-            })
-            .select();
-    };
-});