houston-core 0.7.0 → 0.8.0.pre

data/app/assets/templates/tickets/index.hbs

@@ -10,7 +10,6 @@
       <!-- TMI: knowledge of roadmap module -->
       <a href="/roadmap/milestones/{{id}}">{{name}}</a>
     {{/milestone}}</td>
-    <td class="ticket-antecedents">{{{summarizeAntecedents antecedents}}}</td>
     <td class="ticket-opened date">{{{formatDateWithYear openedAt}}}</td>
     <td class="ticket-closed date">{{{formatDateWithYear closedAt}}}</td>
     <td class="table-margin"></td>

data/app/controllers/github/pulls_controller.rb

@@ -2,6 +2,7 @@ class Github::PullsController < ApplicationController
 
   def index
     @pulls = Github::PullRequest.open.order(created_at: :desc).preload(:project, :user)
+      .find_all { |pull| can?(:read, pull) }
     @labels = @pulls.flat_map(&:labels).uniq { |label| label["name"] }.sort_by { |label| label["name"] }
     @selected_labels = params.fetch(:only, "").split(/,\s*/)
     @selected_labels = @labels.map { |label| label["name"] } if @selected_labels.none?

data/app/controllers/project_tickets_controller.rb

@@ -58,9 +58,6 @@ class ProjectTicketsController < ApplicationController
       return
     end
 
-    @labels = []
-    @labels = Houston::TMI::TICKET_LABELS_FOR_MEMBERS if @project.slug =~ /^360|members$/
-    @labels = Houston::TMI::TICKET_LABELS_FOR_UNITE if @project.slug == "unite"
     Houston.benchmark "Load tickets" do
       @tickets = @project.tickets
         .pluck(:id, :summary, :number, :closed_at)
@@ -76,8 +73,7 @@ class ProjectTicketsController < ApplicationController
     if request.xhr?
       render json: MultiJson.dump({
         tickets: @tickets,
-        project: { slug: @project.slug, ticketTrackerName: @project.ticket_tracker_name },
-        labels: @labels
+        project: { slug: @project.slug, ticketTrackerName: @project.ticket_tracker_name }
       })
     else
       render

data/app/controllers/projects_controller.rb

@@ -7,8 +7,6 @@ class ProjectsController < ApplicationController
   def index
     @title = "Projects"
     @projects = Project \
-      .includes(:owners)
-      .includes(:maintainers)
       .includes(:head)
       .unretired
     @test_runs = TestRun.most_recent.index_by(&:project_id)
@@ -23,13 +21,14 @@ class ProjectsController < ApplicationController
 
   def new
     @title = "New Project"
-
-    @project = Project.new
-    @project.roles.build(user: current_user) if @project.roles.none?
+    @team = Team.find params[:team_id]
+    @project = @team.projects.build
+    authorize! :create, @project
   end
 
   def new_from_github
-    authorize! :create, Project
+    @team = Team.find params[:team_id]
+    authorize! :create, @team.projects.build
 
     existing_projects = Project.unscoped.where("props->>'git.location' LIKE '%github.com%'")
     github_repos = Houston.benchmark "Fetching repos" do
@@ -49,14 +48,15 @@ class ProjectsController < ApplicationController
 
 
   def create_from_github
