uncruft 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6345bf4ac442c6ebf76e3ea890d51e37298bd857673f13f7ab3239bfffba93f9
-  data.tar.gz: f5fe054f25dbc340188fe7f425679e41981e28724ddc99d5e4f2c66d1dcea598
+  metadata.gz: 1c93c7cc504ba0e5d3bf93b8ffbbfadee05e66c8084f3580fc93855490ed4ec3
+  data.tar.gz: 6b1f3835bb69a640c757896730bb9cf284f212087f9f04339709e0186f921b92
 SHA512:
-  metadata.gz: 03d8aa23de032a32889df43c2cd68e5a294449dd9d74d8172873ec6334899cb9924b6f1c080f58e228b7e8e69ffb909dac063bb7d0acea58b65848ac3146961e
-  data.tar.gz: ff7698ff75d7420b1ce01d22a6a87ec96abe0dab622b3893df80b0923722ea550415b66f0540110a12d0b7d99243a1c8845ca4cbf44b7d694ffdf56e434fca22
+  metadata.gz: f6427a8d529e5b0f51f26c3fc8b88f06d3f9823a0d02eb0e3cfdf3c00419dab9c9f2c634adec618ba21c72f54cc9ddedd6b90c18aaad854ea7c0564c224dff52
+  data.tar.gz: 67fba4c3a6ba79098cc141f597e7965917804306b41d5299cb4795600f191a3c5c8589506e4073d7be9ec6f045b75abe635338a75077ebc28b35b4848773d446

data/Rakefile

@@ -6,8 +6,6 @@ end
 
 Bundler::GemHelper.install_tasks
 
-task(:default).clear
-
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
@@ -15,10 +13,14 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS']
-  task default: %i(rubocop spec)
-else
-  require 'appraisal'
-  Appraisal::Task.new
-  task default: :appraisal
+def default_task
+  if ENV['APPRAISAL_INITIALIZED'] || ENV['CI']
+    %i(rubocop spec)
+  else
+    require 'appraisal'
+    Appraisal::Task.new
+    %i(appraisal)
+  end
 end
+
+task(:default).clear.enhance(default_task)

data/lib/uncruft/deprecation_handler.rb

@@ -95,14 +95,12 @@ module Uncruft
     end
 
     def known_deprecations
-      @known_deprecations ||= begin
-        if known_deprecations_file_exists?
-          file = File.read(Uncruft.ignorefile_path)
-          JSON.parse(file)['ignored_warnings'].to_set
-        else
-          Set.new
-        end
-      end
+      @known_deprecations ||= if known_deprecations_file_exists?
+                                file = File.read(Uncruft.ignorefile_path)
+                                JSON.parse(file)['ignored_warnings'].to_set
+                              else
+                                Set.new
+                              end
     end
 
     def file_content(deprecations)

data/lib/uncruft/version.rb

@@ -1,3 +1,3 @@
 module Uncruft
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/uncruft/warning.rb

@@ -2,10 +2,12 @@ module Uncruft
   module Warning
     DEPRECATION_PATTERN = /(deprecation|deprecated)/i.freeze
 
-    def warn(str, *args)
+    def warn(str, *args, **kwargs)
       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)
       else
         super
       end

data/lib/uncruft.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_support/time'
+
 require 'uncruft/version'
 require 'uncruft/railtie'
 require 'uncruft/deprecation_handler'
@@ -10,11 +13,11 @@ module Uncruft
     FALSE_VALUES = [false, 0, "0", "f", "F", "false", "FALSE", "off", "OFF"].to_set
 
     def record_deprecations?
-      ENV['RECORD_DEPRECATIONS'].presence && !FALSE_VALUES.include?(ENV['RECORD_DEPRECATIONS'])
+      ENV['RECORD_DEPRECATIONS'].presence && !ENV['RECORD_DEPRECATIONS'].in?(FALSE_VALUES)
     end
 
     def ignorefile_path
