Skip to content

Commit

Permalink
Remove gemfile locks (#108)
Browse files Browse the repository at this point in the history
* Update .gitignore and remove gemfile locks

* Cache bundler

* pin gems to their required rubies

pin rake to below 11 for older ruby support
Pin amatch to less than 1.7 since 1.7 requires ruby 2
Pin httpi to less than 2.3 on ruby 1.8
Pin i18n
Pin rack-cache
  • Loading branch information
kjg committed May 11, 2016
1 parent e197438 commit 37e62e3
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 823 deletions.
54 changes: 10 additions & 44 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,44 +1,10 @@
.rvmrc

# rcov generated
coverage

# rdoc generated
rdoc

# yard generated
doc
.yardoc

# bundler
.bundle

# jeweler generated
pkg

# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
#
# * Create a file at ~/.gitignore
# * Include files you want ignored
# * Run: git config --global core.excludesfile ~/.gitignore
#
# After doing this, these files will be ignored in all your git projects,
# saving you from having to 'pollute' every project you touch with them
#
# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
#
# For MacOS:
#
#.DS_Store
#
# For TextMate
#*.tmproj
#tmtags
#
# For emacs:
#*~
#\#*
#.\#*
#
# For vim:
#*.swp
/.bundle
/.ruby-version
/.rvmrc
/Gemfile.lock
/rdoc
/pkg
/coverage
/doc
/.yardoc
gemfiles/*.lock
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: ruby
sudo: false
cache: bundler
rvm:
- 1.8.7-p374
- 1.9.3
Expand Down
8 changes: 8 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,30 @@ appraise "rails-32" do
gem "actionpack", "~> 3.2.17"
gem "activeresource", "~> 3.2.17"
gem "activesupport", "~> 3.2.17"
gem "httpi", "< 2.3"
gem "i18n", "< 0.7.0"
gem "rack-cache", "< 1.3"
end

appraise "rails-31" do
gem "actionpack", "~> 3.1.0"
gem "activeresource", "~> 3.1.0"
gem "activesupport", "~> 3.1.0"
gem "httpi", "< 2.3"
gem "i18n", "< 0.7.0"
gem "rack-cache", "< 1.3"
end

appraise "rails-30" do
gem "actionpack", "~> 3.0.20"
gem "activeresource", "~> 3.0.20"
gem "activesupport", "~> 3.0.20"
gem "httpi", "< 2.3"
end

appraise "rails-23" do
gem "actionpack", "~> 2.3.2"
gem "activeresource", "~> 2.3.2"
gem "activesupport", "~> 2.3.2"
gem "httpi", "< 2.3"
end
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
source 'https://rubygems.org'
gemspec

gem "rake", "< 11.0", :platforms => :ruby_18
gem "tins", "< 1.7", :platforms => :ruby_19 # amatch dependency
115 changes: 0 additions & 115 deletions Gemfile.lock

This file was deleted.

3 changes: 3 additions & 0 deletions gemfiles/rails_23.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

source "https://rubygems.org"

gem "rake", "< 11.0", :platforms => :ruby_18
gem "tins", "< 1.7", :platforms => :ruby_19
gem "actionpack", "~> 2.3.2"
gem "activeresource", "~> 2.3.2"
gem "activesupport", "~> 2.3.2"
gem "httpi", "< 2.3"

gemspec :path => "../"
70 changes: 0 additions & 70 deletions gemfiles/rails_23.gemfile.lock

This file was deleted.

3 changes: 3 additions & 0 deletions gemfiles/rails_30.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

source "https://rubygems.org"

gem "rake", "< 11.0", :platforms => :ruby_18
gem "tins", "< 1.7", :platforms => :ruby_19
gem "actionpack", "~> 3.0.20"
gem "activeresource", "~> 3.0.20"
gem "activesupport", "~> 3.0.20"
gem "httpi", "< 2.3"

gemspec :path => "../"
Loading

0 comments on commit 37e62e3

Please sign in to comment.