Skip to content

Commit

Permalink
Use appraisals and everything from stable branchs
Browse files Browse the repository at this point in the history
  • Loading branch information
seuros committed Dec 13, 2014
1 parent 369b5b5 commit 46a6653
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 66 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pkg
*.gem
.*~
.bundle
Gemfile*.lock
*.lock
test/dummy/log/
test/dummy/tmp/
/.rvmrc
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ rvm:
notifications:
irc: "irc.freenode.org#cells"
gemfile:
- gemfiles/Gemfile.rails3-2
- gemfiles/Gemfile.rails4-0
- gemfiles/Gemfile.rails4-1
- gemfiles/rails3.2.gemfile
- gemfiles/rails4.0.gemfile
- gemfiles/rails4.1.gemfile
- gemfiles/rails4.2.gemfile
27 changes: 27 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
appraise 'rails3.2' do
gem 'railties', github: 'rails/rails', branch: '3-2-stable'
gem 'tzinfo'
gem 'minitest', '4.7.5'
gem 'haml'
end

appraise "rails4.0" do
gem 'railties', github: 'rails/rails', branch: '4-0-stable'
gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
gem 'minitest', '4.7.5'
gem 'haml-rails'
end

appraise "rails4.1" do
gem 'railties', github: 'rails/rails', branch: '4-1-stable'
gem 'activemodel', github: 'rails/rails', branch: '4-1-stable'
gem 'minitest', '~> 5.2'
gem 'haml-rails'
end

appraise "rails4.2" do
gem 'railties', github: 'rails/rails', branch: 'master'
gem 'activemodel', github: 'rails/rails', branch: 'master'
gem 'minitest', '~> 5.2'
gem 'haml-rails'
end
10 changes: 3 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ source 'https://rubygems.org'

gemspec

#gem "rails" , :path => "../rayls"

gem "rails", "~> 3.2.12"
gem 'minitest', '4.7.5'
gem 'minitest-reporters'
gem 'pry-byebug' , platforms: [:mri_20, :mri_21]
gem 'appraisal'
gem 'rake'
gem 'test_xml'

# gem 'uber', :path => "../uber"

# gem 'disposable', :path => "../disposable"
gem "haml", git: "https://github.com/haml/haml" # newest haml that doesn't have form helpers.
1 change: 0 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ desc 'Default: run unit tests.'
task :default => :test

Rake::TestTask.new(:test) do |test|
test.libs << 'test'
test.pattern = 'test/*_test.rb'
test.verbose = true
end
8 changes: 1 addition & 7 deletions cells.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ Gem::Specification.new do |spec|
spec.add_dependency 'actionpack', '>= 3.2'
spec.add_dependency "uber", "~> 0.0.9"
spec.add_dependency 'tilt', '>= 1.4', '< 3'
spec.add_dependency 'disposable', '~> 0.0.8'

spec.add_development_dependency "rake"
spec.add_development_dependency "minitest", "~> 5.4.1"
spec.add_development_dependency "test_xml"
spec.add_development_dependency "activemodel"

spec.add_development_dependency "capybara"
spec.add_development_dependency "disposable", "~> 0.0.8"
end
9 changes: 0 additions & 9 deletions gemfiles/Gemfile.rails3-2

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/Gemfile.rails4-0

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/Gemfile.rails4-1

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/Gemfile.rails4-2

This file was deleted.

15 changes: 15 additions & 0 deletions gemfiles/rails3.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-reporters"
gem "pry-byebug", :platforms => [:mri_20, :mri_21]
gem "appraisal"
gem "rake"
gem "test_xml"
gem "railties", :github => "rails/rails", :branch => "3-2-stable"
gem "tzinfo"
gem "minitest", "4.7.5"
gem "haml"

gemspec :path => "../"
15 changes: 15 additions & 0 deletions gemfiles/rails4.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-reporters"
gem "pry-byebug", :platforms => [:mri_20, :mri_21]
gem "appraisal"
gem "rake"
gem "test_xml"
gem "railties", :github => "rails/rails", :branch => "4-0-stable"
gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
gem "minitest", "4.7.5"
gem "haml-rails"

gemspec :path => "../"
15 changes: 15 additions & 0 deletions gemfiles/rails4.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-reporters"
gem "pry-byebug", :platforms => [:mri_20, :mri_21]
gem "appraisal"
gem "rake"
gem "test_xml"
gem "railties", :github => "rails/rails", :branch => "4-1-stable"
gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
gem "minitest", "~> 5.2"
gem "haml-rails"

gemspec :path => "../"
15 changes: 15 additions & 0 deletions gemfiles/rails4.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "minitest-reporters"
gem "pry-byebug", :platforms => [:mri_20, :mri_21]
gem "appraisal"
gem "rake"
gem "test_xml"
gem "railties", :github => "rails/rails", :branch => "master"
gem "activemodel", :github => "rails/rails", :branch => "master"
gem "minitest", "~> 5.2"
gem "haml-rails"

gemspec :path => "../"

0 comments on commit 46a6653

Please sign in to comment.