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

jasmine 0.11.0.0 → 0.11.1.0

Files changed (26) hide show

data/bin/jasmine +3 -55
data/generators/jasmine/jasmine_generator.rb +6 -2
data/generators/jasmine/templates/jasmine-example/SpecRunner.html +27 -0
data/generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js +58 -0
data/generators/jasmine/templates/jasmine-example/spec/SpecHelper.js +9 -0
data/generators/jasmine/templates/jasmine-example/src/Player.js +22 -0
data/generators/jasmine/templates/jasmine-example/src/Song.js +7 -0
data/generators/jasmine/templates/lib/tasks/jasmine.rake +2 -31
data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml +1 -0
data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml +1 -0
data/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb +2 -0
data/jasmine/example/SpecRunner.html +27 -0
data/jasmine/lib/{TrivialReporter.js → jasmine-html.js} +7 -0
data/jasmine/lib/jasmine.js +39 -13
data/lib/jasmine.rb +3 -1
data/lib/jasmine/command_line_tool.rb +67 -0
data/lib/jasmine/config.rb +15 -14
data/lib/jasmine/server.rb +2 -2
data/lib/jasmine/tasks/jasmine.rake +31 -0
data/spec/config_spec.rb +49 -30
data/spec/jasmine_command_line_tool_spec.rb +23 -0
data/spec/rails_generator_spec.rb +26 -0
data/spec/spec_helper.rb +21 -1
metadata +17 -7
data/generators/jasmine/templates/spec/javascripts/ExampleSpec.js +0 -11
data/generators/jasmine/templates/spec/javascripts/helpers/SpecHelper.js +0 -1

data/bin/jasmine CHANGED

@@ -1,58 +1,6 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'rake'
-def cwd
-  File.expand_path(File.join(File.dirname(__FILE__), '..'))
-end
-def expand(*paths)
-  File.expand_path(File.join(*paths))
-end
-def template_path(filepath)
-  expand(cwd, File.join("generators/jasmine/templates", filepath))
-end
-def dest_path(filepath)
-  expand(Dir.pwd, filepath)
-end
-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))
-  end
-end
-if ARGV[0] == 'init'
-  require 'ftools'
-  File.makedirs('spec/javascripts')
-  File.makedirs('spec/javascripts/support')
-  File.makedirs('spec/javascripts/helpers')
-  copy_unless_exists('spec/javascripts/helpers/SpecHelper.js')
-  copy_unless_exists('spec/javascripts/ExampleSpec.js')
-  copy_unless_exists('spec/javascripts/support/jasmine_runner.rb')
-  rails_tasks_dir = dest_path('lib/tasks')
-  if File.exist?(rails_tasks_dir)
-    copy_unless_exists('lib/tasks/jasmine.rake')
-    copy_unless_exists('spec/javascripts/support/jasmine-rails.yml', 'spec/javascripts/support/jasmine.yml')
-  else
-    copy_unless_exists('spec/javascripts/support/jasmine.yml')
-    write_mode = 'w'
-    if File.exist?(dest_path('Rakefile'))
-      load dest_path('Rakefile')
-      write_mode = 'a'
-    end
-    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')))
-      end
-    end
-  end
-  File.open(template_path('INSTALL'), 'r').each_line do |line|
-    puts line
-  end
-end
+require 'rubygems'
+require 'jasmine'
+Jasmine::CommandLineTool.new.process ARGV

data/generators/jasmine/jasmine_generator.rb CHANGED

@@ -2,11 +2,15 @@ class JasmineGenerator < Rails::Generator::Base
   def manifest
     record do |m|
+      m.directory "public/javascripts"
+      m.file "jasmine-example/src/Player.js", "public/javascripts/Player.js"
+      m.file "jasmine-example/src/Song.js", "public/javascripts/Song.js"
       m.directory "spec/javascripts"
-      m.file "spec/javascripts/ExampleSpec.js", "spec/javascripts/ExampleSpec.js"
+      m.file "jasmine-example/spec/PlayerSpec.js", "spec/javascripts/PlayerSpec.js"
       m.directory "spec/javascripts/helpers"
