Support for release candidates in the version.json file; propagates u…

…p through the version string everywhere: filenames, ZIP, source code
tf · Jun 16, 2011 · ae24e00 · ae24e00
1 parent 6b2e45e
commit ae24e00
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 18 deletions.
diff --git a/example/SpecRunner.html b/example/SpecRunner.html
@@ -4,11 +4,11 @@
 <head>
   <title>Jasmine Spec Runner</title>
 
-  <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.1.0/jasmine_favicon.png">
+  <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.1.0.rc1/jasmine_favicon.png">
 
-  <link rel="stylesheet" type="text/css" href="lib/jasmine-1.1.0/jasmine.css">
-  <script type="text/javascript" src="lib/jasmine-1.1.0/jasmine.js"></script>
-  <script type="text/javascript" src="lib/jasmine-1.1.0/jasmine-html.js"></script>
+  <link rel="stylesheet" type="text/css" href="lib/jasmine-1.1.0.rc1/jasmine.css">
+  <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine.js"></script>
+  <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine-html.js"></script>
 
   <!-- include source files here... -->
   <script type="text/javascript" src="spec/SpecHelper.js"></script>

diff --git a/lib/jasmine.js b/lib/jasmine.js
@@ -735,12 +735,16 @@ 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();
-    return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
-  } else {
+  if (!jasmine.version_) {
     return "version unknown";
   }
+
+  var version = this.version();
+  var dotted_version = version.major + "." + version.minor + "." + version.build;
+  if (version.rc) {
+    dotted_version += ".rc" + version.rc;
+  }
+  return dotted_version + " revision " + version.revision;
 };
 
 /**
@@ -2467,5 +2471,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308154429
+  "revision": 1308187385,
+  "rc": 1
 }
diff --git a/src/core/Env.js b/src/core/Env.js
@@ -51,12 +51,16 @@ 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();
-    return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
-  } else {
+  if (!jasmine.version_) {
     return "version unknown";
   }
+
+  var version = this.version();
+  var dotted_version = version.major + "." + version.minor + "." + version.build;
+  if (version.rc) {
+    dotted_version += ".rc" + version.rc;
+  }
+  return dotted_version + " revision " + version.revision;
 };
 
 /**

diff --git a/src/templates/version.erb b/src/templates/version.erb
@@ -2,5 +2,5 @@ jasmine.version_= {
   "major": <%= major %>,
   "minor": <%= minor %>,
   "build": <%= build %>,
-  "revision": <%= revision %>
-}
+  "revision": <%= revision %><%= %Q{,\n  "rc": #{rc}} if rc %>
+};
diff --git a/src/version.js b/src/version.js
@@ -2,5 +2,6 @@ jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1308154429
+  "revision": 1308187385,
+  "rc": 1
 }
diff --git a/src/version.json b/src/version.json
@@ -1,5 +1,6 @@
 {
   "major": 1,
   "minor": 1,
-  "build": 0
+  "build": 0,
+  "rc": 1
 }
diff --git a/tasks/build_dist.rb b/tasks/build_dist.rb
@@ -30,6 +30,7 @@ def concat_into(output_file, &block)
   scope = OpenStruct.new(:major => version_hash["major"],
                          :minor => version_hash["minor"],
                          :build => version_hash["build"],
+                         :rc => version_hash["rc"],
                          :revision => Time.now.to_i)
 
   File.open('src/version.js', 'w+') do |f|

diff --git a/tasks/helpers.rb b/tasks/helpers.rb
@@ -29,7 +29,9 @@ def console_specfiles
 end
 
 def version_string
-  "#{version_hash['major']}.#{version_hash['minor']}.#{version_hash['build']}"
+  version = "#{version_hash['major']}.#{version_hash['minor']}.#{version_hash['build']}"
+  version += ".rc#{version_hash['rc']}" if version_hash['rc']
+  version
 end
 
 def version_hash