Skip to content

Commit

Permalink
Merge branch 'release/5.6.0'
Browse files Browse the repository at this point in the history
* release/5.6.0:
  Update License
  Update Code Climate badge
  Update RuboCop configuration
  Update changelog and version
  Add Rails 5.2 compatibility
  Update development dependencies
  • Loading branch information
tagliala committed Feb 5, 2018
2 parents 2dbfb2d + 0b68016 commit 6279fb1
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .rubocop.yml
Expand Up @@ -18,7 +18,7 @@ Metrics/ClassLength:
- 'test/**/*'

Metrics/CyclomaticComplexity:
Max: 9 # TODO: Lower to 6
Max: 8 # TODO: Lower to 6

Metrics/LineLength:
Enabled: false
Expand Down
8 changes: 8 additions & 0 deletions .travis.yml
Expand Up @@ -8,6 +8,14 @@ rvm:
- 2.3.6
- 2.4.3
- 2.5.0
- ruby-head
gemfile:
- gemfiles/rails_5.0.gemfile
- gemfiles/rails_5.1.gemfile
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_edge.gemfile
matrix:
allow_failures:
- rvm: ruby-head
- gemfile: gemfiles/rails_edge.gemfile
fast_finish: true
8 changes: 8 additions & 0 deletions Appraisals
Expand Up @@ -7,3 +7,11 @@ end
appraise 'rails-5.1' do
gem 'rails', '~> 5.1.0'
end

appraise 'rails-5.2' do
gem 'rails', '5.2.0.rc1'
end

appraise 'rails-edge' do
gem 'rails', github: 'rails/rails'
end
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog

## 5.6.0 / 2018-02-05

* [FEATURE] Add Rails 5.2 compatibility
* [ENHANCEMENT] Test against latest Ruby versions
* [ENHANCEMENT] Update development dependencies

## 5.5.3 / 2018-01-12

* [BUGFIX] Fix regression with translations containing spaces ([#181](https://github.com/enriclluelles/route_translator/issues/181))
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2007 Raul Murciano [http://raul.murciano.net], Domestika INTERNET S.L. [http://domestika.org], 2015 Enric Lluelles [http://enric.lluell.es], 2017 Geremia Taglialatela
Copyright (c) 2007 Raul Murciano [http://raul.murciano.net], Domestika INTERNET S.L. [http://domestika.org], 2015 Enric Lluelles [http://enric.lluell.es], 2018 Geremia Taglialatela

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@
[![Gem Version](https://badge.fury.io/rb/route_translator.svg)](http://badge.fury.io/rb/route_translator)
[![Build Status](https://travis-ci.org/enriclluelles/route_translator.svg?branch=master)](https://travis-ci.org/enriclluelles/route_translator)
[![Dependency Status](https://gemnasium.com/badges/github.com/enriclluelles/route_translator.svg)](https://gemnasium.com/github.com/enriclluelles/route_translator)
[![Code Climate](https://codeclimate.com/github/enriclluelles/route_translator/badges/gpa.svg)](https://codeclimate.com/github/enriclluelles/route_translator)
[![Maintainability](https://api.codeclimate.com/v1/badges/1c369ce6147724b353fc/maintainability)](https://codeclimate.com/github/enriclluelles/route_translator/maintainability)
[![Coverage Status](https://coveralls.io/repos/github/enriclluelles/route_translator/badge.svg?branch=master)](https://coveralls.io/github/enriclluelles/route_translator?branch=master)

RouteTranslator is a gem to allow you to manage the translations of your app routes with a simple dictionary format.
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/rails_5.2.gemfile
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "5.2.0.rc1"

gemspec path: "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_edge.gemfile
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", github: "rails/rails"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/route_translator/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module RouteTranslator
VERSION = '5.5.3'.freeze
VERSION = '5.6.0'.freeze
end
8 changes: 4 additions & 4 deletions route_translator.gemspec
Expand Up @@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z -- {CHANGELOG.md,LICENSE,README.md,lib}`.split("\x0")
spec.require_paths = ['lib']

spec.add_runtime_dependency 'actionpack', '>= 5.0.0.1', '< 5.2'
spec.add_runtime_dependency 'activesupport', '>= 5.0.0.1', '< 5.2'
spec.add_runtime_dependency 'actionpack', '>= 5.0.0.1', '< 6'
spec.add_runtime_dependency 'activesupport', '>= 5.0.0.1', '< 6'

spec.add_development_dependency 'appraisal', '~> 2.2'
spec.add_development_dependency 'byebug', '~> 9.1'
spec.add_development_dependency 'byebug', '~> 10.0'
spec.add_development_dependency 'coveralls_reborn', '~> 0.10.0'
spec.add_development_dependency 'minitest', '~> 5.11'
spec.add_development_dependency 'rails', '>= 5.0.0.1', '< 5.2'
spec.add_development_dependency 'rails', '>= 5.0.0.1', '< 6'
spec.add_development_dependency 'rake', '~> 12.3'
spec.add_development_dependency 'rubocop', '~> 0.52.1'
spec.add_development_dependency 'simplecov', '~> 0.15.1'
Expand Down

0 comments on commit 6279fb1

Please sign in to comment.