-      m.file "spec/javascripts/helpers/SpecHelper.js", "spec/javascripts/helpers/SpecHelper.js"
+      m.file "jasmine-example/spec/SpecHelper.js", "spec/javascripts/helpers/SpecHelper.js"
       m.directory "spec/javascripts/support"
       m.file "spec/javascripts/support/jasmine_runner.rb", "spec/javascripts/support/jasmine_runner.rb"

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

@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Jasmine Test Runner</title>
+  <link rel="stylesheet" type="text/css" href="lib/jasmine-##JASMINE_VERSION##/jasmine.css">
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine.js"></script>
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine-html.js"></script>
+  <!-- include source files here... -->
+  <script type="text/javascript" src="src/Player.js"></script>
+  <script type="text/javascript" src="src/Song.js"></script>
+  <!-- include spec files here... -->
+  <script type="text/javascript" src="spec/SpecHelper.js"></script>
+  <script type="text/javascript" src="spec/PlayerSpec.js"></script>
+</head>
+<body>
+<script type="text/javascript">
+  jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+  jasmine.getEnv().execute();
+</script>
+</body>
+</html>

data/generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js ADDED

@@ -0,0 +1,58 @@
+describe("Player", function() {
+  var player;
+  var song;
+  beforeEach(function() {
+    player = new Player();
+    song = new Song();
+  });
+  it("should be able to play a Song", function() {
+    player.play(song);
+    expect(player.currentlyPlayingSong).toEqual(song);
+    //demonstrates use of custom matcher
+    expect(player).toBePlaying(song);
+  });
+  describe("when song has been paused", function() {
+    beforeEach(function() {
+      player.play(song);
+      player.pause();
+    });
+    it("should indicate that the song is currently paused", function() {
+      expect(player.isPlaying).toBeFalsy();
+      // demonstrates use of 'not' with a custom matcher
+      expect(player).not.toBePlaying(song);
+    });
+    it("should be possible to resume", function() {
+      player.resume();
+      expect(player.isPlaying).toBeTruthy();
+      expect(player.currentlyPlayingSong).toEqual(song);
+    });
+  });
+  // demonstrates use of spies to intercept and test method calls
+  it("tells the current song if the user has made it a favorite", function() {
+    spyOn(song, 'persistFavoriteStatus');
+    player.play(song);
+    player.makeFavorite();
+    expect(song.persistFavoriteStatus).toHaveBeenCalledWith(true);
+  });
+  //demonstrates use of expected exceptions
+  describe("#resume", function() {
+    it("should throw an exception if song is already playing", function() {
+      player.play(song);
+      expect(function() {
+        player.resume();
+      }).toThrow("song is already playing");
+    });
+  });
+});

data/generators/jasmine/templates/jasmine-example/spec/SpecHelper.js ADDED

@@ -0,0 +1,9 @@
+beforeEach(function() {
+  this.addMatchers({
+    toBePlaying: function(expectedSong) {
+      var player = this.actual;
+      return player.currentlyPlayingSong === expectedSong
+          && player.isPlaying;
+    }
+  })
+});

data/generators/jasmine/templates/jasmine-example/src/Player.js ADDED

@@ -0,0 +1,22 @@
+function Player() {
+}
+Player.prototype.play = function(song) {
+  this.currentlyPlayingSong = song;
+  this.isPlaying = true;
+};
+Player.prototype.pause = function() {
+  this.isPlaying = false;
+};
+Player.prototype.resume = function() {
+  if (this.isPlaying) {
+    throw new Error("song is already playing");
+  }
+  this.isPlaying = true;
+};
+Player.prototype.makeFavorite = function() {
+  this.currentlyPlayingSong.persistFavoriteStatus(true);
+};

data/generators/jasmine/templates/jasmine-example/src/Song.js ADDED

@@ -0,0 +1,7 @@
+function Song() {
+}
+Song.prototype.persistFavoriteStatus = function(value) {
+  // something complicated
+  throw new Error("not yet implemented");
+};

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

