diff --git a/Gemfile b/Gemfile index 4dca11ea..10fca11f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,3 @@ source :rubygems gem "term-ansicolor", :require => "term/ansicolor" -gem "json_pure", ">= 1.4.3" gemspec diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 70d7d25e..bd9fd0f9 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -2472,6 +2472,6 @@ jasmine.version_= { "major": 1, "minor": 1, "build": 0, - "revision": 1308618948, + "revision": 1308830021, "release_candidate": 1 }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 07639a21..3b3f5129 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -1,8 +1,6 @@ module Jasmine module Core - require 'json' - VERSION_HASH = JSON.parse(File.new(File.join(File.dirname(__FILE__), "..", "..", "src", "version.json")).read) - VERSION = "#{VERSION_HASH['major']}.#{VERSION_HASH['minor']}.#{VERSION_HASH['build']}" - VERSION << ".rc#{VERSION_HASH['release_candidate']}" if VERSION_HASH['release_candidate'] + VERSION = "1.1.0.rc1" end end + diff --git a/src/templates/version.erb b/src/templates/version.js.erb similarity index 100% rename from src/templates/version.erb rename to src/templates/version.js.erb diff --git a/src/templates/version.rb.erb b/src/templates/version.rb.erb new file mode 100644 index 00000000..7fb8433d --- /dev/null +++ b/src/templates/version.rb.erb @@ -0,0 +1,6 @@ +module Jasmine + module Core + VERSION = "<%= "#{major}.#{minor}.#{build}" %><%= ".rc#{release_candidate}" if release_candidate %>" + end +end + diff --git a/src/version.js b/src/version.js index d3d1d464..9c3f42d9 100644 --- a/src/version.js +++ b/src/version.js @@ -2,6 +2,6 @@ jasmine.version_= { "major": 1, "minor": 1, "build": 0, - "revision": 1308618948, + "revision": 1308830021, "release_candidate": 1 }; diff --git a/tasks/build_dist.rb b/tasks/build_dist.rb index fb6499a3..242fde24 100644 --- a/tasks/build_dist.rb +++ b/tasks/build_dist.rb @@ -1,11 +1,11 @@ desc "Build core jasmine.js" -task :build_dist => [:lint, :write_version_file] do +task :build_dist => [:lint, :write_version_files] do puts 'Building Jasmine distribution from source'.cyan - concat_into('lib/jasmine-core/jasmine.js') { core_sources + version_source_file } - concat_into('lib/jasmine-core/jasmine-html.js') { html_sources } + concat_into('./lib/jasmine-core/jasmine.js') { core_sources + version_source_file } + concat_into('./lib/jasmine-core/jasmine-html.js') { html_sources } - FileUtils.cp('src/html/jasmine.css', 'lib/jasmine-core/jasmine.css') + FileUtils.cp('./src/html/jasmine.css', './lib/jasmine-core/jasmine.css') end def concat_into(output_file, &block) @@ -25,18 +25,22 @@ end task :hint => :lint -task :write_version_file do - template = Tilt.new('src/templates/version.erb') +task :write_version_files do scope = OpenStruct.new(:major => version_hash["major"], :minor => version_hash["minor"], :build => version_hash["build"], :release_candidate => version_hash["release_candidate"], :revision => Time.now.to_i) - File.open('src/version.js', 'w+') do |f| - f << template.render(scope) + js_template = Tilt.new('./src/templates/version.js.erb') + File.open('./src/version.js', 'w+') do |f| + f << js_template.render(scope) end + rb_template = Tilt.new('./src/templates/version.rb.erb') + File.open('./lib/jasmine-core/version.rb', 'w+') do |f| + f << rb_template.render(scope) + end end def version_source_file