houston-core 0.5.0.beta1 → 0.5.0

data/app/models/commit.rb

@@ -1,5 +1,5 @@
 class Commit < ActiveRecord::Base
-  
+
   belongs_to :project
   belongs_to :parent, foreign_key: :parent_sha, primary_key: :sha, class_name: "Commit"
   has_many :children, foreign_key: :parent_sha, primary_key: :sha, class_name: "Commit"
@@ -9,75 +9,70 @@ class Commit < ActiveRecord::Base
   has_and_belongs_to_many :pull_requests, class_name: "Github::PullRequest"
   has_and_belongs_to_many :tickets
   has_and_belongs_to_many :tasks
-  
+
   default_scope { order(:created_at) }
-  
+
   after_create :associate_committers_with_self
   after_create :associate_tickets_with_self
   after_create :associate_tasks_with_self
   after_create { Houston.observer.fire "commit:create", self }
-  
+
   validates :project, presence: true
   validates :sha, presence: true, :uniqueness => {scope: :project_id}
   validates :message, presence: true
   validates :authored_at, presence: true
   validates :committer, presence: true
   validates :committer_email, presence: true
-  
-  
-  
+
+
+
   class << self
     def find_by_sha(sha)
       with_sha_like(sha).first if sha
     end
-    
-    # def [](sha)
-    #   return relation.at(sha) if sha.is_a? Fixnum # <-- normal array accessor syntax
-    #   find_by_sha sha
-    # end
-    
+
     def with_sha_like(sha)
       where(["sha LIKE ?", "#{sha.strip}%"])
     end
-    
+
     def during(range)
       where(authored_at: range)
     end
-    
+
     def reachable
       where(unreachable: false)
     end
-    
+
     def latest
       last
     end
-    
+
     def earliest
       first
     end
-    
+
     def released
       commits_releases = Arel::Table.new("commits_releases")
       where(arel_table[:id].in(commits_releases.project(:commit_id)))
     end
   end
-  
-  
-  
+
+
+
   def summary
     message[/^.*$/]
   end
-  
+
   def description
     message.lines[1..-1].join("\n")
   end
-  
-  
-  
+
+
+
   def self.from_native_commit(native)
     new attributes_from_native_commit(native)
   end
-  
+
   def self.attributes_from_native_commit(native)
     { :sha => native.sha,
       :parent_sha => native.parent_sha,
@@ -86,156 +81,156 @@ class Commit < ActiveRecord::Base
       :committer => native.author_name,
       :committer_email => native.author_email.to_s.downcase }
   end
-  
+
   def native_commit
     project.repo.native_commit(sha)
   end
-  
-  
-  
+
+
+
   def to_str
     sha
   end
-  
+
   def to_s
     sha
   end
-  
+
   def url
     @url ||= begin
       repo = project.repo if project
       repo.commit_url(sha) if repo.respond_to?(:commit_url)
     end
   end
-  
-  
-  
+
+
+
   def skip?
     merge? || tags.member?("skip")
   end
-  
+
   def merge?
     (message =~ MERGE_COMMIT_PATTERN).present?
   end
-  
-  
-  
+
+
+
   def tags
     parsed_message[:tags]
   end
-  
+
   def clean_message
     parsed_message[:clean_message]
   end
-  
+
   def ticket_numbers
     parsed_message[:tickets].map { |(number, task)| number }
   end
-  
+
   def ticket_tasks
     @ticket_tasks ||= parsed_message[:tickets].each_with_object({}) do |(number, task), tasks_by_ticket|
       (tasks_by_ticket[number] ||= []).push(task) unless task.blank?
     end
   end
-  
+
   def hours_worked
     parsed_message[:hours_worked]
   end
-  
+
   def extra_attributes
     parsed_message[:attributes]
   end
-  
+
   def antecedents
     extra_attributes.fetch("err", []).map { |id| TicketAntecedent.new(self, "Errbit", id) }
   end
-  
-  
-  
+
+
+
   def committer_hours
     (hours_worked || 0) * committers.count
   end
-  
-  
-  
+
+
+
   def identify_committers
     emails = Houston.config.identify_committers(self)
     User.with_email_address(emails).to_a
   end
