houston-core 0.6.3 → 0.7.0.beta

data/app/models/commit.rb

@@ -173,7 +173,7 @@ class Commit < ActiveRecord::Base
 
     clean_message.gsub!(TICKET_PATTERN) { tickets << [$1.to_i, $2]; "" }
     clean_message.gsub!(TIME_PATTERN) { hours = $1.to_f; hours /= 60 if $2.starts_with?("m"); "" }
-    clean_message.gsub!(EXTRA_ATTRIBUTE_PATTERN) { (attributes[$1] ||= []).push($2); "" }
+    clean_message.gsub!(EXTRA_ATTRIBUTE_PATTERN) { (attributes[$1] ||= []).concat($2.split(",").map(&:strip).reject(&:blank?)); "" }
     while clean_message.gsub!(TAG_PATTERN) { tags << $1; "" }; end
 
     {tags: tags, tickets: tickets, hours_worked: hours, attributes: attributes, clean_message: clean_message.strip}

data/app/models/error.rb

@@ -0,0 +1,14 @@
+class Error < ActiveRecord::Base
+
+  validates :sha, :message, :backtrace, presence: true
+
+  def self.find_or_create_for_exception(exception)
+    message = exception.message
+    backtrace = exception.backtrace.join("\n")
+    sha = Digest::SHA1.hexdigest([message, backtrace].join)
+    create_with(message: message, backtrace: backtrace).find_or_create_by(sha: sha)
+  rescue ActiveRecord::RecordNotUnique
+    find_by(sha: sha)
+  end
+
+end

data/app/models/github/comment_event.rb

@@ -2,7 +2,7 @@ require "github/event"
 
 module Github
   class CommentEvent < Event
-    attr_reader :comment, :project, :user
+    attr_reader :action, :comment, :project, :user
 
     class << self
       attr_accessor :type
@@ -16,13 +16,13 @@ module Github
     def initialize(payload)
       super
       @comment = payload.fetch "comment"
+      @action = payload.fetch "action", "created"
       comment["project"] = Project.find_by_slug payload["repository"]["name"]
     end
 
     def process!
-      Rails.logger.info "\e[34m[github] Processing Comment Event (type: #{type})\e[0m"
-      Houston.observer.fire "github:comment", comment
-      Houston.observer.fire "github:comment:#{type}", comment
+      Houston.observer.fire "github:comment:#{action}", comment
+      Houston.observer.fire "github:comment:#{action}:#{type}", comment
     end
 
   end

data/app/models/github/pull_request.rb

@@ -1,5 +1,7 @@
 module Github
   class PullRequest < ActiveRecord::Base
+    include Houston::Props
+
     self.table_name = "pull_requests"
 
     attr_readonly :project_id, :user_id, :repo, :number, :username, :base_ref, :base_sha, :url
@@ -15,9 +17,15 @@ module Github
     before_save :associate_user_with_self, if: :username_changed?
     after_commit :associate_commits_with_self
 
-    after_destroy { Houston.observer.fire "github:pull:closed", self }
-    after_create { Houston.observer.fire "github:pull:opened", self }
-    after_update { Houston.observer.fire "github:pull:updated", self, changes }
+    after_create do
+      Houston.observer.fire "github:pull:opened", self
+    end
+
+    after_update do
+      Houston.observer.fire "github:pull:updated", self, changes
+      Houston.observer.fire "github:pull:closed", self if closed_at_changed? && closed_at
+      Houston.observer.fire "github:pull:reopened", self if closed_at_changed? && !closed_at
+    end
 
     validates :project_id, :title, :number, :repo, :url, :base_ref, :base_sha, :head_ref, :head_sha, :username, presence: true
     validates :number, uniqueness: { scope: :project_id }
@@ -36,8 +44,8 @@ module Github
       # requests from 52 repos.
       def fetch!(projects = Project.unretired)
         repos = projects
-          .where("extended_attributes->'git_location' LIKE '%github.com%'")
-          .pluck("extended_attributes->'git_location'")
+          .where("props->>'git.location' LIKE '%github.com%'")
+          .pluck("props->>'git.location'")
           .map { |url| _repo_name_from_url(url) }
           .compact
 
@@ -83,12 +91,14 @@ module Github
         Houston.benchmark "Syncing pull requests" do
           existing_pulls = all.to_a
 
-          # Delete unexpected pulls
+          # Fetch unexpected pulls so that we know
+          # when they were closed and whether they
+          # were merged.
           existing_pulls.each do |existing_pr|
             unless expected_pulls.detect { |expected_pr|
               expected_pr["base"]["repo"]["name"] == existing_pr.repo &&
               expected_pr["number"] == existing_pr.number }
-              existing_pr.destroy
+              expected_pulls << existing_pr.fetch!
             end
           end
 
@@ -108,16 +118,6 @@ module Github
         end
       end
 
-      def close!(github_pr, options={})
-        pr = find_by(
-          repo: github_pr["base"]["repo"]["name"],
-          number: github_pr["number"])
-        return unless pr
-
-        pr.actor = options[:as]
-        pr.destroy
-      end
-
       def upsert!(github_pr, options={})
         retry_count ||= 0
         upsert(github_pr).tap do |pr|