-      ENV['UNCRUFT_IGNOREFILE_PATH'] || Rails.root.join('config', 'deprecations.ignore')
+      ENV['UNCRUFT_IGNOREFILE_PATH'] || Rails.root.join('config/deprecations.ignore')
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,9 +5,13 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path('dummy/config/application', __dir__)
 require 'support/rails_root'
 
-Time.zone = ActiveSupport::TimeZone.all.first
-
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  config.around(:all) do |example|
+    Time.use_zone(ActiveSupport::TimeZone.all.first) do
+      example.run
+    end
+  end
 end

data/spec/uncruft/deprecatable_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Uncruft::Deprecatable do
         attr_accessor :first_name
 
         deprecate_attribute(:first_name,
-          message: "Please stop using this attribute!")
+                            message: "Please stop using this attribute!")
       end
     end
 
@@ -44,7 +44,7 @@ RSpec.describe Uncruft::Deprecatable do
         end
 
         deprecate_method(:legacy_method,
-          message: "Please stop using this method!")
+                         message: "Please stop using this method!")
       end
     end
 

data/spec/uncruft/deprecation_handler_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Uncruft::DeprecationHandler do
-  let(:ignorefile_path) { Rails.root.join('config', 'deprecations.ignore') }
+  let(:ignorefile_path) { Rails.root.join('config/deprecations.ignore') }
 
   before do
     File.delete(ignorefile_path) if File.exist?(ignorefile_path)
@@ -10,7 +10,7 @@ RSpec.describe Uncruft::DeprecationHandler do
   subject { described_class.new }
 
   describe '#call' do
-    let(:absolute_path) { Rails.root.join('chicken', 'nuggets.rb') }
+    let(:absolute_path) { Rails.root.join('chicken/nuggets.rb') }
     let(:line_number) { 123 }
     let(:caller_label) { '<something>' }
     let(:message) { "Warning: BAD called from #{caller_label} at #{absolute_path}:#{line_number}" }
@@ -104,14 +104,14 @@ RSpec.describe Uncruft::DeprecationHandler do
       end
 
       context 'when gem is vendored' do
-        let(:absolute_path) { Rails.root.join('vendor', 'cache', 'chicken', 'nuggets.rb') }
+        let(:absolute_path) { Rails.root.join('vendor/cache/chicken/nuggets.rb') }
 
         it 'sanitizes the message and raises an error' do
           expect { subject.call(message, '') }.to raise_error(RuntimeError, expected_error_message)
         end
 
         context 'when gem is vendored elsewhere' do
-          let(:absolute_path) { Rails.root.join('..', '..', 'vendor', 'cache', 'chicken', 'nuggets.rb') }
+          let(:absolute_path) { Rails.root.join('../../vendor/cache/chicken/nuggets.rb') }
 
           it 'sanitizes the message and raises an error' do
             expect { subject.call(message, '') }.to raise_error(RuntimeError, expected_error_message)

data/spec/uncruft/warning_spec.rb

@@ -32,13 +32,13 @@ describe Uncruft::Warning do
       it 'strips out the path so that ActiveSupport::Deprecation can append a new one' do
         path = caller_locations(0..0).first.path
 
-        expect(ActiveSupport::Deprecation).to receive(:warn).with('foo is deprecated!').and_return('hurray')
+        allow(ActiveSupport::Deprecation).to receive(:warn).with('foo is deprecated!').and_return('hurray')
         expect(warn("#{path}: foo is deprecated!")).to eq('hurray')
 
-        expect(ActiveSupport::Deprecation).to receive(:warn).with('[DEPRECATION] bar is no more.').and_return('huzzah')
+        allow(ActiveSupport::Deprecation).to receive(:warn).with('[DEPRECATION] bar is no more.').and_return('huzzah')
         expect(Kernel.warn("[DEPRECATION] bar is no more. #{path}:#{caller_locations(0..0).first.lineno}")).to eq('huzzah')
 
