Skip to content

Commit 70bde22

Browse files
zenspiderdblandin
authored andcommitted
Remove .ruby-version. (#174)
* This isn't necessary... Removing. Everything is in a docker container and running on 2.3 anyways. * Update rubocop config - Pull in remote styleguide configuration - Sets target ruby version to 2.3 * Fix CC issues
1 parent 31bdf0a commit 70bde22

36 files changed

+107
-194
lines changed

.codeclimate.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
---
2+
prepare:
3+
fetch:
4+
- url: https://raw.githubusercontent.com/codeclimate/styleguide/master/ruby/rubocop.yml
5+
path: base_rubocop.yml
26
engines:
37
rubocop:
48
enabled: true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
base_rubocop.yml
12
node_modules

.rubocop.yml

+3-151
Original file line numberDiff line numberDiff line change
@@ -1,152 +1,4 @@
1-
################################################################################
2-
# Metrics
3-
################################################################################
1+
inherit_from: base_rubocop.yml
42

5-
Metrics/LineLength:
6-
Enabled: false
7-
8-
Metrics/AbcSize:
9-
Enabled: false
10-
11-
################################################################################
12-
# Style
13-
################################################################################
14-
15-
# Executables are conventionally named bin/foo-bar
16-
Style/FileName:
17-
Exclude:
18-
- bin/**/*
19-
20-
# We don't (currently) document our code
21-
Style/Documentation:
22-
Enabled: false
23-
24-
# Always use double-quotes to keep things simple
25-
Style/StringLiterals:
26-
EnforcedStyle: double_quotes
27-
28-
Style/StringLiteralsInInterpolation:
29-
EnforcedStyle: double_quotes
30-
31-
# Use a trailing comma to keep diffs clean when elements are inserted or removed
32-
Style/TrailingCommaInArguments:
33-
EnforcedStyleForMultiline: comma
34-
35-
Style/TrailingCommaInLiteral:
36-
EnforcedStyleForMultiline: comma
37-
38-
# We avoid GuardClause because it can result in "suprise return"
39-
Style/GuardClause:
40-
Enabled: false
41-
42-
# We avoid IfUnlessModifier because it can result in "suprise if"
43-
Style/IfUnlessModifier:
44-
Enabled: false
45-
46-
# We don't care about the fail/raise distinction
47-
Style/SignalException:
48-
EnforcedStyle: only_raise
49-
50-
Style/DotPosition:
51-
EnforcedStyle: trailing
52-
53-
# Common globals we allow
54-
Style/GlobalVars:
55-
AllowedVariables:
56-
- "$statsd"
57-
- "$mongo"
58-
- "$rollout"
59-
60-
# Using english names requires loading an extra module, which is annoying, so
61-
# we prefer the perl names for consistency.
62-
Style/SpecialGlobalVars:
63-
EnforcedStyle: use_perl_names
64-
65-
# We have common cases where has_ and have_ make sense
66-
Style/PredicateName:
67-
Enabled: true
68-
NamePrefixBlacklist:
69-
- is_
70-
71-
# We use %w[ ], not %w( ) because the former looks like an array
72-
Style/PercentLiteralDelimiters:
73-
PreferredDelimiters:
74-
"%i": "[]"
75-
"%I": "[]"
76-
"%w": "[]"
77-
"%W": "[]"
78-
79-
# Allow "trivial" accessors when defined as a predicate? method
80-
Style/TrivialAccessors:
81-
AllowPredicates: true
82-
83-
Style/Next:
84-
Enabled: false
85-
86-
# We think it's OK to use the "extend self" module pattern
87-
Style/ModuleFunction:
88-
Enabled: false
89-
90-
# Disallow extra spacing for token alignment
91-
Style/ExtraSpacing:
92-
AllowForAlignment: false
93-
94-
# and/or in conditionals has no meaningful difference (only gotchas), so we
95-
# disallow them there. When used for control flow, the difference in precedence
96-
# can make for a less noisy expression, as in:
97-
#
98-
# x = find_x or raise XNotFound
99-
#
100-
Style/AndOr:
101-
EnforcedStyle: conditionals
102-
103-
Style/AlignParameters:
104-
EnforcedStyle: with_fixed_indentation
105-
106-
Style/MultilineOperationIndentation:
107-
EnforcedStyle: indented
108-
109-
Style/AlignHash:
110-
EnforcedLastArgumentHashStyle: ignore_implicit
111-
112-
# This has the behavior we want, but it has a bug in it which produces a lot of false positives
113-
# https://github.com/bbatsov/rubocop/issues/3462
114-
# MultilineMethodCallBraceLayout:
115-
# EnforcedStyle: new_line
116-
117-
################################################################################
118-
# Performance
119-
################################################################################
120-
121-
Performance/RedundantMerge:
122-
Enabled: false
123-
124-
################################################################################
125-
# Rails - disable things because we're primarily non-rails
126-
################################################################################
127-
128-
Rails/Delegate:
129-
Enabled: false
130-
131-
Rails/TimeZone:
132-
Enabled: false
133-
134-
################################################################################
135-
# Specs - be more lenient on length checks and block styles
136-
################################################################################
137-
138-
Metrics/ModuleLength:
139-
Exclude:
140-
- spec/**/*
141-
142-
Metrics/MethodLength:
143-
Exclude:
144-
- spec/**/*
145-
146-
Style/ClassAndModuleChildren:
147-
Exclude:
148-
- spec/**/*
149-
150-
Style/BlockDelimiters:
151-
Exclude:
152-
- spec/**/*
3+
AllCops:
4+
TargetRubyVersion: 2.3

.ruby-version

-1
This file was deleted.

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# frozen_string_literal: true
12
source "https://rubygems.org"
23

34
gem "concurrent-ruby", "~> 1.0.0"

Rakefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
# frozen_string_literal: true
12
begin
2-
require 'rspec/core/rake_task'
3+
require "rspec/core/rake_task"
34
RSpec::Core::RakeTask.new(:spec)
45

5-
task :default => :spec
6+
task default: :spec
67
rescue LoadError
78
end

bin/duplication

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/usr/bin/env ruby
2+
# frozen_string_literal: true
23

34
$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "../lib")))
45
require "cc/engine/duplication"
56

