diff --git a/.ruby-version.example b/.ruby-version.example new file mode 100644 index 00000000..8dbb0f26 --- /dev/null +++ b/.ruby-version.example @@ -0,0 +1 @@ +2.1.10 diff --git a/.rvmrc.example b/.rvmrc.example index 9250a4a1..3fa141ff 100644 --- a/.rvmrc.example +++ b/.rvmrc.example @@ -1 +1 @@ -rvm use --create 1.9.3@mercury-rails +rvm use --create 2.1.10@mercury-rails diff --git a/.travis.yml b/.travis.yml index 032a6094..8018517a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 - - diff --git a/Gemfile b/Gemfile index ef1cfb61..b9ae8d9e 100644 --- a/Gemfile +++ b/Gemfile @@ -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' @@ -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 diff --git a/mercury-rails.gemspec b/mercury-rails.gemspec index b13c177d..04da98d3 100644 --- a/mercury-rails.gemspec +++ b/mercury-rails.gemspec @@ -16,8 +16,8 @@ Gem::Specification.new do |s| s.licenses = ['MIT'] # Runtime Dependencies - s.add_dependency 'railties', '>= 4.1.0' - s.add_dependency 'coffee-rails', '>= 4.2.2' + s.add_dependency 'railties' + s.add_dependency 'coffee-rails' # Gem Files s.extra_rdoc_files = %w(LICENSE POST_INSTALL)