@@ -1,31 +1,2 @@
-namespace :jasmine do
-  task :require do
-    require 'jasmine'
-  end
-  desc "Run continuous integration tests"
-  task :ci => "jasmine:require" do
-    require "spec"
-    require 'spec/rake/spectask'
-    Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
-      t.spec_opts = ["--color", "--format", "specdoc"]
-      t.verbose = true
-      t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
-    end
-    Rake::Task["jasmine_continuous_integration_runner"].invoke
-  end
-  task :server => "jasmine:require" do
-    jasmine_config_overrides = 'spec/javascripts/support/jasmine_config.rb'
-    require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
-    puts "your tests are here:"
-    puts "  http://localhost:8888/"
-    Jasmine::Config.new.start_server
-  end
-end
-desc "Run specs via server"
-task :jasmine => ['jasmine:server']
+require 'jasmine'
+load 'jasmine/tasks/jasmine.rake'

data/generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml CHANGED

@@ -16,6 +16,7 @@ src_files:
   - public/javascripts/controls.js
   - public/javascripts/dragdrop.js
   - public/javascripts/application.js
+  - public/javascripts/**/*.js
 # stylesheets
 #

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml CHANGED

@@ -11,6 +11,7 @@
 #   - dist/**/*.js
 #
 src_files:
+    - public/javascripts/**/*.js
 # stylesheets
 #

data/generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb CHANGED

@@ -1,3 +1,5 @@
+$:.unshift(ENV['JASMINE_GEM_PATH']) if ENV['JASMINE_GEM_PATH'] # for gem testing purposes
 require 'rubygems'
 require 'jasmine'
 jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb'))

data/jasmine/example/SpecRunner.html ADDED

@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <title>Jasmine Test Runner</title>
+  <link rel="stylesheet" type="text/css" href="lib/jasmine-##JASMINE_VERSION##/jasmine.css">
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine.js"></script>
+  <script type="text/javascript" src="lib/jasmine-##JASMINE_VERSION##/jasmine-html.js"></script>
+  <!-- include source files here... -->
+  <script type="text/javascript" src="src/Player.js"></script>
+  <script type="text/javascript" src="src/Song.js"></script>
+  <!-- include spec files here... -->
+  <script type="text/javascript" src="spec/SpecHelper.js"></script>
+  <script type="text/javascript" src="spec/PlayerSpec.js"></script>
+</head>
+<body>
+<script type="text/javascript">
+  jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
+  jasmine.getEnv().execute();
+</script>
+</body>
+</html>

data/jasmine/lib/{TrivialReporter.js → jasmine-html.js} RENAMED

@@ -1,6 +1,7 @@
 jasmine.TrivialReporter = function(doc) {
   this.document = doc || document;
   this.suiteDivs = {};
+  this.logRunningSpecs = false;
 };
 jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
@@ -115,6 +116,12 @@ jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
   this.suiteDivs[suite.id].className += " " + status;
 };
+jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
+  if (this.logRunningSpecs) {
+    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+  }
+};
 jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
   var results = spec.results();
   var status = results.passed() ? 'passed' : 'failed';

data/jasmine/lib/jasmine.js CHANGED

