Skip to content

Revert codeclimate-parser, dependency bumps #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Revert "Upgrade to latest versions of flay and sexp_processor (#383
…)"

This reverts commit fcdaf4a.
larkinscott committed Mar 19, 2024
commit cae5e6c5a35dd02e169bc267caa23e8b173b2827
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
source "https://rubygems.org"

gem "concurrent-ruby", "~> 1.0.0"
gem "flay", "~> 2.13.1"
gem "sexp_processor", "~> 4.17"
gem "flay", "~> 2.12"
gem "sexp_processor", "~> 4.11"

gem "codeclimate-parser-client",
path: "/home/app/codeclimate-parser-client"
60 changes: 31 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -8,51 +8,53 @@ PATH
GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
coderay (1.1.3)
concurrent-ruby (1.0.5)
diff-lcs (1.5.0)
erubi (1.12.0)
ast (2.3.0)
coderay (1.1.0)
concurrent-ruby (1.0.0)
diff-lcs (1.2.5)
erubis (2.7.0)
excon (0.99.0)
flay (2.13.1)
erubi (~> 1.10)
flay (2.12.0)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
method_source (1.0.0)
path_expander (1.1.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
rake (13.1.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
method_source (0.8.2)
path_expander (1.0.3)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rake (10.4.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.1)
ruby_parser (3.20.3)
sexp_processor (~> 4.16)
sexp_processor (4.17.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
ruby_parser (3.11.0)
sexp_processor (~> 4.9)
sexp_processor (4.11.0)
slop (3.6.0)

PLATFORMS
ruby

DEPENDENCIES
codeclimate-parser-client!
concurrent-ruby (~> 1.0.0)
flay (~> 2.13.1)
flay (~> 2.12)
pry
rake
rspec
sexp_processor (~> 4.17)
sexp_processor (~> 4.11)

BUNDLED WITH
2.4.22
46 changes: 0 additions & 46 deletions lib/cc/engine/analyzers/analyzer_base.rb
Original file line number Diff line number Diff line change
@@ -1,51 +1,5 @@
# frozen_string_literal: true

# Monkey patch for Parser class
# used in language analyzers via Sexp::Matcher.parse
# https://github.com/seattlerb/sexp_processor/blob/master/lib/sexp_matcher.rb
class Sexp
class Matcher < Sexp
class Parser
def parse_sexp
token = next_token

case token
when "(" then
parse_list
when "[" then
parse_cmd
when "nil" then
nil
when /^\d+$/ then
token.to_i
when "___" then
Sexp.___
when "_" then
Sexp._
when %r%^/(.*)/$% then
re = $1
raise SyntaxError, "Not allowed: /%p/" % [re] unless
re =~ /\A([\w()|.*+^$]+)\z/
Regexp.new re
when /^"(.*)"$/ then
$1
when /^([A-Z]\w*)$/ then
if Object.const_defined?($1)
Object.const_get $1
else
# Handle as a symbol or string
$1.to_sym # or return $1 as a string
end
when /^:?([\w?!=~-]+)$/ then
$1.to_sym
else
raise SyntaxError, "unhandled token: %p" % [token]
end
end
end
end
end

require "cc/engine/analyzers/parser_error"
require "cc/engine/analyzers/parser_base"
require "cc/engine/analyzers/file_list"
4 changes: 2 additions & 2 deletions spec/cc/engine/analyzers/ruby/main_spec.rb
Original file line number Diff line number Diff line change
@@ -61,10 +61,10 @@ def self.from_remediation_amount(amount)

expect(json["location"]).to eq({
"path" => "foo.rb",
"lines" => { "begin" => 2, "end" => 11 },
"lines" => { "begin" => 2, "end" => 12 },
})
expect(json["other_locations"]).to eq([
{"path" => "foo.rb", "lines" => { "begin" => 18, "end" => 27} },
{"path" => "foo.rb", "lines" => { "begin" => 18, "end" => 28} },
])
end

4 changes: 2 additions & 2 deletions spec/cc/engine/analyzers/sexp_lines_spec.rb
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ module CC::Engine::Analyzers

expect(locations.count).to eq 2
expect(locations[0].begin_line).to eq(3)
expect(locations[0].end_line).to eq(4)
expect(locations[0].end_line).to eq(7)
expect(locations[1].begin_line).to eq(5)
expect(locations[1].end_line).to eq(6)
expect(locations[1].end_line).to eq(7)
end

it "gets appropriate locations for hashes" do