deprecation_toolkit 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b57fe6f900e79cc13938de52e802aaff9ab51dfe546d5f9e1cdc0a9ec6c4648
-  data.tar.gz: 61ca80ab4fd5d2337b83cba6af0d53dd1af734957487fcf78d1677ca6b2205d0
+  metadata.gz: 1d780d3c9ef2ad886d0d267a6a3d7e6e5b335cdfef2bb47ea462f285e975e703
+  data.tar.gz: 51eb2e75cee43f91cfa3834baa9640b7c487b1e2b4d6ed8a62c714df84fe4c5c
 SHA512:
-  metadata.gz: cff2de2f59cb48d1d96b4f39c5c4cdc601d2fdf512d990794e09cf791ef49c7ca8ada4effaa1c19ce0cecc53d535cace10a32eb443abc2a04ac5ca831118dc4c
-  data.tar.gz: 9fc7fda9a92dd4f73af1297200b81c20825b5f37529ce8f808c2a3b6e1f777586d0fba83b5982d978222c8f90b9a24e473107456d39d8758df91d775ac821d7b
+  metadata.gz: 2bdc3a73e47cd1341ff4cf34285d73ae5872b27a41343ae34fe447c502c979e1fb7c45dbde21eb4f590590770d2351c4c187b8a80a8310e27fb468874434bd80
+  data.tar.gz: 31c99027dc40530906abeb3dfded92f5672e25710ad0d7fcf32965a22c063b36bcb2ffbdb53af5f995b9b46ff5dd0d9a03211af2482997af3557cf773d0490e8

data/lib/deprecation_toolkit/configuration.rb

@@ -1,24 +1,41 @@
 # frozen_string_literal: true
 
-require "active_support/configurable"
-
 module DeprecationToolkit
-  class Configuration
-    include ActiveSupport::Configurable
-
-    config_accessor(:allowed_deprecations) { [] }
-    config_accessor(:attach_to) { [:rails] }
-    config_accessor(:behavior) { Behaviors::Raise }
-    config_accessor(:deprecation_path) { "test/deprecations" }
-    config_accessor(:test_runner) { :minitest }
-    config_accessor(:warnings_treated_as_deprecation) { [] }
-    config_accessor(:deprecation_file_path_format) do
-      proc do |test|
-        if DeprecationToolkit::Configuration.test_runner == :rspec
-          test.example_group.file_path.sub(%r{^./spec/}, "").sub(/_spec.rb$/, "")
-        else
-          test.class.name.underscore
-        end
+  module Configuration
+    @allowed_deprecations = []
+    singleton_class.attr_accessor(:allowed_deprecations)
+
+    @attach_to = [:rails]
+    singleton_class.attr_accessor(:attach_to)
+
+    @behavior = Behaviors::Raise
+    singleton_class.attr_accessor(:behavior)
+
+    @deprecation_path = "test/deprecations"
+    singleton_class.attr_accessor(:deprecation_path)
+
+    @test_runner = :minitest
+    singleton_class.attr_accessor(:test_runner)
+
+    @warnings_treated_as_deprecation = []
+    singleton_class.attr_accessor(:warnings_treated_as_deprecation)
+
+    @deprecation_file_path_format = proc do |test|
+      if DeprecationToolkit::Configuration.test_runner == :rspec
+        test.example_group.file_path.sub(%r{^./spec/}, "").sub(/_spec.rb$/, "")
+      else
+        test.class.name.underscore
+      end
+    end
+    singleton_class.attr_accessor(:deprecation_file_path_format)
+
+    class << self
+      def configure
+        yield self
+      end
+
+      def config
+        self
       end
     end
   end

data/lib/deprecation_toolkit/read_write_helper.rb

@@ -15,32 +15,29 @@ module DeprecationToolkit
     end
 
     def write(deprecation_file, deprecations_to_record)
-      create_deprecation_file(deprecation_file) unless deprecation_file.exist?
+      original_deprecations = deprecation_file.exist? ? YAML.load_file(deprecation_file) : {}
+      updated_deprecations = original_deprecations.dup
 
-      content = YAML.load_file(deprecation_file)
-
-      deprecations_to_record.each do |test, deprecations|
-        if deprecations.any?
-          content[test] = deprecations
+      deprecations_to_record.each do |test, deprecation_to_record|
+        if deprecation_to_record.any?
+          updated_deprecations[test] = deprecation_to_record
         else
-          content.delete(test)
+          updated_deprecations.delete(test)
         end
       end
 
-      if content.any?
-        deprecation_file.write(YAML.dump(content))
-      else
+      if updated_deprecations.any?
+        if updated_deprecations != original_deprecations
+          deprecation_file.dirname.mkpath
+          deprecation_file.write(YAML.dump(updated_deprecations.sort.to_h))
+        end
+      elsif deprecation_file.exist?
         deprecation_file.delete
       end
     end
 
     private
 
-    def create_deprecation_file(deprecation_file)
-      deprecation_file.dirname.mkpath
-      deprecation_file.write(YAML.dump({}))
-    end
-
     def recorded_deprecations_path(test)
       deprecation_folder = if Configuration.deprecation_path.is_a?(Proc)
         Configuration.deprecation_path.call(test_location(test))

data/lib/deprecation_toolkit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deprecation_toolkit
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Shopify
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 email:
 - rails@shopify.com
 executables: []
@@ -53,7 +53,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/shopify/deprecation_toolkit
-  source_code_uri: https://github.com/Shopify/deprecation_toolkit/tree/v2.2.3
+  source_code_uri: https://github.com/Shopify/deprecation_toolkit/tree/v2.3.0
   changelog_uri: https://github.com/Shopify/deprecation_toolkit/blob/main/CHANGELOG.md
   allowed_push_host: https://rubygems.org
 rdoc_options: []
@@ -63,14 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Deprecation Toolkit around ActiveSupport::Deprecation
 test_files: []