houston-core 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aef236606e7963c5b5c25f937547b1e018785ef
-  data.tar.gz: 90fe22a11402775168fdecf5371238b2622987dd
+  metadata.gz: 3406892d3fcfe0ad9866e9dd8a498ddcd9f289d0
+  data.tar.gz: a211ccfa508c1ed3ce16de510e7f5339d8be2500
 SHA512:
-  metadata.gz: a71ad9e5148b88bf6fe5b23d69f05c1bf28b04ab50c442368e9b24bc133a2a6f1c5aa63aebd9182de8477b503ac1f1f776df3b0b1a37ad83986be63f1975bc1a
-  data.tar.gz: 0a8029b5aa27cb157ee31cad0843b5a613b3103816ead338d6b43e48689c746f9564c68ab241802342385b108de6ec541d821d9e7f72dc6e2480d844f8212d79
+  metadata.gz: 07845570a0d72d5477f0238c20b8d766b6543322ddcd504f94d066efa9b28751ea966943b80c0b461c4140a4e2a9ff079fced0bbf3374a80cad9bd86c4722390
+  data.tar.gz: ba178a7479bb6657c39fd1ecacbb447644929c95bdb35ff66a7ccbf6cb9b76cd8bd39077ac906def21e5bd2e65b5756038722b7ca33e0d97391d919c77841ecd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.5.5)
+    houston-core (0.5.6)
       activerecord-import
       activerecord-pluck_in_batches
       addressable
@@ -9,7 +9,7 @@ PATH
       browser
       bundler
       cancan (~> 1.6.10)
-      codeclimate-test-reporter (= 0.4.1)
+      codeclimate-test-reporter (= 0.4.8)
       coffee-rails (~> 4.0.0)
       default_value_for (= 3.0.0.1)
       devise (~> 3.0.0)
@@ -30,7 +30,7 @@ PATH
       nokogiri (~> 1.6.6.2)
       octokit (~> 4.1.0)
       oj (~> 2.13)
-      openxml-xlsx
+      openxml-xlsx (>= 0.2.0)
       pg (~> 0.18.3)
       pg_search (~> 1.0.5)
       premailer (~> 1.8.6)
@@ -52,31 +52,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
+    actionmailer (4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.13)
-      actionview (= 4.1.13)
-      activesupport (= 4.1.13)
+    actionpack (4.1.14)
+      actionview (= 4.1.14)
+      activesupport (= 4.1.14)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.13)
-      activesupport (= 4.1.13)
+    actionview (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.13)
-      activesupport (= 4.1.13)
+    activemodel (4.1.14)
+      activesupport (= 4.1.14)
       builder (~> 3.1)
-    activerecord (4.1.13)
-      activemodel (= 4.1.13)
-      activesupport (= 4.1.13)
+    activerecord (4.1.14)
+      activemodel (= 4.1.14)
+      activesupport (= 4.1.14)
       arel (~> 5.0.0)
     activerecord-import (0.10.0)
       activerecord (>= 3.0)
     activerecord-pluck_in_batches (0.1.0)
       activerecord
-    activesupport (4.1.13)
+    activesupport (4.1.14)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -102,7 +102,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chronic (0.10.2)
-    codeclimate-test-reporter (0.4.1)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
@@ -208,7 +208,7 @@ GEM
     net-ldap (0.12.0)
     net-ssh (2.9.2)
     netrc (0.11.0)
-    nokogiri (1.6.6.2)
+    nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     oauth (0.4.7)
     oauth2 (1.0.0)
@@ -219,17 +219,17 @@ GEM
       rack (~> 1.2)
     octokit (4.1.1)
       sawyer (~> 0.6.0, >= 0.5.3)
-    oj (2.13.0)
-    open_xml_package (0.2.0.beta1)
+    oj (2.13.1)
+    openxml-package (0.2.0)
       nokogiri
       ox
       rubyzip (~> 1.1.0)
-    openxml-xlsx (0.1.2)
+    openxml-xlsx (0.2.0)
       nokogiri
-      open_xml_package (= 0.2.0.beta1)
+      openxml-package (>= 0.2.0)
     orm_adapter (0.5.0)
     ox (2.2.2)
-    pg (0.18.3)
+    pg (0.18.4)
     pg_search (1.0.5)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
