Skip to content

Commit aed3f80

Browse files
committed
Drop support for MRI < 2.2
1 parent ebe9496 commit aed3f80

File tree

7 files changed

+17
-31
lines changed

7 files changed

+17
-31
lines changed

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ AllCops:
99
- 'smoke/**/*'
1010
DisplayCopNames: true
1111
StyleGuideCopsOnly: false
12-
TargetRubyVersion: 1.9
12+
TargetRubyVersion: 2.2
1313

1414
Rails:
1515
Enabled: false

.travis.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ before_install:
77
- gem update bundler --no-doc
88
- smoke/provision.sh
99
rvm:
10-
- 1.9.3
11-
- 2.0.0
12-
- 2.1.10
1310
- 2.2.5
1411
- 2.3.3
15-
- 2.4.0
12+
- 2.4.1
1613
- ruby-head
1714
env:
1815
- TEST_TASK=spec
@@ -22,23 +19,23 @@ matrix:
2219
- rvm: jruby-head
2320
- rvm: ruby-head
2421
- rvm: jruby-9.1.5.0
25-
- rvm: 2.4.0
22+
- rvm: 2.4.1
2623
env: TEST_TASK=smoke influx_version=nightly channel=nightlies
2724
include:
28-
- rvm: 2.4.0
25+
- rvm: 2.4.1
2926
env: TEST_TASK=rubocop
3027
- rvm: jruby-9.1.5.0
3128
- rvm: jruby-head
3229
env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
33-
- rvm: 2.4.0
30+
- rvm: 2.4.1
3431
env: TEST_TASK=smoke influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
35-
- rvm: 2.4.0
32+
- rvm: 2.4.1
3633
env: TEST_TASK=smoke influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
37-
- rvm: 2.4.0
34+
- rvm: 2.4.1
3835
env: TEST_TASK=smoke influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
39-
- rvm: 2.4.0
36+
- rvm: 2.4.1
4037
env: TEST_TASK=smoke influx_version=1.3.2 pkghash=27b200344bed9de9df193b62a59d378f
41-
- rvm: 2.4.0
38+
- rvm: 2.4.1
4239
env: TEST_TASK=smoke influx_version=nightly channel=nightlies
4340
fail_fast: true
4441
addons:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
44

55
## Unreleased changes
66

7-
- nothing yet
7+
- **Dropped support for Ruby < 2.2**
88

99
## v0.3.16, released 2017-08-17
1010

Gemfile

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
source "https://rubygems.org"
22

3-
if RUBY_ENGINE != "jruby" && RUBY_VERSION < "2.0"
4-
gem "json", "~> 1.8.3"
5-
gem "public_suffix", "< 1.5"
6-
end
7-
83
gemspec
94

105
local_gemfile = 'Gemfile.local'

README.md

+3-8
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,9 @@ Maintained by [@toddboom](https://github.com/toddboom) and [@dmke](https://githu
3838
3939
## Ruby support
4040

41-
Up to and including version 0.3.x, this gem will work with Ruby 1.9+. Starting
42-
with 0.4.0, only Ruby 2.2+ will be supported.
43-
44-
To read the documentation for 0.3.x, see the [stable-03 branch](https://github.com/influxdata/influxdb-ruby/tree/stable-03).
45-
46-
Please note that for Ruby 1.9, you'll need to install the JSON gem in version
47-
1.8.x yourself, for example by pinning the version in your `Gemfile` (i.e.
48-
`gem "json", "~> 1.8.3"`).
41+
Since v0.4.0, this gem requires Ruby >= 2.2.0. Support for MRI < 2.2 is
42+
still available in the v0.3.x series, see [stable-03 branch](https://github.com/influxdata/influxdb-ruby/tree/stable-03)
43+
for documentation.
4944

5045
## Installation
5146

influxdb.gemspec

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ Gem::Specification.new do |spec|
1919
spec.test_files = spec.files.grep(%r{^(test|spec|features|smoke)/})
2020
spec.require_paths = ["lib"]
2121

22-
spec.add_runtime_dependency "json"
23-
spec.post_install_message = "Heads up: version 0.4 will drop support for MRI <= 2.1"
22+
spec.required_ruby_version = ">= 2.2.0"
2423

2524
spec.add_development_dependency "rake"
2625
spec.add_development_dependency "bundler", "~> 1.3"
2726
spec.add_development_dependency "rspec", "~> 3.5.0"
2827
spec.add_development_dependency "webmock", "~> 2.1.0"
2928
spec.add_development_dependency "rubocop", "~> 0.41.2"
30-
spec.add_development_dependency "cause"
3129
end

spec/spec_helper.rb

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
require "influxdb"
22
require "webmock/rspec"
3-
require "cause" unless Exception.instance_methods.include?(:cause)
43

4+
# rubocop:disable Lint/HandleExceptions
55
begin
6-
# rubocop:disable Lint/HandleExceptions
76
require "pry-byebug"
87
rescue LoadError
98
end
9+
# rubocop:enable Lint/HandleExceptions
1010

1111
RSpec.configure do |config|
1212
config.color = ENV["TRAVIS"] != "true"
@@ -17,6 +17,7 @@
1717
else
1818
config.formatter = :progress
1919
end
20+
# rubocop:enable Style/ConditionalAssignment
2021

2122
if ENV["LOG"]
2223
Dir.mkdir("tmp") unless Dir.exist?("tmp")

0 commit comments

Comments
 (0)