6-
if File.exists?("/config.json")
7-
engine_config = JSON.parse(File.read("/config.json"))
8-
else
9-
engine_config = {}
10-
end
7+
engine_config =
8+
if File.exist?("/config.json")
9+
JSON.parse(File.read("/config.json"))
10+
else
11+
{}
12+
end
1113

1214
directory = ARGV[0] || "/code"
1315

lib/cc/engine/analyzers/analyzer_base.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "cc/engine/analyzers/parser_error"
24
require "cc/engine/analyzers/parser_base"
35

@@ -67,8 +69,8 @@ def points_per_overage
6769
self.class::POINTS_PER_OVERAGE
6870
end
6971

70-
def process_file(path)
71-
raise NoMethodError.new("Subclass must implement `process_file`")
72+
def process_file(_path)
73+
raise NoMethodError, "Subclass must implement `process_file`"
7274
end
7375

7476
def file_list

lib/cc/engine/analyzers/command_line_runner.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "open3"
24
require "timeout"
35

@@ -52,4 +54,3 @@ def success?
5254
end
5355
end
5456
end
55-

lib/cc/engine/analyzers/engine_config.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module CC
24
module Engine
35
module Analyzers
@@ -45,8 +47,8 @@ def count_threshold_for(language)
4547

4648
def fetch_language(language)
4749
language = config.
48-
fetch("languages", {}).
49-
fetch(language, {})
50+
fetch("languages", {}).
51+
fetch(language, {})
5052

5153
if language.is_a? Hash
5254
language

lib/cc/engine/analyzers/file_list.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "pathname"
24