@@ -172,7 +172,7 @@ jasmine.isDomNode = function(obj) {
  *
  * @example
  * // don't care about which function is passed in, as long as it's a function
- * expect(mySpy).wasCalledWith(jasmine.any(Function));
+ * expect(mySpy).toHaveBeenCalledWith(jasmine.any(Function));
  *
  * @param {Class} clazz
  * @returns matchable object of the type clazz
@@ -187,7 +187,8 @@ jasmine.any = function(clazz) {
  * Spies should be created in test setup, before expectations.  They can then be checked, using the standard Jasmine
  * expectation syntax. Spies can be checked if they were called or not and what the calling params were.
  *
- * A Spy has the following mehtod: wasCalled, callCount, mostRecentCall, and argsForCall (see docs)
+ * A Spy has the following fields: wasCalled, callCount, mostRecentCall, and argsForCall (see docs).
+ *
  * Spies are torn down at the end of every spec.
  *
  * Note: Do <b>not</b> call new jasmine.Spy() directly - a spy must be created using spyOn, jasmine.createSpy or jasmine.createSpyObj.
@@ -217,8 +218,8 @@ jasmine.any = function(clazz) {
  *
  * // mock example
  * foo.not(7 == 7);
- * expect(foo.not).wasCalled();
- * expect(foo.not).wasCalledWith(true);
+ * expect(foo.not).toHaveBeenCalled();
+ * expect(foo.not).toHaveBeenCalledWith(true);
  *
  * @constructor
  * @see spyOn, jasmine.createSpy, jasmine.createSpyObj
@@ -928,6 +929,10 @@ jasmine.Reporter.prototype.reportRunnerResults = function(runner) {
 jasmine.Reporter.prototype.reportSuiteResults = function(suite) {
 };
+//noinspection JSUnusedLocalSymbols
+jasmine.Reporter.prototype.reportSpecStarting = function(spec) {
+};
 //noinspection JSUnusedLocalSymbols
 jasmine.Reporter.prototype.reportSpecResults = function(spec) {
 };
@@ -1224,12 +1229,18 @@ jasmine.Matchers.prototype.toBeFalsy = function() {
   return !this.actual;
 };
+/** @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.
  */
-jasmine.Matchers.prototype.wasCalled = function() {
+jasmine.Matchers.prototype.toHaveBeenCalled = function() {
   if (arguments.length > 0) {
-    throw new Error('wasCalled does not take arguments, use wasCalledWith');
+    throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
   }
   if (!jasmine.isSpy(this.actual)) {
@@ -1245,6 +1256,8 @@ jasmine.Matchers.prototype.wasCalled = function() {
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was not called.
+ *
+ * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
  */
 jasmine.Matchers.prototype.wasNotCalled = function() {
   if (arguments.length > 0) {
@@ -1262,13 +1275,18 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
   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.
  *
  * @example
  *
  */
-jasmine.Matchers.prototype.wasCalledWith = function() {
+jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {
     throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
@@ -1284,6 +1302,7 @@ jasmine.Matchers.prototype.wasCalledWith = function() {
   return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
+/** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
 jasmine.Matchers.prototype.wasNotCalledWith = function() {
   var expectedArgs = jasmine.util.argsToArray(arguments);
   if (!jasmine.isSpy(this.actual)) {
@@ -1395,7 +1414,14 @@ jasmine.MultiReporter.prototype.addReporter = function(reporter) {
 };
 (function() {
-  var functionNames = ["reportRunnerStarting", "reportRunnerResults", "reportSuiteResults", "reportSpecResults", "log"];
+  var functionNames = [
+    "reportRunnerStarting",
+    "reportRunnerResults",
+    "reportSuiteResults",
+    "reportSpecStarting",
+    "reportSpecResults",
+    "log"
+  ];
   for (var i = 0; i < functionNames.length; i++) {
     var functionName = functionNames[i];
     jasmine.MultiReporter.prototype[functionName] = (function(functionName) {
@@ -1919,7 +1945,8 @@ jasmine.Spec.prototype.execute = function(onComplete) {
     spec.finish(onComplete);
     return;
   }
-  this.env.reporter.log('>> Jasmine Running ' + this.suite.description + ' ' + this.description + '...');
+  this.env.reporter.reportSpecStarting(this);
   spec.env.currentSpec = spec;
@@ -2249,7 +2276,6 @@ jasmine.Clock = {
   },
   uninstallMock: function() {
-    jasmine.log("uninstall")
     jasmine.Clock.assertInstalled();
     jasmine.Clock.installed = jasmine.Clock.real;
   },
@@ -2312,6 +2338,6 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
 jasmine.version_= {
   "major": 0,
   "minor": 11,
-  "build": 0,
-  "revision": 1277317833
-  };
+  "build": 1,
+  "revision": 1277514571
+};

data/lib/jasmine.rb CHANGED

@@ -3,4 +3,6 @@ require 'jasmine/config'
 require 'jasmine/server'
 require 'jasmine/selenium_driver'
-require 'jasmine/spec_builder'
+require 'jasmine/spec_builder'
+require 'jasmine/command_line_tool'

data/lib/jasmine/command_line_tool.rb ADDED

@@ -0,0 +1,67 @@
+module Jasmine
+  class CommandLineTool
+    def cwd
+      File.expand_path(File.join(File.dirname(__FILE__), '../..'))
+    end
+    def expand(*paths)
+      File.expand_path(File.join(*paths))
+    end
+    def template_path(filepath)
+      expand(cwd, File.join("generators/jasmine/templates", filepath))
+    end
+    def dest_path(filepath)
+      expand(Dir.pwd, filepath)
+    end
+    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))
+      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')
+        copy_unless_exists('jasmine-example/src/Player.js', 'public/javascripts/Player.js')
+        copy_unless_exists('jasmine-example/src/Song.js', 'public/javascripts/Song.js')
+        copy_unless_exists('jasmine-example/spec/PlayerSpec.js', 'spec/javascripts/PlayerSpec.js')
+        copy_unless_exists('jasmine-example/spec/SpecHelper.js', 'spec/javascripts/helpers/SpecHelper.js')
+        copy_unless_exists('spec/javascripts/support/jasmine_runner.rb')
+        rails_tasks_dir = dest_path('lib/tasks')
+        if File.exist?(rails_tasks_dir)
+          copy_unless_exists('lib/tasks/jasmine.rake')
+          copy_unless_exists('spec/javascripts/support/jasmine-rails.yml', 'spec/javascripts/support/jasmine.yml')
+        else
+          copy_unless_exists('spec/javascripts/support/jasmine.yml')
+          write_mode = 'w'
+          if File.exist?(dest_path('Rakefile'))
+            load dest_path('Rakefile')
+            write_mode = 'a'
+          end
+          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')))
+            end
+          end
+        end
+        File.open(template_path('INSTALL'), 'r').each_line do |line|
+          puts line
+        end
+      else
+        puts "unknown command #{argv}"
+        puts "Usage: jasmine init"
+      end
+    end
+  end
+end

data/lib/jasmine/config.rb CHANGED

@@ -95,7 +95,8 @@ module Jasmine
     def match_files(dir, patterns)
       dir = File.expand_path(dir)
       patterns.collect do |pattern|
-        Dir.glob(File.join(dir, pattern)).collect {|f| f.sub("#{dir}/", "")}.sort
+        matches = Dir.glob(File.join(dir, pattern))
+        matches.collect {|f| f.sub("#{dir}/", "")}.sort
       end.flatten.uniq
     end
@@ -114,7 +115,7 @@ module Jasmine
     end
     def js_files(spec_filter = nil)
-      spec_files_to_include = spec_filter.nil? ? spec_files : match_files(spec_dir, spec_filter)
+      spec_files_to_include = spec_filter.nil? ? spec_files : match_files(spec_dir, [spec_filter])
       src_files.collect {|f| "/" + f } + helpers.collect {|f| File.join(spec_path, f) } + spec_files_to_include.collect {|f| File.join(spec_path, f) }
     end
@@ -151,35 +152,35 @@ module Jasmine
     end
     def helpers
-      files = match_files(spec_dir, "helpers/**/*.js")
       if simple_config['helpers']
-        files = match_files(spec_dir, simple_config['helpers'])
+        match_files(spec_dir, simple_config['helpers'])
+      else
+        match_files(spec_dir, ["helpers/**/*.js"])
       end
-      files
     end
     def src_files
-      files = []
       if simple_config['src_files']
-        files = match_files(src_dir, simple_config['src_files'])
+        match_files(src_dir, simple_config['src_files'])
+      else
+        []
       end
-      files
     end
     def spec_files
-      files = match_files(spec_dir, "**/*[sS]pec.js")
       if simple_config['spec_files']
-        files = match_files(spec_dir, simple_config['spec_files'])
+        match_files(spec_dir, simple_config['spec_files'])
+      else
+        match_files(spec_dir, ["**/*[sS]pec.js"])
       end
-      files
     end
     def stylesheets
-      files = []
       if simple_config['stylesheets']
-        files = match_files(src_dir, simple_config['stylesheets'])
+        match_files(src_dir, simple_config['stylesheets'])
+      else
+        []
       end
-      files
     end
   end

data/lib/jasmine/server.rb CHANGED

@@ -29,8 +29,8 @@ module Jasmine
     def initialize(config)
       @config = config
       @jasmine_files = [
-        "/__JASMINE_ROOT__/lib/" + File.basename(Dir.glob("#{Jasmine.root}/lib/jasmine*.js").first),
-        "/__JASMINE_ROOT__/lib/TrivialReporter.js",
+        "/__JASMINE_ROOT__/lib/jasmine.js",
+        "/__JASMINE_ROOT__/lib/jasmine-html.js",
         "/__JASMINE_ROOT__/lib/json2.js",
         "/__JASMINE_ROOT__/lib/consolex.js",
       ]

data/lib/jasmine/tasks/jasmine.rake ADDED

@@ -0,0 +1,31 @@
+namespace :jasmine do
+  task :require do
+    require 'jasmine'
+  end
+  desc "Run continuous integration tests"
+  task :ci => "jasmine:require" do
+    require "spec"
+    require 'spec/rake/spectask'
+    Spec::Rake::SpecTask.new(:jasmine_continuous_integration_runner) do |t|
+      t.spec_opts = ["--color", "--format", "specdoc"]
+      t.verbose = true
+      t.spec_files = ['spec/javascripts/support/jasmine_runner.rb']
+    end
+    Rake::Task["jasmine_continuous_integration_runner"].invoke
+  end
+  task :server => "jasmine:require" do
+    jasmine_config_overrides = 'spec/javascripts/support/jasmine_config.rb'
+    require jasmine_config_overrides if File.exists?(jasmine_config_overrides)
+    puts "your tests are here:"
+    puts "  http://localhost:8888/"
+    Jasmine::Config.new.start_server
+  end
+end
+desc "Run specs via server"
+task :jasmine => ['jasmine:server']

data/spec/config_spec.rb CHANGED

@@ -4,6 +4,26 @@ describe Jasmine::Config do
   describe "configuration" do
+    before(:all) do
+      temp_dir_before
+      Dir::chdir @tmp
+      system 'rails rails-project'
+      Dir::chdir 'rails-project'
+      FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
+      system "./script/generate jasmine"
+      Dir::chdir @old_dir
+      @rails_dir = "#{@tmp}/rails-project"
+    end
+    after(:all) do
+      temp_dir_after
+    end
     before(:each) do
       @template_dir = File.expand_path(File.join(File.dirname(__FILE__), "../generators/jasmine/templates"))
       @config = Jasmine::Config.new
@@ -28,25 +48,25 @@ describe Jasmine::Config do
     describe "simple_config" do
       before(:each) do
-        @config.stub!(:src_dir).and_return(File.join(@template_dir))
-        @config.stub!(:spec_dir).and_return(File.join(@template_dir, "spec/javascripts"))
+        @config.stub!(:src_dir).and_return(File.join(@rails_dir, "."))
+        @config.stub!(:spec_dir).and_return(File.join(@rails_dir, "spec/javascripts"))
       end
       shared_examples_for "simple_config defaults" do
         it "should return the correct files and mappings" do
           @config.src_files.should == []
           @config.stylesheets.should == []
-          @config.spec_files.should == ['ExampleSpec.js']
+          @config.spec_files.should == ['PlayerSpec.js']
           @config.helpers.should == ['helpers/SpecHelper.js']
           @config.js_files.should == [
             '/__spec__/helpers/SpecHelper.js',
-            '/__spec__/ExampleSpec.js',
+            '/__spec__/PlayerSpec.js',
           ]
-          @config.js_files("ExampleSpec.js").should ==
+          @config.js_files("PlayerSpec.js").should ==
             ['/__spec__/helpers/SpecHelper.js',
-             '/__spec__/ExampleSpec.js']
+             '/__spec__/PlayerSpec.js']
           @config.spec_files_full_paths.should == [
-            File.join(@template_dir, 'spec/javascripts/ExampleSpec.js'),
+            File.join(@rails_dir, 'spec/javascripts/PlayerSpec.js'),
           ]
         end
       end
@@ -80,13 +100,13 @@ describe Jasmine::Config do
       end
-      describe "using default jasmine.yml" do
-        before(:each) do
-          @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
-        end
-        it_should_behave_like "simple_config defaults"
-      end
+#      describe "using default jasmine.yml" do
+#        before(:each) do
+#          @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine.yml'))
+#        end
+#        it_should_behave_like "simple_config defaults"
+#
+#      end
       describe "should use the first appearance of duplicate filenames" do
         before(:each) do
@@ -123,8 +143,10 @@ describe Jasmine::Config do
         end
         it "spec_files_full_paths" do
-          @config.spec_files_full_paths.should == [File.expand_path("../../generators/jasmine/templates/spec/javascripts/file1.ext", __FILE__),
-                                                   File.expand_path("../../generators/jasmine/templates/spec/javascripts/file2.ext", __FILE__)]
+          @config.spec_files_full_paths.should == [
+              File.expand_path("spec/javascripts/file1.ext", @rails_dir),
+              File.expand_path("spec/javascripts/file2.ext", @rails_dir)
+          ]
         end
       end
@@ -140,40 +162,37 @@ describe Jasmine::Config do
       it "using rails jasmine.yml" do
-        original_glob = Dir.method(:glob)
-        Dir.stub!(:glob).and_return do |glob_string|
-          if glob_string =~ /public/
-            glob_string
-          else
-            original_glob.call(glob_string)
-          end
-        end
         @config.stub!(:simple_config_file).and_return(File.join(@template_dir, 'spec/javascripts/support/jasmine-rails.yml'))
-        @config.spec_files.should == ['ExampleSpec.js']
+        @config.spec_files.should == ['PlayerSpec.js']
         @config.helpers.should == ['helpers/SpecHelper.js']
         @config.src_files.should == ['public/javascripts/prototype.js',
                                      'public/javascripts/effects.js',
                                      'public/javascripts/controls.js',
                                      'public/javascripts/dragdrop.js',
-                                     'public/javascripts/application.js']
+                                     'public/javascripts/application.js',
+                                     'public/javascripts/Player.js',
+                                     'public/javascripts/Song.js']
         @config.js_files.should == [
           '/public/javascripts/prototype.js',
           '/public/javascripts/effects.js',
           '/public/javascripts/controls.js',
           '/public/javascripts/dragdrop.js',
           '/public/javascripts/application.js',
+          '/public/javascripts/Player.js',
+          '/public/javascripts/Song.js',
           '/__spec__/helpers/SpecHelper.js',
-          '/__spec__/ExampleSpec.js',
+          '/__spec__/PlayerSpec.js',
         ]
-        @config.js_files("ExampleSpec.js").should == [
+        @config.js_files("PlayerSpec.js").should == [
           '/public/javascripts/prototype.js',
           '/public/javascripts/effects.js',
           '/public/javascripts/controls.js',
           '/public/javascripts/dragdrop.js',
           '/public/javascripts/application.js',
+          '/public/javascripts/Player.js',
+          '/public/javascripts/Song.js',
           '/__spec__/helpers/SpecHelper.js',
-          '/__spec__/ExampleSpec.js'
+          '/__spec__/PlayerSpec.js'
         ]
       end

data/spec/jasmine_command_line_tool_spec.rb ADDED

@@ -0,0 +1,23 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+describe "Jasmine command line tool" do
+  before :each do
+    temp_dir_before
+    Dir::chdir @tmp
+  end
+  after :each do
+    temp_dir_after
+  end
+  it "should create files on init" do
+    Jasmine::CommandLineTool.new.process ["init"]
+    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.should =~ (/[1-9][0-9]* examples, 0 failures/)
+  end
+end

data/spec/rails_generator_spec.rb ADDED

@@ -0,0 +1,26 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
+describe "Jasmine rails generator" do
+  before :each do
+    temp_dir_before
+    Dir::chdir @tmp
+  end
+  after :each do
+    temp_dir_after
+  end
+  it "should create files on init" do
+    system 'rails rails-project'
+    Dir::chdir 'rails-project'
+    FileUtils.cp_r(File.join(@root, 'generators'), 'vendor')
+    system "./script/generate jasmine"
+    bootstrap = "$:.unshift('#{@root}/lib')"
+    ENV['JASMINE_GEM_PATH'] = "#{@root}/lib"
+    ci_output = `rake -E \"#{bootstrap}\" --trace jasmine:ci`
+    ci_output.should =~ (/[1-9][0-9]* examples, 0 failures/)
+  end
+end

data/spec/spec_helper.rb CHANGED

@@ -5,4 +5,24 @@ Bundler.setup(:default, :test)
 require 'spec'
-require File.expand_path(File.join(File.dirname(__FILE__), "../lib/jasmine"))
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib")))
+require "jasmine"
+def create_temp_dir
+  tmp = File.join(Dir.tmpdir, 'jasmine-gem-test')
+  FileUtils.rm_r(tmp, :force => true)
+  FileUtils.mkdir(tmp)
+  tmp
+end
+def temp_dir_before
+  @root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+  @old_dir = Dir::pwd
+  @tmp = create_temp_dir
+end
+def temp_dir_after
+  Dir::chdir @old_dir
+  FileUtils.rm_r @tmp
+end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 19
   prerelease: false
   segments:
   - 0
   - 11
+  - 1
   - 0
-  - 0
-  version: 0.11.0.0
+  version: 0.11.1.0
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-06-23 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: jasmine
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -95,28 +95,36 @@ extra_rdoc_files:
 files:
 - generators/jasmine/jasmine_generator.rb
 - generators/jasmine/templates/INSTALL
+- generators/jasmine/templates/jasmine-example/SpecRunner.html
+- generators/jasmine/templates/jasmine-example/spec/PlayerSpec.js
+- generators/jasmine/templates/jasmine-example/spec/SpecHelper.js
+- generators/jasmine/templates/jasmine-example/src/Player.js
+- generators/jasmine/templates/jasmine-example/src/Song.js
 - generators/jasmine/templates/lib/tasks/jasmine.rake
-- generators/jasmine/templates/spec/javascripts/ExampleSpec.js
-- generators/jasmine/templates/spec/javascripts/helpers/SpecHelper.js
 - generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml
 - generators/jasmine/templates/spec/javascripts/support/jasmine.yml
 - generators/jasmine/templates/spec/javascripts/support/jasmine_runner.rb
-- jasmine/lib/TrivialReporter.js
+- jasmine/example/SpecRunner.html
 - jasmine/lib/consolex.js
+- jasmine/lib/jasmine-html.js
 - jasmine/lib/jasmine.css
 - jasmine/lib/jasmine.js
 - jasmine/lib/json2.js
 - lib/jasmine.rb
 - lib/jasmine/base.rb
+- lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
 - lib/jasmine/run.html.erb
 - lib/jasmine/selenium_driver.rb
 - lib/jasmine/server.rb
 - 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
@@ -156,7 +164,9 @@ specification_version: 3
 summary: Jasmine Ruby Runner
 test_files:
 - 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

data/generators/jasmine/templates/spec/javascripts/ExampleSpec.js DELETED

@@ -1,11 +0,0 @@
-describe('Example', function () {
-  it('should have a passing test', function() {
-      expect(true).toEqual(true);
-  });
-  describe('nested describe', function () {
-     it('should also have a passing test', function () {
-        expect(true).toEqual(true);
-     });
-  });
-});

data/generators/jasmine/templates/spec/javascripts/helpers/SpecHelper.js DELETED

	@@ -1 +0,0 @@
1	- //You may load required files here, or create test-runner-wide environment settings.