houston-core 0.5.6 → 0.6.0

data/app/concerns/commit_synchronizer.rb

@@ -14,6 +14,8 @@ module CommitSynchronizer
 
       unreachable_commits = project.commits.unreachable.pluck(:sha)
       flag_reachable_commits! unreachable_commits & expected_commits
+
+      project.update_column :head_sha, project.repo.branch("master")
     end
   end
 
@@ -82,6 +84,7 @@ private
     commit = find_by_sha(native_commit.sha)
     return commit if commit
 
+    $!.additional_information["project"] = project.slug
     $!.additional_information["native_commit.sha"] = native_commit.sha
     raise
   end

data/app/controllers/github/pulls_controller.rb

@@ -0,0 +1,12 @@
+class Github::PullsController < ApplicationController
+
+  def index
+    @pulls = Github::PullRequest.order(created_at: :desc).preload(:project, :user)
+    @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?
+    @selected_labels -= params.fetch(:except, "").split(/,\s*/)
+    @title = "Pull Requests (#{@pulls.count})"
+  end
+
+end

data/app/controllers/project_tests_controller.rb

@@ -3,7 +3,7 @@ class ProjectTestsController < ApplicationController
   def index
     @project = Project.find_by_slug! params[:slug]
 
-    head = params.fetch :at, @project.repo.branch("master")
+    head = params.fetch :at, @project.head_sha
     commits = params.fetch(:limit, 500).to_i
 
     @commits = Houston.benchmark("[project_tests#index] fetch commits") {
@@ -35,7 +35,7 @@ class ProjectTestsController < ApplicationController
     @totals = Hash[@test.test_results.group(:status).pluck(:status, "COUNT(*)")]
 
     begin
-      head = params.fetch :at, @project.repo.branch("master")
+      head = params.fetch :at, @project.head_sha
       stop_shas = @test.introduced_in_shas
       @commits = Houston.benchmark("[project_tests#show] fetch commits") {
         @project.repo.ancestors(head, including_self: true, limit: 100, hide: stop_shas) }
@@ -54,7 +54,7 @@ class ProjectTestsController < ApplicationController
 
         @results = @test.test_results.where(test_run_id: @runs.map(&:id))
           .joins(:test_run)
-          .select("test_runs.sha", :*)
+          .select("test_runs.sha", "test_results.*")
           .index_by { |result| result[:sha] }
         @runs = @runs.index_by(&:sha)
       end

data/app/controllers/projects_controller.rb

@@ -9,8 +9,8 @@ class ProjectsController < ApplicationController
     @projects = Project \
       .includes(:owners)
       .includes(:maintainers)
+      .includes(:head)
       .unretired
-      .map { |project| ProjectDependencies.new(project) }
     @test_runs = TestRun.most_recent.index_by(&:project_id)
     @releases = Release.where(environment_name: "production").most_recent.index_by(&:project_id)
   end
@@ -28,6 +28,50 @@ class ProjectsController < ApplicationController
     @project.roles.build(user: current_user) if @project.roles.none?
   end
 
+  def new_from_github
+    authorize! :create, Project
+
+    existing_projects = Project.unscoped.where("extended_attributes->'git_location' LIKE '%github.com%'")
+    github_repos = Houston.benchmark "Fetching repos" do
+      Houston.github.repos
+    end
+    @repos = github_repos.map do |repo|
+      project = existing_projects.detect { |project|
+        [repo.git_url, repo.ssh_url, repo.clone_url].member?(project.extended_attributes["git_location"]) }
+      { name: repo.name,
+        owner: repo.owner.login,
+        full_name: repo.full_name,
+        private: repo[:private],
+        git_location: repo.ssh_url,
+        project: project }
+    end
+  end
+
+
+  def create_from_github
+    authorize! :create, Project
+
+    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!(
+          name: title,
+          slug: name,
+          version_control_name: "Git",
+          extended_attributes: {"git_location" => "git@github.com:#{repo}.git"})
+      end
+    end
+
+    flash[:notice] = "#{projects.count} projects added"
+    redirect_to projects_path
+
+  rescue ActiveRecord::RecordInvalid
+    flash[:error] = $!.message
+    redirect_to :back
+  end
+
 
   def edit
     @project = Project.find_by_slug!(params[:id])

data/app/controllers/releases_controller.rb

@@ -1,20 +1,17 @@
 class ReleasesController < ApplicationController
   include UrlHelper
-  before_filter :get_project_and_environment
+  include ReleaseHelper
+  before_filter :get_release_and_project, only: [:show, :edit, :update, :destroy]
+  before_filter :get_project_and_environment, only: [:index, :new, :create]
   before_filter :load_tickets, only: [:new, :edit, :create, :update]
 
+
+
   def index
     @title = "Releases • #{@project.name}"
     @title << " (#{@environment})" if @environment
   end
 
-  def show
-    @release = @releases.find(params[:id])
-    authorize! :show, @release
-
-    @title = "Release #{@release.release_date.strftime("%b %-d")} • #{@project.name}"
-  end
-
   def new
     @title = "New Release (#{@environment}) • #{@project.name}"
 
@@ -42,22 +39,6 @@ class ReleasesController < ApplicationController
     end
   end
 
-  def edit
-    @release = @releases.find(params[:id])
-    authorize! :update, @release
-
-    if params[:recreate]
-      if @release.can_read_commits?
-        @release.load_commits!
-        @release.load_tickets!
-        @release.build_changes_from_commits
-      end
-    end
-
-    @release.release_changes = [ReleaseChange.new(@release, "", "")] if @release.release_changes.none?
-    @release.valid?
-  end
-
   def create
     @release = @releases.new(params[:release])
     @release.user = current_user
@@ -81,8 +62,39 @@ class ReleasesController < ApplicationController
     end
   end
 
+
+
+  def show
+    authorize! :show, @release
+
+    @title = "Release #{@release.release_date.strftime("%b %-d")} • #{@project.name}"
+
+    if request.format.oembed?
+      render json: {
+        version: "1.0",
+        type: "link",
+        author_name: "#{@project.slug} / #{@release.environment_name}",
+        title: format_release_subject(@release),
+        html: format_release_description(@release) }
+    end
+  end
+
+  def edit
+    authorize! :update, @release
+
+    if params[:recreate]
+      if @release.can_read_commits?
+        @release.load_commits!
+        @release.load_tickets!
+        @release.build_changes_from_commits
+      end
+    end
+
+    @release.release_changes = [ReleaseChange.new(@release, "", "")] if @release.release_changes.none?
+    @release.valid?
+  end
+
   def update
-    @release = @releases.find(params[:id])
     authorize! :update, @release
 
     if @release.update_attributes(params[:release])
@@ -93,7 +105,6 @@ class ReleasesController < ApplicationController
   end
 
   def destroy
-    @release = @releases.find(params[:id])
     authorize! :destroy, @release
 
     @release.destroy
@@ -103,6 +114,11 @@ class ReleasesController < ApplicationController
 
 private
 
+  def get_release_and_project
+    @release = Release.find(params[:id])
+    @project = @release.project
+  end
+
   def get_project_and_environment
     @project = Project.find_by_slug!(params[:project_id])
     @environment = params[:environment] || @project.environments_with_release_notes.first

data/app/helpers/application_helper.rb

@@ -75,6 +75,14 @@ module ApplicationHelper
 
 
 
+  def pull_request_label(label)
+    background = "##{label["color"]}"
+    foreground = "#fff"
+    foreground = "#333" if %w{#f7c6c7 #d4c5f9 #fbca04 #fad8c7 #bfe5bf}.member? background
+    "<span class=\"label\" style=\"background: #{background}; color: #{foreground};\">#{label["name"]}</span>".html_safe
+  end
+
+
 end
 
 

data/app/helpers/avatar_helper.rb

@@ -22,11 +22,11 @@ module AvatarHelper
   # http://en.gravatar.com/site/implement/ruby
   # http://en.gravatar.com/site/implement/url
   def gravatar_url(email, options={})
-    url = "//www.gravatar.com/avatar/#{Digest::MD5::hexdigest(email)}?r=g&d=retro"
+    url = "https://www.gravatar.com/avatar/#{Digest::MD5::hexdigest(email)}?r=g&d=retro"
     url << "&s=#{options[:size]}" if options.key?(:size)
     url
   end
 
 
 
-end
+end

data/app/helpers/commit_helper.rb

@@ -13,8 +13,8 @@ module CommitHelper
     project = commit.project
     content = block_given? ? yield : "<span class=\"commit-sha\">#{commit.sha[0...7]}</span>".html_safe
 
-    return content unless github_url?(project)
-    link_to content, github_commit_url(project, commit.sha), options.reverse_merge(target: "_blank")
+    return content unless url = github_commit_url(project, commit.sha)
+    link_to content, url, options.reverse_merge(target: "_blank")
   end
 
   def link_to_release_commit_range(release)

data/app/helpers/oembed_helper.rb

@@ -0,0 +1,8 @@
+module OembedHelper
+
+  def link_to_oembed(url)
+    url = "#{main_app.root_url}oembed/1.0?url=#{CGI.escape(url)}"
+    tag "link", rel: "alternate", type: "application/json+oembed", href: url
+  end
+
+end

data/app/helpers/project_helper.rb

@@ -1,10 +1,9 @@
 module ProjectHelper
 
   def with_most_recent_commit(project)
-    return if project.repo.nil?
-    commit = project.find_commit_by_sha project.repo.branch("master")
+    commit = project.head
     if commit
-      commit.project = project.model # so that _Commit_ doesn't load project again
+      commit.project = project # so that _Commit_ doesn't load project again
       yield commit
     end
   end
@@ -12,7 +11,7 @@ module ProjectHelper
   def with_most_recent_release(project)
     release = @releases[project.id]
     if release
-      release.project = project.model # so that _Release_ doesn't load project again
+      release.project = project # so that _Release_ doesn't load project again
       yield release
     end
   end
@@ -20,7 +19,7 @@ module ProjectHelper
   def with_most_recent_test_run(project)
     test_run = @test_runs[project.id]
     if test_run
-      test_run.project = project.model # so that _TestRun_ doesn't load project again
+      test_run.project = project # so that _TestRun_ doesn't load project again
       yield test_run
     end
   end

data/app/helpers/release_helper.rb

@@ -4,6 +4,17 @@ module ReleaseHelper
     "<span class=\"weekday\">#{date.strftime("%A")}</span> #{date.strftime("%b %e, %Y")}".html_safe
   end
 
+  def format_release_subject(release)
+    release.date.strftime("%b %e, %Y • ") + release.released_at.strftime("%-I:%M%p").downcase
+  end
+
+  def format_release_description(release)
+    ordered_by_tag(release.release_changes)
+      .map { |change| "#{change.tag.name.upcase}&nbsp;&nbsp;&nbsp;#{change.description}" }
+      .join("\r\n")
+      .html_safe
+  end
+
   def ordered_by_tag(changes)
     changes.sort_by { |change| change.tag ? change.tag.position : 99 }
   end

data/app/helpers/timeline_helper.rb

@@ -3,7 +3,7 @@ module TimelineHelper
   def render_timeline_gap_for(date_range)
     days = date_range.end - date_range.begin
     if days < 3
-      date_range.inject("") { |html, date| html << render_timeline_date(date) }.html_safe
+      date_range.to_a.reverse.inject("") { |html, date| html << render_timeline_date(date) }.html_safe
     else
       <<-HTML.html_safe
       <div class="timeline-date-gap"></div>

data/app/helpers/url_helper.rb

@@ -48,24 +48,6 @@ module UrlHelper
     end
   end
 
-  def release_path(release, options={})
-    super(release.project.to_param, release.environment_name, release, options)
-  end
-
-  def edit_release_path(release, options={})
-    super(release.project.to_param, release.environment_name, release, options)
-  end
-
-
-
-  def release_url(release, options={})
-    super(release.project.to_param, release.environment_name, release, options)
-  end
-
-  def edit_release_url(release, options={})
-    super(release.project.to_param, release.environment_name, release, options)
-  end
-
   def new_release_url(release, options={})
     super(release.project.to_param, release.environment_name, options.merge(deploy_id: release.deploy_id))
   end

data/app/interactors/cache_key_dependencies.rb

@@ -0,0 +1,28 @@
+class CacheKeyDependencies
+  attr_reader :project
+
+  def self.for(*projects)
+    projects = projects[0] if projects.length == 1 && projects[0].respond_to?(:each)
+    projects.each do |project|
+      begin
+        self.new(project).perform!
+      rescue StandardError => e
+        Houston.report_exception(e)
+      end
+    end
+  end
+
+  def initialize(project)
+    @project = ProjectDependencies.new(project)
+  end
+
+  def perform!
+    KeyDependency.all.each do |dependency|
+      version = ProjectDependency.new(project, dependency).version
+      project.extended_attributes = project.extended_attributes.merge(
+        "key_dependency.#{dependency.slug}" => version)
+    end
+    project.update_column :extended_attributes, project.extended_attributes
+  end
+
+end

data/app/jobs/sync_all_tickets_job.rb

@@ -16,6 +16,7 @@ class SyncAllTicketsJob
   end
 
   def update_tickets_for_project!(project)
+    connection_retry_count ||= 0
     SyncProjectTicketsJob.new(project).run!
 
   rescue Houston::Adapters::TicketTracker::ConnectionError

data/app/mailers/view_mailer.rb

@@ -23,7 +23,6 @@ class ViewMailer < ActionMailer::Base
     application/markdown.scss
     application/test_run.scss
     application/releases.scss
-    application/pull_requests.scss
     application/follow_up.scss
   }
 

data/app/models/commit.rb

@@ -206,7 +206,7 @@ class Commit < ActiveRecord::Base
     self.tasks = identify_tasks
 
     tasks.each do |task|
-      task.committed!(self)
+      task.mark_committed!(self)
     end
   end
 

data/app/models/github/pull_request.rb

@@ -21,21 +21,63 @@ module Github
     validates :number, uniqueness: { scope: :project_id }
 
     class << self
-      def fetch!
+      # Makes X + Y requests to GitHub
+      # where X is the number of projects in Houston on GitHub
+      # and Y is the number of pull requests for those projects
+      #
+      # We _could_ group repos by their owner and fetch `org_issues`
+      # but that will only work for organizations, not personal
+      # accounts.
+      #
+      # This method can chomp through your rate limit rather quickly.
+      # Also, on my computer it took 19 seconds to fetch 39 pull
+      # requests from 52 repos.
+      def fetch!(projects = Project.unretired)
+        repos = projects
+          .where("extended_attributes->'git_location' LIKE '%github.com%'")
+          .pluck("extended_attributes->'git_location'")
+          .map { |url| _repo_name_from_url(url) }
+          .compact
+
         Houston.benchmark "Fetching pull requests" do
-          Houston.github.org_issues(Houston.config.github[:organization], filter: "all", state: "open")
+          requests = 0
+          issues = repos.flat_map do |repo|
+            _fetch_issues_for!(repo).tap do |results|
+              requests += 1 + (results.length / 30)
+            end
+          end
+
+          pulls = issues
             .select { |issue| !issue.pull_request.nil? }
-            .map { |issue| Houston.github.pull_request(issue.repository.full_name, issue.number)
-              .to_h
-              .merge(labels: issue.labels.map(&:name))
-              .with_indifferent_access }
+            .map { |issue|
+              requests += 1
+              repo = issue.pull_request.url[/https:\/\/api.github.com\/repos\/(.*)\/pulls\/\d+/, 1]
+              Houston.github.pull_request(repo, issue.number)
+                .to_h
+                .merge(labels: issue.labels)
+                .with_indifferent_access }
+
+          Rails.logger.info "[pulls] #{requests} requests; #{Houston.github.last_response.headers["x-ratelimit-remaining"]} remaining"
+          pulls
+        end
+      end
+
+      def _repo_name_from_url(url)
+        url[/\Agit@github\.com:(.*)\.git\Z/, 1] || url[/\Agit:\/\/github.com\/(.*)\.git\Z/, 1]
+      end
+
+      def _fetch_issues_for!(repo)
+        if repo.end_with? "/*"
+          Houston.github.org_issues(repo[0...-2], filter: "all", state: "open")
+        else
+          Houston.github.issues(repo, filter: "all", state: "open")
         end
+      rescue Octokit::NotFound
+        []
       end
 
-      def sync!
-        expected_pulls = fetch!
-        expected_pulls.select! { |pr| pr["base"]["repo"]["name"] == pr["head"]["repo"]["name"] }
-        # select only ones where head and base are the same repo
+      def sync!(projects = Project.unretired)
+        expected_pulls = fetch!(projects)
         Houston.benchmark "Syncing pull requests" do
           existing_pulls = all.to_a
 
@@ -56,7 +98,9 @@ module Github
 
             existing_pr ||= Github::PullRequest.new
             existing_pr.merge_attributes(expected_pr)
-            existing_pr.save if existing_pr.valid?
+            unless existing_pr.save
+              Rails.logger.warn "\e[31m[pulls] Invalid PR: #{existing_pr.errors.full_messages.join("; ")}\e[0m"
+            end
             existing_pr
           end
         end
@@ -93,42 +137,52 @@ module Github
       end
 
       def labeled(*labels)
-        where(["labels && ARRAY[?]", labels])
+        where(["exists (select 1 from jsonb_array_elements(pull_requests.json_labels) as \"label\" where \"label\"->>'name' IN (?))", labels])
       end
     end
 
 
 
     def labels=(value)
-      super Array(value).uniq
+      self.json_labels = value.map { |label| label.to_h.stringify_keys.pick("name", "color") }
+    end
+
+    def labels
+      json_labels
     end
 
     def add_label!(label, options={})
+      label = label.to_h.stringify_keys.pick("name", "color")
+
       transaction do
         pr = self.class.lock.find id
-        pr.update_attributes! labels: pr.labels + [label], actor: options[:as]
+        new_labels = pr.json_labels.reject { |l| l["name"] == label["name"] } + [label]
+        pr.update_attributes! json_labels: new_labels, actor: options[:as]
       end
     end
 
     def remove_label!(label, options={})
+      label = label.to_h.stringify_keys.pick("name", "color")
+
       transaction do
         pr = self.class.lock.find id
-        pr.update_attributes! labels: pr.labels - [label], actor: options[:as]
+        new_labels = pr.json_labels.reject { |l| l["name"] == label["name"] }
+        pr.update_attributes! json_labels: new_labels, actor: options[:as]
       end
     end
 
 
 
     def merge_attributes(pr)
-      if new_record?
-        self.repo = pr["base"]["repo"]["name"]
-        self.number = pr["number"]
-        self.username = pr["user"]["login"]
-        self.url = pr["html_url"]
-        self.base_sha = pr["base"]["sha"]
-        self.base_ref = pr["base"]["ref"]
-      end
-
+      self.repo = pr["base"]["repo"]["name"] unless repo
+      self.number = pr["number"] unless number
+      self.username = pr["user"]["login"] unless username
+      self.avatar_url = pr["user"]["avatar_url"] unless avatar_url
+      self.url = pr["html_url"] unless url
+      self.base_sha = pr["base"]["sha"] unless base_sha
+      self.base_ref = pr["base"]["ref"] unless base_ref
+
+      self.created_at = pr["created_at"]
       self.title = pr["title"]
       self.body = pr["body"]
       self.head_sha = pr["head"]["sha"]
@@ -145,11 +199,13 @@ module Github
     end
 
     def associate_user_with_self
-      self.user = User.find_by_nickname(username)
+      self.user = User.find_by_github_username(username)
     end
 
     def associate_commits_with_self
-      self.commits = project.commits.between(base_sha, head_sha)
+      Houston.try({max_tries: 2, base: 0}, ActiveRecord::RecordNotUnique) do
+        self.commits = project.commits.between(base_sha, head_sha)
+      end
     end
 
   end