uncruft 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf00cb55dbde2d67dd46ff78d173af307f9d8d18030dc195f8d11ea5481be93
-  data.tar.gz: 1bf1d7d58d8c196ff4b4a83d15e01745873f154ba55224b46a9bd5f1e895ca23
+  metadata.gz: 75e548761723a5ef0bf1e9f5ab10ec4b415270ccf22b2961c7b24cfa0e25992d
+  data.tar.gz: 52ff06d81f84337a23ab913f23d792c9875b12ab863d2ff501f38dbd1b790986
 SHA512:
-  metadata.gz: e7beb1904dc3ce85e47c79e7f925b57d3d7858395019ffb2e8868c39c838ab773515f93e0aa50dbd35d002288b8a2343a146d6a902415869db6e819d88ffd8f2
-  data.tar.gz: 5f5a77e13579923808298d102df2c75abf3a6bbb2b9c65551f252837108daf3ddcbbf029cef3ba1d74b57718ac72b6bb1d14397b3f4c8958a58d668c5ae02bf1
+  metadata.gz: 390695412c3992cce207fc9d16847e42bd7d4788ae3d9b45d0bcfcdf324909883077a73ed350b75f26ab99eae635af2b813541f6b563e7395aaaaca2c55c6e2a
+  data.tar.gz: 86c23923dfc8aa15ca9d965af0b4b63f0592044c3d39a7b921a98e6a4bf1517d2746b26691752332c705b65c57e2e2fe4583d728a0f133c8834b5cd9ac3466ec

data/lib/uncruft/deprecatable.rb

@@ -15,7 +15,7 @@ module Uncruft
 
         prepended_method.module_eval do
           define_method method do |*args, &block|
-            ActiveSupport::Deprecation.warn(message)
+            Uncruft.deprecator.warn(message)
             super(*args, &block)
           end
         end

data/lib/uncruft/deprecation_handler.rb

@@ -44,6 +44,10 @@ module Uncruft
         message.gsub!(gem_home, '$GEM_PATH')
       end
 
+      if (user_install = user_install(message)).present?
+        message.gsub!(user_install, '$GEM_PATH')
+      end
+
       if message.include?(bin_dir)
         message.gsub!(bin_dir, '$BIN_PATH')
       end
@@ -70,7 +74,11 @@ module Uncruft
     end
 
     def gem_home(message)
-      message.match(%r{(?i:c)alled from( .+ at)? (#{ENV['GEM_HOME']}/(.+/)*gems)})&.[](2) # rubocop:disable Style/FetchEnvVar
+      message.match(%r{(?i:c)alled from( .+ at)? (#{ENV.fetch('GEM_HOME', nil)}/(.+/)*gems)})&.[](2).presence
+    end
+
+    def user_install(message)
+      message.match(%r{(?i:c)alled from( .+ at)? (#{Gem.user_dir}/(.+/)*gems)})&.[](2).presence
     end
 
     def absolute_path(message)
@@ -107,17 +115,19 @@ module Uncruft
 
     def known_deprecations
       @known_deprecations ||= if known_deprecations_file_exists?
-                                file = File.read(Uncruft.ignorefile_path)
-                                JSON.parse(file)['ignored_warnings'].to_set
-                              else
-                                Set.new
-                              end
+        file = File.read(Uncruft.ignorefile_path)
+        JSON.parse(file)['ignored_warnings'].to_set
+      else
+        Set.new
+      end
     end
 
     def file_content(deprecations)
-      JSON.pretty_generate ignored_warnings: deprecations.sort,
-                           updated: now,
-                           rails_version: Rails::VERSION::STRING
+      JSON.pretty_generate(
+        ignored_warnings: deprecations.sort,
+        updated: now,
+        rails_version: Rails::VERSION::STRING,
+      )
     end
 
     def now

data/lib/uncruft/railtie.rb

@@ -11,6 +11,10 @@ module Uncruft
         strategies.unshift(DeprecationHandler.new)
         config.active_support.deprecation = strategies
       end
+
+      initializer "uncruft.deprecator" do |app|
+        app.deprecators[:uncruft] = Uncruft.deprecator
+      end
     end
   end
 end

data/lib/uncruft/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uncruft
-  VERSION = '0.4.0'
+  VERSION = '0.6.1'
 end

data/lib/uncruft/warning.rb

@@ -4,12 +4,12 @@ module Uncruft
   module Warning
     DEPRECATION_PATTERN = /(deprecation|deprecated)/i
 
-    def warn(str, *args, **kwargs)
+    def warn(*args, **kwargs)
+      str = args[0]
+
       if str =~ DEPRECATION_PATTERN # rubocop:disable Performance/RegexpMatch
         message = strip_caller_info(str, caller_locations(1..1).first).strip
-        ActiveSupport::Deprecation.warn(message)
-      elsif RUBY_VERSION < '2.7' && kwargs.empty?
-        super(str, *args)
+        Uncruft.deprecator.warn(message)
       else
         super
       end

data/lib/uncruft.rb

@@ -21,5 +21,9 @@ module Uncruft
     def ignorefile_path
       ENV['UNCRUFT_IGNOREFILE_PATH'] || Rails.root.join('config/deprecations.ignore')
     end
+
+    def deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new(Uncruft::VERSION, "Uncruft")
+    end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uncruft
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nathan Griffith
 - Chris Zega
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2025-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -47,7 +46,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A library to assist with Rails upgrades
 test_files: []