Skip to content

Commit

Permalink
run specs on rails-5
Browse files Browse the repository at this point in the history
  • Loading branch information
razum2um committed Aug 22, 2016
1 parent 00020e5 commit 0631378
Show file tree
Hide file tree
Showing 15 changed files with 169 additions and 43 deletions.
17 changes: 12 additions & 5 deletions .travis.yml
Expand Up @@ -6,18 +6,25 @@ gemfile:
- gemfiles/rails_40.gemfile
- gemfiles/rails_41.gemfile
- gemfiles/rails_42.gemfile
- gemfiles/rails_50.gemfile
rvm:
- 1.9.3
- 2.0.0
- 2.1.5
- 2.2.0
- 2.3.0
- 2.1.10
- 2.2.5
- 2.3.1
matrix:
exclude:
# NOTE : incompatible
- rvm: 2.2.0
- rvm: 1.9.3
gemfile: gemfiles/rails_50.gemfile
- rvm: 2.0.0
gemfile: gemfiles/rails_50.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails_50.gemfile
- rvm: 2.2.5
gemfile: gemfiles/rails_32.gemfile
- rvm: 2.3.0
- rvm: 2.3.1
gemfile: gemfiles/rails_32.gemfile
install: bundle install -j4 --path vendor/bundle
notifications:
Expand Down
22 changes: 19 additions & 3 deletions Appraisals
@@ -1,9 +1,10 @@
appraise 'rails-32' do
gem 'rails', '~> 3.2.21'
gem 'rails', '~> 3.2.22'
gem 'sprockets', '~> 2.2.2.backport2', github: 'razum2um/sprockets-2.2.2.backport', branch: 'master'
gem 'sass-rails', github: 'razum2um/sass-rails', branch: 'backport'
gem 'autoprefixer-rails', '~> 5.2'
gem 'rspec', '~> 2.14'
gem 'rspec-rails', '~> 2.14.0'
eval ::File.read('Gemfile')
end

Expand All @@ -13,24 +14,39 @@ appraise 'rails-40' do
gem 'sass-rails'
gem 'autoprefixer-rails', '~> 5.2'
gem 'rspec', '~> 2.14'
gem 'rspec-rails', '~> 2.14.0'
eval ::File.read('Gemfile')
end

appraise 'rails-41' do
gem 'rails', '~> 4.1.9'
gem 'rails', '~> 4.1.16'
gem 'sprockets'
gem 'sass-rails'
gem 'autoprefixer-rails', '~> 5.2'
gem 'rspec', '~> 2.14'
gem 'rspec-rails', '~> 2.14.0'
eval ::File.read('Gemfile')
end

appraise 'rails-42' do
gem 'rails', '~> 4.2.0'
gem 'rails', '~> 4.2.7'
gem 'sprockets'
gem 'sass-rails'
gem 'autoprefixer-rails', '~> 5.2'
gem 'rspec', '~> 2.14'
gem 'rspec-rails', '~> 2.14.0'
eval ::File.read('Gemfile')
end

appraise 'rails-50' do
gem 'rails', '~> 5.0.0'
gem 'sprockets'
gem 'sass-rails'
gem 'autoprefixer-rails'
gem 'rspec', '~> 3.5.0'
gem 'rspec-rails', '~> 3.5.1'
gem 'sinatra', '~> 2.0.0.beta2'
gem 'listen', '~> 3.0.5', group: [:development] # FIXME
eval ::File.read('Gemfile')
end

17 changes: 13 additions & 4 deletions Gemfile
@@ -1,13 +1,22 @@
source 'https://rubygems.org'
gemspec

group :development do
# tools
platforms :mri_20, :mri_21, :mri_22 do
# these gems are needed while cucumber runs
gem 'pg', '~> 0.16'
gem 'kramdown', '~> 1.3'
gem 'diffy', '~> 3.0'
gem 'execjs', '~> 2.0'
gem 'pdfkit', '~> 0.6'
gem 'wkhtmltopdf-binary', '~> 0.9'

