Skip to content

Commit 52fd497

Browse files
committed
ALL_RUBY_FILES => ALL_RUBY_FILES + ALL_RAKE_FILES
1 parent eaeda21 commit 52fd497

35 files changed

+43
-43
lines changed

lib/bullet/rename_whitelist_to_safelist.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
if_gem 'bullet', '>= 6.1.5'
2929

30-
within_files Synvert::ALL_RUBY_FILES do
30+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
3131
bullet_methods = {
3232
add_whitelist: 'add_safelist',
3333
delete_whitelist: 'delete_safelist',

lib/debug_me/remove_debug_me_calls.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
|__ http://github.com/MadBomber/debug_me
1111
EOS
1212

13-
within_files Synvert::ALL_RUBY_FILES do
13+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
1414
# removes debug_me methods
1515
# removes all debug_me calls that have a block
1616
find_node '.block[caller=.send[message=debug_me]]' do
1717
remove
1818
end
1919
end
2020

21-
within_files Synvert::ALL_RUBY_FILES do
21+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2222
# removes all debug_me calls that DO NOT have a block
2323
find_node '.send[message=debug_me]' do
2424
remove

lib/default/check_syntax.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
description 'Just used to check if there is a syntax error.'
77

8-
within_files Synvert::ALL_RUBY_FILES do
8+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
99
end
1010
end

lib/faker/use_keyword_arguments.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
}
277277
}
278278

279-
within_files Synvert::ALL_RUBY_FILES do
279+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
280280
with_node node_type: 'send', receiver: /\AFaker::/ do
281281
class_name = node.receiver.to_source
282282
methods = FAKER_USE_KEYWORD_ARGUMENTS_MAPPING[class_name]

lib/rails/convert_dynamic_finders.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
if_gem 'rails', '>= 3.0'
5252

53-
within_files Synvert::ALL_RUBY_FILES do
53+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
5454
# find_all_by_... => where(...)
5555
with_node node_type: 'send', message: /^find_all_by_/ do
5656
hash_params = dynamic_finder_to_hash('find_all_by_')
@@ -82,7 +82,7 @@
8282

8383
if_gem 'rails', '>= 4.0'
8484

85-
within_files Synvert::ALL_RUBY_FILES do
85+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
8686
# find_or_initialize_by_... => find_or_initialize_by(...)
8787
with_node node_type: 'send', message: /^find_or_initialize_by_/ do
8888
hash_params = dynamic_finder_to_hash('find_or_initialize_by_')

lib/rails/convert_rails_env.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
if_gem 'rails', '>= 2.3'
3131

32-
within_files Synvert::ALL_RUBY_FILES do
32+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
3333
# RAILS_ENV == 'test'
3434
# =>
3535
# Rails.env == 'test'
@@ -41,7 +41,7 @@
4141
end
4242
end
4343

44-
within_files Synvert::ALL_RUBY_FILES do
44+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
4545
# Rails.env == 'test'
4646
# =>
4747
# Rails.env.test?

lib/rails/convert_rails_logger.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if_gem 'rails', '>= 2.3'
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
with_node node_type: 'const', to_source: 'RAILS_DEFAULT_LOGGER' do
2424
replace_with 'Rails.logger'
2525
end

lib/rails/convert_rails_root.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
if_gem 'rails', '>= 2.3'
2929

30-
within_files Synvert::ALL_RUBY_FILES do
30+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
3131
# RAILS_ROOT => Rails.root
3232
with_node node_type: 'const', to_source: 'RAILS_ROOT' do
3333
replace_with 'Rails.root'
@@ -37,7 +37,7 @@
3737
end
3838
end
3939

40-
within_files Synvert::ALL_RUBY_FILES do
40+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
4141
# File.join(Rails.root, 'config/database.yml')
4242
# =>
4343
# Rails.root.join('config/database.yml')
@@ -65,7 +65,7 @@
6565
end
6666
end
6767

68-
within_files Synvert::ALL_RUBY_FILES do
68+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
6969
# File.exists?(Rails.root.join('config/database.yml'))
7070
# =>
7171
# Rails.root.join('config/database.yml').exist?

lib/rails/convert_update_attributes_to_update.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
if_gem 'activerecord', '>= 6.0'
2323

24-
within_files Synvert::ALL_RUBY_FILES do
24+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2525
# user.update_attributes(title: 'new')
2626
# =>
2727
# user.update(title: 'new')