@@ -138,6 +138,18 @@ module Github
           .merge_attributes(github_pr)
       end
 
+      def open
+        where(closed_at: nil)
+      end
+
+      def closed
+        where.not(closed_at: nil)
+      end
+
+      def merged
+        where.not(merged_at: nil)
+      end
+
       def labeled(*labels)
         where(["exists (select 1 from jsonb_array_elements(pull_requests.json_labels) as \"label\" where \"label\"->>'name' IN (?))", labels])
       end
@@ -198,6 +210,14 @@ module Github
       project.repo.create_commit_status(head_sha, status)
     end
 
+    def full_repo
+      url[/https:\/\/github.com\/(.*)\/pull\/\d+/, 1]
+    end
+
+    def fetch!
+      Houston.github.pull_request(full_repo, number).to_h.with_indifferent_access
+    end
+
 
 
     def merge_attributes(pr)
@@ -214,6 +234,8 @@ module Github
       self.body = pr["body"]
       self.base_sha = pr["base"]["sha"]
       self.head_sha = pr["head"]["sha"]
+      self.closed_at = pr["closed_at"]
+      self.merged_at = pr["merged_at"]
       self.labels = pr["labels"] if pr.key?("labels")
 
       self

data/app/models/github/pull_request_event.rb

@@ -20,14 +20,8 @@ module Github
         return
       end
 
-      # Delete pull requests when they are closed
-      if action == "closed"
-        PullRequest.close! pull_request, as: actor
-        return
-      end
-
       # Ensure that we have a record of this open pull request
-      # action: labeled, unlabeled, opened, reopened, or synchronized
+      # action: labeled, unlabeled, opened, closed, reopened, or synchronized
       pr = PullRequest.upsert! pull_request, as: actor
 
       # The Pull Request may be invalid if it isn't for a

data/app/models/job.rb

@@ -0,0 +1,81 @@
+class Job < ActiveRecord::Base
+
+  validates :name, :started_at, presence: true
+  belongs_to :error
+
+  default_scope -> { order(started_at: :desc) }
+
+
+
+  def self.started_before(time)
+    where arel_table[:started_at].lteq time
+  end
+
+  def self.record(job_name)
+    job = Job.create!(name: job_name, started_at: Time.now)
+    begin
+      exception = nil
+
+      Houston.reconnect do
+        yield
+      end
+
+    rescue SocketError,
+           Errno::ECONNREFUSED,
+           Errno::ETIMEDOUT,
+           Faraday::ConnectionFailed,
+           Faraday::SSLError,
+           Faraday::HTTP::ServerError,
+           Faraday::HTTP::Unauthorized,
+           Faraday::TimeoutError,
+           Rugged::NetworkError,
+           Unfuddle::ConnectionError,
+           Octokit::BadGateway,
+           Octokit::InternalServerError,
+           Net::OpenTimeout,
+           exceptions_wrapping(PG::ConnectionBad)
+
+      # Note that the job failed, but do not report _these_ exceptions
+      exception = $!
+
+    rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
+
+      # Report all other exceptions
+      exception = $!
+      Houston.report_exception($!, parameters: {job_id: job.id, job_name: job_name})
+
+    ensure
+      begin
+        Houston.reconnect do
+          job.finish! exception
+        end
+      rescue Exception # rescues StandardError by default; but we want to rescue and report all errors
+        Houston.report_exception($!, parameters: {job_id: job.id, job_name: job_name})
+      end
+    end
+  end
+
+
+
+  def exception=(exception)
+    self.error = Error.find_or_create_for_exception(exception) if exception
+  end
+
+  def finish!(exception)
+    update_attributes! finished_at: Time.now, succeeded: exception.nil?, exception: exception
+  end
+
+  def duration
+    return nil unless finished?
+    finished_at - started_at
+  end
+
+  def finished?
+    finished_at.present?
+  end
+
+  def in_progress?
+    finished_at.nil?
+  end
+
+end

data/app/models/measurement.rb

@@ -49,6 +49,7 @@ class Measurement < ActiveRecord::Base
 
     def for(subject)
       return where(subject_type: nil, subject_id: nil) if subject.nil?
+      return where(subject_type: subject.name) if subject.is_a?(Class)
       where(subject_type: subject.class.name, subject_id: subject.id)
     end
 
@@ -65,7 +66,7 @@ class Measurement < ActiveRecord::Base
     #  - weekly.hours.*.fix
     def named(*name_patterns)
       name_patterns =  name_patterns.flatten.map { |pattern| pattern
-        .gsub(/\{([\w,]+)\}/) { "(#{$~.captures[0].gsub(/,/, "|")})" }
+        .gsub(/\{([\w\-,]+)\}/) { "(#{$~.captures[0].gsub(/,/, "|")})" }
         .gsub(/\*$/, "%") }
       where(["name SIMILAR TO ?", "(#{name_patterns.join("|")})"])
     end