group :development, :test do
# tools (MRI without 1.9)
platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem 'pry-byebug'
gem 'pry-stack_explorer'
gem 'pry-session'
end

# rspec --format fuubar
gem 'fuubar'
# cucumber --format fuubar
Expand All @@ -28,7 +37,7 @@ group :development do
gem 'coffee-rails'
gem 'bootstrap-sass', '~> 3.3.3'
gem 'jquery-rails'
gem 'remotipart'
# gem 'remotipart'
gem 'launchy'
end

14 changes: 10 additions & 4 deletions gemfiles/rails_32.gemfile
Expand Up @@ -2,13 +2,20 @@

source "https://rubygems.org"

gem "rails", "~> 3.2.21"
gem "pg", "~> 0.16"
gem "kramdown", "~> 1.3"
gem "diffy", "~> 3.0"
gem "execjs", "~> 2.0"
gem "pdfkit", "~> 0.6"
gem "wkhtmltopdf-binary", "~> 0.9"
gem "rails", "~> 3.2.22"
gem "sprockets", "~> 2.2.2.backport2", :github => "razum2um/sprockets-2.2.2.backport", :branch => "master"
gem "sass-rails", :github => "razum2um/sass-rails", :branch => "backport"
gem "autoprefixer-rails", "~> 5.2"
gem "rspec", "~> 2.14"
gem "rspec-rails", "~> 2.14.0"

group :development do
group :development, :test do
gem "fuubar"
gem "fuubar-cucumber"
gem "selenium-webdriver"
Expand All @@ -18,10 +25,9 @@ group :development do
gem "coffee-rails"
gem "bootstrap-sass", "~> 3.3.3"
gem "jquery-rails"
gem "remotipart"
gem "launchy"

platforms :mri_20, :mri_21, :mri_22 do
platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem "pry-byebug"
gem "pry-stack_explorer"
gem "pry-session"
Expand Down
12 changes: 9 additions & 3 deletions gemfiles/rails_40.gemfile
Expand Up @@ -2,13 +2,20 @@

source "https://rubygems.org"

gem "pg", "~> 0.16"
gem "kramdown", "~> 1.3"
gem "diffy", "~> 3.0"
gem "execjs", "~> 2.0"
gem "pdfkit", "~> 0.6"
gem "wkhtmltopdf-binary", "~> 0.9"
gem "rails", "~> 4.0.13"
gem "sprockets"
gem "sass-rails"
gem "autoprefixer-rails", "~> 5.2"
gem "rspec", "~> 2.14"
gem "rspec-rails", "~> 2.14.0"

group :development do
group :development, :test do
gem "fuubar"
gem "fuubar-cucumber"
gem "selenium-webdriver"
Expand All @@ -18,10 +25,9 @@ group :development do
gem "coffee-rails"
gem "bootstrap-sass", "~> 3.3.3"
gem "jquery-rails"
gem "remotipart"
gem "launchy"

platforms :mri_20, :mri_21, :mri_22 do
platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem "pry-byebug"
gem "pry-stack_explorer"
gem "pry-session"
Expand Down
14 changes: 10 additions & 4 deletions gemfiles/rails_41.gemfile
Expand Up @@ -2,13 +2,20 @@

source "https://rubygems.org"

gem "rails", "~> 4.1.9"
gem "pg", "~> 0.16"
gem "kramdown", "~> 1.3"
gem "diffy", "~> 3.0"
gem "execjs", "~> 2.0"
gem "pdfkit", "~> 0.6"
gem "wkhtmltopdf-binary", "~> 0.9"
gem "rails", "~> 4.1.16"
gem "sprockets"
gem "sass-rails"
gem "autoprefixer-rails", "~> 5.2"
gem "rspec", "~> 2.14"
gem "rspec-rails", "~> 2.14.0"

