Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency on railties and coffee-rails to allow Rails 4. #496

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.1.10
2 changes: 1 addition & 1 deletion .rvmrc.example
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rvm use --create 1.9.3@mercury-rails
rvm use --create 2.1.10@mercury-rails
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
rvm:
- 1.9.3
- 2.1.10
#before_script:
# - 'sh -e /etc/init.d/xvfb start'
#env:

# - DISPLAY=':99.0' CUCUMBER_OPTS='-f progress'
script: bundle exec rake --trace


17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
source 'http://rubygems.org'
source 'https://rubygems.org'

gemspec

# dependencies for the dummy app
gem 'rails', '>= 3.2.8'
gem 'rails', '3.2.8'
gem 'jquery-rails'
gem 'sqlite3'
gem 'teabag'
gem 'teabag', '0.3.2'

group :assets do
gem 'sass-rails'
Expand All @@ -16,13 +16,14 @@ end

group :development, :test do
gem 'rspec-core'
gem 'cucumber', '~> 1.3.20'
gem 'cucumber-rails'
gem 'capybara-firebug'
gem 'aruba'
gem 'aruba', '0.14.2'
gem 'database_cleaner'

# required for travis-ci and linux environments
gem "phantomjs-linux" if RUBY_PLATFORM =~ /linux/
end


gem 'phantomjs-linux', :git => 'https://github.com/bandzoogle/phantomjs-linux.git'
# if RUBY_PLATFORM =~ /linux/
# gem 'phantomjs-linux'
# end
2 changes: 1 addition & 1 deletion lib/mercury/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Mercury
VERSION = '0.9.0'
VERSION = '0.9.0.1'
end
6 changes: 3 additions & 3 deletions mercury-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Gem::Specification.new do |s|

# General Gem Information
s.name = 'mercury-rails'
s.date = '2012-10-19'
s.date = '2017-08-25'
s.version = Mercury::VERSION
s.authors = ['Jeremy Jackson']
s.email = ['[email protected]']
Expand All @@ -16,8 +16,8 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']

# Runtime Dependencies
s.add_dependency 'railties', '>= 3.0'
s.add_dependency 'coffee-rails', '>= 3.2.2'
s.add_dependency 'railties'
s.add_dependency 'coffee-rails'

# Gem Files
s.extra_rdoc_files = %w(LICENSE POST_INSTALL)
Expand Down