-  
-  
-  
+
+
+
   def self.parse_message(message)
     tags = []
     tickets = []
     attributes = {}
     hours = 0
     clean_message = normalize_commit_message(message)
-    
+
     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); "" }
     while clean_message.gsub!(TAG_PATTERN) { tags << $1; "" }; end
-    
+
     {tags: tags, tickets: tickets, hours_worked: hours, attributes: attributes, clean_message: clean_message.strip}
   end
-  
+
   def self.normalize_commit_message(message)
     message = message[/^.*(?=\n\n)/] || message # just take the first paragraph of the commit message
     message = message.gsub(/[\n\s]+/, ' ') # normalize white space within the message
   end
-  
-  
-  
+
+
+
   TAG_PATTERN = /^\s*\[([^\]]+)\]\s*/.freeze
-  
+
   TICKET_PATTERN = /\[#(\d+)([a-z]*)\]/.freeze
-  
+
   TIME_PATTERN = /\((\d*\.?\d+) ?(h|hrs?|hours?|m|min|minutes?)\)/.freeze
-  
+
   EXTRA_ATTRIBUTE_PATTERN = /\{\{([^:\}]+):[ \s]*([^\}]+)\}\}/.freeze
-  
+
   MERGE_COMMIT_PATTERN = /^Merge\b/.freeze
-  
-  
-  
+
+
+
   def associate_tickets_with_self
     self.tickets = identify_tickets
   end
-  
+
   def associate_tasks_with_self
     self.tasks = identify_tasks
-    
+
     tasks.each do |task|
       task.committed!(self)
     end
   end
-  
+
   def associate_committers_with_self
     self.committers = identify_committers
   end
-  
-  
-  
+
+
+
   def create_test_run!
     super(project: project, sha: sha, commit: self)
   end
-  
-  
-  
+
+
+
 private
-  
+
   def parsed_message
     @parsed_message ||= self.class.parse_message(message)
   end
-  
+
   def identify_tickets
     project.find_or_create_tickets_by_number(ticket_numbers)
   end
-  
+
   def identify_tasks
     tickets.each_with_object([]) do |ticket, tasks|
-      
+
       # Allow committers who are not using the Tasks feature
       # to mention a ticket (e.g. [#45]) and record progress
       # against its only (default) task.
@@ -247,9 +242,9 @@ private
       letters = ticket_tasks.fetch(ticket.number) do
         ticket.tasks.count == 1 ? [ticket.tasks.first.letter] : []
       end
-      
+
       tasks.concat ticket.tasks.lettered(*letters)
     end
   end
-  
+
 end

data/app/models/consumer_token.rb

@@ -7,7 +7,7 @@ class ConsumerToken < ActiveRecord::Base
 
   # Modify this with class_name etc to match your application
   belongs_to :user
-  
+
   validates_uniqueness_of :token
-  
+
 end

data/app/models/deploy.rb

@@ -1,38 +1,38 @@
 class Deploy < ActiveRecord::Base
   include BelongsToCommit
-  
+
   belongs_to :project
   has_one :release
   belongs_to :user
-  
+
   validates :project_id, :environment_name, presence: true
-  
+
   default_scope { order("completed_at DESC") }
-  
+
   before_save :identify_deployer, if: :deployer
   after_save :notify_if_completed
-  
-  
+
+
   class << self
     def completed
       where arel_table[:completed_at].not_eq(nil)
     end
-    
+
     def to_environment(environment_name)
       where(environment_name: environment_name)
     end
     alias :to :to_environment
-    
+
     def before(time)
       where arel_table[:completed_at].lt(time)
     end
-    
+
     def environments
       reorder(nil).pluck "DISTINCT environment_name"
     end
   end
-  
-  
+
+
   def build_release
     @release ||= Release.new(
       project: project,
@@ -41,12 +41,12 @@ class Deploy < ActiveRecord::Base
       commit1: sha,
       deploy: self)
   end
-  
-  
+
+
   def commits
     @commits ||= find_commits
   end
-  
+
   def previous_deploy
     @previous_deploy ||= project.deploys
       .completed