group :development do
group :development, :test do
gem "fuubar"
gem "fuubar-cucumber"
gem "selenium-webdriver"
Expand All @@ -18,10 +25,9 @@ group :development do
gem "coffee-rails"
gem "bootstrap-sass", "~> 3.3.3"
gem "jquery-rails"
gem "remotipart"
gem "launchy"

platforms :mri_20, :mri_21, :mri_22 do
platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem "pry-byebug"
gem "pry-stack_explorer"
gem "pry-session"
Expand Down
14 changes: 10 additions & 4 deletions gemfiles/rails_42.gemfile
Expand Up @@ -2,13 +2,20 @@

source "https://rubygems.org"

gem "rails", "~> 4.2.0"
gem "pg", "~> 0.16"
gem "kramdown", "~> 1.3"
gem "diffy", "~> 3.0"
gem "execjs", "~> 2.0"
gem "pdfkit", "~> 0.6"
gem "wkhtmltopdf-binary", "~> 0.9"
gem "rails", "~> 4.2.7"
gem "sprockets"
gem "sass-rails"
gem "autoprefixer-rails", "~> 5.2"
gem "rspec", "~> 2.14"
gem "rspec-rails", "~> 2.14.0"

group :development do
group :development, :test do
gem "fuubar"
gem "fuubar-cucumber"
gem "selenium-webdriver"
Expand All @@ -18,10 +25,9 @@ group :development do
gem "coffee-rails"
gem "bootstrap-sass", "~> 3.3.3"
gem "jquery-rails"
gem "remotipart"
gem "launchy"

platforms :mri_20, :mri_21, :mri_22 do
platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem "pry-byebug"
gem "pry-stack_explorer"
gem "pry-session"
Expand Down
39 changes: 39 additions & 0 deletions gemfiles/rails_50.gemfile
@@ -0,0 +1,39 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "pg", "~> 0.16"
gem "kramdown", "~> 1.3"
gem "diffy", "~> 3.0"
gem "execjs", "~> 2.0"
gem "pdfkit", "~> 0.6"
gem "wkhtmltopdf-binary", "~> 0.9"
gem "rails", "~> 5.0.0"
gem "sprockets"
gem "sass-rails"
gem "autoprefixer-rails"
gem "rspec", "~> 3.5.0"
gem "rspec-rails", "~> 3.5.1"
gem "sinatra", "~> 2.0.0.beta2"
gem "listen", "~> 3.0.5", :group => [:development]

group :development, :test do
gem "fuubar"
gem "fuubar-cucumber"
gem "selenium-webdriver"
gem "highline"
gem "appraisal"
gem "uglifier"
gem "coffee-rails"
gem "bootstrap-sass", "~> 3.3.3"
gem "jquery-rails"
gem "launchy"

platforms :mri_20, :mri_21, :mri_22, :mri_23 do
gem "pry-byebug"
gem "pry-stack_explorer"
gem "pry-session"
end
end

gemspec :path => "../"
1 change: 1 addition & 0 deletions lib/lurker/rendering_controller.rb
Expand Up @@ -2,6 +2,7 @@
require 'abstract_controller'
require 'action_view'
require 'action_dispatch/http/mime_type'
require 'active_support/core_ext/string/filters'
require 'action_dispatch/routing'

module Lurker
Expand Down
2 changes: 1 addition & 1 deletion lib/lurker/templates/javascripts/application.js
@@ -1,7 +1,7 @@
// Bundled
//= require jquery
//= require jquery_ujs
//= require jquery.remotipart
// require jquery.remotipart

// require bootstrap
//= require bootstrap/collapse
Expand Down
23 changes: 12 additions & 11 deletions lurker.gemspec
Expand Up @@ -23,17 +23,17 @@ Gem::Specification.new do |spec|
spec.add_dependency("json", "~> 1.7")
spec.add_dependency("json-schema", "~> 2.2")
spec.add_dependency("thor", "~> 0.19")
spec.add_dependency("sinatra", "~> 1.4")
spec.add_dependency("sinatra", ">= 1.4", "< 2.1")
spec.add_dependency("hashie", ">= 3.0")
spec.add_dependency("activesupport", ">= 3.2", "< 4.3")
spec.add_dependency("activesupport", ">= 3.2", "< 5.1")

