From 9752dbfbe0e92dac1cef5d9d6b9e3539d1ccea12 Mon Sep 17 00:00:00 2001 From: Dmitry Kulikov Date: Wed, 8 May 2024 13:20:58 +0200 Subject: [PATCH 1/3] Parameter --additional-file-patterns is fixed --- lib/annotate/parser.rb | 2 +- lib/annotate/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/annotate/parser.rb b/lib/annotate/parser.rb index ad85caf5..b39fbd0b 100644 --- a/lib/annotate/parser.rb +++ b/lib/annotate/parser.rb @@ -56,7 +56,7 @@ def add_options_to_parser(option_parser) # rubocop:disable Metrics/MethodLength, option_parser.on('--additional-file-patterns path1,path2,path3', Array, "Additional file paths or globs to annotate, separated by commas (e.g. `/foo/bar/%model_name%/*.rb,/baz/%model_name%.rb`)") do |additional_file_patterns| - ENV['additional_file_patterns'] = additional_file_patterns + env['additional_file_patterns'] = additional_file_patterns.join(',') end option_parser.on('-d', diff --git a/lib/annotate/version.rb b/lib/annotate/version.rb index e103c6b8..f63d8a3e 100644 --- a/lib/annotate/version.rb +++ b/lib/annotate/version.rb @@ -1,5 +1,5 @@ module Annotate def self.version - '3.2.0' + '3.2.1' end end From 51f578ea481f8a37156ed498472dbf91dfaad6a2 Mon Sep 17 00:00:00 2001 From: Dmitry Kulikov Date: Wed, 8 May 2024 14:28:04 +0200 Subject: [PATCH 2/3] Fix the specs --- spec/lib/annotate/parser_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/annotate/parser_spec.rb b/spec/lib/annotate/parser_spec.rb index 16084b02..f420804b 100644 --- a/spec/lib/annotate/parser_spec.rb +++ b/spec/lib/annotate/parser_spec.rb @@ -20,7 +20,7 @@ module Annotate # rubocop:disable Metrics/ModuleLength paths = 'foo/bar,baz' allow(ENV).to receive(:[]=) Parser.parse([option, paths]) - expect(ENV).to have_received(:[]=).with('additional_file_patterns', ['foo/bar', 'baz']) + expect(ENV).to have_received(:[]=).with('additional_file_patterns', 'foo/bar,baz') end end end From 26091b2adaeb075f09d4cab7f623317662670b55 Mon Sep 17 00:00:00 2001 From: Dimitri Kulk Date: Sun, 18 May 2025 08:45:33 +0200 Subject: [PATCH 3/3] activerecord dependency is fixed --- annotate.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annotate.gemspec b/annotate.gemspec index 43b2ac99..a3e4e470 100644 --- a/annotate.gemspec +++ b/annotate.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.specification_version = 4 if s.respond_to? :specification_version s.add_runtime_dependency(%q, '>= 10.4', '< 14.0') - s.add_runtime_dependency(%q, ['>= 3.2', '< 8.0']) + s.add_runtime_dependency(%q, ['>= 3.2', '< 8.1']) s.metadata = { "bug_tracker_uri" => "https://github.com/ctran/annotate_models/issues/",