@@ -247,19 +247,19 @@ GEM
       rack (>= 1.0)
     rack-utf8_sanitizer (1.3.1)
       rack (~> 1.0)
-    rails (4.1.13)
-      actionmailer (= 4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
-      activemodel (= 4.1.13)
-      activerecord (= 4.1.13)
-      activesupport (= 4.1.13)
+    rails (4.1.14)
+      actionmailer (= 4.1.14)
+      actionpack (= 4.1.14)
+      actionview (= 4.1.14)
+      activemodel (= 4.1.14)
+      activerecord (= 4.1.14)
+      activesupport (= 4.1.14)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.13)
+      railties (= 4.1.14)
       sprockets-rails (~> 2.0)
-    railties (4.1.13)
-      actionpack (= 4.1.13)
-      activesupport (= 4.1.13)
+    railties (4.1.14)
+      actionpack (= 4.1.14)
+      activesupport (= 4.1.14)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -272,7 +272,7 @@ GEM
     rr (1.1.2)
     ruby-progressbar (1.7.5)
     rubyzip (1.1.7)
-    rufus-scheduler (3.1.7)
+    rufus-scheduler (3.1.10)
     rugged (0.23.3)
     safe_yaml (1.0.4)
     sass (3.2.19)

data/app/assets/stylesheets/application/test.scss

@@ -56,3 +56,29 @@
     &.project-test-status-fail { color: #e24e32; }
   }
 }
