codeclimate 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea54a5cb0fd28dff4dace4113e3daa47202f430
-  data.tar.gz: b79903b3a89cda679a49fff516ddab90885e4cae
+  metadata.gz: 11171f9d7ad3325e8abac63936c5efeef978f5b7
+  data.tar.gz: 37a9cd60b0718bd03ddb3c5fc0a1675cedc8c991
 SHA512:
-  metadata.gz: f75e1d353a5476ab13e52e7114879527e5777b7dd484c5d86a9902329a1f76a92ce789f06a34ad92dddaeed25e89f9d1bf0bc867aa34494325e258a8f6820f8b
-  data.tar.gz: 2c428e8609deeeae40ef26d775249b5552d8be4fba4539cc35e48a6cc9cfdf51bc80c7eaa2d41db52565588784b870c34c891351d00723539d213ddb90cfb466
+  metadata.gz: daf6c470c221a08e7a8545440ae5d05f3f0a61616087cc99bda596890af6b578f5545300d9874efce310a3f803c207946e4345365c276055f7d8a12e1da295da
+  data.tar.gz: 5921b2c2fe7abb7a33626d42875130992d379aa12f67c386323537307a8a3d2bef914f9c6f234c3a81d70e788627e17e80f2f80a80195cf2b09aff3e963cf036

data/bin/prep-release

@@ -33,10 +33,11 @@ git add VERSION Gemfile.lock
 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)"
 if command -v hub > /dev/null 2>&1; then
-  hub pull-request -m "Release v$version"
+  hub pull-request -m "Release v$version\n\n$compare_link"
 elif command -v gh > /dev/null 2>&1; then
-  gh pull-request -m "Release v$version"
+  gh pull-request -m "Release v$version\n\n$compare_link"
 else
   echo "hub not installed? Please open the PR manually" >&2
 fi

data/bin/release

@@ -4,21 +4,16 @@
 #
 # Assumes bin/prep-release was run and the PR merged.
 #
-# Usage: bin/release VERSION
+# Usage: bin/release
 #
 ###
 set -e
 
-if [ -z "$1" ]; then
-  echo "usage: bin/release VERSION" >&2
-  exit 64
-fi
-
-version=$1
-
 git checkout master
 git pull
 
+version=$(< VERSION)
+
 printf "RELEASE %s\n" "$version"
 rake release
 

data/lib/cc/analyzer/container.rb

@@ -57,10 +57,10 @@ module CC
         _, status = Process.waitpid2(pid)
 
         if @timed_out
-          duration = timeout
+          duration = timeout * 1000
           @listener.timed_out(container_data(duration: duration))
         else
-          sleep 0.01 until !t_out.alive? && !t_err.alive?
+          sleep 1 until !t_out.alive? && !t_err.alive?
           duration = ((Time.now - started) * 1000).round
           @listener.finished(container_data(duration: duration, status: status))
         end
@@ -74,14 +74,7 @@ module CC
           @stderr_io.string,
         )
       ensure
-        t_timeout.kill if t_timeout
-        if @timed_out
-          t_out.kill if t_out
-          t_err.kill if t_err
-        else
-          t_out.join if t_out
-          t_err.join if t_err
-        end
+        [t_timeout, t_out, t_err].each { |t| t.kill if t }
       end
 
       def stop
@@ -128,10 +121,18 @@ module CC
 
       def timeout_thread
         Thread.new do
-          sleep timeout
+          # Doing one long `sleep timeout` seems to fail sometimes, so
+          # we do a series of short timeouts before exiting
+          start_time = Time.now
+          loop do
+            sleep 10
+            duration = Time.now - start_time
+            break if duration >= timeout
+          end
+
           @timed_out = true
           reap_running_container
-        end
+        end.run
       end
 
       def check_output_bytes(last_read_byte_count)

data/lib/cc/cli/test.rb

@@ -106,16 +106,16 @@ module CC
       end
 
       def run_tests
-        Dir["**/*"].each do |test_file|
-          next unless File.file?(test_file)
-          process_file(test_file)
+        Dir["*"].each do |file|
+          next unless File.directory?(file)
+          process_directory(file)
         end
       end
 
-      def process_file(test_file)
-        markers = markers_in(test_file)
+      def process_directory(test_directory)
+        markers = markers_in(test_directory)
 
-        actual_issues = issues_in(test_file)
+        actual_issues = issues_in(test_directory)
         compare_issues(actual_issues, markers)
       end
 
@@ -176,9 +176,9 @@ module CC
         end
       end
 
-      def issues_in(test_file)
+      def issues_in(test_directory)
         issue_docs = capture_stdout do
-          codeclimate_analyze(test_file)
+          codeclimate_analyze(test_directory)
         end
 
         JSON.parse(issue_docs)
@@ -206,13 +206,16 @@ module CC
         end
       end
 
-      def markers_in(test_file)
-        lines = File.readlines(test_file)
-
+      def markers_in(test_directory)
         [].tap do |markers|
-          lines.each_with_index do |line, index|
-            if line =~ /\[issue\].*/
-              markers << Marker.from_text(@engine_name, test_file, index + 1, line)
+          Dir[File.join(test_directory, "**/*")].each do |file|
+            next unless File.file?(file)
+            lines = File.readlines(file)
+
+            lines.each_with_index do |line, index|
+              if line =~ /\[issue\].*/
+                markers << Marker.from_text(@engine_name, file, index + 1, line)
+              end
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport