jasmine-core 1.1.0.rc1 → 1.1.0.rc2

data/lib/jasmine-core.rb

@@ -9,6 +9,25 @@ module Jasmine
         (["jasmine.js"] + Dir.glob(File.join(path, "*.js"))).map { |f| File.basename(f) }.uniq
       end
 
+      SPEC_TYPES = ["core", "html", "node"]
+
+      def core_spec_files
+        spec_files("core")
+      end
+
+      def html_spec_files
+        spec_files("html")
+      end
+
+      def node_spec_files
+        spec_files("node")
+      end
+
+      def spec_files(type)
+        raise ArgumentError.new("Unrecognized spec type") unless SPEC_TYPES.include?(type)
+        (Dir.glob(File.join(path, "spec", type, "*.js"))).map { |f| File.join("spec", type, File.basename(f)) }.uniq
+      end
+
       def css_files
         Dir.glob(File.join(path, "*.css")).map { |f| File.basename(f) }
       end

data/lib/jasmine-core/jasmine.js

@@ -735,17 +735,17 @@ jasmine.Env.prototype.version = function () {
  * @returns string containing jasmine version build info, if set.
  */
 jasmine.Env.prototype.versionString = function() {
-  if (jasmine.version_) {
-    var version = this.version();
-    var versionString = version.major + "." + version.minor + "." + version.build;
-    if (version.release_candidate) {
-      versionString += ".rc" + version.release_candidate
-    }
-    versionString += " revision " + version.revision
-    return versionString;
-  } else {
+  if (!jasmine.version_) {
     return "version unknown";
   }
+
+  var version = this.version();
+  var versionString = version.major + "." + version.minor + "." + version.build;
+  if (version.release_candidate) {
+    versionString += ".rc" + version.release_candidate
+  }
+  versionString += " revision " + version.revision;
+  return versionString;
 };
 
 /**
@@ -2472,5 +2472,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308358300
+  "revision": 1308965645,
+  "release_candidate": 2
 };

data/lib/jasmine-core/version.rb

@@ -1,8 +1,6 @@
 module Jasmine
   module Core
-    require 'json'
-    VERSION_HASH = JSON.parse(File.new(File.join(File.dirname(__FILE__), "..", "..", "src", "version.json")).read);
-    VERSION = "#{VERSION_HASH['major']}.#{VERSION_HASH['minor']}.#{VERSION_HASH['build']}"
-    VERSION << ".rc#{VERSION_HASH['release_candidate']}" if VERSION_HASH['release_candidate']
+    VERSION = "1.1.0.rc2"
   end
 end
+

metadata

@@ -2,7 +2,7 @@
 name: jasmine-core
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -04:00
+date: 2011-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,33 +79,30 @@ files:
 - ./lib/jasmine-core/json2.js
 - ./lib/jasmine-core/version.rb
 - ./lib/jasmine-core.rb
-- spec/console/ConsoleReporterSpec.js
-- spec/core/BaseSpec.js
-- spec/core/CustomMatchersSpec.js
-- spec/core/EnvSpec.js
-- spec/core/ExceptionsSpec.js
-- spec/core/JsApiReporterSpec.js
-- spec/core/MatchersSpec.js
-- spec/core/MockClockSpec.js
-- spec/core/MultiReporterSpec.js
-- spec/core/NestedResultsSpec.js
-- spec/core/PrettyPrintSpec.js
-- spec/core/QueueSpec.js
-- spec/core/ReporterSpec.js
-- spec/core/RunnerSpec.js
-- spec/core/SpecRunningSpec.js
-- spec/core/SpecSpec.js
-- spec/core/SpySpec.js
-- spec/core/SuiteSpec.js
-- spec/core/UtilSpec.js
-- spec/core/WaitsForBlockSpec.js
-- spec/html/MatchersHtmlSpec.js
-- spec/html/PrettyPrintHtmlSpec.js
-- spec/html/TrivialReporterSpec.js
-- spec/node_suite.js
-- spec/runner.html
-- spec/templates/runner.html.erb
-- spec/templates/script_tag.html.erb
+- ./lib/jasmine-core/spec/console/ConsoleReporterSpec.js
+- ./lib/jasmine-core/spec/core/BaseSpec.js
+- ./lib/jasmine-core/spec/core/CustomMatchersSpec.js
+- ./lib/jasmine-core/spec/core/EnvSpec.js
+- ./lib/jasmine-core/spec/core/ExceptionsSpec.js
+- ./lib/jasmine-core/spec/core/JsApiReporterSpec.js
+- ./lib/jasmine-core/spec/core/MatchersSpec.js
+- ./lib/jasmine-core/spec/core/MockClockSpec.js
+- ./lib/jasmine-core/spec/core/MultiReporterSpec.js
+- ./lib/jasmine-core/spec/core/NestedResultsSpec.js
+- ./lib/jasmine-core/spec/core/PrettyPrintSpec.js
+- ./lib/jasmine-core/spec/core/QueueSpec.js
+- ./lib/jasmine-core/spec/core/ReporterSpec.js
+- ./lib/jasmine-core/spec/core/RunnerSpec.js
+- ./lib/jasmine-core/spec/core/SpecRunningSpec.js
+- ./lib/jasmine-core/spec/core/SpecSpec.js
+- ./lib/jasmine-core/spec/core/SpySpec.js
+- ./lib/jasmine-core/spec/core/SuiteSpec.js
+- ./lib/jasmine-core/spec/core/UtilSpec.js
+- ./lib/jasmine-core/spec/core/WaitsForBlockSpec.js
+- ./lib/jasmine-core/spec/html/MatchersHtmlSpec.js
+- ./lib/jasmine-core/spec/html/PrettyPrintHtmlSpec.js
+- ./lib/jasmine-core/spec/html/TrivialReporterSpec.js
+- ./lib/jasmine-core/spec/node_suite.js
 has_rdoc: true
 homepage: http://pivotal.github.com/jasmine
 licenses: []
@@ -134,31 +131,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: JavaScript BDD framework
-test_files: 
-- spec/console/ConsoleReporterSpec.js
-- spec/core/BaseSpec.js
-- spec/core/CustomMatchersSpec.js
-- spec/core/EnvSpec.js
-- spec/core/ExceptionsSpec.js
-- spec/core/JsApiReporterSpec.js
-- spec/core/MatchersSpec.js
-- spec/core/MockClockSpec.js
-- spec/core/MultiReporterSpec.js
-- spec/core/NestedResultsSpec.js
-- spec/core/PrettyPrintSpec.js
-- spec/core/QueueSpec.js
-- spec/core/ReporterSpec.js
-- spec/core/RunnerSpec.js
-- spec/core/SpecRunningSpec.js
-- spec/core/SpecSpec.js
-- spec/core/SpySpec.js
-- spec/core/SuiteSpec.js
-- spec/core/UtilSpec.js
-- spec/core/WaitsForBlockSpec.js
-- spec/html/MatchersHtmlSpec.js
-- spec/html/PrettyPrintHtmlSpec.js
-- spec/html/TrivialReporterSpec.js
-- spec/node_suite.js
-- spec/runner.html
-- spec/templates/runner.html.erb
-- spec/templates/script_tag.html.erb
+test_files: []
+

data/spec/runner.html

@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title>Jasmine Spec Runner: Jasmine Core</title>
-
-  <link rel="shortcut icon" type="image/png" href="../images/jasmine_favicon.png">
-
-  <link href="../lib/jasmine-core/jasmine.css" rel="stylesheet"/>
-  <script type="text/javascript" src="../lib/jasmine-core/jasmine.js"></script>
-  <script type="text/javascript">
-    // yes, really keep this here to keep us honest, but only for jasmine's own runner! [xw]
-    undefined = "diz be undefined yo";
-  </script>
-
-
-  <!-- include source files here... -->
-  <script type="text/javascript" src=".././src/html/TrivialReporter.js"></script>
-  <script type="text/javascript" src=".././src/console/ConsoleReporter.js"></script>
-
-  <!-- include spec files here... -->
-  <script type="text/javascript" src=".././spec/core/BaseSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/CustomMatchersSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/EnvSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/ExceptionsSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/JsApiReporterSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/MatchersSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/MockClockSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/MultiReporterSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/NestedResultsSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/PrettyPrintSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/QueueSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/ReporterSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/RunnerSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/SpecRunningSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/SpecSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/SpySpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/SuiteSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/UtilSpec.js"></script>
-  <script type="text/javascript" src=".././spec/core/WaitsForBlockSpec.js"></script>
-  <script type="text/javascript" src=".././spec/html/MatchersHtmlSpec.js"></script>
-  <script type="text/javascript" src=".././spec/html/PrettyPrintHtmlSpec.js"></script>
-  <script type="text/javascript" src=".././spec/html/TrivialReporterSpec.js"></script>
-  <script type="text/javascript" src=".././spec/console/ConsoleReporterSpec.js"></script>
-
-  <script type="text/javascript">
-    (function() {
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.updateInterval = 1000;
-
-      var trivialReporter = new jasmine.TrivialReporter();
-
-      jasmineEnv.addReporter(trivialReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return trivialReporter.specFilter(spec);
-      };
-
-      var currentWindowOnload = window.onload;
-
-      window.onload = function() {
-        if (currentWindowOnload) {
-          currentWindowOnload();
-        }
-        execJasmine();
-      };
-
-      function execJasmine() {
-        jasmineEnv.execute();
-      }
-
-    })();
-  </script>
-
-</head>
-
-<body>
-</body>
-</html>

data/spec/templates/runner.html.erb

@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-  "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title><%= title %></title>
-
-  <%= favicon %>
-  <%= jasmine_tags %>
-
-  <!-- include source files here... -->
-  <%= source_tags %>
-
-  <!-- include spec files here... -->
-  <%= spec_file_tags %>
-
-  <script type="text/javascript">
-    (function() {
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.updateInterval = 1000;
-
-      var trivialReporter = new jasmine.TrivialReporter();
-
-      jasmineEnv.addReporter(trivialReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return trivialReporter.specFilter(spec);
-      };
-
-      var currentWindowOnload = window.onload;
-
-      window.onload = function() {
-        if (currentWindowOnload) {
-          currentWindowOnload();
-        }
-        execJasmine();
-      };
-
-      function execJasmine() {
-        jasmineEnv.execute();
-      }
-
-    })();
-  </script>
-
-</head>
-
-<body>
-</body>
-</html>

data/spec/templates/script_tag.html.erb

@@ -1 +0,0 @@
-<script type="text/javascript" src="<%= file %>"></script>