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

Fixed bug where version for Ruby gem wasn't correct

Browse Source
This commit is contained in:
Davis W. Frank
2012-04-01 13:08:42 -07:00
parent 885832e920
commit ad78d0d0d8
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jasmine-core/jasmine.js
View File

@@ -2520,9 +2520,11 @@ jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
}, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
} }
}; };
jasmine.version_= { jasmine.version_= {
"major": 1, "major": 1,
"minor": 1, "minor": 2,
"build": 0, "build": 0,
"revision": 1333301588 "revision": 1333310589,
"release_candidate": 1
}; };

2
lib/jasmine-core/version.rb
View File

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

2
spec/tasks/version_spec.rb
View File

@@ -21,7 +21,7 @@ describe "Version tasks" do
js_version.should match(%Q{"build": #{jasmine_version_object["build"]}}) js_version.should match(%Q{"build": #{jasmine_version_object["build"]}})
if jasmine_version_object["release_candidate"] 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 end
js_version.should match(/"revision": \d+/) js_version.should match(/"revision": \d+/)

1
src/templates/version.js.erb
View File

@@ -1,3 +1,4 @@
jasmine.version_= { jasmine.version_= {
"major": <%= major %>, "major": <%= major %>,
"minor": <%= minor %>, "minor": <%= minor %>,

6
src/version.js
View File

@@ -1,6 +1,8 @@
jasmine.version_= { jasmine.version_= {
"major": 1, "major": 1,
"minor": 1, "minor": 2,
"build": 0, "build": 0,
"revision": 1333304168 "revision": 1333310630,
"release_candidate": 1
}; };

8
tasks/jasmine_dev/version.rb
View File

@@ -1,6 +1,7 @@
class JasmineDev < Thor class JasmineDev < Thor
desc "write_version_files", "Write out version files" desc "write_version_files", "Write out version files"
def write_version_files def write_version_files
say JasmineDev.spacer say JasmineDev.spacer
@@ -16,9 +17,16 @@ class JasmineDev < Thor
create_file File.join(JasmineDev.project_root, 'src', 'version.js'), :force => true do create_file File.join(JasmineDev.project_root, 'src', 'version.js'), :force => true do
js_template.render(scope) js_template.render(scope)
end 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 end
desc "display_version", "Display version currently stored in source" desc "display_version", "Display version currently stored in source"
def display_version def display_version
say "Current version information from src/version.json", :cyan say "Current version information from src/version.json", :cyan