houston-core 0.6.0 → 0.6.1

data/app/models/task.rb

@@ -66,8 +66,9 @@ class Task < ActiveRecord::Base
       joins(:sprint).where("sprints.end_date >= current_date")
     end
 
-    def checked_out_by(user)
-      where(checked_out_by_id: user.id)
+    def checked_out_by(user, during: nil)
+      raise ArgumentError, "Please specify :during which Sprint" unless during
+      all.merge(SprintTask.where(sprint_id: during.id))
     end
 
     def find_by_project_and_shorthand(project_slug, shorthand)

data/app/models/test_run.rb

@@ -36,6 +36,10 @@ class TestRun < ActiveRecord::Base
       where arel_table[:id].not_in(ids)
     end
 
+    def pending
+      where completed_at: nil
+    end
+
     def completed
       where arel_table[:completed_at].not_eq(nil)
     end

data/app/presenters/project_presenter.rb

@@ -0,0 +1,28 @@
+class ProjectPresenter
+  include UrlHelper
+
+  def initialize(projects)
+    @projects = OneOrMany.new(projects)
+  end
+
+  def as_json(*args)
+    projects = @projects
+    projects = Houston.benchmark "[#{self.class.name.underscore}] Load objects" do
+      projects.load
+    end if projects.is_a?(ActiveRecord::Relation)
+    Houston.benchmark "[#{self.class.name.underscore}] Prepare JSON" do
+      projects.map(&method(:project_to_json))
+    end
+  end
+
+  def project_to_json(project)
+    { id: project.id,
+      name: project.name,
+      slug: project.slug,
+      color: {
+        name: project.color,
+        hex: project.color_value.hex },
+      props: project.extended_attributes }
+  end
+
+end

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

@@ -20,6 +20,10 @@
   Completed: <b><%= @deploy.completed_at %></b>
 </p>
 
+<p>
+  Succeeded: <b><%= @deploy.succeeded? %></b>
+</p>
+
 <p>
   Duration: <b><%= @deploy.duration %></b> seconds
 </p>

data/app/views/github/pulls/index.html.erb

@@ -37,7 +37,9 @@
               <%= image_tag pull.avatar_url, size: "32", alt: pull.username, class: "avatar avatar-not-our-user" %>
             <% end %>
           </td>
-          <td class="pull-request-project"><%= pull.project.slug %></td>
+          <td class="pull-request-project">
+            <%= link_to pull.project.slug, pull.project.repo.pulls_url, class: "label #{pull.project.color}", target: "_blank" %>
+          </td>
           <td class="pull-request-title">
             <%= link_to emojify(pull.title), pull.url, target: "_blank" %>
           </td>