+
+.project-tests tbody {
+  .test-suite-name {
+    color: #777;
+    font-weight: 800;
+  }
+
+  .test-name {
+    color: #333;
+    font-weight: 200;
+  }
+
+  .test-passes {
+    font-weight: 600;
+    color: #5db64c;
+
+    &.zero { color: #ddd; }
+  }
+
+  .test-fails {
+    font-weight: 600;
+    color: #e24e32;
+
+    &.zero { color: #ddd; }
+  }
+}

data/app/controllers/project_tests_controller.rb

@@ -2,13 +2,42 @@ class ProjectTestsController < ApplicationController
 
   def index
     @project = Project.find_by_slug! params[:slug]
+
+    head = params.fetch :at, @project.repo.branch("master")
+    commits = params.fetch(:limit, 500).to_i
+
+    @commits = Houston.benchmark("[project_tests#index] fetch commits") {
+      @project.repo.ancestors(head, including_self: true, limit: commits) }
+    @runs = @project.test_runs.where(sha: @commits.map(&:sha))
+
+    @tests = @project.tests.order(:suite, :name)
+      .joins(<<-SQL)
+        LEFT JOIN LATERAL (
+          SELECT COUNT(*) FROM test_results
+          WHERE test_results.test_run_id IN (#{@runs.pluck(:id).join(",")})
+          AND test_results.status='pass'
+          AND test_results.test_id=tests.id
+        ) "passes" ON TRUE
+        LEFT JOIN LATERAL (
+          SELECT COUNT(*) FROM test_results
+          WHERE test_results.test_run_id IN (#{@runs.pluck(:id).join(",")})
+          AND test_results.status='fail'
+          AND test_results.test_id=tests.id
+        ) "fails" ON TRUE
+      SQL
+      .where("passes.count + fails.count > 0")
+      .pluck("tests.id", "tests.suite", "tests.name", "passes.count", "fails.count")
+  end
+
+  def show
+    @project = Project.find_by_slug! params[:slug]
     @test = @project.tests.find params[:id]
     @totals = Hash[@test.test_results.group(:status).pluck(:status, "COUNT(*)")]
 
     begin
       head = params.fetch :at, @project.repo.branch("master")
       stop_shas = @test.introduced_in_shas
-      @commits = Houston.benchmark("[project_tests#index] fetch commits") {
+      @commits = Houston.benchmark("[project_tests#show] fetch commits") {
         @project.repo.ancestors(head, including_self: true, limit: 100, hide: stop_shas) }
 
       if @commits.any?

data/app/models/code_climate/coverage_report.rb

@@ -20,6 +20,8 @@
 #  * environment/simplecov_root is absent
 #
 module CodeClimate
+  module ServerError; end
+
   class CoverageReport
 
     def self.publish!(test_run)
@@ -36,6 +38,10 @@ module CodeClimate
     def publish!
       code_climate = CodeClimate::TestReporter::Client.new
       code_climate.post_results code_climate_payload
+    rescue RuntimeError
+      # https://github.com/codeclimate/ruby-test-reporter/blob/v0.4.8/lib/code_climate/test_reporter/client.rb#L72
+      $!.extend CodeClimate::ServerError if $!.message =~ /HTTP Error: 5\d\d/
+      raise
     end
 
 
@@ -158,6 +164,7 @@ module CodeClimate
     end
 
     # https://github.com/codeclimate/ruby-test-reporter/blob/v0.2.0/lib/code_climate/test_reporter/formatter.rb#L78-L83
+    # Compare to https://github.com/codeclimate/ruby-test-reporter/blob/v0.4.8/lib/code_climate/test_reporter/calculate_blob.rb
     def blob_id_of(filename)
       blob = project.repo.find_file(filename, commit: test_run.sha)
       blob && blob.oid

data/app/models/run_tests_on_post_receive.rb

@@ -150,6 +150,8 @@ class RunTestsOnPostReceive
     test_run.project.feature_working! :publish_coverage_to_code_climate
   rescue Houston::Adapters::VersionControl::CommitNotFound
     # Got a bad Test Run, nothing we can do about it.
+  rescue CodeClimate::ServerError
+    # Error on Code Climate's end
   rescue Net::OpenTimeout, Net::ReadTimeout
     test_run.project.feature_broken! :publish_coverage_to_code_climate
     Rails.logger.warn "\e[31m[push:publish:codeclimate] #{$!.class}: #{$!.message}\e[0m"

data/app/presenters/tasks_excel_presenter.rb

@@ -1,5 +1,5 @@
 class TasksExcelPresenter
-  include Xlsx::Elements
+  include OpenXml::Xlsx::Elements
 
   attr_reader :tasks
 
@@ -8,7 +8,7 @@ class TasksExcelPresenter
   end
 
   def to_s
-    package = Xlsx::Package.new
+    package = OpenXml::Xlsx::Package.new
     worksheet = package.workbook.worksheets[0]
 
     tasks = Houston.benchmark "[#{self.class.name.underscore}] Load objects" do

data/app/views/project_tests/index.html.erb

@@ -1,39 +1,40 @@
 <h1 class="project-banner <%= @project.color %>" style="margin-bottom: 12px;">
-  <small>Test for</small> <%= @project.name %>
+  <small>Tests for</small> <%= @project.name %>
 </h1>
 
-<div class="project-test-history">
-  <h3><b><%= @test.suite %></b> <%= @test.name.to_s.gsub(/^(test :|: )/, "") %></h3>
-
-  <dl class="project-test-totals">
-    <dd><%= @totals.values.sum %></dd><dt>test runs</dt>
-    <% @totals.each do |key, count| %>
-      <dd><%= count %></dd><dt><%= key.pluralize %></dt>
-    <% end %>
-  </dl>
-
-  <% if @exception %>
-    <div class="alert alert-block alert-error">
-      <h4>Invalid Commit</h4>
-      <p><%= @exception.message %></p>
-    </div>
-  <% end %>
-
-  <div class="timeline infinite-scroll">
-    <p class="spinner"><i class="fa fa-spinner fa-spin fa-large"></i> Loading...</p>
-    <%= render "commits" %>
-  </div>
+<div class="nomargin">
+  <table id="project_tests" class="table table-sortable table-striped project-tests">
+    <thead>
+      <tr>
+        <td class="table-margin"></td>
+        <th class="test-name sort-asc">Name</th>
+        <th class="test-passes">Passes</th>
+        <th class="test-fails">Fails</th>
+        <td class="table-margin"></td>
+      </tr>
+    </thead>
+    <tbody>
+      <% @tests.each do |(id, suite, name, passes, fails)| %>
+        <tr class="test">
+          <td class="table-margin"></td>
+          <td class="test-name">
+            <%= link_to project_test_url(slug: @project.slug, id: id) do %>
+              <span class="test-suite-name"><%= suite.gsub("__", "::") %></span>
+              <span class="test-name"><%= name.to_s.gsub(/^(test :|: )/, "") %></span>
+            <% end %>
+          </td>
+          <td class="test-passes <%= "zero" if passes.zero? %>"><%= passes %></td>
+          <td class="test-fails <%= "zero" if fails.zero? %>"><%= fails %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>
 
 <% content_for :javascripts do %>
-<script type="text/javascript">
-$(function() {
-  new InfiniteScroll({
-    load: function($ol) {
-      var sha = $ol.find('.project-test-commit:last').attr('data-sha');
-      return $.get(window.location.pathname, {at: sha});
-    }
-  });
-});
-</script>
+  <script type="text/javascript">
+    $(function() {
+      $('#project_tests').tablesorter();
+    });
+  </script>
 <% end %>

data/app/views/project_tests/show.html.erb

@@ -0,0 +1,39 @@
+<h1 class="project-banner <%= @project.color %>" style="margin-bottom: 12px;">
+  <small>Test for</small> <%= @project.name %>
+</h1>
+
+<div class="project-test-history">
+  <h3><b><%= @test.suite %></b> <%= @test.name.to_s.gsub(/^(test :|: )/, "") %></h3>
+
+  <dl class="project-test-totals">
+    <dd><%= @totals.values.sum %></dd><dt>test runs</dt>
+    <% @totals.each do |key, count| %>
+      <dd><%= count %></dd><dt><%= key.pluralize %></dt>
+    <% end %>
+  </dl>
+
+  <% if @exception %>
+    <div class="alert alert-block alert-error">
+      <h4>Invalid Commit</h4>
+      <p><%= @exception.message %></p>
+    </div>
+  <% end %>
+
+  <div class="timeline infinite-scroll">
+    <p class="spinner"><i class="fa fa-spinner fa-spin fa-large"></i> Loading...</p>
+    <%= render "commits" %>
+  </div>
+</div>
+
+<% content_for :javascripts do %>
+<script type="text/javascript">
+$(function() {
+  new InfiniteScroll({
+    load: function($ol) {
+      var sha = $ol.find('.project-test-commit:last').attr('data-sha');
+      return $.get(window.location.pathname, {at: sha});
+    }
+  });
+});
+</script>
+<% end %>

data/config/application.rb

@@ -30,6 +30,7 @@ require "nokogiri"
 require "oauth-plugin"
 require "octokit"
 require "oj"
+require "openxml/xlsx"
 require "premailer"
 require "progressbar"
 require "rack/utf8_sanitizer"
@@ -40,7 +41,6 @@ require "strongbox"
 require "thread_safe"
 require "vestal_versions"
 require "whenever"
-require "xlsx"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

data/config/routes.rb

@@ -37,7 +37,9 @@ Rails.application.routes.draw do
   get "projects/:slug/test_runs/:commit", to: "test_runs#show", :as => :test_run
   get "projects/:slug/test_runs/:commit/retry", to: "test_runs#confirm_retry", :as => :retry_test_run
   post "projects/:slug/test_runs/:commit/retry", to: "test_runs#retry"
-  get "projects/:slug/tests/:id", to: "project_tests#index", as: :project_test
+
+  get "projects/:slug/tests", to: "project_tests#index", as: :project_tests
+  get "projects/:slug/tests/:id", to: "project_tests#show", as: :project_test
 
 
 

data/houston.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", "~> 1.6.6.2"
   spec.add_dependency "houston-oauth-plugin"
   spec.add_dependency "oj", "~> 2.13"
-  spec.add_dependency "openxml-xlsx"
+  spec.add_dependency "openxml-xlsx", ">= 0.2.0"
   spec.add_dependency "pg_search", "~> 1.0.5"
   spec.add_dependency "premailer", "~> 1.8.6"
   spec.add_dependency "progressbar" # for long migrations
@@ -76,7 +76,7 @@ Gem::Specification.new do |spec|
   # This is a runtime dependency because Houston uses it to publish
   # code coverage to Code Climate. The version is locked because
   # Houston implements its API.
-  spec.add_dependency "codeclimate-test-reporter", "0.4.1"
+  spec.add_dependency "codeclimate-test-reporter", "0.4.8"
 
   # This is a runtime dependency because Houston uses it to parse
   # code coverage data generated by simplecov

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston-core
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -576,14 +576,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -1101,6 +1101,7 @@ files:
 - app/views/project_pretickets/show.html.erb
 - app/views/project_tests/_commits.html.erb
 - app/views/project_tests/index.html.erb
+- app/views/project_tests/show.html.erb
 - app/views/project_tickets/_tickets.html.erb
 - app/views/project_tickets/bugs.html.erb
 - app/views/project_tickets/ideas.html.erb