houston-core 0.5.6 → 0.6.0

data/app/models/github/pull_request_event.rb

@@ -35,8 +35,8 @@ module Github
       return unless pr && pr.persisted?
 
       case action
-      when "labeled" then pr.add_label! payload["label"]["name"], as: actor
-      when "unlabeled" then pr.remove_label! payload["label"]["name"], as: actor
+      when "labeled" then pr.add_label! payload["label"], as: actor
+      when "unlabeled" then pr.remove_label! payload["label"], as: actor
       end
     end
 

data/app/models/milestone.rb

@@ -30,6 +30,7 @@ class Milestone < ActiveRecord::Base
         arel_table[:tickets_count].gt(0).and(
         arel_table[:closed_tickets_count].eq(arel_table[:tickets_count])))
     end
+    alias :closed :completed
 
     def uncompleted
       where(

data/app/models/project.rb

@@ -15,6 +15,7 @@ class Project < ActiveRecord::Base
   has_many :roles, -> { joins(:user).merge(User.unretired) }, dependent: :destroy, validate: false
   has_many :value_statements, dependent: :destroy
   has_many :pull_requests, class_name: "Github::PullRequest"
+  belongs_to :head, class_name: "Commit", foreign_key: "head_sha", primary_key: "sha"
 
   Houston.config.project_roles.each do |role|
     collection_name = role.downcase.gsub(' ', '_').pluralize
@@ -27,6 +28,9 @@ class Project < ActiveRecord::Base
     reject_if: proc { |attrs| attrs[:user_id].blank? or attrs[:name].blank? }
   accepts_nested_attributes_for :value_statements, :allow_destroy => true
 
+  before_validation :generate_default_slug, :set_default_color
+  validates_presence_of :name, :slug, :color
+
 
 
   has_adapter :TicketTracker,
@@ -248,4 +252,14 @@ class Project < ActiveRecord::Base
 
 
 
+private
+
+  def generate_default_slug
+    self.slug = self.name.to_s.underscore.gsub("/", "-").dasherize.gsub(".", "").gsub(/\s+/, "_") unless slug
+  end
+
+  def set_default_color
+    self.color = "default" unless color
+  end
+
 end

data/app/models/project_dependencies.rb

@@ -41,10 +41,12 @@ class ProjectDependencies < SimpleDelegator
   end
 
   def lockfile
-    return "" if repo.nil?
+    return @lockfile if defined?(@lockfile)
+    return "" unless repo.exists?
 
-    @lockfile = read_file("Gemfile.lock", commit: repo.branch("master")) unless defined?(@lockfile)
-    @lockfile
+    Houston.benchmark "[project_dependencies.lockfile] #{slug}" do
+      @lockfile = read_file("Gemfile.lock", commit: head_sha)
+    end
   rescue Houston::Adapters::VersionControl::FileNotFound
     @lockfile = ""
   end

data/app/models/task.rb

@@ -123,7 +123,7 @@ class Task < ActiveRecord::Base
 
 
 
-  def committed!(commit)
+  def mark_committed!(commit)
     update_column :first_commit_at, commit.authored_at unless committed?
     Houston.observer.fire "task:committed", self
   end

data/app/models/user.rb

@@ -117,6 +117,47 @@ class User < ActiveRecord::Base
 
 
 
+  # Extract to Houston::GitHub
+  # ------------------------------------------------------------------------- #
+
+  def self.find_by_github_username(username)
+    # If we can already identify the user who has the given username, return them
+    user = ::User.where(["view_options->'github_username' = ?", username]).first
+    return user if user
+
+    # Look up the email address of the GitHub user and see if we can
+    # identify the Houston user by the GitHub user's email address.
+    user = Houston.github.user(username)
+    user = find_by_email_address user.email if user
+
+    # We couldn't find the user by their email address, now
+    # we'll look at their nicknames
+    user = find_by_nickname username unless user
+
+    # We've failed to identify this user
+    unless user
+      Rails.logger.warn "\e[31m[pulls] Unable to identify a user for the GitHub username \e[1m#{username}\e[0m"
+      return nil
+    end
+
+    # If we have identified the user, store their username so that
+    # we can skip the email-lookup step in the future.
+    user.set_github_username! username
+    user
+  end
+
+  def github_username
+    view_options["github_username"]
+  end
+
+  def set_github_username!(username)
+    update_column :view_options, view_options.merge("github_username" => username)
+  end
+
+  # ------------------------------------------------------------------------- #
+
+
+
   # LDAP Overrides
   # ------------------------------------------------------------------------- #
 

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

@@ -1,3 +1,11 @@
+<% content_for :meta do %>
+  <%= tag "meta", property: "og:type", content: "website" %>
+  <%= tag "meta", property: "og:site_name", content: "#{@project.slug} / commit" %>
+  <%= tag "meta", property: "og:title", content: @commit.summary %>
+  <%= tag "meta", property: "og:description", content: @commit.description %>
+  <%= tag "meta", property: "og:url", content: commit_url(@commit) %>
+<% end %>
+
 <%= render partial: "projects/header", locals: {project: @project, postfix: @commit.sha[0...8]} %>
 
 <div class="commit-profile">
@@ -16,7 +24,7 @@
         <%= div_for(release) do %>
           <p class="release-header">
             <%= release.released_at.strftime("%l:%M %p") %>&nbsp;&nbsp;
-            <%= link_to "details &rarr;".html_safe, release %>
+            <%= 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>

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

@@ -0,0 +1,102 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  <span id="pull_request_count" class="light"><%= @pulls.count %></span>
+  Pull Requests
+</h1>
+<% end %>
+
+<div class="pull-request-labels pull-request-labels-toggle">
+  <% @labels.each do |label| %>
+    <%= check_box_tag label["name"], "1", @selected_labels.member?(label["name"]) %><%= label_tag label["name"] do %>
+      <%= pull_request_label(label) %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class="nomargin">
+  <table id="pull_requests" class="table table-sortable table-striped">
+    <thead>
+      <tr>
+        <td class="table-margin"></td>
+        <td class="pull-request-avatar"></td>
+        <th class="pull-request-project">Project</th>
+        <th class="pull-request-title">Title</th>
+        <th class="pull-request-labels">Labels</th>
+        <th class="pull-request-age sort-asc">Age</th>
+        <td class="table-margin"></td>
+      </tr>
+    </thead>
+    <tbody>
+      <% @pulls.each do |pull| %>
+        <tr class="pull-request <%= pull.labels.map { |label| "pull-request-label-#{label["name"]}" }.join(" ") %>">
+          <td class="table-margin"></td>
+          <td class="pull-request-avatar">
+            <% if pull.user %>
+              <%= avatar_for pull.user, size: 32 %>
+            <% elsif pull.avatar_url %>
+              <%= 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-title">
+            <%= link_to emojify(pull.title), pull.url, target: "_blank" %>
+          </td>
+          <td class="pull-request-labels">
+            <% pull.json_labels.each do |label| %>
+              <%= pull_request_label(label) %>
+            <% end %>
+          </td>
+          <td class="pull-request-age" data-timestamp="<%= pull.created_at.iso8601 if pull.created_at %>">
+            <%= format_time_ago(pull.created_at) %>
+          </td>
+          <td class="table-margin"></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    $.tablesorter.addParser({
+      id: 'labels',
+      type: 'text',
+      is: function(s) { return false; }, // return false so this parser is not auto detected
+      format: function(s, table, td) {
+        var $td = $(td),
+            labels = _.map($td.find('.label'), function(el) { return $(el).text() });
+        return labels.sort().join(',');
+      }
+    });
+
+    $(function() {
+      $('#pull_requests').tablesorter({
+        headers: {
+          4: {sorter: 'labels'},
+          5: {sorter: 'timestamp'}
+        }
+      });
+
+      function filterPullRequests() {
+        var visibleClasses = $('.pull-request-labels-toggle :checkbox:checked').map(function(el) {
+          return 'pull-request-label-' + $(this).attr('name');
+        });
+
+        $('.pull-request').each(function() {
+          var $pull = $(this),
+              classes = $pull.attr('class').split(' '); classes.shift();
+          $pull.toggle(_.all(classes, function(cssClass) {
+            return _.contains(visibleClasses, cssClass);
+          }));
+        });
+
+        $('#pull_request_count').html($('.pull-request:visible').length);
+      }
+      filterPullRequests();
+
+      $('.pull-request-labels-toggle :checkbox').click(function(e) {
+        filterPullRequests();
+      });
+    });
+  </script>
+<% end %>

data/app/views/project_notification/new_release.html.erb

@@ -29,3 +29,9 @@
     </span>
   </p>
 <% end %>
+
+<% unless @release.new_record? %>
+  <p style="margin-top: 3em;">
+    <%= link_to "permalink", release_url(@release) %>
+  </p> 
+<% end %>

data/app/views/project_tickets/index.xls.erb

@@ -49,13 +49,11 @@
    <Column ss:AutoFitWidth="0" ss:Width="700"/>
    <Column ss:AutoFitWidth="0" ss:Width="85"/>
    <Column ss:AutoFitWidth="0" ss:Width="85"/>
-   <Column ss:AutoFitWidth="0" ss:Width="85"/>
    <Row ss:StyleID="s65">
     <Cell><Data ss:Type="String">Number</Data></Cell>
     <Cell><Data ss:Type="String">Type</Data></Cell>
     <Cell><Data ss:Type="String">Reporter Name</Data></Cell>
     <Cell><Data ss:Type="String">Summary</Data></Cell>
-    <Cell><Data ss:Type="String">Effort</Data></Cell>
     <Cell><Data ss:Type="String">Opened</Data></Cell>
     <Cell><Data ss:Type="String">Closed</Data></Cell>
    </Row>
@@ -65,11 +63,6 @@
     <Cell><Data ss:Type="String"><%= ticket.type %></Data></Cell>
     <Cell><Data ss:Type="String"><%= ticket.reporter_name %></Data></Cell>
     <Cell><Data ss:Type="String"><%= ticket.summary %></Data></Cell>
-    <% if ticket.effort.blank? %>
-    <Cell />
-    <% else %>
-    <Cell><Data ss:Type="Number"><%= ticket.effort %></Data></Cell>
-    <% end %>
     <Cell ss:StyleID="s64"><Data ss:Type="DateTime"><%= xls_time ticket.opened_at %></Data></Cell>
     <% if ticket.closed_at %>
     <Cell ss:StyleID="s64"><Data ss:Type="DateTime"><%= xls_time ticket.closed_at  %></Data></Cell>

data/app/views/projects/_form.html.erb

@@ -1,23 +1,23 @@
-<%= form_for @project, :html => { :class => 'form-horizontal' } do |f| %>
+<%= form_for @project, :html => { :class => "form-horizontal" } do |f| %>
   <fieldset>
     <div class="control-group">
-      <%= f.label :name, :class => 'control-label' %>
+      <%= f.label :name, :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :name, :class => 'text_field' %>
+        <%= f.text_field :name, :class => "text_field" %>
       </div>
     </div>
 
     <div class="control-group">
-      <%= f.label :slug, :class => 'control-label' %>
+      <%= f.label :slug, :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :slug, :class => 'text_field' %>
+        <%= f.text_field :slug, :class => "text_field" %>
       </div>
     </div>
     
     <div class="control-group">
-      <%= f.label :color, :class => 'control-label' %>
+      <%= f.label :color, :class => "control-label" %>
       <div class="controls">
-        <%= f.select :color, Houston.config.project_colors.keys.map { |name| [name.titleize, name] }, :class => 'select_field' %>
+        <%= f.select :color, [["None", "default"]] + Houston.config.project_colors.keys.map { |name| [name.titleize, name] }, :class => "select_field" %>
         <% if Project.count > 0 %>
           (Unused colors: <%= (Houston.config.project_colors.keys - Project.pluck(:color).uniq).map(&:titleize).join(", ") %>)
         <% end %>
@@ -42,7 +42,7 @@
             <div class="project-adapter-fields" data-adapter="<%= name %>">
               <% adapter.namespace.adapter(name).parameters.each do |parameter| %>
                 <% errors = @project.errors[parameter].flatten %>
-                <%= label_tag "project[extended_attributes][#{parameter}]", parameter.to_s.gsub('_', ' ').gsub(/\b('?[a-z])/) { $1.capitalize } %>
+                <%= label_tag "project[extended_attributes][#{parameter}]", parameter.to_s.gsub("_", " ").gsub(/\b('?[a-z])/) { $1.capitalize } %>
                 <%= text_field_tag "project[extended_attributes][#{parameter}]", @project.extended_attributes[parameter.to_s], :class => "text_field #{"error" if errors.any?}" %>
                 <% if errors.any? %>
                   <span class="help-inline">&nbsp;<%= errors.to_sentence %></span>
@@ -58,9 +58,9 @@
     <hr />
 
     <div class="control-group">
-      <%= f.label :code_climate_repo_token, "Code Climate Repo Token", :class => 'control-label' %>
+      <%= f.label :code_climate_repo_token, "Code Climate Repo Token", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :code_climate_repo_token, :class => 'text_field' %>
+        <%= f.text_field :code_climate_repo_token, :class => "text_field" %>
       </div>
     </div>
 
@@ -95,7 +95,7 @@
     <hr />
 
     <div class="control-group">
-      <%= f.label :roles, "Teammates", :class => 'control-label' %>
+      <%= f.label :roles, "Teammates", :class => "control-label" %>
       <div class="controls changes-nested-editor">
         <%= f.nested_editor_for :roles do |f| -%>
           <%= f.select :user_id, [nil] + User.all.map { |user| [user.name, user.id] } %>
@@ -105,16 +105,19 @@
     </div>
 
     <div class="control-group">
-      <%= f.label :min_passing_verdicts, "Min. Passing Verdicts", :class => 'control-label' %>
+      <%= f.label :min_passing_verdicts, "Min. Passing Verdicts", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :min_passing_verdicts, :class => 'text_field' %>
+        <%= f.text_field :min_passing_verdicts, :class => "text_field" %>
       </div>
     </div>
 
     <div class="form-actions">
-      <%= f.submit nil, :class => 'btn btn-primary' %>
-      <%= link_to 'Cancel', projects_path, :class => 'btn' %>
-      <%= link_to 'Retire', retire_project_path(@project), :method => 'put', :class => 'btn btn-danger' if @project.persisted? && can?(:destroy, @project) %>
+      <%= f.submit nil, :class => "btn btn-primary" %>
+      <%= link_to "Cancel", projects_path, :class => "btn" %>
+
+      <% if @project.persisted? && can?(:destroy, @project) %>
+        <button class="btn btn-delete btn-danger" id="retire_project_button">Retire</button>
+      <% end %>
     </div>
   </fieldset>
 <% end %>
@@ -125,7 +128,7 @@
     NestedEditorFor.init();
 
     function dasherize(string) {
-      return inflect.dasherize(inflect.underscore(string));
+      return inflect.dasherize(inflect.underscore(string)).replace(/\./g, '').replace(/\s+/g, '_');
     }
 
     var $name = $('#project_name'),
@@ -166,6 +169,15 @@
 
     $('.project-feature').click(showProjectFeatureParameters);
     showProjectFeatureParameters();
+
+    <% if @project.persisted? && can?(:destroy, @project) %>
+    $('#retire_project_button').click(function(e) {
+      e.preventDefault();
+      $.put('<%= retire_project_path(@project) %>')
+        .success(function() { window.location = '/projects'; })
+        .error(function() { console.log(arguments); });
+    });
+    <% end %>
   });
 </script>
 <% end %>

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

@@ -2,7 +2,8 @@
 <h1 class="project-banner space-below">
   Projects
   <%= link_to "New Project", new_project_path, :class => "btn btn-primary" if can?(:create, Project) %>
-  
+  <%= link_to "Add Projects from GitHub", add_github_projects_path, :class => "btn btn-primary" if can?(:create, Project) %>
+
   <%= render partial: "projects/keyboard_shortcuts" %>
 </h1>
 <% end %>
@@ -75,9 +76,8 @@
             </td>
 
           <% KeyDependency.all.each do |dependency| %>
-          <% version = ProjectDependency.new(project, dependency).version %>
             <td class="project-dependency">
-              <%= version %>
+              <%= project.extended_attributes["key_dependency.#{dependency.slug}"] %>
             </td>
           <% end %>
 

data/app/views/projects/new_from_github.html.erb

@@ -0,0 +1,67 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Add Projects from GitHub
+</h1>
+<% end %>
+
+<p>Select the repos to create projects for in Houston</p>
+
+<%= form_tag do %>
+  <ul id="repos">
+    <% @repos.each do |repo| %>
+      <li class="repo <%= "disabled" if repo[:project] %> <%= "retired" if repo[:project] && repo[:project].retired? %>">
+        <% if repo[:project] %>
+          <input type="checkbox" checked disabled />
+        <% else %>
+          <input type="checkbox" name="repos[]" value="<%= repo[:full_name] %>" id="<%= repo[:full_name] %>" />
+        <% end %>
+
+        <label for="<%= repo[:full_name] %>">
+          <span class="repo-visibility">
+            <% if repo[:private] %>
+              <i class="fa fa-lock"></i>
+            <% else %>
+              <i class="fa fa-unlock"></i>
+            <% end %>
+          </span>
+          <span class="repo-owner">
+            <%= repo[:owner] %>
+          </span>
+          <span class="repo-name">
+            <% if repo[:project] %>
+              <span class="label <%= repo[:project].color %>">
+                <%= repo[:name] %>
+              </span>
+            <% else %>
+              <b><%= repo[:name] %></b>
+            <% end %>
+          </span>
+        </label>
+      </li>
+    <% end %>
+  </ul>
+
+  <div class="form-actions">
+    <button type="submit" class="btn btn-primary">Add</button>
+  </div>
+<% end %>
+
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    $(function() {
+      $(':checkbox').click(function(e) {
+        var $checkbox = $(e.target);
+        $checkbox.closest('.repo').toggleClass('selected', $checkbox.prop('checked'));
+      });
+
+      $('[type="submit"]').click(function(e) {
+        e.preventDefault();
+        $(e.target)
+          .prop('disabled', true)
+          .html('<i class="fa fa-spinner fa-spin"></i> Adding Projects...')
+          .closest('form')
+          .submit();
+      });
+    });
+  </script>
+<% end %>