Skip to content

Commit afca7ff

Browse files
Bump ameba and fix violations
1 parent 8728f5f commit afca7ff

16 files changed

+31
-22
lines changed

shard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ scripts:
1818
development_dependencies:
1919
ameba:
2020
github: veelenga/ameba
21-
version: 1.2.0
21+
version: 1.6.1

spec/fake_file.cr

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
class FakeFile
23
@@files_deleted = [] of String
34
@@tempfiles_created = [] of String

spec/fake_generator.cr

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
require "../src/crytic/generator/generator"
23
require "../src/crytic/mutation/mutation"
34

spec/fake_http_client.cr

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
require "../src/crytic/reporter/http_client"
23
require "http/server/response"
34

spec/fake_mutation.cr

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
require "../src/crytic/mutant/bool_literal_flip"
23
require "../src/crytic/mutation/mutation"
34
require "../src/crytic/mutation/result"

spec/fake_process_runner.cr

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
require "../src/crytic/process_runner"
23

34
module Crytic
@@ -10,7 +11,7 @@ module Crytic
1011
@output_io = IO::Memory.new
1112

1213
def cmd_with_args
13-
@cmd.zip(@args).map { |c, a| "#{c} #{a}".strip }
14+
@cmd.zip(@args).map { |cmd, args| "#{cmd} #{args}".strip }
1415
end
1516

1617
def run(cmd : String, args : Array(String), output, error)

spec/generator/empty_source_file.cr

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# ameba:disable Lint/SpecFilename
+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ameba:disable Lint/SpecFilename
12
def foo
23
1
34
end

spec/runner/sequential_spec.cr

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private class FakeRun
5454
property mutations = [] of Crytic::Mutation::Mutation
5555
property events = [] of String
5656
property original_exit_code = 0
57-
property final_result = true
57+
property? final_result = true
5858
property neutral = FakeMutation.new.as(Crytic::Mutation::Mutation)
5959

6060
def generate_mutations
@@ -70,7 +70,7 @@ private class FakeRun
7070
end
7171

7272
def report_final(results)
73-
final_result
73+
final_result?
7474
end
7575

7676
def execute_original_test_suite(side_effects)

src/crytic/diff.cr

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module Crytic
4646
data.map(&.colorize(append? ? :green : :red).to_s)
4747
end
4848

49-
def is_last_chunk?(a_size, b_size)
49+
def last_chunk?(a_size, b_size)
5050
delete? ? range_a.end == a_size : range_b.end == b_size
5151
end
5252
end
@@ -199,7 +199,7 @@ module Crytic
199199

200200
add_with_prefix cur.prefix, cur.colored_data, group
201201

202-
if !group.last.ends_with?(newline) && cur.is_last_chunk?(a.size, b.size)
202+
if !group.last.ends_with?(newline) && cur.last_chunk?(a.size, b.size)
203203
group[-1] += newline
204204
group.push "\\ No newline at end of file#{newline}"
205205
end

src/crytic/mutant/full_location.cr

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ module Crytic::Mutant
1313
def matches?(node : Crystal::And | Crystal::Or)
1414
node_location = node.location
1515
return false if node_location.nil?
16-
return is_same(node_location, location) if name_location.nil?
16+
return same?(node_location, location) if name_location.nil?
1717

18-
is_same(node_location, location) && is_same(node.end_location, name_location)
18+
same?(node_location, location) && same?(node.end_location, name_location)
1919
end
2020

2121
def matches?(node : Crystal::ASTNode)
2222
node_location = node.location
2323
return false if node_location.nil?
24-
return is_same(node_location, location) if name_location.nil?
24+
return same?(node_location, location) if name_location.nil?
2525

26-
is_same(node_location, location) && is_same(node.name_location, name_location)
26+
same?(node_location, location) && same?(node.name_location, name_location)
2727
end
2828

29-
private def is_same(location : Crystal::Location, other : Crystal::Location) : Bool
29+
private def same?(location : Crystal::Location, other : Crystal::Location) : Bool
3030
location.line_number == other.line_number && location.column_number == other.column_number
3131
end
3232

33-
private def is_same(location : Nil, other : Nil) : Bool
33+
private def same?(location : Nil, other : Nil) : Bool
3434
false
3535
end
3636

37-
private def is_same(location : Crystal::Location, other : Nil) : Bool
37+
private def same?(location : Crystal::Location, other : Nil) : Bool
3838
false
3939
end
4040

41-
private def is_same(location : Nil, other : Crystal::Location) : Bool
41+
private def same?(location : Nil, other : Crystal::Location) : Bool
4242
false
4343
end
4444
end

src/crytic/mutant/number_literal_sign_flip_possibilities.cr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Crytic::Mutant
44
class NumberLiteralSignFlipPossibilities < Possibilities
55
def visit(node : Crystal::NumberLiteral)
66
return true if node.value == "0"
7-
return true if is_unsigned_type(node)
7+
return true if unsigned_type?(node)
88

99
location = node.location
1010
unless location.nil?
@@ -13,7 +13,7 @@ module Crytic::Mutant
1313
true
1414
end
1515

16-
private def is_unsigned_type(node)
16+
private def unsigned_type?(node)
1717
node.kind.to_s.starts_with?("u")
1818
end
1919
end

src/crytic/mutation/inject_mutated_subject_into_specs.cr

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ module Crytic::Mutation
3333

3434
@enriched_source = unfold_required(astree.to_s)
3535
else
36-
@enriched_source.not_nil!
36+
# force unwrapping is fine here, we're in the else
37+
# branch of having done the nil check
38+
@enriched_source.not_nil! # ameba:disable Lint/NotNil
3739
end
3840
end
3941

src/crytic/mutation/require_resolver.cr

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Crytic::Mutation
99
recursive = filename.ends_with?("/**")
1010

1111
if filename.ends_with?("/*") || recursive
12-
filename_dir_index = filename.rindex('/').not_nil!
12+
filename_dir_index = filename.rindex!('/')
1313
filename_dir = filename[0..filename_dir_index]
1414
relative_dir = "#{relative_to}/#{filename_dir}"
1515

src/crytic/mutation/result_set.cr

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module Crytic::Mutation
2626
end
2727

2828
def longest_mutated_filename_length
29-
@results.map(&.mutated_file.size).max? || 0
29+
@results.max_of?(&.mutated_file.size) || 0
3030
end
3131
end
3232
end

src/crytic/mutation/tracker.cr

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ module Crytic::Mutation
2525
relative_path_to_project(File.expand_path(file.path, "."))
2626
end
2727

28-
def parse_file_at_path(file)
28+
def parse_file_at_path(file, &)
2929
file = relative_path_to_project(file)
30-
unless is_already_tracked?(file)
30+
unless already_tracked?(file)
3131
tracked_filepaths.add(file)
3232
yield
3333
end
3434
end
3535

36-
private def is_already_tracked?(file)
36+
private def already_tracked?(file)
3737
tracked_filepaths.includes?(file)
3838
end
3939

0 commit comments

Comments
 (0)