From 4d97b0d39cf9eb03638310c52250db3d727692ef Mon Sep 17 00:00:00 2001 From: Yuri Smirnov Date: Mon, 15 Mar 2021 17:21:47 +0300 Subject: [PATCH] bump version --- .travis.yml | 2 +- CHANGELOG.md | 2 + Gemfile.lock | 167 +++++++++++++++++++++++------------------- lib/memery/version.rb | 2 +- memery.gemspec | 4 +- spec/memery_spec.rb | 4 +- 6 files changed, 102 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67b4a63..fecbefd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ language: ruby sudo: false rvm: - - 2.4 - 2.5 - 2.6 - 2.7 + - 3.0 - ruby-head before_install: gem install bundler diff --git a/CHANGELOG.md b/CHANGELOG.md index 5416c63..fab2834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] +## [1.4.0] - 2021-03-15 ### Fixed - Fix compatibility with `ActiveSupport::Concern`. ([@tycooon] and [@AlexWayfer]) [#26] @@ -57,3 +58,4 @@ [#22]: https://github.com/tycooon/memery/pull/22 [#23]: https://github.com/tycooon/memery/pull/23 [#25]: https://github.com/tycooon/memery/pull/25 +[#26]: https://github.com/tycooon/memery/pull/26 diff --git a/Gemfile.lock b/Gemfile.lock index 8a26fea..fbc87b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,102 +1,121 @@ PATH remote: . specs: - memery (1.3.0) + memery (1.4.0) ruby2_keywords (~> 0.0.2) GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.2) + activesupport (6.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - ast (2.4.0) - benchmark-ips (2.7.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + ast (2.4.2) + benchmark-ips (2.8.4) benchmark-memory (0.1.2) memory_profiler (~> 0.9) - coderay (1.1.2) - concurrent-ruby (1.1.6) - coveralls (0.8.23) - json (>= 1.8, < 3) - simplecov (~> 0.16.1) - term-ansicolor (~> 1.3) - thor (>= 0.19.4, < 2.0) - tins (~> 1.6) - diff-lcs (1.3) - docile (1.3.2) - i18n (1.8.2) + coderay (1.1.3) + concurrent-ruby (1.1.8) + coveralls (0.7.2) + multi_json (~> 1.3) + rest-client (= 1.6.7) + simplecov (>= 0.7) + term-ansicolor (= 1.2.2) + thor (= 0.18.1) + diff-lcs (1.4.4) + docile (1.3.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) - json (2.3.0) memory_profiler (0.9.14) - method_source (0.9.2) - minitest (5.14.0) - parallel (1.19.1) - parser (2.7.0.2) - ast (~> 2.4.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - rack (2.1.1) + method_source (1.0.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0225) + minitest (5.14.4) + multi_json (1.15.0) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) + pry (0.14.0) + coderay (~> 1.1) + method_source (~> 1.0) + rack (2.2.3) rainbow (3.0.0) - rake (13.0.1) - rspec (3.9.0) - rspec-core (~> 3.9.0) - rspec-expectations (~> 3.9.0) - rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.0) + rake (13.0.3) + regexp_parser (2.1.1) + rest-client (1.6.7) + mime-types (>= 1.16) + rexml (3.2.4) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-mocks (3.9.1) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.9.0) - rspec-support (3.9.2) - rubocop (0.79.0) - jaro_winkler (~> 1.5.1) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.11.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-config-umbrellio (0.79.0.68) - rubocop (= 0.79.0) - rubocop-performance (= 1.5.2) - rubocop-rails (= 2.4.1) - rubocop-rspec (= 1.37.1) - rubocop-performance (1.5.2) - rubocop (>= 0.71.0) - rubocop-rails (2.4.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + rubocop-config-umbrellio (1.11.0.40) + rubocop (= 1.11.0) + rubocop-performance (= 1.10.0) + rubocop-rails (= 2.9.1) + rubocop-rake (= 0.5.1) + rubocop-rspec (= 2.2.0) + rubocop-sequel (= 0.2.0) + rubocop-performance (1.10.0) + rubocop (>= 0.90.0, < 2.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.9.1) + activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.72.0) - rubocop-rspec (1.37.1) - rubocop (>= 0.68.1) - ruby-progressbar (1.10.1) - ruby2_keywords (0.0.2) - simplecov (0.16.1) + rubocop (>= 0.90.0, < 2.0) + rubocop-rake (0.5.1) + rubocop + rubocop-rspec (2.2.0) + rubocop (~> 1.0) + rubocop-ast (>= 1.1.0) + rubocop-sequel (0.2.0) + rubocop (~> 1.0) + ruby-progressbar (1.11.0) + ruby2_keywords (0.0.4) + simplecov (0.21.2) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - thor (1.0.1) - thread_safe (0.3.6) - tins (1.24.0) - sync - tzinfo (1.2.6) - thread_safe (~> 0.1) - unicode-display_width (1.6.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.2) + term-ansicolor (1.2.2) + tins (~> 0.8) + thor (0.18.1) + tins (0.13.2) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + unicode-display_width (2.0.0) + zeitwerk (2.4.2) PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.0) + activesupport benchmark-ips benchmark-memory bundler @@ -109,4 +128,4 @@ DEPENDENCIES simplecov BUNDLED WITH - 2.1.2 + 2.2.11 diff --git a/lib/memery/version.rb b/lib/memery/version.rb index 514ef88..c9bc501 100644 --- a/lib/memery/version.rb +++ b/lib/memery/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Memery - VERSION = "1.3.0" + VERSION = "1.4.0" end diff --git a/memery.gemspec b/memery.gemspec index eee0cba..edf2f16 100644 --- a/memery.gemspec +++ b/memery.gemspec @@ -5,6 +5,8 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "memery/version" Gem::Specification.new do |spec| + spec.required_ruby_version = ">= 2.5.0" + spec.name = "memery" spec.version = Memery::VERSION spec.authors = ["Yuri Smirnov"] @@ -22,7 +24,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "ruby2_keywords", "~> 0.0.2" - spec.add_development_dependency "activesupport", "~> 5.0" + spec.add_development_dependency "activesupport" spec.add_development_dependency "benchmark-ips" spec.add_development_dependency "benchmark-memory" spec.add_development_dependency "bundler" diff --git a/spec/memery_spec.rb b/spec/memery_spec.rb index 65849b7..cc95be6 100644 --- a/spec/memery_spec.rb +++ b/spec/memery_spec.rb @@ -203,8 +203,8 @@ def self.macro(name) context "calling method with block" do specify do values = [] - values << a.m_args(1, 1) {} - values << a.m_args(1, 1) {} + values << a.m_args(1, 1) { nil } + values << a.m_args(1, 1) { nil } expect(values).to eq([[1, 1], [1, 1]]) expect(CALLS).to eq([[1, 1], [1, 1]])