Skip to content

Commit

Permalink
Use Rubygems versioning instead of Versionomy.
Browse files Browse the repository at this point in the history
Since we are already using Rubygems for other things, it seems better to
avoid having the dependency on Versionomy.
  • Loading branch information
floehopper committed Feb 2, 2012
1 parent ace9ab7 commit ca48748
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion Gemfile
Expand Up @@ -44,7 +44,6 @@ group :test do
gem 'mocha', :require => false gem 'mocha', :require => false
gem 'test_track' gem 'test_track'
gem 'timecop' gem 'timecop'
gem 'versionomy'
gem 'webmock' gem 'webmock'
end end


Expand Down
4 changes: 0 additions & 4 deletions Gemfile.lock
Expand Up @@ -69,7 +69,6 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.6) addressable (2.2.6)
arel (2.2.1) arel (2.2.1)
blockenspiel (0.4.3)
boomerang-rails (0.0.2) boomerang-rails (0.0.2)
rails (~> 3.0) rails (~> 3.0)
builder (3.0.0) builder (3.0.0)
Expand Down Expand Up @@ -253,8 +252,6 @@ GEM
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
validates_email_format_of (1.5.3) validates_email_format_of (1.5.3)
versionomy (0.4.1)
blockenspiel (>= 0.4.1)
warden (1.1.0) warden (1.1.0)
rack (>= 1.0) rack (>= 1.0)
webmock (1.7.8) webmock (1.7.8)
Expand Down Expand Up @@ -303,5 +300,4 @@ DEPENDENCIES
transitions transitions
uglifier uglifier
validates_email_format_of validates_email_format_of
versionomy
webmock webmock
10 changes: 4 additions & 6 deletions lib/tasks/test_javascript.rake
Expand Up @@ -4,13 +4,11 @@ namespace :test do


desc "Run javascript tests" desc "Run javascript tests"
task :javascript => :environment do task :javascript => :environment do
require 'versionomy' phantomjs_requirement = Gem::Requirement.new(">= 1.3.0")

phantomjs_version = Gem::Version.new(`phantomjs --version`.strip) rescue Gem::Version.new("0.0.0")
minimum_supported_version = Versionomy.parse("1.3.0") unless phantomjs_requirement.satisfied_by?(phantomjs_version)
phantomjs_version = Versionomy.parse(`phantomjs --version`.strip) rescue nil
unless phantomjs_version && (phantomjs_version >= minimum_supported_version)
STDERR.puts "Your version of phantomjs (v#{phantomjs_version}) is not compatible with the current phantom-driver.js." STDERR.puts "Your version of phantomjs (v#{phantomjs_version}) is not compatible with the current phantom-driver.js."
STDERR.puts "Please upgrade your version of phantomjs to at least #{minimum_supported_version} and re-run this task." STDERR.puts "Please upgrade your version of phantomjs to #{phantomjs_requirement} and re-run this task."
exit 1 exit 1
end end


Expand Down

0 comments on commit ca48748

Please sign in to comment.