Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use Rubygems versioning instead of Versionomy.

Since we are already using Rubygems for other things, it seems better to
avoid having the dependency on Versionomy.
  • Loading branch information...
commit ca48748cb092efcab37daccd1b29671935e7e561 1 parent ace9ab7
@floehopper floehopper authored
Showing with 4 additions and 11 deletions.
  1. +0 −1  Gemfile
  2. +0 −4 Gemfile.lock
  3. +4 −6 lib/tasks/test_javascript.rake
View
1  Gemfile
@@ -44,7 +44,6 @@ group :test do
gem 'mocha', :require => false
gem 'test_track'
gem 'timecop'
- gem 'versionomy'
gem 'webmock'
end
View
4 Gemfile.lock
@@ -69,7 +69,6 @@ GEM
multi_json (~> 1.0)
addressable (2.2.6)
arel (2.2.1)
- blockenspiel (0.4.3)
boomerang-rails (0.0.2)
rails (~> 3.0)
builder (3.0.0)
@@ -253,8 +252,6 @@ GEM
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
validates_email_format_of (1.5.3)
- versionomy (0.4.1)
- blockenspiel (>= 0.4.1)
warden (1.1.0)
rack (>= 1.0)
webmock (1.7.8)
@@ -303,5 +300,4 @@ DEPENDENCIES
transitions
uglifier
validates_email_format_of
- versionomy
webmock
View
10 lib/tasks/test_javascript.rake
@@ -4,13 +4,11 @@ namespace :test do
desc "Run javascript tests"
task :javascript => :environment do
- require 'versionomy'
-
- minimum_supported_version = Versionomy.parse("1.3.0")
- phantomjs_version = Versionomy.parse(`phantomjs --version`.strip) rescue nil
- unless phantomjs_version && (phantomjs_version >= minimum_supported_version)
+ phantomjs_requirement = Gem::Requirement.new(">= 1.3.0")
+ phantomjs_version = Gem::Version.new(`phantomjs --version`.strip) rescue Gem::Version.new("0.0.0")
+ unless phantomjs_requirement.satisfied_by?(phantomjs_version)
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
end
Please sign in to comment.
Something went wrong with that request. Please try again.