deprecation_toolkit 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d0b00fe8e8b87b77af20209fac4531b7d2faebdecc55a8cdbd1b490cd65089
-  data.tar.gz: 4ed23c378e87023b0303839edaaa99265929c2b4eb5e7c1b56156992c24ba8e7
+  metadata.gz: a215b859ad3948057d353332378a89f8ff22199296677f2ecab9f318d24a73b3
+  data.tar.gz: 99a5d3368ab2a066a4118ba0330a913223214ba686c5779138cc685610eea4ae
 SHA512:
-  metadata.gz: 947cd740128e855612cc94917760cf00160adeda014fb4727153a811ea3e2b4cec4e563c61c02729c4eabdebdbf28307787f727feefa4a76e273c4b534c0fc40
-  data.tar.gz: e46958cb158e2ede1139cabb445462349ceb8bc4de06b4084d6af1f086aacba390e86c9cba7c07a23d074d899cd669ef775c790263632be66b88990164404cd2
+  metadata.gz: a6b2c17228b8091e8d2260fb6aa001153b859fcc029412133552b6fb074cb547735bbd27e1194c36128f390658c4e8b82e76018244388a91a56528f6fad05256
+  data.tar.gz: 4199799c0190b92530119d4ad093e359a6b076f35a1ceb039081bbdf6c0b26bd3731cd36fedb6f6025e3bc4bedd7fc38cd43c13e21652b7a3ac898a9a86c3d37

data/.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         gemfile: [gemfiles/activesupport_5.2.gemfile, gemfiles/activesupport_6.0.gemfile, gemfiles/activesupport_6.1.gemfile, gemfiles/activesupport_7.0.gemfile, gemfiles/activesupport_edge.gemfile]
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         exclude:
         # Active Support requires Ruby >= 2.7 as of 7.0
         - gemfile: "gemfiles/activesupport_7.0.gemfile"
@@ -43,7 +43,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - name: RuboCop

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## main (unreleased)
 
+## 2.0.3 (2023-02-10)
+
+* [#80](https://github.com/Shopify/deprecation_toolkit/pull/80): Filter out stack trace from Gem::Deprecate deprecation messages
+
+## 2.0.2 (2023-02-08)
+
+* [#78](https://github.com/Shopify/deprecation_toolkit/pull/78): Show deprecations without stacktrace. (@shioyama)
+
 ## 2.0.1 (2022-11-18)
 
 * [#74](https://github.com/Shopify/deprecation_toolkit/pull/74): Add support for `Rails.application.deprecators`. (@gmcgibbon)

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    deprecation_toolkit (2.0.1)
+    deprecation_toolkit (2.0.3)
       activesupport (>= 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -52,7 +52,7 @@ GEM
     rubocop-shopify (2.5.0)
       rubocop (~> 1.25)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
 
@@ -68,4 +68,4 @@ DEPENDENCIES
   rubocop-shopify
 
 BUNDLED WITH
-   2.2.22
+   2.4.4

data/deprecation_toolkit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.files = %x(git ls-files -z).split("\x0").reject do |f|
     f.match(%r{^(test)/})

data/lib/deprecation_toolkit/behaviors/raise.rb

@@ -77,9 +77,9 @@ module DeprecationToolkit
           #{record_message}
 
           ===== Expected
-          #{recorded_deprecations.deprecations.join("\n")}
+          #{recorded_deprecations.deprecations_without_stacktrace.join("\n")}
           ===== Actual
-          #{current_deprecations.deprecations.join("\n")}
+          #{current_deprecations.deprecations_without_stacktrace.join("\n")}
         EOM
 
         super(message)

data/lib/deprecation_toolkit/collector.rb

@@ -35,11 +35,9 @@ module DeprecationToolkit
 
     def deprecations_without_stacktrace
       deprecations.map do |deprecation|
-        if ActiveSupport.gem_version.to_s < "5.0"
-          deprecation.sub(/\W\s\(called from .*\)$/, "")
-        else
-          deprecation.sub(/ \(called from .*\)$/, "")
-        end
+        deprecation
+          .sub(*active_support_deprecation_sub_params)
+          .sub(*gem_deprecate_sub_params)
       end
     end
 
@@ -63,5 +61,19 @@ module DeprecationToolkit
     def flaky?
       size == 1 && deprecations.first["flaky"] == true
     end
+
+    private
+
+    def active_support_deprecation_sub_params
+      if ActiveSupport.gem_version.to_s < "5.0"
+        [/\W\s\(called from .*\)$/, ""]
+      else
+        [/ \(called from .*\)$/, ""]
+      end
+    end
+
+    def gem_deprecate_sub_params
+      [/NOTE: (.*is deprecated.*)\n.* called from.*:\d+\.\n/, "\\1"]
+    end
   end
 end

data/lib/deprecation_toolkit/read_write_helper.rb

@@ -58,7 +58,7 @@ module DeprecationToolkit
     end
 
     def test_location(test)
-      test.method(test_name(test)).source_location[0]
+      Kernel.const_source_location(test.class.name)[0]
     rescue NameError
       "unknown"
     end

data/lib/deprecation_toolkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeprecationToolkit
-  VERSION = "2.0.1"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deprecation_toolkit
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="