From 49c756e2ffbf544c14fbc76762b6321a6489d594 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Fri, 27 Oct 2017 17:43:47 +0100 Subject: [PATCH] Test in ruby 2.4 --- .travis.yml | 13 +++++++------ CHANGELOG.md | 4 ++++ edn.gemspec | 7 ++++--- lib/edn/core_ext.rb | 8 +------- lib/edn/version.rb | 2 +- spec/spec_helper.rb | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53e6c1e..1d5e866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ +sudo: false language: ruby rvm: - - "1.9.2" - - "1.9.3" - "2.0.0" - - jruby-19mode # JRuby in 1.9 mode -# - "1.8.7" -# - jruby-18mode # JRuby in 1.8 mode -script: bundle exec rspec spec + - "2.2" + - "2.3" + - "2.4" + - jruby + +script: bundle exec rspec diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a03026..15f6ae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.2.0 +* Remove ruby Bignum +* Drop support for ruby 1.9.* + # 1.0.2 * Handle numbers with M precision diff --git a/edn.gemspec b/edn.gemspec index 1947168..569b626 100644 --- a/edn.gemspec +++ b/edn.gemspec @@ -10,14 +10,15 @@ Gem::Specification.new do |gem| gem.license = "MIT" gem.files = `git ls-files`.split($\) - gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) } - gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) + gem.test_files = gem.files.grep(%r{^(spec)/}) gem.name = "edn" gem.require_paths = ["lib"] gem.version = EDN::VERSION + gem.required_ruby_version = '>= 2.0.0' + gem.add_development_dependency 'pry', '~> 0.9.10' - gem.add_development_dependency 'rspec', '~> 2.11.0' + gem.add_development_dependency 'rspec', '~> 2.99' gem.add_development_dependency 'rantly', '~> 0.3.1' gem.add_development_dependency 'rake', '~> 10.3' end diff --git a/lib/edn/core_ext.rb b/lib/edn/core_ext.rb index 316ce2c..7cd291d 100644 --- a/lib/edn/core_ext.rb +++ b/lib/edn/core_ext.rb @@ -16,12 +16,6 @@ def allows_metadata? end end - module Bignum - def to_edn - self.to_s + 'M' - end - end - module BigDecimal def to_edn self.to_s('F') + 'M' @@ -90,11 +84,11 @@ def to_edn EDN.tagout("inst", self.xmlschema) end end + end end Numeric.send(:include, EDN::CoreExt::Unquoted) -Bignum.send(:include, EDN::CoreExt::Bignum) BigDecimal.send(:include, EDN::CoreExt::BigDecimal) TrueClass.send(:include, EDN::CoreExt::Unquoted) FalseClass.send(:include, EDN::CoreExt::Unquoted) diff --git a/lib/edn/version.rb b/lib/edn/version.rb index 5c9d1c8..5b15ee6 100644 --- a/lib/edn/version.rb +++ b/lib/edn/version.rb @@ -1,3 +1,3 @@ module EDN - VERSION = "1.1.1" + VERSION = "1.2.0" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c9d080b..056e326 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,8 +8,8 @@ RSpec.configure do |c| c.fail_fast = true - c.filter_run_including :focused => true - c.alias_example_to :fit, :focused => true + c.filter_run_including :focus => true + c.alias_example_to :fit, :focus => true c.treat_symbols_as_metadata_keys_with_true_values = true c.run_all_when_everything_filtered = true