data/app/models/oauth/provider.rb

@@ -0,0 +1,35 @@
+module Oauth
+  class Provider < ActiveRecord::Base
+    self.table_name = "oauth_providers"
+
+    validates :name, :site, :authorize_path, :token_path, :client_id, :client_secret, presence: true
+
+    def authorize_url(params={})
+      client.auth_code.authorize_url params.merge(redirect_uri: oauth2_callback_url)
+    end
+
+    def redeem_access_token(code, params={})
+      client.auth_code.get_token(code, params.merge(redirect_uri: oauth2_callback_url))
+    end
+
+    def refresh_access_token(authorization)
+      OAuth2::AccessToken.from_hash(client, authorization.attributes).refresh!
+    end
+
+  private
+
+    def client
+      @client ||= OAuth2::Client.new(
+        client_id,
+        client_secret,
+        site: site,
+        authorize_url: authorize_path,
+        token_url: token_path)
+    end
+
+    def oauth2_callback_url
+      "http://#{Houston.host}/oauth2/callback"
+    end
+
+  end
+end

data/app/models/project.rb

@@ -2,6 +2,7 @@ class Project < ActiveRecord::Base
   extend ProjectAdapter
   include Retirement
   include FeatureState
+  include Houston::Props
 
   has_many :releases, dependent: :destroy
   has_many :commits, dependent: :destroy, extend: CommitSynchronizer
@@ -59,7 +60,7 @@ class Project < ActiveRecord::Base
   end
 
   def show_release_notes_for?(environment_name)
-    extended_attributes["releases.ignore.#{environment_name.downcase}"] != "1"
+    props["releases.ignore.#{environment_name.downcase}"] != "1"
   end
 
   def environment(environment_name)
@@ -67,11 +68,19 @@ class Project < ActiveRecord::Base
   end
 
   def extended_attributes
-    super || (self.extended_attributes = {})
+    raise NotImplementedError, "This feature has been deprecated; use props"
+  end
+
+  def extended_attributes=(value)
+    raise NotImplementedError, "This feature has been deprecated; use props"
   end
 
   def view_options
-    super || {}
+    raise NotImplementedError, "This feature has been deprecated; use props"
+  end
+
+  def view_options=(value)
+    raise NotImplementedError, "This feature has been deprecated; use props"
   end
 
   def testers

data/app/models/slackdown.rb

@@ -3,7 +3,7 @@ class Slackdown
   attr_reader :markdown
 
   def initialize(markdown)
-    @markdown = markdown
+    @markdown = markdown.to_s
   end
 
   def convert

data/app/models/user.rb

@@ -1,10 +1,10 @@
 class User < ActiveRecord::Base
   include Retirement
+  include Houston::Props
 
   has_many :testing_notes
   has_many :roles, :dependent => :destroy
   has_many :credentials, :class_name => "UserCredentials", :dependent => :destroy
-  has_many :consumer_tokens
   has_many :tickets, foreign_key: "reporter_id"
   has_and_belongs_to_many :commits
   belongs_to :current_project, class_name: "Project"
@@ -73,10 +73,6 @@ class User < ActiveRecord::Base
     with_email_address(email_address).first
   end
 
-  def self.with_view_option(option, value)
-    where(["view_options->? = ?", option, value])
-  end
-
 
 
   def email=(value)
@@ -86,7 +82,7 @@ class User < ActiveRecord::Base
   end
 
   def email_addresses
-    super || []
+    (super || []).reject(&:blank?)
   end
 
   def alias_emails
@@ -94,7 +90,7 @@ class User < ActiveRecord::Base
   end
 
   def alias_emails=(value)
-    self.email_addresses = [email] + Array.wrap(value)
+    self.email_addresses = [email] + Array.wrap(value).reject(&:blank?)
   end
 
 
@@ -112,7 +108,19 @@ class User < ActiveRecord::Base
   end
 
   def view_options
-    super || {}
+    raise NotImplementedError, "This feature has been deprecated; use props"
+  end
+
+  def view_options=(value)
+    raise NotImplementedError, "This feature has been deprecated; use props"
+  end
+
+  def unfuddle_id
+    raise NotImplementedError, "This feature has been deprecated; use props[\"unfuddle.id\"]"
+  end
+
+  def unfuddle_id=(value)
+    raise NotImplementedError, "This feature has been deprecated; use props[\"unfuddle.id\"]"
   end
 
 
@@ -121,37 +129,22 @@ class User < ActiveRecord::Base
   # ------------------------------------------------------------------------- #
 
   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
+    find_by_prop "github.username", username do |username|
 
-    # 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
+      # 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
 
-  def github_username
-    view_options["github_username"]
+      # We couldn't find the user by their email address, now
+      # we'll look at their nicknames
+      user = find_by_nickname username unless user
+
+    end
   end
 
-  def set_github_username!(username)
-    update_column :view_options, view_options.merge("github_username" => username)
+  def github_username
+    props["github.username"]
   end
 
   # ------------------------------------------------------------------------- #