houston-core 0.5.4 → 0.5.5

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

@@ -44,6 +44,7 @@ h2.test-result-banner {
   &.pass  { @include badge-style(#5DB64C); letter-spacing: 0.088em; } // grass
   &.error  { @include badge-style(#DDC522); letter-spacing: 0.088em; } // mustard
   &.aborted  { @include badge-style(#888888); letter-spacing: 0.088em; } // gray
+  &.pending  { @include badge-style(#888888); letter-spacing: 0.088em; } // gray
   &.fail  { @include badge-style(#E24E32); letter-spacing: 0.160em; } // tomato
 
   a {
@@ -75,12 +76,20 @@ h2.test-result-banner {
   .test {
     display: block;
     margin: 0;
-    padding: 0.18em 0 0.18em 5.25em;
-    text-indent: -4em;
 
-    &.fail  { background-color: rgba(226, 78, 50, 0.15); }
-    &.error { background-color: rgb(252, 247, 207); }
-    &.skip  { }
+    & > a {
+      display: block;
+      padding: 0.18em 0 0.18em 5.25em;
+      text-indent: -4em;
+
+      color: inherit;
+      text-decoration: none !important;
+
+      &:hover { background-color: #edf9ff; }
+    }
+
+    &.fail  > a       { background-color: rgba(226, 78, 50, 0.15); }
+    &.fail  > a:hover { background-color: rgba(226, 78, 50, 0.33); }
   }
 
   .test-suite-name {

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

@@ -39,11 +39,11 @@ $lightGray: #eee;
 
   .timeline-event {
     margin-left: 50px;
-    padding: 4px 4px 4px 16px;
+    padding: 4px 4px 4px 70px;
     border-left: solid 2px $lightGray;
     position: relative;
     font-size: 0.92em;
-    text-indent: -21px;
+    text-indent: -57px;
     line-height: 1.25em;
 
     .timeline-event-time {
@@ -131,8 +131,6 @@ $lightGray: #eee;
     &.timeline-event-ticket-created,
     &.timeline-event-ticket-closed {
       padding-right: 100px;
-      text-indent: -57px;
-      padding-left: 70px;
     }
 
     &.timeline-event-release {

data/app/concerns/commit_synchronizer.rb

@@ -8,7 +8,12 @@ module CommitSynchronizer
       expected_commits = repo.all_commits
 
       create_missing_commits!   expected_commits - existing_commits
-      flag_unreachable_commits! existing_commits - expected_commits
+
+      reachable_commits = project.commits.reachable.pluck(:sha)
+      flag_unreachable_commits! reachable_commits - expected_commits
+
+      unreachable_commits = project.commits.unreachable.pluck(:sha)
+      flag_reachable_commits! unreachable_commits & expected_commits
     end
   end
 
@@ -29,7 +34,13 @@ module CommitSynchronizer
   end
 
 
-  def synchronize(native_commits)
+  def synchronize(native_commits=[])
+    if block_given?
+      native_commits = Houston.benchmark("[commits.synchonize] reading commits") do
+        yield repo
+      end
+    end
+
     native_commits = native_commits.reject(&:nil?)
     return [] if native_commits.empty?
 
@@ -100,6 +111,31 @@ private
     Houston.report_exception $!
   end
 
+  def flag_reachable_commits!(reachable_commits)
+    return if reachable_commits.none?
+
+    # Inserting this to help troubleshoot a scenario where PG::TRDeadlockDetected
+    # is raised from this method. This is a recoverable scenario, so we report
+    # the exception (with additional context) but do not re-raise it.
+    query = <<-SQL
+      SELECT query, state, waiting, pid
+      FROM pg_stat_activity
+      WHERE state <> 'idle' AND waiting='t'
+    SQL
+    waiting_queries = connection.select_all(query).to_hash
+      .reject { |result| result["query"] == query }
+
+    project.commits.where(sha: reachable_commits).update_all(unreachable: false)
+
+    Rails.logger.info "[commits:sync] #{reachable_commits.length} reachable commits for #{project.name}"
+
+  rescue exceptions_wrapping(PG::TRDeadlockDetected)
+    $!.additional_information["project"] = project.slug
+    $!.additional_information["reachable_commits"] = reachable_commits.join("\n")
+    $!.additional_information["waiting_queries"] = MultiJson.dump(waiting_queries)
+    Houston.report_exception $!
+  end
+
   def repo
     project.repo
   end

data/app/controllers/application_controller.rb

@@ -9,6 +9,9 @@ class ApplicationController < ActionController::Base
   after_filter :save_current_project
 
 
+  delegate :mobile?, to: :browser
+  helper_method :mobile?
+
 
   rescue_from CanCan::AccessDenied do |exception|
     if current_user

data/app/controllers/hooks_controller.rb

@@ -28,4 +28,22 @@ class HooksController < ApplicationController
     end
   end
 
+  def trigger
+    event = "hooks:#{params[:hook]}"
+    unless Houston.observer.observed?(event)
+      render text: "A hook with the slug '#{params[:hook]}' is not defined", status: 404
+      return
+    end
+
+    payload = params.except(:action, :controller).merge({
+      sender: {
+        ip: request.remote_ip,
+        agent: request.user_agent
+      }
+    })
+
+    Houston.observer.fire event, payload
+    head 200
+  end
+
 end

data/app/controllers/project_tests_controller.rb

@@ -0,0 +1,46 @@
+class ProjectTestsController < ApplicationController
+
+  def index
+    @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") {
+        @project.repo.ancestors(head, including_self: true, limit: 100, hide: stop_shas) }
+
+      if @commits.any?
+        @runs = @project.test_runs.where(sha: @commits.map(&:sha))
+
+        @commits.each do |commit|
+          def commit.date
+            @date ||= committed_at.to_date
+          end
+          def commit.time
+            committed_at
+          end
+        end
+
+        @results = @test.test_results.where(test_run_id: @runs.map(&:id))
+          .joins(:test_run)
+          .select("test_runs.sha", :*)
+          .index_by { |result| result[:sha] }
+        @runs = @runs.index_by(&:sha)
+      end
+    rescue Houston::Adapters::VersionControl::CommitNotFound
+      @commits = []
+      @exception = $!
+    end
+
+    if request.xhr?
+      if @commits.any?
+        render partial: "project_tests/commits"
+      else
+        head 204
+      end
+    end
+  end
+
+end

data/app/helpers/commit_helper.rb

@@ -61,4 +61,11 @@ module CommitHelper
     end
   end
 
+  def commit_test_message(commit)
+    message = commit.message[/^.*$/]
+    return message unless @project
+    return message unless @project.repo.respond_to? :commit_url
+    link_to message, @project.repo.commit_url(commit), target: "_blank"
+  end
+
 end

data/app/helpers/test_run_helper.rb

@@ -33,4 +33,20 @@ module TestRunHelper
     end
   end
 
+  def commit_test_status(test_run, test_result)
+    status = test_result.status if test_result
+    status = "untested" if test_run.nil?
+    status = "pending" if test_run && test_run.pending?
+    status = "aborted" if test_run && test_run.aborted?
+    status ||= "unknown"
+
+    css = "project-test-status project-test-status-#{status}"
+
+    if test_run
+      link_to status, test_run_url(slug: test_run.project.slug, commit: test_run.sha), class: css
+    else
+      "<span class=\"#{css}\">#{status}</span>".html_safe
+    end
+  end
+
 end

data/app/models/commit.rb

@@ -43,6 +43,10 @@ class Commit < ActiveRecord::Base
       where(unreachable: false)
     end
 
+    def unreachable
+      where(unreachable: true)
+    end
+
     def latest
       last
     end

data/app/models/github/pull_request.rb

@@ -17,8 +17,7 @@ module Github
     after_create { Houston.observer.fire "github:pull:opened", self }
     after_update { Houston.observer.fire "github:pull:updated", self, changes }
 
-    validates :project_id, :title, :number, :repo, :url, :base_ref, :base_sha, :head_ref, :head_sha,
-      presence: true
+    validates :project_id, :title, :number, :repo, :url, :base_ref, :base_sha, :head_ref, :head_sha, :username, presence: true
     validates :number, uniqueness: { scope: :project_id }
 
     class << self
@@ -92,16 +91,16 @@ module Github
           number: github_pr["number"])
           .merge_attributes(github_pr)
       end
-    end
 
+      def labeled(*labels)
+        where(["labels && ARRAY[?]", labels])
+      end
+    end
 
 
-    def labels
-      super.split(/\n/)
-    end
 
     def labels=(value)
-      super Array(value).uniq.join("\n")
+      super Array(value).uniq
     end
 
     def add_label!(label, options={})
@@ -131,6 +130,7 @@ module Github
       end
 
       self.title = pr["title"]
+      self.body = pr["body"]
       self.head_sha = pr["head"]["sha"]
       self.head_ref = pr["head"]["ref"]
       self.labels = pr["labels"] if pr.key?("labels")

data/app/models/milestone.rb

@@ -4,7 +4,7 @@ class Milestone < ActiveRecord::Base
   belongs_to :project
   has_many :tickets, -> { reorder("NULLIF(tickets.extended_attributes->'milestoneSequence', '')::int") }
 
-  versioned only: [:name, :start_date, :end_date, :band, :lanes], class_name: "MilestoneVersion", initial_version: true
+  versioned only: [:name, :start_date, :end_date, :band, :lanes, :destroyed_at], class_name: "MilestoneVersion", initial_version: true
 
   default_scope { where(destroyed_at: nil).order(:start_date) }
 

data/app/models/run_tests_on_post_receive.rb

@@ -148,6 +148,8 @@ class RunTestsOnPostReceive
     return if test_run.project.code_climate_repo_token.blank?
     CodeClimate::CoverageReport.publish!(test_run)
     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 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/models/test.rb

@@ -5,4 +5,8 @@ class Test < ActiveRecord::Base
 
   validates :project_id, :suite, :name, presence: true
 
+  def introduced_in_shas
+    test_results.where(new_test: true).joins(:test_run).pluck("test_runs.sha")
+  end
+
 end

data/app/models/test_result.rb

@@ -11,7 +11,7 @@ class TestResult < ActiveRecord::Base
     return if attributes.none?
     columns = attributes.first.keys
     values = attributes.map(&:values)
-    import columns, values
+    import columns, values, validate: false
   end
 
 end

data/app/models/test_run.rb

@@ -63,6 +63,24 @@ class TestRun < ActiveRecord::Base
         AND test_runs.completed_at=most_recent_test_runs.completed_at
       SQL
     end
+
+    def rebuild_tests!(options={})
+      test_runs = where("tests is not null")
+                 .where("id NOT IN (SELECT DISTINCT test_run_id FROM test_results)")
+      if options[:progress]
+        require "progressbar"
+        pbar = ProgressBar.new("test runs", test_runs.count)
+      end
+      test_runs.find_each do |test_run|
+        if test_run.read_attribute(:tests).nil?
+          test_run.update_column :tests, nil
+        else
+          test_run.save_tests_and_results
+        end
+        pbar.inc if options[:progress]
+      end
+      pbar.finish if options[:progress]
+    end
   end
 
 
@@ -181,6 +199,10 @@ class TestRun < ActiveRecord::Base
     completed_at.present?
   end
 
+  def pending?
+    !completed?
+  end
+
   def has_results?
     result.present? and !aborted?
   end
@@ -223,8 +245,9 @@ class TestRun < ActiveRecord::Base
   def tests
     @tests ||= test_results.includes(:error).joins(:test).select("test_results.*", "tests.suite", "tests.name").map do |test_result|
       message, backtrace = test_result.error.output.split("\n\n") if test_result.error
-      { suite: test_result[:suite],
-        name: test_result[:name],
+      { test_id: test_result.test_id,
+        suite: test_result[:suite],
+        name: test_result[:name].to_s.gsub(/^(test :|: )/, ""),
         status: test_result.status,
         duration: test_result.duration,
         error_message: message,

data/app/views/layouts/_mobile_navigation.html.erb

@@ -0,0 +1,100 @@
+<div class="navbar navbar-fixed-top navbar-inverse">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+      <%= link_to Houston.config.title, main_app.root_url, class: "brand" %>
+
+      <ul class="nav pull-right nav-inline">
+        <% if current_user -%>
+          <li class="current-user dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= avatar_for(current_user, size: 30) %> <b class="caret"></b></a>
+            <ul class="dropdown-menu">
+              <li><%= link_to "Settings", main_app.edit_user_path(current_user) %></li>
+              <li><%= link_to "Sign out", main_app.destroy_user_session_path %></li>
+            </ul>
+          </li>
+        <% else -%>
+          <li><%= link_to "Sign in", main_app.new_user_session_path %></li>
+        <% end -%>
+      </ul>
+
+    </div>
+  </div>
+</div>
+
+<div id="slideout_menu" class="slideout-menu">
+  <div class="general-navbar">
+    <ul class="nav">
+      <% Houston.config.navigation.each do |navigation| %><%= render_navigation navigation %><% end %>
+
+      <li class="divider-horizontal"></li>
+
+      <% if can?(:read, Project) -%>
+        <%= render_nav_link "Projects", main_app.projects_path, icon: "fa-database" %>
+      <% end -%>
+
+      <% if can?(:read, User) -%>
+        <%= render_nav_link "Team", main_app.users_path, icon: "fa-user" %>
+      <% end -%>
+
+      <% if can?(:read, :job) -%>
+        <%= render_nav_link "Jobs", main_app.jobs_path, icon: "fa-user" %>
+      <% end -%>
+
+    </ul>
+  </div>
+
+  <% if current_project && current_project.persisted? %>
+  <div class="project-navbar <%= current_project.color %>">
+    <ul class="nav nav-inline">
+      <% if current_user -%>
+        <li class="dropdown current-project <%= current_project && current_project.color %>">
+          <a href="#" title="Feedback" class="dropdown-toggle" data-toggle="dropdown">
+            <%= current_project ? current_project.name : "Select Project" %>
+          </a>
+          <ul class="dropdown-menu">
+            <% followed_projects.each do |project| %>
+              <% if project == current_project %>
+                <li class="current">
+                  <b class="bubble <%= project.color %>"></b> <%= project.name %></a>
+                </li>
+              <% else %>
+                <li>
+                  <% path = if !current_feature
+                              # we're not on a project page,
+                              # just refresh the page and set the project
+                              "?project=#{project.slug}" 
+                            elsif !project.features.include?(current_feature)
+                              # we're using a feature that this project
+                              # doesn't support. Navigate to the root URL
+                              # and set the project
+                              main_app.root_path(project: project.slug)
+                            else
+                              feature_path(project, current_feature)
+                            end %>
+                  <%= link_to path do %>
+                    <b class="bubble <%= project.color %>"></b> <%= project.name %></a>
+                  <% end %>
+                </li>
+              <% end %>
+            <% end %>
+          </ul>
+        </li>
+      <% end %>
+    </ul>
+    <% if current_project.features.any? %>
+      <ul class="nav">
+        <% current_project.features.each do |feature| %>
+          <%= render_nav_for_feature(feature) %>
+        <% end %>
+      </ul>
+    <% else %>
+      <div class="project-no-features">
+        No features are enabled for <%= current_project.name %>.
+        <% if can?(:update, current_project) %>
+          You can enable features in <%= link_to "Project Settings", main_app.edit_project_path(current_project) %>.
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+  <% end %>
+</div>