RubyGems - jasmine - Versions diffs - 0.11.1.0 → 1.0.0 - Mend

jasmine 0.11.1.0 → 1.0.0

Files changed (16) hide show

data/README.markdown +11 -5
data/generators/jasmine/templates/jasmine-example/SpecRunner.html +1 -1
data/generators/jasmine/templates/lib/tasks/jasmine.rake +1 -1
data/jasmine/example/SpecRunner.html +1 -1
data/jasmine/lib/jasmine-html.js +1 -1
data/jasmine/lib/jasmine.js +123 -45
data/lib/jasmine/base.rb +1 -5
data/lib/jasmine/command_line_tool.rb +8 -7
data/lib/jasmine/config.rb +33 -39
data/lib/jasmine/server.rb +0 -1
data/spec/config_spec.rb +2 -22
data/spec/jasmine_command_line_tool_spec.rb +5 -2
data/spec/rails_generator_spec.rb +3 -2
data/spec/spec_helper.rb +12 -0
metadata +50 -45
data/jasmine/lib/consolex.js +0 -28

data/README.markdown CHANGED

@@ -1,19 +1,23 @@
 jasmine-gem
 ============
-Jasmine Gem dynamically serves HTML suites for [Jasmine](http://github.com/pivotal/jasmine)
+Jasmine Gem dynamically serves and runs suites for [Jasmine](http://github.com/pivotal/jasmine).
 To use:
-`(sudo) gem install jasmine`
+`gem install jasmine`
 Post-installation:
-For Rails support, use
+For Rails2 support, use
 `script/generate jasmine`
-For other projects, use
+For Rails3 support, use
+`bundle exec jasmine init`
+For other Ruby projects (including Merb), use
 `jasmine init`
@@ -27,7 +31,7 @@ You may also
 `rake jasmine:ci`
-which will run your Jasmine suites using selenium and rspec. This task is suitable for running in continuous integration environments.
+which will run your Jasmine suites using selenium and rspec. This task is suitable for running in continuous integration environments.  There is currently a known issue using this rake task with RSpec2 beta.
 Simple Configuration:
@@ -35,3 +39,5 @@ Customize `spec/javascripts/support/jasmine.yml` to enumerate the source files,
 You may use dir glob strings.
 It is also possible to add overrides into the `spec/javascripts/support/jasmine_config.rb` file directly if you require further customization.
+Copyright (c) 2008-2010 Pivotal Labs. This software is licensed under the MIT License.

data/generators/jasmine/templates/jasmine-example/SpecRunner.html CHANGED

@@ -17,6 +17,7 @@
 </head>
 <body>
+<div id="REMOVE_THIS_LINE_FROM_BUILD"><p>You must be trying to look at examples in the Jasmine source tree.</p><p>Please download a distribution version of Jasmine at <a href="http://pivotal.github.com/jasmine/">http://pivotal.github.com/jasmine/</a>.</p></div>
 <script type="text/javascript">
   jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
   jasmine.getEnv().execute();
@@ -24,4 +25,3 @@
 </body>
 </html>

data/generators/jasmine/templates/lib/tasks/jasmine.rake CHANGED

@@ -1,2 +1,2 @@
 require 'jasmine'
-load 'jasmine/tasks/jasmine.rake'
+load 'jasmine/tasks/jasmine.rake'

data/jasmine/example/SpecRunner.html CHANGED

@@ -17,6 +17,7 @@
 </head>
 <body>
+<div id="REMOVE_THIS_LINE_FROM_BUILD"><p>You must be trying to look at examples in the Jasmine source tree.</p><p>Please download a distribution version of Jasmine at <a href="http://pivotal.github.com/jasmine/">http://pivotal.github.com/jasmine/</a>.</p></div>
 <script type="text/javascript">
   jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
   jasmine.getEnv().execute();
@@ -24,4 +25,3 @@
 </body>
 </html>

data/jasmine/lib/jasmine-html.js CHANGED

@@ -34,7 +34,7 @@ jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
   this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
       this.createDom('div', { className: 'banner' },
         this.createDom('div', { className: 'logo' },
-            "Jasmine",
+            this.createDom('a', { href: 'http://pivotal.github.com/jasmine/', target: "_blank" }, "Jasmine"),
             this.createDom('span', { className: 'version' }, runner.env.versionString())),
         this.createDom('div', { className: 'options' },
             "Show ",

data/jasmine/lib/jasmine.js CHANGED

@@ -21,11 +21,16 @@ jasmine.unimplementedMethod_ = function() {
 jasmine.undefined = jasmine.___undefined___;
 /**
- * Default interval for event loop yields. Small values here may result in slow test running. Zero means no updates until all tests have completed.
+ * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed.
  *
  */
 jasmine.DEFAULT_UPDATE_INTERVAL = 250;
+/**
+ * Default timeout interval in milliseconds for waitsFor() blocks.
+ */
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 jasmine.getGlobal = function() {
   function getGlobal() {
     return this;
@@ -490,22 +495,24 @@ var runs = function(func) {
 };
 /**
- * Waits for a timeout before moving to the next runs()-defined block.
- * @param {Number} timeout
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
  */
 var waits = function(timeout) {
   jasmine.getEnv().currentSpec.waits(timeout);
 };
 /**
- * Waits for the latchFunction to return true before proceeding to the next runs()-defined block.
+ * Waits for the latchFunction to return true before proceeding to the next block.
  *
- * @param {Number} timeout
  * @param {Function} latchFunction
- * @param {String} message
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
  */
-var waitsFor = function(timeout, latchFunction, message) {
-  jasmine.getEnv().currentSpec.waitsFor(timeout, latchFunction, message);
+var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
 };
 /**
@@ -660,6 +667,7 @@ jasmine.Env = function() {
   this.reporter = new jasmine.MultiReporter();
   this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
+  this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
   this.lastUpdate = 0;
   this.specFilter = function() {
     return true;
@@ -1135,7 +1143,7 @@ jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
       message: message
     });
     this.spec.addMatcherResult(expectationResult);
-    return result;
+    return jasmine.undefined;
   };
 };
@@ -1153,6 +1161,7 @@ jasmine.Matchers.prototype.toBe = function(expected) {
 /**
  * toNotBe: compares the actual to the expected using !==
  * @param expected
+ * @deprecated as of 1.0. Use not.toBe() instead.
  */
 jasmine.Matchers.prototype.toNotBe = function(expected) {
   return this.actual !== expected;
@@ -1170,6 +1179,7 @@ jasmine.Matchers.prototype.toEqual = function(expected) {
 /**
  * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual
  * @param expected
+ * @deprecated as of 1.0. Use not.toNotEqual() instead.
  */
 jasmine.Matchers.prototype.toNotEqual = function(expected) {
   return !this.env.equals_(this.actual, expected);
@@ -1188,6 +1198,7 @@ jasmine.Matchers.prototype.toMatch = function(expected) {
 /**
  * Matcher that compares the actual to the expected using the boolean inverse of jasmine.Matchers.toMatch
  * @param expected
+ * @deprecated as of 1.0. Use not.toMatch() instead.
  */
 jasmine.Matchers.prototype.toNotMatch = function(expected) {
   return !(new RegExp(expected).test(this.actual));
@@ -1230,11 +1241,6 @@ jasmine.Matchers.prototype.toBeFalsy = function() {
 };
-/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
-jasmine.Matchers.prototype.wasCalled = function() {
-  return this.toHaveBeenCalled();
-};
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was called.
  */
@@ -1248,12 +1254,18 @@ jasmine.Matchers.prototype.toHaveBeenCalled = function() {
   }
   this.message = function() {
-    return "Expected spy " + this.actual.identity + " to have been called.";
+    return [
+      "Expected spy " + this.actual.identity + " to have been called.",
+      "Expected spy " + this.actual.identity + " not to have been called."
+    ];
   };
   return this.actual.wasCalled;
 };
+/** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
+jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCalled;
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was not called.
  *
@@ -1269,17 +1281,15 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
   }
   this.message = function() {
-    return "Expected spy " + this.actual.identity + " to not have been called.";
+    return [
+      "Expected spy " + this.actual.identity + " to not have been called.",
+      "Expected spy " + this.actual.identity + " to have been called."
+    ];
   };
   return !this.actual.wasCalled;
 };
-/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasCalledWith = function() {
-  return this.toHaveBeenCalledWith.apply(this, arguments);
-};
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was called with a set of parameters.
  *
@@ -1293,15 +1303,25 @@ jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
   }
   this.message = function() {
     if (this.actual.callCount == 0) {
-      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.";
+      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
+      return [
+        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
+        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
+      ];
     } else {
-      return "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall);
+      return [
+        "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
+        "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
+      ];
     }
   };
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
+/** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
+jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
 /** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
 jasmine.Matchers.prototype.wasNotCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
@@ -1310,7 +1330,10 @@ jasmine.Matchers.prototype.wasNotCalledWith = function() {
   }
   this.message = function() {
-    return "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was";
+    return [
+      "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
+      "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
+    ]
   };
   return !this.env.contains_(this.actual.argsForCall, expectedArgs);
@@ -1329,6 +1352,7 @@ jasmine.Matchers.prototype.toContain = function(expected) {
  * Matcher that checks that the expected item is NOT an element in the actual Array.
  *
  * @param {Object} expected
+ * @deprecated as of 1.0. Use not.toNotContain() instead.
  */
 jasmine.Matchers.prototype.toNotContain = function(expected) {
   return !this.env.contains_(this.actual, expected);
@@ -1362,9 +1386,11 @@ jasmine.Matchers.prototype.toThrow = function(expected) {
     result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
   }
+  var not = this.isNot ? "not " : "";
   this.message = function() {
     if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
-      return ["Expected function to throw", expected.message || expected, ", but it threw", exception.message || exception].join(' ');
+      return ["Expected function " + not + "to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' ');
     } else {
       return "Expected function to throw an exception.";
     }
@@ -1644,6 +1670,7 @@ jasmine.Queue = function(env) {
   this.running = false;
   this.index = 0;
   this.offset = 0;
+  this.abort = false;
 };
 jasmine.Queue.prototype.addBefore = function(block) {
@@ -1678,7 +1705,7 @@ jasmine.Queue.prototype.next_ = function() {
   while (goAgain) {
     goAgain = false;
-    if (self.index < self.blocks.length) {
+    if (self.index < self.blocks.length && !this.abort) {
       var calledSynchronously = true;
       var completedSynchronously = false;
@@ -1688,6 +1715,10 @@ jasmine.Queue.prototype.next_ = function() {
           return;
         }
+        if (self.blocks[self.index].abort) {
+          self.abort = true;
+        }
         self.offset = 0;
         self.index++;
@@ -1884,14 +1915,46 @@ jasmine.Spec.prototype.expect = function(actual) {
   return positive;
 };
+/**
+ * Waits a fixed time period before moving to the next block.
+ *
+ * @deprecated Use waitsFor() instead
+ * @param {Number} timeout milliseconds to wait
+ */
 jasmine.Spec.prototype.waits = function(timeout) {
   var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
   this.addToQueue(waitsFunc);
   return this;
 };
-jasmine.Spec.prototype.waitsFor = function(timeout, latchFunction, timeoutMessage) {
-  var waitsForFunc = new jasmine.WaitsForBlock(this.env, timeout, latchFunction, timeoutMessage, this);
+/**
+ * Waits for the latchFunction to return true before proceeding to the next block.
+ *
+ * @param {Function} latchFunction
+ * @param {String} optional_timeoutMessage
+ * @param {Number} optional_timeout
+ */
+jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
+  var latchFunction_ = null;
+  var optional_timeoutMessage_ = null;
+  var optional_timeout_ = null;
+  for (var i = 0; i < arguments.length; i++) {
+    var arg = arguments[i];
+    switch (typeof arg) {
+      case 'function':
+        latchFunction_ = arg;
+        break;
+      case 'string':
+        optional_timeoutMessage_ = arg;
+        break;
+      case 'number':
+        optional_timeout_ = arg;
+        break;
+    }
+  }
+  var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
   this.addToQueue(waitsForFunc);
   return this;
 };
@@ -2114,41 +2177,56 @@ jasmine.WaitsBlock.prototype.execute = function (onComplete) {
     onComplete();
   }, this.timeout);
 };
+/**
+ * A block which waits for some condition to become true, with timeout.
+ *
+ * @constructor
+ * @extends jasmine.Block
+ * @param {jasmine.Env} env The Jasmine environment.
+ * @param {Number} timeout The maximum time in milliseconds to wait for the condition to become true.
+ * @param {Function} latchFunction A function which returns true when the desired condition has been met.
+ * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
+ * @param {jasmine.Spec} spec The Jasmine spec.
+ */
 jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
-  this.timeout = timeout;
+  this.timeout = timeout || env.defaultTimeoutInterval;
   this.latchFunction = latchFunction;
   this.message = message;
   this.totalTimeSpentWaitingForLatch = 0;
   jasmine.Block.call(this, env, null, spec);
 };
 jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
-jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 100;
+jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
-jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
-  var self = this;
-  self.env.reporter.log('>> Jasmine waiting for ' + (self.message || 'something to happen'));
+jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
+  this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
   var latchFunctionResult;
   try {
-    latchFunctionResult = self.latchFunction.apply(self.spec);
+    latchFunctionResult = this.latchFunction.apply(this.spec);
   } catch (e) {
-    self.spec.fail(e);
+    this.spec.fail(e);
     onComplete();
     return;
   }
   if (latchFunctionResult) {
     onComplete();
-  } else if (self.totalTimeSpentWaitingForLatch >= self.timeout) {
-    var message = 'timed out after ' + self.timeout + ' msec waiting for ' + (self.message || 'something to happen');
-    self.spec.fail({
+  } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
+    var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
+    this.spec.fail({
       name: 'timeout',
       message: message
     });
+    this.abort = true;
+    onComplete();
   } else {
-    self.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
-    self.env.setTimeout(function () { self.execute(onComplete); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
+    this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
+    var self = this;
+    this.env.setTimeout(function() {
+      self.execute(onComplete);
+    }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
   }
 };
 // Mock setTimeout, clearTimeout
@@ -2336,8 +2414,8 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
 jasmine.version_= {
-  "major": 0,
-  "minor": 11,
-  "build": 1,
-  "revision": 1277514571
+  "major": 1,
+  "minor": 0,
+  "build": 0,
+  "revision": 1284494074
 };

data/lib/jasmine/base.rb CHANGED

@@ -1,6 +1,6 @@
 require 'socket'
 require 'erb'
-require 'json'
+require 'json/pure'
 module Jasmine
   def self.root
@@ -44,10 +44,6 @@ module Jasmine
     end
   end
-  def self.kill_process_group(process_group_id, signal="TERM")
-    Process.kill signal, -process_group_id # negative pid means kill process group. (see man 2 kill)
-  end
   def self.cachebust(files, root_dir="", replace=nil, replace_with=nil)
     require 'digest/md5'
     files.collect do |file_name|

data/lib/jasmine/command_line_tool.rb CHANGED

@@ -18,17 +18,18 @@ module Jasmine
     def copy_unless_exists(relative_path, dest_path = nil)
       unless File.exist?(dest_path(relative_path))
-        File.copy(template_path(relative_path), dest_path(dest_path || relative_path))
+        FileUtils.copy(template_path(relative_path), dest_path(dest_path || relative_path))
       end
     end
     def process(argv)
       if argv[0] == 'init'
-        require 'ftools'
-        File.makedirs('public/javascripts')
-        File.makedirs('spec/javascripts')
-        File.makedirs('spec/javascripts/support')
-        File.makedirs('spec/javascripts/helpers')
+        require 'fileutils'
+        FileUtils.makedirs('public/javascripts')
+        FileUtils.makedirs('spec/javascripts')
+        FileUtils.makedirs('spec/javascripts/support')
+        FileUtils.makedirs('spec/javascripts/helpers')
         copy_unless_exists('jasmine-example/src/Player.js', 'public/javascripts/Player.js')
         copy_unless_exists('jasmine-example/src/Song.js', 'public/javascripts/Song.js')
@@ -51,7 +52,7 @@ module Jasmine
           require 'rake'
           unless Rake::Task.task_defined?('jasmine')
             File.open(dest_path('Rakefile'), write_mode) do |f|
-              f.write(File.read(template_path('lib/tasks/jasmine.rake')))
+              f.write("\n" + File.read(template_path('lib/tasks/jasmine.rake')))
             end
           end
         end

data/lib/jasmine/config.rb CHANGED

@@ -3,13 +3,16 @@ module Jasmine
     require 'yaml'
     require 'erb'
-    def initialize(options = {})
-      require 'selenium_rc'
-      @selenium_jar_path = SeleniumRC::Server.allocate.jar_path
+    def browser
+      ENV["JASMINE_BROWSER"] || 'firefox'
+    end
-      @browser = ENV["JASMINE_BROWSER"] || 'firefox'
-      @selenium_pid = nil
-      @jasmine_server_pid = nil
+    def jasmine_host
+      ENV["JASMINE_HOST"] || 'http://localhost'
+    end
+    def external_selenium_server_port
+      ENV['SELENIUM_SERVER_PORT'] && ENV['SELENIUM_SERVER_PORT'].to_i > 0 ? ENV['SELENIUM_SERVER_PORT'].to_i : nil
     end
     def start_server(port = 8888)
@@ -19,45 +22,33 @@ module Jasmine
     def start
       start_servers
-      @client = Jasmine::SeleniumDriver.new("localhost", @selenium_server_port, "*#{@browser}", "#{jasmine_host}:#{@jasmine_server_port}/")
+      @client = Jasmine::SeleniumDriver.new("localhost", @selenium_server_port, "*#{browser}", "#{jasmine_host}:#{@jasmine_server_port}/")
       @client.connect
     end
     def stop
       @client.disconnect
-      stop_servers
-    end
-    def jasmine_host
-      ENV["JASMINE_HOST"] || 'http://localhost'
     end
     def start_jasmine_server
       @jasmine_server_port = Jasmine::find_unused_port
-      @jasmine_server_pid = fork do
-        Process.setpgrp
+      Thread.new do
         start_server(@jasmine_server_port)
-        exit! 0
       end
-      puts "jasmine server started.  pid is #{@jasmine_server_pid}"
       Jasmine::wait_for_listener(@jasmine_server_port, "jasmine server")
-    end
-    def external_selenium_server_port
-      ENV['SELENIUM_SERVER_PORT'] && ENV['SELENIUM_SERVER_PORT'].to_i > 0 ? ENV['SELENIUM_SERVER_PORT'].to_i : nil
+      puts "jasmine server started."
     end
     def start_selenium_server
       @selenium_server_port = external_selenium_server_port
       if @selenium_server_port.nil?
         @selenium_server_port = Jasmine::find_unused_port
-        @selenium_pid = fork do
-          Process.setpgrp
-          exec "java -jar #{@selenium_jar_path} -port #{@selenium_server_port} > /dev/null 2>&1"
-        end
-        puts "selenium started.  pid is #{@selenium_pid}"
+        require 'selenium_rc'
+        SeleniumRC::Server.send(:include, SeleniumServerForkHackForRSpec)
+        SeleniumRC::Server.boot("localhost", @selenium_server_port, :args => ["> /dev/null"])
+      else
+        Jasmine::wait_for_listener(@selenium_server_port, "selenium server")
       end
-      Jasmine::wait_for_listener(@selenium_server_port, "selenium server")
     end
     def start_servers
@@ -65,18 +56,6 @@ module Jasmine
       start_selenium_server
     end
-    def stop_servers
-      puts "shutting down the servers..."
-      Jasmine::kill_process_group(@selenium_pid) if @selenium_pid
-      if @jasmine_server_pid
-        if Rack::Handler.default == Rack::Handler::WEBrick
-          Jasmine::kill_process_group(@jasmine_server_pid, "INT")
-        else
-          Jasmine::kill_process_group(@jasmine_server_pid)
-        end
-      end
-    end
     def run
       begin
         start
@@ -183,5 +162,20 @@ module Jasmine
       end
     end
+    module SeleniumServerForkHackForRSpec
+      # without this, Selenium's forked process will attempt to run specs a second time at exit;
+      # see http://www.ruby-forum.com/topic/212722
+      def self.included(base)
+        alias_method :fork_without_fix_for_rspec, :fork
+        alias_method :fork, :fork_with_fix_for_rspec
+      end
+      def fork_with_fix_for_rspec
+        fork_without_fix_for_rspec do
+          yield
+          at_exit { exit! }
+        end
+      end
+    end
   end
-end
+end

data/lib/jasmine/server.rb CHANGED

@@ -32,7 +32,6 @@ module Jasmine
         "/__JASMINE_ROOT__/lib/jasmine.js",
         "/__JASMINE_ROOT__/lib/jasmine-html.js",
         "/__JASMINE_ROOT__/lib/json2.js",
-        "/__JASMINE_ROOT__/lib/consolex.js",
       ]
       @jasmine_stylesheets = ["/__JASMINE_ROOT__/lib/jasmine.css"]
     end

data/spec/config_spec.rb CHANGED

@@ -8,12 +8,12 @@ describe Jasmine::Config do
       temp_dir_before
       Dir::chdir @tmp
-      system 'rails rails-project'
+      `rails rails-project`
       Dir::chdir 'rails-project'
       FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
-      system "./script/generate jasmine"
+      `./script/generate jasmine`
       Dir::chdir @old_dir
@@ -256,24 +256,4 @@ describe Jasmine::Config do
       config.start_selenium_server
     end
   end
-  describe "#stop_servers" do
-    it "should kill Selenium and Rack servers" do
-      Rack::Handler.stub!(:default).and_return("Not WEBrick")
-      config = Jasmine::Config.new
-      config.instance_variable_set(:@selenium_pid, 100)
-      config.instance_variable_set(:@jasmine_server_pid, 200)
-      Jasmine.should_receive(:kill_process_group).with(100)
-      Jasmine.should_receive(:kill_process_group).with(200)
-      config.stop_servers
-    end
-    it "should send kill with SIGINT to WEBrick" do
-      Rack::Handler.stub!(:default).and_return(Rack::Handler::WEBrick)
-      config = Jasmine::Config.new
-      config.instance_variable_set(:@jasmine_server_pid, 100)
-      Jasmine.should_receive(:kill_process_group).with(100, "INT")
-      config.stop_servers
-    end
-  end
 end

data/spec/jasmine_command_line_tool_spec.rb CHANGED

@@ -11,13 +11,16 @@ describe "Jasmine command line tool" do
   end
   it "should create files on init" do
-    Jasmine::CommandLineTool.new.process ["init"]
+    output = capture_stdout do
+      Jasmine::CommandLineTool.new.process ["init"]
+    end
+    output.should =~ /Jasmine has been installed with example specs./
     my_jasmine_lib = File.expand_path(File.join(@root, "lib"))
     bootstrap = "$:.unshift('#{my_jasmine_lib}')"
     ENV['JASMINE_GEM_PATH'] = "#{@root}/lib"
-    ci_output = `rake -E \"#{bootstrap}\" --trace jasmine:ci`
+    ci_output = `rake -E "#{bootstrap}" --trace jasmine:ci`
     ci_output.should =~ (/[1-9][0-9]* examples, 0 failures/)
   end
 end

data/spec/rails_generator_spec.rb CHANGED

@@ -11,12 +11,13 @@ describe "Jasmine rails generator" do
   end
   it "should create files on init" do
-    system 'rails rails-project'
+    `rails rails-project`
     Dir::chdir 'rails-project'
     FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
-    system "./script/generate jasmine"
+    output = `./script/generate jasmine`
+    output.should =~ /Jasmine has been installed with example specs./
     bootstrap = "$:.unshift('#{@root}/lib')"
     ENV['JASMINE_GEM_PATH'] = "#{@root}/lib"

data/spec/spec_helper.rb CHANGED

@@ -1,5 +1,6 @@
 require "rubygems"
 require "bundler"
+require 'stringio'
 Bundler.setup(:default, :test)
@@ -26,3 +27,14 @@ def temp_dir_after
   Dir::chdir @old_dir
   FileUtils.rm_r @tmp
 end
+module Kernel
+  def capture_stdout
+    out = StringIO.new
+    $stdout = out
+    yield
+    return out.string
+  ensure
+    $stdout = STDOUT
+  end
+end

metadata CHANGED

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  hash: 19
   prerelease: false
   segments:
-  - 0
-  - 11
   - 1
   - 0
-  version: 0.11.1.0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -17,75 +15,95 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-06-25 00:00:00 -07:00
+date: 2010-09-14 00:00:00 -07:00
 default_executable: jasmine
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: &id001 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  requirement: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  type: :runtime
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 25
         segments:
         - 1
         - 1
         - 5
         version: 1.1.5
-  type: :runtime
-  name: rspec
-  version_requirements: *id001
+  requirement: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: &id002 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  name: rack
+  version_requirements: &id003 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 23
         segments:
         - 1
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  name: rack
-  version_requirements: *id002
+  requirement: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: &id003 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  name: selenium-rc
+  version_requirements: &id004 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 11
         segments:
         - 2
         - 1
         - 0
         version: 2.1.0
-  type: :runtime
-  name: selenium-rc
-  version_requirements: *id003
+  requirement: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency
-  requirement: &id004 !ruby/object:Gem::Requirement
-    none: false
+  type: :runtime
+  name: selenium-client
+  version_requirements: &id005 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 61
         segments:
         - 1
         - 2
         - 17
         version: 1.2.17
+  requirement: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency
   type: :runtime
-  name: selenium-client
-  version_requirements: *id004
+  name: json_pure
+  version_requirements: &id006 !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        segments:
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  requirement: *id006
   prerelease: false
 description: Javascript BDD test framework
-email: ragaskar@gmail.com
+email: jasmine-js@googlegroups.com
 executables:
 - jasmine
 extensions: []
@@ -105,7 +123,6 @@ files:
 - generators/jasmine/templates/spec/javascripts/support/jasmine.yml
 - generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
 - jasmine/example/SpecRunner.html
-- jasmine/lib/consolex.js
 - jasmine/lib/jasmine-html.js
 - jasmine/lib/jasmine.css
 - jasmine/lib/jasmine.js
@@ -120,16 +137,8 @@ files:
 - lib/jasmine/spec_builder.rb
 - lib/jasmine/tasks/jasmine.rake
 - README.markdown
-- spec/config_spec.rb
-- spec/jasmine_command_line_tool_spec.rb
-- spec/jasmine_self_test_config.rb
-- spec/jasmine_self_test_spec.rb
-- spec/rails_generator_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- bin/jasmine
 has_rdoc: true
-homepage: http://github.com/pivotal/jasmine-ruby
+homepage: http://pivotal.github.com/jasmine
 licenses: []
 post_install_message:
@@ -138,30 +147,26 @@ rdoc_options:
 require_paths:
 - lib
 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
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
       segments:
       - 0
       version: "0"
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key:
 specification_version: 3
-summary: Jasmine Ruby Runner
+summary: Jasmine Runner for Ruby
 test_files:
 - spec/config_spec.rb
 - spec/jasmine_command_line_tool_spec.rb

data/jasmine/lib/consolex.js DELETED

@@ -1,28 +0,0 @@
-/** Console X
-* http://github.com/deadlyicon/consolex.js
-*
-* By Jared Grippe <jared@jaredgrippe.com>
-*
-* Copyright (c) 2009 Jared Grippe
-* Licensed under the MIT license.
-*
-* consolex avoids ever having to see javascript bugs in browsers that do not implement the entire
-* firebug console suit
-*
-*/
-(function(window) {
-  window.console || (window.console = {});
-  var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml",
-  "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
-  function emptyFunction(){}
-  for (var i = 0; i < names.length; ++i){
-    window.console[names[i]] || (window.console[names[i]] = emptyFunction);
-    if (typeof window.console[names[i]] !== 'function')
-      window.console[names[i]] = (function(method) {
-          return function(){ return Function.prototype.apply.apply(method, [console,arguments]); };
-        })(window.console[names[i]]);
-  }
-})(this);