Changing dependencies for Rails 5 and Globalize

Issue #19
simplelogica · Jun 7, 2016 · 3023b5b · 3023b5b
1 parent bca71f8
commit 3023b5b
Show file tree

Hide file tree

Showing 18 changed files with 975 additions and 38 deletions.
diff --git a/Appraisals b/Appraisals
@@ -13,6 +13,14 @@ appraise "rails-4-2-mysql" do
   gem "rails", "4.2.5"
 end
 
+appraise "rails-5-rc1-mysql" do
+  gem "mysql2"
+  gem "rails", "5.0.0.rc1"
+  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
+  gem 'rails-observers', github: 'rails/rails-observers'
+  gem 'activeresource', github: 'rails/activeresource'
+end
+
 appraise "rails-4-0-pgsql" do
   gem "pg"
   gem "rails", "4.0.13"
@@ -28,6 +36,14 @@ appraise "rails-4-2-pgsql" do
   gem "rails", "4.2.5"
 end
 
+appraise "rails-5-rc1-pgsql" do
+  gem "pg"
+  gem "rails", "5.0.0.rc1"
+  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
+  gem 'rails-observers', github: 'rails/rails-observers'
+  gem 'activeresource', github: 'rails/activeresource'
+end
+
 appraise "rails-4-0-sqlite" do
   gem "sqlite3"
   gem "rails", "4.0.13"
@@ -42,3 +58,11 @@ appraise "rails-4-2-sqlite" do
   gem "sqlite3"
   gem "rails", "4.2.5"
 end
+
+appraise "rails-5-rc1-sqlite" do
+  gem "sqlite3"
+  gem "rails", "5.0.0.rc1"
+  gem "globalize", git: '[email protected]:globalize/globalize.git', branch: 'master'
+  gem 'rails-observers', github: 'rails/rails-observers'
+  gem 'activeresource', github: 'rails/activeresource'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: .
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -75,7 +75,7 @@ GEM
       json (>= 1.7)
       mime-types (>= 1.16)
     coderay (1.1.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.2)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
@@ -100,8 +100,8 @@ GEM
       addressable (~> 2.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
@@ -178,10 +178,10 @@ GEM
       json
       simplecov
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.2)
+    sprockets-rails (3.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -214,3 +214,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/blocks.gemspec b/blocks.gemspec
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "CHANGELOG", "LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", "~> 4.0", '< 4.3'
-  s.add_dependency "activeresource", "~> 4.0", '<= 4.1'
-  s.add_dependency "globalize", '>= 4.0.0', '< 5.1'
+  s.add_dependency "rails", ">= 4.0.0", '< 5.1'
+  s.add_dependency "activeresource", ">= 4.0.0", '< 5.1'
+  s.add_dependency "globalize", '>= 4.0.0', '< 5.2'
   s.add_dependency "awesome_nested_set", '~> 3.0.0'
 
   s.add_development_dependency "sqlite3"

diff --git a/gemfiles/rails_4_0_mysql.gemfile.lock b/gemfiles/rails_4_0_mysql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -188,3 +188,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_0_pgsql.gemfile.lock b/gemfiles/rails_4_0_pgsql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -190,3 +190,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_0_sqlite.gemfile.lock b/gemfiles/rails_4_0_sqlite.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -188,3 +188,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_1_mysql.gemfile.lock b/gemfiles/rails_4_1_mysql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -194,3 +194,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_1_pgsql.gemfile.lock b/gemfiles/rails_4_1_pgsql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -194,3 +194,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_1_sqlite.gemfile.lock b/gemfiles/rails_4_1_sqlite.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -192,3 +192,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_2_mysql.gemfile.lock b/gemfiles/rails_4_2_mysql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -216,3 +216,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_2_pgsql.gemfile.lock b/gemfiles/rails_4_2_pgsql.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -216,3 +216,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_4_2_sqlite.gemfile.lock b/gemfiles/rails_4_2_sqlite.gemfile.lock
@@ -2,10 +2,10 @@ PATH
   remote: ../
   specs:
     nocms-blocks (1.1.3)
-      activeresource (~> 4.0, <= 4.1)
+      activeresource (>= 4.0.0, < 5.1)
       awesome_nested_set (~> 3.0.0)
-      globalize (>= 4.0.0, < 5.1)
-      rails (~> 4.0, < 4.3)
+      globalize (>= 4.0.0, < 5.2)
+      rails (>= 4.0.0, < 5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -214,3 +214,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   sqlite3
+
+BUNDLED WITH
+   1.12.5
diff --git a/gemfiles/rails_5_rc1_mysql.gemfile b/gemfiles/rails_5_rc1_mysql.gemfile
@@ -0,0 +1,32 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2"
+gem "rails", "5.0.0.rc1"
+gem "globalize", :git => "[email protected]:globalize/globalize.git", :branch => "master"
+gem "rails-observers", :github => "rails/rails-observers"
+gem "activeresource", :github => "rails/activeresource"
+
+group :development, :test do
+  gem "pry-rails"
+  gem "pry-nav"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
+group :test do
+  gem "rspec-rails", "~> 3.0"
+  gem "capybara-screenshot"
+  gem "factory_girl"
+  gem "capybara"
+  gem "database_cleaner"
+  gem "faker"
+  gem "carrierwave"
+  gem "appraisal"
+  gem "simplecov"
+  gem "simplecov-json"
+  gem "generator_spec"
+end
+
+gemspec :path => "../"