admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for release candidates in the version.json file; propagates up through the version string everywhere: filenames, ZIP, source code

Browse Source
This commit is contained in:
Davis W. Frank
2011-06-15 18:37:12 -07:00
parent 6b2e45eab5
commit ae24e00c0f
8 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/SpecRunner.html
View File

@@ -4,11 +4,11 @@
<head> <head>
<title>Jasmine Spec Runner</title> <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"> <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/jasmine.js"></script> <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine.js"></script>
<script type="text/javascript" src="lib/jasmine-1.1.0/jasmine-html.js"></script> <script type="text/javascript" src="lib/jasmine-1.1.0.rc1/jasmine-html.js"></script>
<!-- include source files here... --> <!-- include source files here... -->
<script type="text/javascript" src="spec/SpecHelper.js"></script> <script type="text/javascript" src="spec/SpecHelper.js"></script>

15
lib/jasmine.js
View File

@@ -735,12 +735,16 @@ jasmine.Env.prototype.version = function () {
* @returns string containing jasmine version build info, if set. * @returns string containing jasmine version build info, if set.
*/ */
jasmine.Env.prototype.versionString = function() { jasmine.Env.prototype.versionString = function() {
if (jasmine.version_) { if (!jasmine.version_) {
var version = this.version();
return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
} else {
return "version unknown"; 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, "major": 1,
"minor": 1, "minor": 1,
"build": 0, "build": 0,
"revision": 1308154429 "revision": 1308187385,
"rc": 1
} }

12
src/core/Env.js
View File

@@ -51,12 +51,16 @@ jasmine.Env.prototype.version = function () {
* @returns string containing jasmine version build info, if set. * @returns string containing jasmine version build info, if set.
*/ */
jasmine.Env.prototype.versionString = function() { jasmine.Env.prototype.versionString = function() {
if (jasmine.version_) { if (!jasmine.version_) {
var version = this.version();
return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
} else {
return "version unknown"; 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;
}; };
/** /**

4
src/templates/version.erb
View File

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

3
src/version.js
View File

@@ -2,5 +2,6 @@ jasmine.version_= {
"major": 1, "major": 1,
"minor": 1, "minor": 1,
"build": 0, "build": 0,
"revision": 1308154429 "revision": 1308187385,
"rc": 1
} }

3
src/version.json
View File

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

1
tasks/build_dist.rb
View File

@@ -30,6 +30,7 @@ task :write_version_file do
scope = OpenStruct.new(:major => version_hash["major"], scope = OpenStruct.new(:major => version_hash["major"],
:minor => version_hash["minor"], :minor => version_hash["minor"],
:build => version_hash["build"], :build => version_hash["build"],
:rc => version_hash["rc"],
:revision => Time.now.to_i) :revision => Time.now.to_i)
File.open('src/version.js', 'w+') do |f| File.open('src/version.js', 'w+') do |f|

4
tasks/helpers.rb
View File

@@ -29,7 +29,9 @@ def console_specfiles
end end
def version_string 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 end
def version_hash def version_hash