merge

.gitignore

@@ -5,3 +5,7 @@ site/
 .bundle/
 .pairs
 .rvmrc
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

Gemfile

@@ -1,8 +1,3 @@
 source :rubygems
-
-gem "json_pure", "~>1.4.3"
-gem "frank"
-gem "haml"
-gem "term-ansicolor"
-gem "ragaskar-jsdoc_helper"
-gem "rake", "0.8.7"
+gem "term-ansicolor", :require => "term/ansicolor"
+gemspec

Rakefile

@@ -1,6 +1,8 @@
-require 'json'
-require 'tilt'
-require 'term/ansicolor'
+require "bundler"
+Bundler::GemHelper.install_tasks
+require "term/ansicolor"
+require "json"
+require "tilt"
 
 Dir["#{File.dirname(__FILE__)}/tasks/**/*.rb"].each do |file|
   require file
@@ -29,4 +31,3 @@ class String
 end
 
 Term::ANSIColor.coloring = STDOUT.isatty
-

jasmine-core.gemspec

@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "jasmine-core/version"
+
+Gem::Specification.new do |s|
+  s.name = "jasmine-core"
+  s.version = Jasmine::Core::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Rajan Agaskar", "Davis Frank", "Christian Williams"]
+  s.summary = %q{JavaScript BDD framework}
+  s.description = %q{Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.}
+  s.email = %q{jasmine-js@googlegroups.com}
+  s.homepage = "http://pivotal.github.com/jasmine"
+  s.rubyforge_project = "jasmine-core"
+
+  s.files         = Dir.glob("./lib/**/*") + Dir.glob("./lib/jasmine-core/spec/**/*.js")
+  s.require_paths = ["lib"]
+  s.add_development_dependency "term-ansicolor"
+  s.add_development_dependency "json_pure", ">= 1.4.3"
+  s.add_development_dependency "frank"
+  s.add_development_dependency "haml"
+  s.add_development_dependency "ragaskar-jsdoc_helper"
+end

lib/jasmine-core.rb

@@ -0,0 +1,36 @@
+module Jasmine
+  module Core
+    class << self
+      def path
+        File.join(File.dirname(__FILE__), "jasmine-core")
+      end
+
+      def js_files
+        (["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
+    end
+  end
+end

lib/jasmine.js → lib/jasmine-core/jasmine.js

@@ -740,11 +740,12 @@ jasmine.Env.prototype.versionString = function() {
   }
 
   var version = this.version();
-  var dotted_version = version.major + "." + version.minor + "." + version.build;
-  if (version.rc) {
-    dotted_version += ".rc" + version.rc;
+  var versionString = version.major + "." + version.minor + "." + version.build;
+  if (version.release_candidate) {
+    versionString += ".rc" + version.release_candidate
   }
-  return dotted_version + " revision " + version.revision;
+  versionString += " revision " + version.revision;
+  return versionString;
 };
 
 /**
@@ -2471,6 +2472,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308359945,
+  "revision": 1308584756,
   "rc": 1
 };

lib/jasmine-core/spec

@@ -0,0 +1 @@
+../../spec

lib/jasmine-core/version.rb

@@ -0,0 +1,8 @@
+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']
+  end
+end

spec/core/EnvSpec.js

@@ -64,9 +64,10 @@ describe("jasmine.Env", function() {
             "major": 1,
             "minor": 9,
             "build": 7,
+            "release_candidate": "1",
             "revision": 8
           };
-          expect(env.versionString()).toEqual("1.9.7 revision 8");
+          expect(env.versionString()).toEqual("1.9.7.rc1 revision 8");
         });
 
         it("should return a nice string when version is unknown", function() {

spec/node_suite.js

@@ -6,7 +6,7 @@ var path = require('path');
 // undefined = "diz be undefined yo";
 
 
-var jasmineGlobals = require('../lib/jasmine.js');
+var jasmineGlobals = require('../lib/jasmine-core/jasmine.js');
 for (var k in jasmineGlobals) {
   global[k] = jasmineGlobals[k];
 }
@@ -124,4 +124,4 @@ jasmine.executeSpecs(domIndependentSpecs, function(runner, log) {
   } else {
     process.exit(1);
   }
-}, isVerbose, showColors);
+}, isVerbose, showColors);

spec/runner.html

@@ -6,42 +6,42 @@
 
   <link rel="shortcut icon" type="image/png" href="../images/jasmine_favicon.png">
 
-  <link href="../lib/jasmine.css" rel="stylesheet"/>
-  <script type="text/javascript" src="../lib/jasmine.js"></script>
+  <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>
+  <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" 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() {

src/core/Env.js

@@ -56,11 +56,12 @@ jasmine.Env.prototype.versionString = function() {
   }
 
   var version = this.version();
-  var dotted_version = version.major + "." + version.minor + "." + version.build;
-  if (version.rc) {
-    dotted_version += ".rc" + version.rc;
+  var versionString = version.major + "." + version.minor + "." + version.build;
+  if (version.release_candidate) {
+    versionString += ".rc" + version.release_candidate
   }
-  return dotted_version + " revision " + version.revision;
+  versionString += " revision " + version.revision;
+  return versionString;
 };
 
 /**

src/templates/version.erb

@@ -2,5 +2,5 @@ jasmine.version_= {
   "major": <%= major %>,
   "minor": <%= minor %>,
   "build": <%= build %>,
-  "revision": <%= revision %><%= %Q{,\n  "rc": #{rc}} if rc %>
+  "revision": <%= revision %><%= %Q{,\n  "rc": #{release_candidate}} if release_candidate %>
 };

src/version.js

@@ -2,6 +2,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308359945,
+  "revision": 1308584756,
   "rc": 1
 };

src/version.json

@@ -2,5 +2,5 @@
   "major": 1,
   "minor": 1,
   "build": 0,
-  "rc": 1
+  "release_candidate": 1
 }