-        expect(ActiveSupport::Deprecation).to receive(:warn).with('Deprecation detected: banana --').and_return('we do our best...')
+        allow(ActiveSupport::Deprecation).to receive(:warn).with('Deprecation detected: banana --').and_return('we do our best...')
         expect(Warning.warn("Deprecation detected: banana -- #{caller(0..0).first}")).to eq('we do our best...')
       end
     end

data/spec/uncruft_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Uncruft do
 
   describe '.ignorefile_path' do
     it 'uses rails root' do
-      expect(described_class.ignorefile_path).to eq(Rails.root.join('config', 'deprecations.ignore'))
+      expect(described_class.ignorefile_path).to eq(Rails.root.join('config/deprecations.ignore'))
     end
 
     context 'when env var is set' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uncruft
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Griffith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: betterlint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,33 +54,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-betterment
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +113,6 @@ files:
 - lib/uncruft/version.rb
 - lib/uncruft/warning.rb
 - spec/dummy/config/application.rb
-- spec/dummy/config/deprecations.ignore
-- spec/examples.txt
 - spec/spec_helper.rb
 - spec/support/rails_root.rb
 - spec/uncruft/deprecatable_spec.rb
@@ -125,7 +123,8 @@ files:
 homepage: https://github.com/Betterment/uncruft
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -134,22 +133,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A library to assist with Rails upgrades
 test_files:
 - spec/spec_helper.rb
-- spec/dummy/config/deprecations.ignore
 - spec/dummy/config/application.rb
-- spec/examples.txt
 - spec/uncruft/railtie_spec.rb
 - spec/uncruft/warning_spec.rb
 - spec/uncruft/deprecatable_spec.rb

data/spec/dummy/config/deprecations.ignore

@@ -1,7 +0,0 @@
-{
-  "ignored_warnings": [
-    "Warning: BAD called from chicken/nuggets.rb"
-  ],
-  "updated": "2018-06-05 15:20:12 -0400",
-  "rails_version": "5.1.6"
-}

data/spec/examples.txt

@@ -1,28 +0,0 @@
-example_id                                              | status | run_time        |
-------------------------------------------------------- | ------ | --------------- |
-./spec/uncruft/deprecatable_spec.rb[1:1:1]              | passed | 0.00763 seconds |
-./spec/uncruft/deprecatable_spec.rb[1:1:2]              | passed | 0.00031 seconds |
-./spec/uncruft/deprecatable_spec.rb[1:2:1]              | passed | 0.00025 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:1]       | passed | 0.00536 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:2:1]     | passed | 0.00786 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:2:2:1]   | passed | 0.00347 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:3:1]     | passed | 0.00061 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:4:1]     | passed | 0.00039 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:5:1]     | passed | 0.00044 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:6:1]     | passed | 0.00054 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:6:2:1]   | passed | 0.00045 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:6:3:1]   | passed | 0.00058 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:6:3:2:1] | passed | 0.00066 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:7:1]     | passed | 0.00047 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:8:1]     | passed | 0.00302 seconds |
-./spec/uncruft/deprecation_handler_spec.rb[1:1:8:2:1]   | passed | 0.00166 seconds |
-./spec/uncruft/railtie_spec.rb[1:1]                     | passed | 0.04267 seconds |
-./spec/uncruft/railtie_spec.rb[1:2:1]                   | passed | 0.00167 seconds |
-./spec/uncruft/railtie_spec.rb[1:3:1]                   | passed | 0.00219 seconds |
-./spec/uncruft/warning_spec.rb[1:1]                     | passed | 0.00031 seconds |
-./spec/uncruft/warning_spec.rb[1:2]                     | passed | 0.00011 seconds |
-./spec/uncruft/warning_spec.rb[1:3:1]                   | passed | 0.00054 seconds |
-./spec/uncruft/warning_spec.rb[1:3:2:1]                 | passed | 0.00045 seconds |
-./spec/uncruft_spec.rb[1:1:1]                           | passed | 0.00246 seconds |
-./spec/uncruft_spec.rb[1:2:1]                           | passed | 0.00025 seconds |
-./spec/uncruft_spec.rb[1:2:2:1]                         | passed | 0.00024 seconds |