Skip to content

Commit 3023b5b

Browse files
brenesbrenes
committed
Changing dependencies for Rails 5 and Globalize
Issue #19
1 parent bca71f8 commit 3023b5b

18 files changed

+975
-38
lines changed

‎Appraisals

+24
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ appraise "rails-4-2-mysql" do
1313
gem "rails", "4.2.5"
1414
end
1515

16+
appraise "rails-5-rc1-mysql" do
17+
gem "mysql2"
18+
gem "rails", "5.0.0.rc1"
19+
gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
20+
gem 'rails-observers', github: 'rails/rails-observers'
21+
gem 'activeresource', github: 'rails/activeresource'
22+
end
23+
1624
appraise "rails-4-0-pgsql" do
1725
gem "pg"
1826
gem "rails", "4.0.13"
@@ -28,6 +36,14 @@ appraise "rails-4-2-pgsql" do
2836
gem "rails", "4.2.5"
2937
end
3038

39+
appraise "rails-5-rc1-pgsql" do
40+
gem "pg"
41+
gem "rails", "5.0.0.rc1"
42+
gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
43+
gem 'rails-observers', github: 'rails/rails-observers'
44+
gem 'activeresource', github: 'rails/activeresource'
45+
end
46+
3147
appraise "rails-4-0-sqlite" do
3248
gem "sqlite3"
3349
gem "rails", "4.0.13"
@@ -42,3 +58,11 @@ appraise "rails-4-2-sqlite" do
4258
gem "sqlite3"
4359
gem "rails", "4.2.5"
4460
end
61+
62+
appraise "rails-5-rc1-sqlite" do
63+
gem "sqlite3"
64+
gem "rails", "5.0.0.rc1"
65+
gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
66+
gem 'rails-observers', github: 'rails/rails-observers'
67+
gem 'activeresource', github: 'rails/activeresource'
68+
end

‎Gemfile.lock

+11-8
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: .
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -75,7 +75,7 @@ GEM
7575
json (>= 1.7)
7676
mime-types (>= 1.16)
7777
coderay (1.1.0)
78-
concurrent-ruby (1.0.0)
78+
concurrent-ruby (1.0.2)
7979
database_cleaner (1.4.1)
8080
debug_inspector (0.0.2)
8181
diff-lcs (1.2.5)
@@ -100,8 +100,8 @@ GEM
100100
addressable (~> 2.3)
101101
loofah (2.0.3)
102102
nokogiri (>= 1.5.9)
103-
mail (2.6.3)
104-
mime-types (>= 1.16, < 3)
103+
mail (2.6.4)
104+
mime-types (>= 1.16, < 4)
105105
method_source (0.8.2)
106106
mime-types (2.6.1)
107107
mini_portile (0.6.2)
@@ -178,10 +178,10 @@ GEM
178178
json
179179
simplecov
180180
slop (3.6.0)
181-
sprockets (3.5.2)
181+
sprockets (3.6.0)
182182
concurrent-ruby (~> 1.0)
183183
rack (> 1, < 3)
184-
sprockets-rails (3.0.2)
184+
sprockets-rails (3.0.4)
185185
actionpack (>= 4.0)
186186
activesupport (>= 4.0)
187187
sprockets (>= 3.0.0)
@@ -214,3 +214,6 @@ DEPENDENCIES
214214
simplecov
215215
simplecov-json
216216
sqlite3
217+
218+
BUNDLED WITH
219+
1.12.5

‎blocks.gemspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
1616
s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"]
1717
s.test_files = Dir["spec/**/*"]
1818

19-
s.add_dependency "rails", "~> 4.0", '< 4.3'
20-
s.add_dependency "activeresource", "~> 4.0", '<= 4.1'
21-
s.add_dependency "globalize", '>= 4.0.0', '< 5.1'
19+
s.add_dependency "rails", ">= 4.0.0", '< 5.1'
20+
s.add_dependency "activeresource", ">= 4.0.0", '< 5.1'
21+
s.add_dependency "globalize", '>= 4.0.0', '< 5.2'
2222
s.add_dependency "awesome_nested_set", '~> 3.0.0'
2323

