Skip to content

Commit

Permalink
! Gemfile seems to be capitalized in git although downcased in as fil…
Browse files Browse the repository at this point in the history
…e name
  • Loading branch information
beatrichartz committed Sep 22, 2012
1 parent c0f92ea commit 3c376aa
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ script: "bundle exec rake spec cucumber"

gemfile:
- gemfiles/3.2.gemfile
- gemfiles/3.1.gemfile
- gemfiles/3.0.gemfile
- gemfiles/3.1.Gemfile
- gemfiles/3.0.Gemfile
2 changes: 0 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
appraise '3.0' do
gem 'rails', '~> 3.0.0'
gem 'rake', '~> 0.8'
end

appraise '3.1' do
gem 'rails', '~> 3.1.0'
gem 'jquery-rails'
gem 'sass-rails'
gem 'rake', '~> 0.8'
end

appraise '3.2' do
Expand Down
8 changes: 3 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ PATH
remote: .
specs:
view_models (3.0.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
rails (>= 3.0.0)

GEM
remote: http://rubygems.org/
Expand Down Expand Up @@ -121,7 +120,7 @@ GEM
rspec-core (2.11.1)
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.2)
rspec-mocks (2.11.3)
rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
Expand Down Expand Up @@ -172,8 +171,7 @@ DEPENDENCIES
factory_girl_rails (~> 1.7.0)
jdbc-sqlite3
jruby-openssl
rails (>= 3.0)
rake
rake (>= 0.9.2)
rspec-rails (~> 2.11.0)
slim-rails (~> 1.0.0)
sqlite3
Expand Down
4 changes: 3 additions & 1 deletion gemfiles/3.0.Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# This file was generated by Appraisal

source :rubygems
source :gemcutter

gem "sqlite3", :platform=>:ruby
gem "activerecord-jdbc-adapter", :platform=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
gem "jdbc-sqlite3", :platform=>:jruby
gem "jruby-openssl", :platform=>:jruby
gem "therubyrhino", :platform=>:jruby
gem "rails", "3.0.17"
gem "rails", "~> 3.0.0"
gem "rake", "~> 0.8"

gemspec :path=>"../"
4 changes: 3 additions & 1 deletion gemfiles/3.1.Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
# This file was generated by Appraisal

source :rubygems
source :gemcutter

gem "sqlite3", :platform=>:ruby
gem "activerecord-jdbc-adapter", :platform=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
gem "jdbc-sqlite3", :platform=>:jruby
gem "jruby-openssl", :platform=>:jruby
gem "therubyrhino", :platform=>:jruby
gem "rails", "3.1.8"
gem "rails", "~> 3.1.0"
gem "jquery-rails"
gem "sass-rails"
gem "rake", "~> 0.8"

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

source :rubygems
source :gemcutter

gem "sqlite3", :platform=>:ruby
gem "activerecord-jdbc-adapter", :platform=>:jruby
gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
gem "jdbc-sqlite3", :platform=>:jruby
gem "jruby-openssl", :platform=>:jruby
gem "therubyrhino", :platform=>:jruby
gem "rails", ">= 3.2.0"
gem "rails", "~> 3.2.0"
gem "jquery-rails"
gem "sass-rails"

Expand Down
6 changes: 2 additions & 4 deletions view_models.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency 'activesupport', '>= 3.0.0'
s.add_dependency 'actionpack', '>= 3.0.0'
s.add_dependency 'rails', '>= 3.0.0'

s.add_development_dependency 'rake'
s.add_development_dependency 'rake', '>= 0.9.2'
s.add_development_dependency 'aruba'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'appraisal', '~> 0.4.0'
Expand All @@ -29,6 +28,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'factory_girl_rails', '~> 1.7.0'
s.add_development_dependency 'factory_girl', '~> 2.6.4'
s.add_development_dependency 'slim-rails', '~> 1.0.0'
s.add_development_dependency 'rails', '>= 3.0'
s.add_development_dependency 'rspec-rails', '~> 2.11.0'
end

0 comments on commit 3c376aa

Please sign in to comment.