@@ -54,50 +54,54 @@ class Deploy < ActiveRecord::Base
       .before(completed_at || Time.now)
       .first
   end
-  
+
   def completed?
     completed_at.present?
   end
-  
+
   def environment
     environment_name
   end
-  
+
   def environment_name=(value)
     super value.downcase
   end
-  
+
   def output_stream
     @output_stream ||= OutputStream.new(self)
   end
-  
+
   def date
     completed_at.to_date
   end
-  
-  
-  
+
+  def url
+    "https://#{Houston.config.host}/projects/#{project.slug}/deploys/#{id}"
+  end
+
+
+
 private
-  
+
   def find_commits
     return [] unless sha
     return [] unless previous_deploy
     project.commits.between(previous_deploy.sha, sha)
   end
-  
+
   def identify_deployer
     self.user = User.find_by_email_address(deployer)
   end
-  
+
   def notify_if_completed
     if just_completed?
       update_column :duration, completed_at - created_at if duration.nil?
       Houston.observer.fire "deploy:completed", self
     end
   end
-  
+
   def just_completed?
     completed_at_changed? && completed?
   end
-  
+
 end

data/app/models/environment.rb

@@ -1,39 +1,39 @@
 class Environment
-  
+
   def initialize(project, environment_name)
     @project = project
     @environment_name = environment_name
   end
-  
+
   attr_reader :project, :environment_name
-  
+
   def last_deploy
     @last_deploy ||= project.deploys.completed.to(environment_name).first
   end
-  
+
   def head
     return (environment_name == "Production" ? "c7c7380" : "98318a3") if Rails.env.development?
     @head ||= last_deploy.try(:commit)
   end
-  
+
   def read_file(path)
     project.read_file(path, commit: head) if head
   rescue Houston::Adapters::VersionControl::CommitNotFound
     nil
   end
-  
-  
-  
+
+
+
   def dependency_version(dependency)
     lockfile = read_file("Gemfile.lock")
     return nil unless lockfile
-    
+
     dependency = dependency.to_s
     locked_gems = Bundler::LockfileParser.new(lockfile)
     spec = locked_gems.specs.find { |spec| spec.name == dependency }
     spec.version if spec
   end
-  
-  
-  
+
+
+
 end

data/app/models/github/commit_status_report.rb

@@ -12,24 +12,24 @@
 #
 module Github
   class CommitStatusReport
-    
+
     def self.publish!(test_run)
       self.new(test_run).publish!
     end
-    
+
     def initialize(test_run)
       @access_token = Houston.config.github[:access_token]
       @project = test_run.project
       @test_run = test_run
     end
-    
+
     attr_reader :access_token, :project, :test_run
-    
-    
-    
+
+
+
     def publish!
       return no_access_token unless access_token
-      
+
       Houston.try({max_tries: 5}, Faraday::Error::ConnectionFailed) do
         Rails.logger.info "[github/commit_status_report:publish!] POST #{state} to #{github_status_url}"
         response = Faraday.post(github_status_url, payload)
@@ -37,37 +37,37 @@ module Github
         response
       end
     end
-    
+
     def github_status_url
       project.repo.commit_status_url(test_run.sha) << "?access_token=#{access_token}"
     end
-    
+
     def state
       return "pending" unless test_run.completed?
       {"pass" => "success", "fail" => "failure"}.fetch(test_run.result.to_s, "error")
     end
-    
+
     def payload
       MultiJson.dump(
         state: state,
         context: "jenkins",
         description: test_run.short_description,
-        target_url: test_run.results_url)
+        target_url: test_run.url)
     end
-    
-    
-    
+
+
+
     def no_access_token
       message = "Houston can publish your test results to GitHub"
       additional_info = "Supply github/access_token in Houston's config.rb"
       ProjectNotification.ci_configuration_error(test_run, message, additional_info: additional_info).deliver!
     end
-    
+
     def bad_response(response)
       message = "Houston was unable to publish your commit status to GitHub"
       additional_info = "GitHub returned #{response.status}: #{response.body} (URL: #{github_status_url})"
       ProjectNotification.ci_configuration_error(test_run, message, additional_info: additional_info).deliver!
     end
-    
+
   end
 end