2424
s.add_development_dependency "sqlite3"

‎gemfiles/rails_4_0_mysql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -188,3 +188,6 @@ DEPENDENCIES
188188
simplecov
189189
simplecov-json
190190
sqlite3
191+
192+
BUNDLED WITH
193+
1.12.5

‎gemfiles/rails_4_0_pgsql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -190,3 +190,6 @@ DEPENDENCIES
190190
simplecov
191191
simplecov-json
192192
sqlite3
193+
194+
BUNDLED WITH
195+
1.12.5

‎gemfiles/rails_4_0_sqlite.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -188,3 +188,6 @@ DEPENDENCIES
188188
simplecov
189189
simplecov-json
190190
sqlite3
191+
192+
BUNDLED WITH
193+
1.12.5

‎gemfiles/rails_4_1_mysql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -194,3 +194,6 @@ DEPENDENCIES
194194
simplecov
195195
simplecov-json
196196
sqlite3
197+
198+
BUNDLED WITH
199+
1.12.5

‎gemfiles/rails_4_1_pgsql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -194,3 +194,6 @@ DEPENDENCIES
194194
simplecov
195195
simplecov-json
196196
sqlite3
197+
198+
BUNDLED WITH
199+
1.12.5

‎gemfiles/rails_4_1_sqlite.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -192,3 +192,6 @@ DEPENDENCIES
192192
simplecov
193193
simplecov-json
194194
sqlite3
195+
196+
BUNDLED WITH
197+
1.12.5

‎gemfiles/rails_4_2_mysql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -216,3 +216,6 @@ DEPENDENCIES
216216
simplecov
217217
simplecov-json
218218
sqlite3
219+
220+
BUNDLED WITH
221+
1.12.5

‎gemfiles/rails_4_2_pgsql.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -216,3 +216,6 @@ DEPENDENCIES
216216
simplecov
217217
simplecov-json
218218
sqlite3
219+
220+
BUNDLED WITH
221+
1.12.5

‎gemfiles/rails_4_2_sqlite.gemfile.lock

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PATH
22
remote: ../
33
specs:
44
nocms-blocks (1.1.3)
5-
activeresource (~> 4.0, <= 4.1)
5+
activeresource (>= 4.0.0, < 5.1)
66
awesome_nested_set (~> 3.0.0)
7-
globalize (>= 4.0.0, < 5.1)
8-
rails (~> 4.0, < 4.3)
7+
globalize (>= 4.0.0, < 5.2)
8+
rails (>= 4.0.0, < 5.1)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -214,3 +214,6 @@ DEPENDENCIES
214214
simplecov
215215
simplecov-json
216216
sqlite3
217+
218+
BUNDLED WITH
219+
1.12.5

‎gemfiles/rails_5_rc1_mysql.gemfile

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "mysql2"
6+
gem "rails", "5.0.0.rc1"
7+
gem "globalize", :git => "[email protected]:globalize/globalize.git", :branch => "master"
8+
gem "rails-observers", :github => "rails/rails-observers"
9+
gem "activeresource", :github => "rails/activeresource"
10+
11+
group :development, :test do
12+
gem "pry-rails"
13+
gem "pry-nav"
14+
gem "pry-remote"
15+
gem "pry-stack_explorer"
16+
end
17+
18+
group :test do
19+
gem "rspec-rails", "~> 3.0"
20+
gem "capybara-screenshot"
21+
gem "factory_girl"
22+
gem "capybara"
23+
gem "database_cleaner"
24+
gem "faker"
25+
gem "carrierwave"
26+
gem "appraisal"
27+
gem "simplecov"
28+
gem "simplecov-json"
29+
gem "generator_spec"
30+
end
31+
32+
gemspec :path => "../"

0 commit comments

Comments
 (0)