codeclimate 0.85.27 → 0.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e09ed17ce9ec4365cae365db7bba58fe24249134eb4ceeb27c06f303a5bf9f5
-  data.tar.gz: b263fb932ae6baca90405bc6b3b073c925571816a9803fe024858389397e9fb9
+  metadata.gz: ff82fca07cdf87fc66cd1f5999de48ca7361160a82de553ba9d08c4b50cf84d9
+  data.tar.gz: 2232adc3deb9897164a58e91e1228ec8d39c29a36eb66e393ec03d783ffe28a6
 SHA512:
-  metadata.gz: e62725c2f9b8733053d406db3f8abfd77217b5bf800a78bb3e09966f18e05435a931a17d73ca4f10d79fd10da02477dbf0a7b5993af4d9c393fdc02c6d8249e4
-  data.tar.gz: 2e1903aeabc18f07f11c461f0d35c0857eaad4909bdd77d5c794e2e9e29415417069a247d9692619a47381ef7ffff7f3d4bd7fb5bac4f3c11e62c63983112101
+  metadata.gz: 2095d9f29f26838ac72b91c433b306e93bef66185427eacf100c995619941c012c77d5623f136f651705c3e25ddf0a420a729bacd36d2b7423fce2d5588dd058
+  data.tar.gz: e80478964ff1133009fa0cecb81c127cb2c430381b5c77442acfeb33b87f445592d024143a4895932e745a33a23e62f55db8042110519ee5539a814c7725c104

data/config/engines.yml

@@ -81,6 +81,7 @@ eslint:
     eslint-5: codeclimate/codeclimate-eslint:eslint-5
     eslint-6: codeclimate/codeclimate-eslint:eslint-6
     eslint-7: codeclimate/codeclimate-eslint:eslint-7
+    eslint-8: codeclimate/codeclimate-eslint:eslint-8
   description: A JavaScript/JSX linting utility.
 flog:
   channels:

data/lib/cc/analyzer/container.rb

@@ -1,5 +1,5 @@
-require "posix/spawn"
 require "cc/analyzer/container/result"
+require "open3"
 
 module CC
   module Analyzer
@@ -52,19 +52,14 @@ module CC
 
         command = docker_run_command(options)
         Analyzer.logger.debug("docker run: #{command.inspect}")
-        pid, _, out, err = POSIX::Spawn.popen4(*command)
+        _, out, err, @t_wait = Open3.popen3(*command)
 
         @t_out = read_stdout(out)
         @t_err = read_stderr(err)
         t_timeout = timeout_thread
 
-        # blocks until the engine stops. this is put in a thread so that we can
-        # explicitly abort it as part of #stop. otherwise a run-away container
-        # could still block here forever if the docker-kill/wait is not
-        # successful. there may still be stdout in flight if it was being
-        # produced more quickly than consumed.
-        @t_wait = Thread.new { _, @status = Process.waitpid2(pid) }
-        @t_wait.join
+        # Calling @t_wait.value waits the termination of the process / engine
+        @status = @t_wait.value
 
         # blocks until all readers are done. they're still governed by the
         # timeout thread at this point. if we hit the timeout while processing
@@ -97,6 +92,9 @@ module CC
       def stop(message = nil)
         reap_running_container(message)
         kill_reader_threads
+        # Manually killing the process otherwise a run-away container
+        # could still block here forever if the docker-kill/wait is not
+        # successful
         kill_wait_thread
       end
 
@@ -178,9 +176,11 @@ module CC
 
       def reap_running_container(message)
         Analyzer.logger.warn("killing container name=#{@name} message=#{message.inspect}")
-        POSIX::Spawn::Child.new("docker", "kill", @name, timeout: 2.minutes)
-        POSIX::Spawn::Child.new("docker", "wait", @name, timeout: 2.minutes)
-      rescue POSIX::Spawn::TimeoutExceeded
+        Timeout.timeout(2.minutes.to_i) do
+          Kernel.system("docker", "kill", @name, [:out, :err] => File::NULL)
+          Kernel.system("docker", "wait", @name, [:out, :err] => File::NULL)
+        end
+      rescue Timeout::Error
         Analyzer.logger.error("unable to kill container name=#{@name} message=#{message.inspect}")
         Analyzer.statsd.increment("container.zombie")
         Analyzer.statsd.increment("container.zombie.#{metric_name}") if metric_name

data/lib/cc/cli/file_store.rb

@@ -31,7 +31,7 @@ module CC
         @data =
           if File.exist? self.class::FILE_NAME
             File.open(self.class::FILE_NAME, "r:bom|utf-8") do |f|
-              YAML.safe_load(f, [Time], [], false, self.class::FILE_NAME) || {}
+              YAML.safe_load(f, permitted_classes: [Time], permitted_symbols: [], aliases: false, filename: self.class::FILE_NAME)  || {}
             end
           else
             {}

data/lib/cc/cli/prepare.rb

@@ -26,6 +26,7 @@ module CC
         IPAddr.new("fd00::/8"),
         IPAddr.new("127.0.0.1"),
         IPAddr.new("0:0:0:0:0:0:0:1"),
+        IPAddr.new("169.254.0.0/16"),
       ].freeze
 
       def run

data/lib/cc/config/prepare.rb

@@ -34,6 +34,10 @@ module CC
           entries.each(&block)
         end
 
+        def paths
+          entries.map(&:path)
+        end
+
         def merge(other)
           Fetch.new(each.to_a | other.each.to_a)
         end

data/lib/cc/config.rb

@@ -40,10 +40,12 @@ module CC
     end
 
     def self.build(data)
+      prepare = Prepare.from_data(data["prepare"])
+      base_excluded_patterns = data.fetch("exclude_patterns", DefaultAdapter::EXCLUDE_PATTERNS)
       new(
         engines: EngineSet.new(data.fetch("plugins", {})).engines,
-        exclude_patterns: data.fetch("exclude_patterns", DefaultAdapter::EXCLUDE_PATTERNS),
-        prepare: Prepare.from_data(data["prepare"]),
+        exclude_patterns: base_excluded_patterns + prepare.fetch.paths,
+        prepare: prepare,
       )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.85.27
+  version: 0.86.0
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,40 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: posix-spawn
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -96,22 +70,22 @@ dependencies:
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -256,16 +230,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.6'
+  - - "<="
+    - !ruby/object:Gem::Version
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Code Climate CLI