Skip to content

Commit

Permalink
Merge pull request #5 from sealink/TT-5814-update-ruby-and-rails
Browse files Browse the repository at this point in the history
Update to support Rails5+ and Ruby2.4+
  • Loading branch information
jmortlock committed Aug 6, 2019
2 parents bc5916a + 62be55a commit 43049e5
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 40 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ pkg
coverage
Gemfile.lock
tmp
vendor
.bundle
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.3
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
language: ruby
rvm:
- 2.3.0
- 2.4
- 2.5
- 2.6
matrix:
exclude:
- rvm: 2.4
gemfile: gemfiles/rails6.gemfile
before_install:
- gem install bundler
script: bundle exec rake spec
gemfile:
- gemfiles/rails3.gemfile
- gemfiles/rails4.gemfile
- gemfiles/rails5.gemfile
- gemfiles/rails6.gemfile
notifications:
email:
- support@travellink.com.au
flowdock:
secure: IK3CyMRa++LNdooemZJBZSNdwUiKpVdXZUz9exYIkj3La/EJDOy+kqV2NzYdqRht2BGHHiRsVn3hVqySDDuv9jxBHTZgM0v/pQ4kT8JZqi7fDb36axf3M6Y2VJyrJ0S/9BbHqLE95B4NXQ30ctLCSfQNbp9sOn2EwP3DZS9KJks=
sudo: false
cache: bundler
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
This changelog adheres to [Keep a CHANGELOG](http://keepachangelog.com/).

## Unreleased
-[TT-5814] Update to Rails5+ and Ruby2.4+

## 0.1.0

Expand Down
11 changes: 0 additions & 11 deletions gemfiles/rails3.gemfile

This file was deleted.

11 changes: 0 additions & 11 deletions gemfiles/rails4.gemfile

This file was deleted.

6 changes: 6 additions & 0 deletions gemfiles/rails5.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'
gemspec path: '../'

group :development, :test do
gem 'activerecord', '~> 5.0'
end
6 changes: 6 additions & 0 deletions gemfiles/rails6.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'
gemspec :path => '../'

group :development, :test do
gem 'activerecord', '~> 6.0.0.rc2'
end
10 changes: 0 additions & 10 deletions lib/ruby_core_extensions/hash.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
class Hash
unless self.method_defined?(:extract!)
# Imported from Rails 3
def extract!(*keys)
result = {}
keys.each { |key| result[key] = delete(key) }
result
end
end


def map_key_value(key_method, value_method = nil)
value_method ||= key_method
each.with_object({}) do |(k, v), new_hash|
Expand Down
4 changes: 2 additions & 2 deletions ruby_core_extensions.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_dependency 'activesupport', '>= 2.0'
spec.add_dependency 'activesupport', '>= 5.0'
spec.add_dependency 'tzinfo'

spec.add_development_dependency "bundler", "~> 1.3"
spec.add_development_dependency "bundler", "~> 2.0.1"
spec.add_development_dependency "rake"
spec.add_development_dependency 'rspec'
spec.add_development_dependency 'coverage-kit'
Expand Down
2 changes: 1 addition & 1 deletion spec/support/coverage.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'simplecov-rcov'
require 'coveralls'
require 'coverage/kit'
Coverage::Kit.setup(minimum_coverage: 87.2)
Coverage::Kit.setup(minimum_coverage: 88.5)

0 comments on commit 43049e5

Please sign in to comment.