# testing
spec.add_development_dependency("psych", "~> 2.0")
spec.add_development_dependency("bundler", ">= 1.7.11")
spec.add_development_dependency("rack-cors", "~> 0.2")
spec.add_development_dependency("rails", ">= 3.2", "< 4.3")
spec.add_development_dependency("rails", ">= 3.2", "< 5.1")
spec.add_development_dependency("rake", "~> 10.2")
spec.add_development_dependency("rspec", "~> 2.14.0")
spec.add_development_dependency("rspec", ">= 2.14.0")
spec.add_development_dependency("cucumber", "~> 1.3")
spec.add_development_dependency("aruba", "~> 0.6.2")
spec.add_development_dependency("capybara", "~> 2.2")
Expand All @@ -47,13 +47,14 @@ Gem::Specification.new do |spec|

# FIXME: these gems are needed while cucumber runs
# inner Gemfile isn"t getting used, but lib"s one
spec.add_development_dependency("rspec-rails", "~> 2.14.0")
spec.add_development_dependency("pg", "~> 0.16")
spec.add_development_dependency("kramdown", "~> 1.3")
spec.add_development_dependency("diffy", "~> 3.0")
spec.add_development_dependency("execjs", "~> 2.0")
spec.add_development_dependency("pdfkit", "~> 0.6")
spec.add_development_dependency("wkhtmltopdf-binary", "~> 0.9")
#spec.add_development_dependency("rspec-rails", "~> 2.14.0")
#spec.add_development_dependency("pg", "~> 0.16")
#spec.add_development_dependency("kramdown", "~> 1.3")
#spec.add_development_dependency("diffy", "~> 3.0")
#spec.add_development_dependency("execjs", "~> 2.0")
#spec.add_development_dependency("pdfkit", "~> 0.6")
#spec.add_development_dependency("wkhtmltopdf-binary", "~> 0.9")
#spec.add_development_dependency("pry-byebug")

if RUBY_VERSION >= "2.2.0"
# FIXME : this gem are needed to ruby 2.2.0
Expand Down
3 changes: 2 additions & 1 deletion tasks/build.rake
Expand Up @@ -37,7 +37,8 @@ namespace :assets do
sprockets.append_path(SOURCE_DIR.join('javascripts').to_s)
sprockets.append_path(SOURCE_DIR.join('stylesheets').to_s)

%w[jquery-rails bootstrap-sass remotipart lurker].each do |gem|
# %w[jquery-rails bootstrap-sass remotipart lurker].each do |gem|
%w[jquery-rails bootstrap-sass lurker].each do |gem|
gem_path = Pathname.new(Bundler.rubygems.find_name(gem).first.full_gem_path)
%w[javascripts stylesheets fonts].each do |prefix|
%w[assets vendor/assets lib/lurker/templates].each do |interfix|
Expand Down
6 changes: 5 additions & 1 deletion tasks/generate.rake
Expand Up @@ -40,7 +40,11 @@ namespace :generate do

desc "generate a bunch of stuff with generators"
task :stuff do
in_lurker_app "LOCATION='../../templates/generate_stuff.rb' bin/rake rails:template --quiet --silent"
if ENV['BUNDLE_GEMFILE'] =~ /rails_5/
in_lurker_app "LOCATION='../../templates/generate_stuff.rb' bin/rake app:template"
else
in_lurker_app "LOCATION='../../templates/generate_stuff.rb' bin/rake rails:template --quiet --silent"
end

unless ENV['TRAVIS']
in_lurker_app 'bin/rake db:setup'
Expand Down

0 comments on commit 0631378

Please sign in to comment.