Version 1.2.0

- Bump version
- Update pages submodule

README.markdown

@@ -6,18 +6,11 @@ Jasmine is a Behavior Driven Development testing framework for JavaScript. It do
 
 Documentation & guides live here: [http://pivotal.github.com/jasmine/](http://pivotal.github.com/jasmine/)
 
-## What's Here?
-
-* 
-
-
-
 
 ## Support
 
 * Search past discussions: [http://groups.google.com/group/jasmine-js](http://groups.google.com/group/jasmine-js)
 * Send an email to the list: [jasmine-js@googlegroups.com](jasmine-js@googlegroups.com)
-* Check the current build status: [ci.pivotallabs.com](http://ci.pivotallabs.com)
 * View the project backlog at Pivotal Tracker: [http://www.pivotaltracker.com/projects/10606](http://www.pivotaltracker.com/projects/10606)
 * Follow us on Twitter: [@JasmineBDD](http://twitter.com/JasmineBDD)
 
@@ -28,4 +21,4 @@ Documentation & guides live here: [http://pivotal.github.com/jasmine/](http://pi
 * [Rajan Agaskar](mailto:rajan@pivotallabs.com), Pivotal Labs
 * [Christian Williams](mailto:antixian666@gmail.com), Square
 
-Copyright (c) 2008-2011 Pivotal Labs. This software is licensed under the MIT License.
+Copyright (c) 2008-2012 Pivotal Labs. This software is licensed under the MIT License.

Rakefile

@@ -7,19 +7,38 @@ Dir["#{File.dirname(__FILE__)}/tasks/**/*.rb"].each do |file|
   require file
 end
 
-task :default => :spec
+desc "Run all Jasmine JS specs"
+task :jasmine_specs do
+  jasmine_dev = JasmineDev.new
+
+  return unless jasmine_dev.node_installed?
+
+  system "thor jasmine_dev:execute_specs"
+
+  puts "\n\033[33m>>> DEPRECATED <<< Run Jasmine's JavaScript specs with 'thor jasmine_dev:execute_specs'\n\033[0m"
+end
+
+desc "Run all Jasmine core tests (JavaScript and dev tasks)"
+task :spec => :require_pages_submodule do
+  jasmine_dev = JasmineDev.new
+
+  return unless jasmine_dev.node_installed?
 
-desc "Run all developement tests"
-task :spec do
   system "rspec"
 end
 
-# Keeping this around for the Doc task, remove when doc is refactored
 task :require_pages_submodule do
-  raise "Submodule for Github Pages isn't present. Run git submodule update --init" unless pages_submodule_present
+  jasmine_dev = JasmineDev.new
+
+  unless jasmine_dev.pages_submodule_installed?
+    puts 'Installing the Github pages submodule:'
+    system 'git submodule update --init'
+    puts 'Now continuing...'
+  end
 end
 
-def pages_submodule_present
+desc "View full development tasks"
-  File.exist?('pages/download.html')
+task :list_dev_tasks do
+  puts "Jasmine uses Thor for command line tasks for development. Here is the command set:"
+  system "thor list"
 end
-

Release.markdown

@@ -5,8 +5,11 @@ ___Jasmine Core Maintainers Only___
 
 Follow the instructions in `Contribute.markdown` during development.
 
-### Git Commits
+### Git Rules
 
+Please work on feature branches.
+
+Please attempt to keep commits to `master` small, but cohesive. If a feature is contained in a bunch of small commits (e.g., it has several wip commits), please squash them when merging back to `master`.
 
 ### Version
 
@@ -16,10 +19,11 @@ The current version lives in the file `src/version.json`. This file should be se
 
 This version is used by both `jasmine.js` and the `jasmine-core` Ruby gem.
 
+Note that Jasmine should *not* use the "patch" version number. Let downstream projects rev their patch versions as needed, keeping their major and minor version numbers in sync with Jasmine core.
                  
 ### Update the Github Pages (as needed)
 
-Github pages have to exist in a branch called gh-pages in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks.
+Github pages have to exist in a branch called `gh-pages` in order for their app to serve them. This repo adds that branch as a submodule under the `pages` directory. This is a bit of a hack, but it allows us to work with the pages and the source at the same time and with one set of rake tasks.
 
 If you want to submit changes to this repo and aren't a Pivotal Labs employee, you can fork and work in the `gh-pages` branch. You won't be able to edit the pages in the submodule off of master.
 
@@ -29,12 +33,10 @@ The pages are built with [Frank](https://github.com/blahed/frank). All the sourc
 
 When ready to release - specs are all green and the stories are done:
 
-1. Update the version in `version.json` to a release candidate - add an `rc` property with a value of 1
+1. Update the version in `version.json` to a release candidate - add a `release_candidate` property with a value of 1
 1. Update any comments on the public interfaces 
-1. `rake doc` - builds the `jsdoc` pages
 1. Update any links or top-level landing page for the Github Pages
-1. `rake standalone` - builds the standalone distribution ZIP file
+1. `thor jasmine_dev:release_prep` - updates the version, builds the `.js` files, builds the standalone release, and builds the Github pages
-1. `rake build_pages` - builds the Github Pages
 1. `rake release` - tags the repo with the version, builds the `jasmine-core` gem, pushes the gem to Rubygems.org
 
 There should be a post to Pivotal Labs blog and a tweet to that link.

lib/jasmine-core/jasmine.js

@@ -2525,6 +2525,5 @@ jasmine.version_= {
   "major": 1,
   "minor": 2,
   "build": 0,
-  "revision": 1333492179,
+  "revision": 1337005947
-  "release_candidate": 2
 };

lib/jasmine-core/version.rb

@@ -1,6 +1,6 @@
 module Jasmine
   module Core
-    VERSION = "1.2.0.rc2"
+    VERSION = "1.2.0"
   end
 end
 

spec/core/MatchersSpec.js

@@ -947,28 +947,28 @@ describe("jasmine.Matchers", function() {
       describe("with Object", function () {
         it("says it's looking for an object", function () {
           any = jasmine.any(Object);
-          expect(any.jasmineToString()).toMatch(/<jasmine\.any\(function Object.*\)>/);
+          expect(any.jasmineToString().replace(/\n/g, "")).toMatch(/<jasmine\.any\(function Object.*\)>/);
         });
       });
 
       describe("with Function", function () {
         it("says it's looking for a function", function () {
           any = jasmine.any(Function);
-          expect(any.jasmineToString()).toMatch(/<jasmine\.any\(function Function.*\)>/);
+          expect(any.jasmineToString().replace(/\n/g, "")).toMatch(/<jasmine\.any\(function Function.*\)>/);
         });
       });
 
       describe("with String", function () {
         it("says it's looking for a string", function () {
           any = jasmine.any(String);
-          expect(any.jasmineToString()).toMatch(/<jasmine\.any\(function String.*\)>/);
+          expect(any.jasmineToString().replace(/\n/g, "")).toMatch(/<jasmine\.any\(function String.*\)>/);
         });
       });
 
       describe("with Number", function () {
         it("says it's looking for a number", function () {
           any = jasmine.any(Number);
-          expect(any.jasmineToString()).toMatch(/<jasmine\.any\(function Number.*\)>/);
+          expect(any.jasmineToString().replace(/\n/g, "")).toMatch(/<jasmine\.any\(function Number.*\)>/);
         });
       });
 
@@ -976,7 +976,7 @@ describe("jasmine.Matchers", function() {
         it("says it's looking for an object", function () {
           function MyClass () {}
           any = jasmine.any(MyClass);
-          expect(any.jasmineToString()).toMatch(/<jasmine\.any\(function MyClass.*\)>/);
+          expect(any.jasmineToString().replace("\n", "")).toMatch(/<jasmine\.any\(function MyClass.*\)>/);
         });
       });
     });

src/version.js

@@ -3,6 +3,5 @@ jasmine.version_= {
   "major": 1,
   "minor": 2,
   "build": 0,
-  "revision": 1333492179,
+  "revision": 1337006083
-  "release_candidate": 2
 };

src/version.json

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

tasks/jasmine_dev/base.rb

@@ -29,7 +29,7 @@ class JasmineDev < Thor
     def node_installed?
       return true if has_node?
 
-      say "Node.js is required to develop Jasmine. Please visit http://nodejs.org to install. ",
+      say "Node.js is required to develop Jasmine. Please visit http://nodejs.org to install.",
           :red
       false
     end
@@ -48,7 +48,7 @@ class JasmineDev < Thor
     end
 
     def has_pages_submodule?
-      File.exist?(File.join(JasmineDev.project_root, 'pages', 'download.html'))
+      File.exist?(File.join(JasmineDev.project_root, 'pages', 'index.html'))
     end
   end
 end

tasks/jasmine_dev/execute_specs.rb

@@ -30,7 +30,7 @@ class JasmineDev < Thor
     open_specs_in_browser
   end
 
-  desc "execute_specs", "Run all of Jasmine's specs"
+  desc "execute_specs", "Run all of Jasmine's JavaScript specs"
 
   def execute_specs
     invoke :execute_specs_in_node