codeclimate 0.14.6 → 0.14.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b77427581b32cd6729aa4d13a1770b644960597c
-  data.tar.gz: 7bdb62420b891564207ec621ae7bc51ffc5ccbf6
+  metadata.gz: 8680877759cb9d64b775677c48ef5ec45abdf3ac
+  data.tar.gz: 9857356e8ec12071e973337f505b98964321d585
 SHA512:
-  metadata.gz: 786921be51e12ea7af81d38d0e98662e3ff80297babf1a92b303eb64d33db5c4c526908cb8880927736373db15e284059f303ee8f1b775e82fba76858e53c6c5
-  data.tar.gz: e06d71da3ccd7e9070c6519f10717f6edc1f4b0fa68beee855254a4d317c0a3c59f76f8c3354d2844736a8b1441f22692573b7bf6126373707ec05164bc9040c
+  metadata.gz: 15e9c529f7fd7d656d93cc7580564ad5fb36016868292e773c260b6e53eb06a704998c867c5cc8cc378a7e5e3abaee86379aa0e729b93bbef78cb41bead356aa
+  data.tar.gz: 636f04b117fbd5b3951fa2409bb80fc75c99b70fbac75836c55ed79856236fec7ed976a59214b537287edca3ba56d311168060a1eef1861bddf11fc3dd826d9c

data/bin/prep-release

@@ -34,12 +34,15 @@ git commit -m "Release v$version"
 git push origin $branch
 
 compare_link="https://github.com/codeclimate/codeclimate/compare/${old_version}...$(git rev-parse --short $branch)"
+pr_description_file=$(mktemp -t cc_commit_message) || exit 1
+printf "Release v$version\n\n$s\n" "$compare_link" > "$pr_description_file"
 if command -v hub > /dev/null 2>&1; then
-  hub pull-request -m "Release v$version\n\n$compare_link"
+  hub pull-request -F "$pr_description_file"
 elif command -v gh > /dev/null 2>&1; then
-  gh pull-request -m "Release v$version\n\n$compare_link"
+  gh pull-request -F "$pr_description_file"
 else
   echo "hub not installed? Please open the PR manually" >&2
 fi
+rm "$commit_message_file"
 
 echo "After merging the version-bump PR, run bin/release"

data/lib/cc/analyzer/container.rb

@@ -50,17 +50,24 @@ module CC
 
         pid, _, out, err = POSIX::Spawn.popen4(*docker_run_command(options))
 
-        t_out = read_stdout(out)
-        t_err = read_stderr(err)
+        @t_out = read_stdout(out)
+        @t_err = read_stderr(err)
         t_timeout = timeout_thread
 
+        # blocks until the engine stops. there may still be stdout in flight if
+        # it was being produced more quickly than consumed.
         _, status = Process.waitpid2(pid)
 
+        # blocks until all readers are done. they're still governed by the
+        # timeout thread at this point. if we hit the timeout while processing
+        # output, the threads will be Thread#killed as part of #stop and this
+        # will unblock with the correct value in @timed_out
+        [@t_out, @t_err].each(&:join)
+
         if @timed_out
           duration = timeout * 1000
           @listener.timed_out(container_data(duration: duration))
         else
-          [t_out, t_err].each(&:join)
           duration = ((Time.now - started) * 1000).round
           @listener.finished(container_data(duration: duration, status: status))
         end
@@ -74,14 +81,13 @@ module CC
           @stderr_io.string,
         )
       ensure
-        [t_timeout, t_out, t_err].each { |t| t.kill if t }
+        kill_reader_threads
+        t_timeout.kill if t_timeout
       end
 
-      def stop
-        # Prevents the processing of more output after first error
-        @on_output = ->(*) {}
-
-        reap_running_container
+      def stop(message = nil)
+        reap_running_container(message)
+        kill_reader_threads
       end
 
       private
@@ -139,7 +145,7 @@ module CC
           end
 
           @timed_out = true
-          reap_running_container
+          stop("timed out")
         end.run
       end
 
@@ -150,7 +156,7 @@ module CC
 
         if output_byte_count > maximum_output_bytes
           @maximum_output_exceeded = true
-          stop
+          stop("maximum output exceeded")
         end
       end
 
@@ -158,8 +164,13 @@ module CC
         ContainerData.new(@image, @name, duration, status, @stderr_io.string)
       end
 
-      def reap_running_container
-        Analyzer.logger.warn("killing container name=#{@name}")
+      def kill_reader_threads
+        @t_out.kill if @t_out
+        @t_err.kill if @t_err
+      end
+
+      def reap_running_container(message)
+        Analyzer.logger.warn("killing container name=#{@name} message=#{message.inspect}")
         POSIX::Spawn::Child.new("docker", "kill", @name)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.14.7
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport