diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index a9c03f73..9ae2ad53 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -2520,9 +2520,11 @@ jasmine.WaitsForBlock.prototype.execute = function(onComplete) { }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); } }; + jasmine.version_= { "major": 1, - "minor": 1, + "minor": 2, "build": 0, - "revision": 1333301588 + "revision": 1333310589, + "release_candidate": 1 }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 6bb7db79..61e85cb9 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -1,6 +1,6 @@ module Jasmine module Core - VERSION = "1.1.0" + VERSION = "1.2.0.rc1" end end diff --git a/spec/tasks/version_spec.rb b/spec/tasks/version_spec.rb index 5018252a..861357d7 100644 --- a/spec/tasks/version_spec.rb +++ b/spec/tasks/version_spec.rb @@ -21,7 +21,7 @@ describe "Version tasks" do js_version.should match(%Q{"build": #{jasmine_version_object["build"]}}) if jasmine_version_object["release_candidate"] - js_version.should match(%Q{"rc:" #{jasmine_version_object["release_candidate"]}}) + js_version.should match(%Q{"release_candidate": #{jasmine_version_object["release_candidate"]}}) end js_version.should match(/"revision": \d+/) diff --git a/src/templates/version.js.erb b/src/templates/version.js.erb index 88d52242..ad5eddb8 100644 --- a/src/templates/version.js.erb +++ b/src/templates/version.js.erb @@ -1,3 +1,4 @@ + jasmine.version_= { "major": <%= major %>, "minor": <%= minor %>, diff --git a/src/version.js b/src/version.js index f689fbe0..9b6209f9 100644 --- a/src/version.js +++ b/src/version.js @@ -1,6 +1,8 @@ + jasmine.version_= { "major": 1, - "minor": 1, + "minor": 2, "build": 0, - "revision": 1333304168 + "revision": 1333310630, + "release_candidate": 1 }; diff --git a/tasks/jasmine_dev/version.rb b/tasks/jasmine_dev/version.rb index 18f42a03..0b97c8e3 100644 --- a/tasks/jasmine_dev/version.rb +++ b/tasks/jasmine_dev/version.rb @@ -1,6 +1,7 @@ class JasmineDev < Thor desc "write_version_files", "Write out version files" + def write_version_files say JasmineDev.spacer @@ -16,9 +17,16 @@ class JasmineDev < Thor create_file File.join(JasmineDev.project_root, 'src', 'version.js'), :force => true do js_template.render(scope) end + + rb_template = Tilt.new(File.join(JasmineDev.project_root, 'src', 'templates', 'version.rb.erb')) + + create_file File.join(JasmineDev.project_root, 'lib', 'jasmine-core', 'version.rb'), :force => true do + rb_template.render(scope) + end end desc "display_version", "Display version currently stored in source" + def display_version say "Current version information from src/version.json", :cyan