35
module CC

lib/cc/engine/analyzers/file_thread_pool.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "thread"
24

35
module CC
@@ -12,7 +14,7 @@ def initialize(files, concurrency: DEFAULT_CONCURRENCY)
1214
@concurrency = concurrency
1315
end
1416

15-
def run(&block)
17+
def run
1618
queue = build_queue
1719
lock = Mutex.new
1820

@@ -46,7 +48,7 @@ def build_queue
4648
end
4749

4850
def thread_count
49-
if (1..MAX_CONCURRENCY) === concurrency
51+
if (1..MAX_CONCURRENCY).cover?(concurrency)
5052
concurrency
5153
elsif concurrency < 1
5254
DEFAULT_CONCURRENCY

lib/cc/engine/analyzers/javascript/main.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "cc/engine/analyzers/analyzer_base"
24
require "cc/engine/analyzers/javascript/parser"
35
require "cc/engine/analyzers/javascript/minification_checker"

lib/cc/engine/analyzers/javascript/minification_checker.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module CC
24
module Engine
35
module Analyzers

lib/cc/engine/analyzers/javascript/node.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
require 'cc/engine/analyzers/node'
1+
# frozen_string_literal: true
2+
3+
require "cc/engine/analyzers/node"
24

35
module CC
46
module Engine
57
module Analyzers
68
module Javascript
79
class Node < CC::Engine::Analyzers::Node
8-
SCRUB_PROPERTIES = %w[type start end]
10+
SCRUB_PROPERTIES = %w[type start end].freeze
911

1012
private
1113

lib/cc/engine/analyzers/javascript/parser.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "cc/engine/analyzers/command_line_runner"
24

35
module CC
@@ -24,12 +26,12 @@ def parse
2426
private
2527

2628
def js_command
27-
file = File.expand_path(File.dirname(__FILE__)) + '/parser.js'
29+
file = File.expand_path(File.dirname(__FILE__)) + "/parser.js"
2830
"node #{file}"
2931
end
3032

3133
def strip_shebang(code)
32-
if code.start_with?('#!')
34+
if code.start_with?("#!")
3335
code.lines.drop(1).join
3436
else
3537
code

lib/cc/engine/analyzers/node.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
# frozen_string_literal: true
2+
13
module CC
24
module Engine
35
module Analyzers
46
class Node
5-
SCRUB_PROPERTIES = []
7+
SCRUB_PROPERTIES = [].freeze
68

79
def initialize(node, file, default_line = 0)
810
@node = node
@@ -42,7 +44,7 @@ def properties_to_sexps
4244
valid_properties.map do |key, value|
4345
if value.is_a?(Array)
4446
create_sexp(key.to_sym, *self.class.new(value, @file, @line).format)
45-
elsif value.is_a?(Hash)
47+
elsif value.is_a?(Hash)
4648
create_sexp(key.to_sym, self.class.new(value, @file, @line).format)
4749
else
4850
value.to_s.to_sym

lib/cc/engine/analyzers/parser_base.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module CC
24
module Engine
35
module Analyzers

lib/cc/engine/analyzers/parser_error.rb

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module CC
24
module Engine
35
module Analyzers

lib/cc/engine/analyzers/php/ast.rb

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
require 'cc/engine/analyzers/php/nodes'
1+
# frozen_string_literal: true
2+
3+
require "cc/engine/analyzers/php/nodes"
24

35
module CC
46
module Engine
@@ -24,8 +26,8 @@ def self.json_to_ast(ast, filename)
2426
}
2527
if (node_type = ast.delete("nodeType"))
2628
node_attrs[:node_type] = node_type.
27-
sub(prefix_re, '').
28-
sub(suffix_re, '')
29+
sub(prefix_re, "").
30+
sub(suffix_re, "")
2931
end
3032
ast.each do |key, value|
3133
unless key == "nodeAttributes"

0 commit comments

Comments
 (0)