-    authorize! :create, Project
+    @team = Team.find params[:team_id]
+    authorize! :create, @team.projects.build
 
     repos = params.fetch(:repos, [])
     projects = Project.transaction do
       repos.map do |repo|
         owner, name = repo.split("/")
         title = name.humanize.gsub(/\b(?<!['’.`])[a-z]/) { $&.capitalize }.gsub("-", "::")
-        Project.create!(
+        @team.projects.create!(
           name: title,
           slug: name,
           version_control_name: "Git",
@@ -65,7 +65,7 @@ class ProjectsController < ApplicationController
     end
 
     flash[:notice] = "#{projects.count} projects added"
-    redirect_to projects_path
+    redirect_to teams_path
 
   rescue ActiveRecord::RecordInvalid
     flash[:error] = $!.message
@@ -75,8 +75,6 @@ class ProjectsController < ApplicationController
 
   def edit
     @project = Project.find_by_slug!(params[:id])
-    @project.roles.build(user: current_user) if @project.roles.none?
-
     @title = "Edit #{@project.name}"
   end
 
@@ -85,7 +83,7 @@ class ProjectsController < ApplicationController
     @project = Project.new(project_attributes)
 
     if @project.save
-      redirect_to projects_path, notice: 'Project was successfully created.'
+      redirect_to teams_path, notice: 'Project was successfully created.'
     else
       flash.now[:error] = @project.errors[:base].join("\n")
       render action: "new"

data/app/controllers/teams_controller.rb

@@ -0,0 +1,60 @@
+class TeamsController < ApplicationController
+  before_action :find_team, only: [:edit, :update]
+  load_and_authorize_resource
+
+
+  def index
+    @title = "Teams"
+    @teams = Team.all
+  end
+
+
+  def new
+    @title = "New Team"
+    @team = Team.new
+    @team.roles.build(user: current_user, roles: ["Team Owner"]) if @team.roles.none?
+  end
+
+
+  def create
+    @team = Team.new(team_attributes)
+
+    if @team.save
+      redirect_to teams_path, notice: "Team was successfully created."
+    else
+      flash.now[:error] = @team.errors[:base].join("\n")
+      render action: "new"
+    end
+  end
+
+
+  def edit
+    @title = "Edit #{@team.name}"
+    @team.roles.build(user: current_user, roles: ["Team Owner"]) if @team.roles.none?
+  end
+
+
+  def update
+    @team.props.merge! team_attributes.delete(:props) if team_attributes.key?(:props)
+
+    if @team.update_attributes(team_attributes)
+      redirect_to teams_path, notice: "Team was successfully updated."
+    else
+      flash.now[:error] = @team.errors[:base].join("\n")
+      render action: "edit"
+    end
+  end
+
+
+private
+
+  def find_team
+    @team = Team.find(params[:id])
+  end
+
+  def team_attributes
+    params.fetch(:team)
+    # params.require(:team).permit(:name, :roles_attributes)
+  end
+
+end

data/app/controllers/users_controller.rb

@@ -1,15 +1,11 @@
 class UsersController < ApplicationController
-  before_filter :extract_administrator, :only => [:update, :create]
+  before_filter :extract_role, :only => [:update, :create]
   load_and_authorize_resource
 
 
   def index
-    @title = "Team"
+    @title = "Users"
     @users = User.unretired
-
-    @ticket_stats_by_user = @users.each_with_object({}) do |user, stats|
-      stats[user] = stats_for_user(user)
-    end
   end
 
 
@@ -43,7 +39,7 @@ class UsersController < ApplicationController
     if params[:send_invitation]
       User.invite!(params[:user])
     else
-      @user.administrator = @administrator
+      @user.role = @role
       @user.save!
     end
 
@@ -57,7 +53,7 @@ class UsersController < ApplicationController
 
   def update
     @user = User.find(params[:id])
-    @user.administrator = @administrator
+    @user.role = @role
 
     attributes = params[:user]
     attributes[:alias_emails] = attributes.fetch(:alias_emails, "").split.map(&:strip)
@@ -83,9 +79,13 @@ class UsersController < ApplicationController
 private
 
 
-  def extract_administrator
-    @administrator = params[:user].delete(:administrator) == "1"
-    @administrator = false unless current_user.administrator?
+  def extract_role
+    @role = params[:user].delete(:role)
+    if current_user.owner?
+      @role = "Owner" if current_user.id == params[:id].to_i # Owners can't demote themselves
+    else
+      @role = "Member" # Others can't promote themselves
+    end
   end
 
 
@@ -106,7 +106,7 @@ private
 
   def user_params
     params.require(:user).permit(:first_name, :last_name, :email,
-                    :role, :password, :password_confirmation, :remember_me,
+                    :password, :password_confirmation, :remember_me,
                     :environments_subscribed_to, :view_options, :alias_emails)
   end
 

data/app/helpers/commit_helper.rb

@@ -49,16 +49,14 @@ module CommitHelper
 
     message.gsub! Commit::EXTRA_ATTRIBUTE_PATTERN do |match|
       key, value = match.scan(Commit::EXTRA_ATTRIBUTE_PATTERN).first
-      link_to_err(project, value) if key == "err"
+      format_extra_attribute(key, value)
     end
 
     message.html_safe
   end
 
-  def link_to_err(project, err)
-    link_to project.error_tracker_error_url(err), "target" => "_blank" do
-      (image_tag(image_url("bug-fixed-32.png"), "data-tooltip-placement" => "right", rel: "tooltip", title: "View Exception in Errbit", width: 16, height: 16) + err).html_safe
-    end
+  def format_extra_attribute(key, value)
+    "<span class=\"commit-extra-attribute\"><span class=\"commit-extra-attribute-key\">#{key}</span><span class=\"commit-extra-attribute-value\">#{value}</span></span>"
   end
 
   def commit_test_message(commit)

data/app/helpers/exposure_helper.rb

@@ -5,7 +5,7 @@ module ExposureHelper
   end
 
   def beta
-    yield if current_user && current_user.administrator?
+    yield if current_user && current_user.owner?
   end
 
 end

data/app/helpers/ticket_helper.rb

@@ -22,17 +22,4 @@ module TicketHelper
     "#{feature}#{message}".html_safe
   end
 
-
-
-  def format_antecedent(antecedent)
-    case antecedent.kind
-    when "Goldmine"; "Goldmine #{link_to_goldmine_case(antecedent.id)}".html_safe
-    when "Errbit"; "Errbit #{link_to_err(antecedent.project, antecedent.id)}".html_safe
-    end
-  end
-
-  def link_to_goldmine_case(number)
-    link_to "##{number}", goldmine_case_number_url(number), target: "_blank"
-  end
-
 end

data/app/interactors/ticket_report.rb

@@ -8,16 +8,11 @@ class TicketReport
       :reporter_email,
       :reporter_first_name,
       :reporter_last_name,
-      :antecedents,
       :opened_at,
       :closed_at,
       :milestone_id,
       :milestone_name)
 
-    def antecedents
-      (super || []).map { |s| TicketAntecedent.from_s(self, s) }
-    end
-
     def reporter_name
       "#{reporter_first_name} #{reporter_last_name}"
     end
@@ -33,7 +28,6 @@ class TicketReport
         milestone: milestone_id && {
           id: milestone_id,
           name: milestone_name },
-        antecedents: antecedents.map { |antecedent| { id: antecedent.id, kind: antecedent.kind } },
         openedAt: opened_at,
         closedAt: closed_at }
     end
@@ -55,7 +49,6 @@ class TicketReport
         "users.email",
         "users.first_name",
         "users.last_name",
-        :antecedents,
         :created_at,
         :closed_at,
         "milestones.id",

data/app/mailers/project_notification.rb

@@ -10,22 +10,16 @@ class ProjectNotification < ViewMailer
     mail({
       from:     release.user,
       to:       options.fetch(:to, @release.notification_recipients),
-      cc:       options.fetch(:cc, @project.maintainers),
       subject:  "new release to #{release.environment_name}",
       template: "new_release"
     })
   end
 
 
-  def test_results(test_run, options={})
+  def test_results(test_run, recipients, options={})
     @test_run = test_run
     @project = test_run.project
 
-    committers = test_run.commits_since_last_test_run.map { |commit| commit.author_email.downcase }
-    recipients = (committers + Array(test_run.agent_email)).uniq \
-               - @project.maintainers.map(&:email) \
-               + @project.maintainers
-
     mail({
       to:       recipients,
       subject:  test_run_summary(test_run),
@@ -65,28 +59,13 @@ class ProjectNotification < ViewMailer
     @additional_info = options[:additional_info]
 
     mail({
-      to:       options.fetch(:to, @project.maintainers),
+      to:       options.fetch(:to, @project.team_owners),
       subject:  "configuration error",
       template: "ci_configuration_error"
     })
   end
 
 
-  def follow_up(antecedent)
-    @antecedent = antecedent
-    @ticket = antecedent.ticket
-    @project = @ticket.project
-    @reporter = antecedent.reporter
-    @customer = @antecedent.customer
-
-    mail({
-      to: @reporter,
-      subject: "Sample Ticket follow-up",
-      template: "follow_up"
-    })
-  end
-
-
 protected
 
 

data/app/mailers/view_mailer.rb

@@ -23,7 +23,6 @@ class ViewMailer < ActionMailer::Base
     houston/application/markdown.scss
     houston/application/test_run.scss
     houston/application/releases.scss
-    houston/application/follow_up.scss
   }
 
   helper_method :can?, :cannot?, :current_ability, :stylesheets

data/app/models/ability.rb

@@ -4,9 +4,30 @@ class Ability
 
 
   def initialize(user)
-    if user && user.administrator?
-      can :manage, :all
-    elsif Houston.config.defines_abilities?
+    if user
+
+      # Owners can do everything
+
+      if user.owner?
+        can :manage, :all
+        return
+      end
+
+      # Admins can create teams
+
+      if user.admin?
+        can [:read, :create], Team
+      end
+
+      # Users get abilities based on their role
+      # in any teams they are members of
+
+      user.roles.each do |role|
+        Houston.config.configure_team_abilities(self, role)
+      end
+    end
+
+    if Houston.config.defines_abilities?
       Houston.config.configure_abilities(self, user)
     else
       default_abilities_for(user)
@@ -16,25 +37,13 @@ class Ability
 
 
   def default_abilities_for(user)
+    return unless user
 
-    # Anyone can see everything
+    # If you're logged in, you can see everything
     can :read, :all
 
-    if user
-
-      # If you're logged in, you can update yourself
-      can :update, user
-
-      if user.developer?
-
-        # Developers can manage projects and releases
-        can :manage, Project
-        can :manage, Release
-        can :manage, Sprint
-
-      end
-    end
-
+    # If you're logged in, you can update yourself
+    can :update, user
   end
 
 

data/app/models/commit.rb

@@ -145,10 +145,6 @@ class Commit < ActiveRecord::Base
     parsed_message[:attributes]
   end
 
-  def antecedents
-    extra_attributes.fetch("err", []).map { |id| TicketAntecedent.new(self, "Errbit", id) }
-  end
-
 
 
   def committer_hours