@@ -85,6 +87,7 @@
         $('.pull-request').each(function() {
           var $pull = $(this),
               classes = $pull.attr('class').split(' '); classes.shift();
+              classes = _.filter(classes, function(str) { return str; });
           $pull.toggle(_.all(classes, function(cssClass) {
             return _.contains(visibleClasses, cssClass);
           }));

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

@@ -1,23 +1,20 @@
 <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" %>
+    <%= 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>
+    <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>
 

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

@@ -1,96 +1,96 @@
 <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">
-        <% 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>
-      <ul class="nav">
-        
-        <% 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 %>
+    <%= link_to Houston.config.title, main_app.root_url, class: "brand" %>
+
+    <ul class="nav pull-right">
+      <% 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>
+    <ul class="nav">
+
+      <% Houston.config.navigation.each do |navigation| %><%= render_navigation navigation %><% end %>
+
+      <li class="divider-vertical"></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>
+</div>
+
+<% if current_user -%>
+<div class="navbar project-navbar <%= current_project.color %>">
+  <ul class="nav">
+
+    <li class="dropdown current-project <%= current_project && current_project.color %>">
+      <a href="#" 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 %>
-            </ul>
-          </li>
+            </li>
+          <% end %>
         <% end %>
-        
-        
-        
-        <% Houston.config.navigation.each do |navigation| %><%= render_navigation navigation %><% end %>
-        
-        <li class="divider-vertical"></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>
-  </div>
-</div>
+    </li>
 
-<% if current_project && current_project.persisted? %>
-<div class="project-navbar <%= current_project.color %>">
-  <% 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) %>.
+    <% if current_project && current_project.persisted? %>
+      <% if current_project.features.any? %>
+        <% current_project.features.each do |feature| %>
+          <% if feature == :settings %>
+          <li class="divider-vertical"></li>
+          <% end %>
+          <%= render_nav_for_feature(feature) %>
+        <% end %>
+      <% else %>
+        <li 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 %>
+        </li>
       <% end %>
-    </div>
-  <% end %>
+    <% end %>
+  </ul>
 </div>
 <% end %>

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

@@ -27,10 +27,10 @@
     <link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon" sizes="114x114">
   </head>
   <body class="dashboard">
-    <div id="container" <% if params[:zoom].to_f > 0 %> style="transform: scale(<%= params[:zoom].to_f %>); transform-origin: 50% 0; -webkit-transform: scale(<%= params[:zoom].to_f %>); -webkit-transform-origin: 50% 0; -moz-transform: scale(<%= params[:zoom].to_f %>); -moz-transform-origin: 50% 0;" <% end %>>
+    <div id="container" <% if params[:zoom].to_f > 0 %> style="transform: scale(<%= params[:zoom].to_f %>); transform-origin: 50% 0; -webkit-transform: scale(<%= params[:zoom].to_f %>); -webkit-transform-origin: 50% 0; -moz-transform: scale(<%= params[:zoom].to_f %>); -moz-transform-origin: 50% 0; width: <%= (1 / params[:zoom].to_f) * 100 %>%; height: <%= (1 / params[:zoom].to_f) * 100 %>%;" <% end %>>
       <%= yield -%>
     </div>
-    
+
     <!-- Le javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->

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

@@ -10,21 +10,31 @@
         <th class="test-name sort-asc">Name</th>
         <th class="test-passes">Passes</th>
         <th class="test-fails">Fails</th>
+        <th class="test-graph">Graph</th>
+        <th class="test-duration">Duration</th>
         <td class="table-margin"></td>
       </tr>
     </thead>
     <tbody>
-      <% @tests.each do |(id, suite, name, passes, fails)| %>
+      <% @tests.each do |test| %>
         <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>
+            <%= link_to project_test_url(slug: @project.slug, id: test[:id]) do %>
+              <span class="test-suite-name"><%= test[:suite].gsub("__", "::") %></span>
+              <span class="test-name"><%= test[: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>
+          <td class="test-passes"><%= test_results_pass_count(test)%></td>
+          <td class="test-fails"><%= test_results_fail_count(test)%></td>
+          <td class="test-graph" data-position="<%= test_results_count(test) %>"><%= test_results_graph(test) %></td>
+          <td class="test-duration">
+            <span class="test-duration-average"><%= test[:duration_avg].to_i %>ms</span>
+            <span class="test-duration-range">
+              <%= test[:duration5].to_i %>ms &ndash; <%= test[:duration95].to_i %>ms
+            </span>
+          </td>
+          <td class="table-margin"></td>
         </tr>
       <% end %>
     </tbody>
@@ -34,7 +44,12 @@
 <% content_for :javascripts do %>
   <script type="text/javascript">
     $(function() {
-      $('#project_tests').tablesorter();
+      $('#project_tests').tablesorter({
+        headers: {
+          4: {sorter: 'property'},
+          5: {sorter: 'digit'}
+        }
+      });
     });
   </script>
 <% end %>

data/app/views/releases/_index.html.erb

@@ -0,0 +1,65 @@
+<% if @deploys.none? %>
+
+  <div class="alert alert-info">
+    There have been no deploys of <b><%= @project.name %></b> to <b><%= @environment %></b> recorded.
+  </div>
+
+<% else %>
+
+  <% date = nil %>
+  <div id="<%= @project.slug %>_changelog" class="-houston-changelog">
+    <% @deploys.each do |deploy| %>
+      <% deploy.project = @project; release = deploy.release %>
+      <% next if release.nil? && deploy.commit.nil? %>
+
+      <% if date.nil? || date != deploy.date %>
+        <% if date %></div><% end %><%# end .-houston-changelog-day %>
+        <div class="-houston-changelog-day">
+          <h4><%= format_release_date(date = deploy.date) %></h4>
+      <% end %>
+
+      <% unless release %>
+        <div class="release release-deploy">
+          <p class="release-header">
+            <%= deploy.completed_at.strftime("%l:%M %p") %>&nbsp;&nbsp;
+            <% deploy.commit.project = @project %>
+            Deploy to <%= link_to_commit deploy.commit, style: "float: none;" %>
+
+            <span style="float: right;">
+              <%= link_to "New Release", new_release_path(slug: @project.slug, environment: @environment, deploy_id: deploy.id), class: "btn btn-mini btn-default" %>
+            </span>
+        </div>
+      <% else %>
+        <%= div_for(release) do %>
+          <% release.project = @project %>
+          <p class="release-header">
+            <%= release.released_at.strftime("%l:%M %p") %>&nbsp;&nbsp;
+            <%= link_to "details &rarr;".html_safe, release_url(release) %>
+
+            <% if can?(:read, @project.commits.build) %>
+              <span class="commit-range"><%= link_to_release_commit_range(release) %></span>
+            <% end %>
+          </p>
+
+          <% if release.release_changes.any? %>
+            <div class="release-changes">
+              <% ordered_by_tag(release.release_changes).each do |change| %>
+                <% if can?(:read, change) %>
+                  <div class="change">
+                    <%= format_change_tag change.tag %>
+                    <div class="change-summary"><%= format_change(change) %></div>
+                  </div>
+                <% end %>
+              <% end %>
+            </div>
+          <% else %>
+            <div class="release-no-changes">No changes</div>
+          <% end %>
+        <% end %>
+      <% end %>
+    
+    <% end %>
+    <% if date %></div><% end %><%# end .-houston-changelog-day %>
+  </div>
+
+<% end %>

data/app/views/releases/_results.html.erb

@@ -0,0 +1,47 @@
+<% if @releases.none? %>
+
+  <div class="alert alert-info">
+    No results found.
+  </div>
+
+<% else %>
+
+  <% date = nil %>
+  <div id="<%= @project.slug %>_changelog" class="-houston-changelog release-search-result">
+    <% @releases.each do |release| %>
+      <% release.project = @project %>
+
+      <% if date.nil? || date != release.date %>
+        <% if date %></div><% end %><%# end .-houston-changelog-day %>
+        <div class="-houston-changelog-day">
+          <h4><%= format_release_date(date = release.date) %></h4>
+      <% end %>
+
+      <%= div_for(release) do %>
+        <% release.project = @project %>
+        <p class="release-header">
+          <%= release.released_at.strftime("%l:%M %p") %>&nbsp;&nbsp;
+          <%= link_to "details &rarr;".html_safe, release_url(release) %>
+
+          <% if can?(:read, @project.commits.build) %>
+            <span class="commit-range"><%= link_to_release_commit_range(release) %></span>
+          <% end %>
+        </p>
+
+        <div class="release-changes">
+          <% ordered_by_tag(release.release_changes).each do |change| %>
+            <% if can?(:read, change) %>
+              <div class="change">
+                <%= format_change_tag change.tag %>
+                <div class="change-summary"><%= format_change(change) %></div>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+
+    <% end %>
+    <% if date %></div><% end %><%# end .-houston-changelog-day %>
+  </div>
+
+<% end %>