lib/rails/deprecate_errors_as_hash.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
if_gem 'activemodel', '>= 6.1'
2525

26-
within_files Synvert::ALL_RUBY_FILES do
26+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2727
with_node node_type: 'send',
2828
receiver: {
2929
node_type: 'send',

lib/rails/fix_4_0_deprecations.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
if_gem 'rails', '>= 4.0'
3939

40-
within_files Synvert::ALL_RUBY_FILES do
40+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
4141
{
4242
'ActiveRecord::Fixtures' => 'ActiveRecord::FixtureSet',
4343
'ActiveRecord::TestCase' => 'ActiveSupport::TestCase',

lib/rails/prefer_nor_conditions.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if_gem 'rails', '>= 6.0'
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
find_node '.send[receiver=.send[message=where][arguments.size=0]][message=not][arguments.size=1][arguments.0=.hash[pairs.length>1]]' do
2424
new_source = node.arguments[0].pairs.map { |pair| "where.not(#{pair.to_source})" }
2525
.join('.')

lib/rails/upgrade_4_0_to_4_1.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
add_file 'config/initializers/cookies_serializer.rb',
5252
'Rails.application.config.action_dispatch.cookies_serializer = :json'
5353

54-
within_files Synvert::ALL_RUBY_FILES do
54+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
5555
# MultiJson.dump(obj) => obj.to_json
5656
with_node node_type: 'send', receiver: 'MultiJson', message: 'dump' do
5757
replace_with '{{arguments}}.to_json'
@@ -63,7 +63,7 @@
6363
end
6464
end
6565

66-
within_files Synvert::ALL_RUBY_FILES do
66+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
6767
[/before_/, /after_/].each do |message_regex|
6868
# Warn if finding return in before_* or after_* callbacks
6969
within_node node_type: 'block', caller: { node_type: 'send', message: message_regex } do

lib/rails/upgrade_4_2_to_5_0.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
end
7777
end
7878

79-
within_files Synvert::ALL_RUBY_FILES do
79+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
8080
# MissingSourceFile
8181
# =>
8282
# LoadError

lib/rails/upgrade_5_0_to_5_1.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
call_helper 'rails/set_load_defaults', rails_version: '5.1'
2020

21-
within_files Synvert::ALL_RUBY_FILES do
21+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2222
# HashWithIndifferentAccess
2323
# =>
2424
# ActiveSupport::HashWithIndifferentAccess

lib/ruby/block_to_yield.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def slow
2121
```
2222
EOS
2323

24-
within_files Synvert::ALL_RUBY_FILES do
24+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2525
# def slow(&block)
2626
# block.call
2727
# end

lib/ruby/deprecate_big_decimal_new.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```
1818
EOS
1919

20-
within_files Synvert::ALL_RUBY_FILES do
20+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2121
find_node '.send[receiver=BigDecimal][message=new]' do
2222
delete :dot, :message
2323
end

lib/ruby/frozen_string_literal_comment.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
```
2020
EOS
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
find_node ":not_has(> .Comment[value='# frozen_string_literal: true'])" do
2424
insert "# frozen_string_literal: true\n\n", at: 'beginning'
2525
end

lib/ruby/gsub_to_tr.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```
1818
EOS
1919

20-
within_files Synvert::ALL_RUBY_FILES do
20+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2121
# 'slug from title'.gsub(' ', '_')
2222
# =>
2323
# 'slug from title'.tr(' ', '_')

lib/ruby/hash_short_syntax.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if_ruby '3.1.0'
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
# {a: a} => {a:}
2424
find_node '.hash > .pair[key="{{value}}"]' do
2525
replace_with '{{key}}:'

lib/ruby/kernel_open_to_uri_open.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```
1818
EOS
1919

20-
within_files Synvert::ALL_RUBY_FILES do
20+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2121
# open('http://test.com')
2222
# =>
2323
# URI.open('http://test.com')

lib/ruby/keys_each_to_each_key.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```
1818
EOS
1919

20-
within_files Synvert::ALL_RUBY_FILES do
20+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2121
# params.keys.each {}
2222
# =>
2323
# params.each_key {}

lib/ruby/map_and_flatten_to_flat_map.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
```
2222
EOS
2323

24-
within_files Synvert::ALL_RUBY_FILES do
24+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2525
# enum.map do
2626
# # do something
2727
# end.flatten

lib/ruby/merge_to_square_brackets.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
}.join(splitter)
5757
end
5858

59-
within_files Synvert::ALL_RUBY_FILES do
59+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
6060
# enum.inject({}) do |h, e|
6161
# h.merge(e => e)
6262
# end
@@ -103,7 +103,7 @@
103103
end
104104
end
105105

106-
within_files Synvert::ALL_RUBY_FILES do
106+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
107107
# hash.merge!(e => e)
108108
# =>
109109
# hash[e] = e

lib/ruby/nested_class_definition.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test; end
2828
original_names = []
2929

3030
# round one
31-
within_files Synvert::ALL_RUBY_FILES do
31+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
3232
# class Foo::Bar < Base
3333
# def test; end
3434
# end
@@ -47,7 +47,7 @@ def test; end
4747
end
4848

4949
# round two
50-
within_files Synvert::ALL_RUBY_FILES do
50+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
5151
# class Foo:Bar < Base
5252
# end
5353
# =>

lib/ruby/new_1_9_hash_syntax.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if_ruby '1.9.0'
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
# {:foo => 'bar'} => {foo: 'bar'}
2424
find_node %q{.hash > .pair[key=.sym][key=~/\A:([^'"]+)\z/]} do
2525
new_key = node.key.to_source[1..-1]

lib/ruby/new_2_2_hash_syntax.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
if_ruby '2.2.0'
2727

28-
within_files Synvert::ALL_RUBY_FILES do
28+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2929
# {:foo => 'bar'} => {foo: 'bar'}
3030
# {:'foo-x' => 'bar'} => {'foo-x': 'bar'}
3131
# {:"foo-#{suffix}" 'bar'} => {"foo-#{suffix}": 'bar'}

lib/ruby/new_lambda_syntax.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
if_ruby '1.9.0'
2323

24-
within_files Synvert::ALL_RUBY_FILES do
24+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2525
# lambda { test } => -> { test }
2626
find_node '.block[caller=.send[receiver=nil][message=lambda]][arguments.size=0]' do
2727
replace_with '-> { {{body}} }'

lib/ruby/new_safe_navigation_operator.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if_ruby '2.3.0'
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
# u.try!(:profile).try!(:thumbnails).try!(:large, 100, format: 'jpg')
2424
# u.try(:profile).try(:thumbnails).try(:large, 100, format: 'jpg')
2525
# =>

lib/ruby/numbered_parameters.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
if_ruby '2.7'
2525

26-
within_files Synvert::ALL_RUBY_FILES do
26+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2727
find_node '.block[arguments.size > 0]' do
2828
node.arguments.each_with_index do |argument, index|
2929
find_node ".lvar[name=#{argument.name}]" do

lib/ruby/parallel_assignment_to_sequential_assignment.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
```
1919
EOS
2020

21-
within_files Synvert::ALL_RUBY_FILES do
21+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2222
# a, b = 1, 2
2323
# =>
2424
# a = 1

lib/ruby/prefer_dig.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```
1818
EOS
1919

20-
within_files Synvert::ALL_RUBY_FILES do
20+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2121
find_node '.and[right_value=.send[message=[]][arguments.size=1]]' do
2222
writeable_node = node.dup
2323
param_names = []

lib/ruby/prefer_nil.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
```
2222
EOS
2323

24-
within_files Synvert::ALL_RUBY_FILES do
24+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2525
find_node '.send[message=!=][arguments.size=1][arguments.0=nil]' do
2626
replace_with '!{{receiver}}.nil?'
2727
end

lib/ruby/remove_debug_code.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
It removes `puts` and `p` calls.
88
EOS
99

10-
within_files Synvert::ALL_RUBY_FILES do
10+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
1111
# removes puts and p methods
1212
find_node '.send[receiver=nil][message IN (puts p)]' do
1313
remove

lib/ruby/use_symbol_to_proc.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
```
2020
EOS
2121

22-
within_files Synvert::ALL_RUBY_FILES do
22+
within_files Synvert::ALL_RUBY_FILES + Synvert::ALL_RAKE_FILES do
2323
# (1..100).each { |i| i.to_s }
2424
# =>
2525
# (1..100).each(&:to_s)

0 commit comments

Comments
 (0)