Skip to content

Commit 37e62e3

Browse files
committed
Remove gemfile locks (#108)
* 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
1 parent e197438 commit 37e62e3

19 files changed

+44
-823
lines changed

.gitignore

+10-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,10 @@
1-
.rvmrc
2-
3-
# rcov generated
4-
coverage
5-
6-
# rdoc generated
7-
rdoc
8-
9-
# yard generated
10-
doc
11-
.yardoc
12-
13-
# bundler
14-
.bundle
15-
16-
# jeweler generated
17-
pkg
18-
19-
# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
20-
#
21-
# * Create a file at ~/.gitignore
22-
# * Include files you want ignored
23-
# * Run: git config --global core.excludesfile ~/.gitignore
24-
#
25-
# After doing this, these files will be ignored in all your git projects,
26-
# saving you from having to 'pollute' every project you touch with them
27-
#
28-
# 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)
29-
#
30-
# For MacOS:
31-
#
32-
#.DS_Store
33-
#
34-
# For TextMate
35-
#*.tmproj
36-
#tmtags
37-
#
38-
# For emacs:
39-
#*~
40-
#\#*
41-
#.\#*
42-
#
43-
# For vim:
44-
#*.swp
1+
/.bundle
2+
/.ruby-version
3+
/.rvmrc
4+
/Gemfile.lock
5+
/rdoc
6+
/pkg
7+
/coverage
8+
/doc
9+
/.yardoc
10+
gemfiles/*.lock

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: ruby
22
sudo: false
3+
cache: bundler
34
rvm:
45
- 1.8.7-p374
56
- 1.9.3

Appraisals

+8
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,30 @@ appraise "rails-32" do
2020
gem "actionpack", "~> 3.2.17"
2121
gem "activeresource", "~> 3.2.17"
2222
gem "activesupport", "~> 3.2.17"
23+
gem "httpi", "< 2.3"
24+
gem "i18n", "< 0.7.0"
25+
gem "rack-cache", "< 1.3"
2326
end
2427

2528
appraise "rails-31" do
2629
gem "actionpack", "~> 3.1.0"
2730
gem "activeresource", "~> 3.1.0"
2831
gem "activesupport", "~> 3.1.0"
32+
gem "httpi", "< 2.3"
33+
gem "i18n", "< 0.7.0"
34+
gem "rack-cache", "< 1.3"
2935
end
3036

3137
appraise "rails-30" do
3238
gem "actionpack", "~> 3.0.20"
3339
gem "activeresource", "~> 3.0.20"
3440
gem "activesupport", "~> 3.0.20"
41+
gem "httpi", "< 2.3"
3542
end
3643

3744
appraise "rails-23" do
3845
gem "actionpack", "~> 2.3.2"
3946
gem "activeresource", "~> 2.3.2"
4047
gem "activesupport", "~> 2.3.2"
48+
gem "httpi", "< 2.3"
4149
end

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
source 'https://rubygems.org'
22
gemspec
3+
4+
gem "rake", "< 11.0", :platforms => :ruby_18
5+
gem "tins", "< 1.7", :platforms => :ruby_19 # amatch dependency

Gemfile.lock

-115
This file was deleted.

gemfiles/rails_23.gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "rake", "< 11.0", :platforms => :ruby_18
6+
gem "tins", "< 1.7", :platforms => :ruby_19
57
gem "actionpack", "~> 2.3.2"
68
gem "activeresource", "~> 2.3.2"
79
gem "activesupport", "~> 2.3.2"
10+
gem "httpi", "< 2.3"
811

912
gemspec :path => "../"

gemfiles/rails_23.gemfile.lock

-70
This file was deleted.

gemfiles/rails_30.gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
source "https://rubygems.org"
44

5+
gem "rake", "< 11.0", :platforms => :ruby_18
6+
gem "tins", "< 1.7", :platforms => :ruby_19
57
gem "actionpack", "~> 3.0.20"
68
gem "activeresource", "~> 3.0.20"
79
gem "activesupport", "~> 3.0.20"
10+
gem "httpi", "< 2.3"
811

912
gemspec :path => "../"

0 commit comments

Comments
 (0)