houston-core 0.6.3 → 0.7.0.beta

data/app/controllers/github/pulls_controller.rb

@@ -1,7 +1,7 @@
 class Github::PullsController < ApplicationController
 
   def index
-    @pulls = Github::PullRequest.order(created_at: :desc).preload(:project, :user)
+    @pulls = Github::PullRequest.open.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?

data/app/controllers/jobs_controller.rb

@@ -1,12 +1,41 @@
 class JobsController < ApplicationController
 
+  def index
+    authorize! :show, :jobs
+    jobs_by_name = $scheduler.jobs.each_with_object({}) { |job, map|
+      map[job.tags.first] = {
+        name: job.tags.first,
+        schedule: job.original } }
+
+    jobs = Job.where(name: jobs_by_name.keys)
+
+    most_recent_jobs = jobs.joins(<<-SQL)
+    inner join (select name, max(started_at) "started_at" from jobs group by name) "most_recent"
+    on jobs.name=most_recent.name and jobs.started_at=most_recent.started_at
+    SQL
+    most_recent_jobs.each do |job|
+      jobs_by_name[job.name][:last] = job
+    end
+
+    jobs.group(:name).unscope(:order).pluck(:name, "COUNT(id)", "COUNT(CASE WHEN succeeded THEN 1 ELSE NULL END)", "AVG(EXTRACT(epoch from finished_at - started_at))").each do |name, runs, successful_runs, avg_duration|
+      jobs_by_name[name].merge!(
+        runs: runs,
+        successful_runs: successful_runs,
+        avg_duration: avg_duration )
+    end
+
+    @jobs = jobs_by_name.values
+  end
+
   def show
     authorize! :show, :jobs
+    @job_name = params[:slug]
+    @jobs = Job.where(name: @job_name).preload(:error)
   end
 
   def run
     authorize! :run, :jobs
-    Houston.jobs.run_async params[:slug]
+    Houston.jobs.run params[:slug]
     redirect_to "/jobs", notice: "#{params[:slug]} is running"
   end
 

data/app/controllers/oauth/providers_controller.rb

@@ -0,0 +1,45 @@
+module Oauth
+  class ProvidersController < ApplicationController
+
+    def index
+      @title = "Providers"
+      authorize! :read, Oauth::Provider
+      @providers = Oauth::Provider.all
+    end
+
+    def new
+      @title = "New Provider"
+      authorize! :create, Oauth::Provider
+      @provider = Oauth::Provider.new
+    end
+
+    def create
+      @provider = Oauth::Provider.new(params[:oauth_provider])
+      authorize! :create, @provider
+
+      if @provider.save
+        redirect_to oauth_providers_path
+      else
+        render action: :new
+      end
+    end
+
+    def edit
+      @title = "Edit Provider"
+      @provider = Oauth::Provider.find(params[:id])
+      authorize! :update, @provider
+    end
+
+    def update
+      @provider = Oauth::Provider.find(params[:id])
+      authorize! :update, @provider
+
+      if @provider.update_attributes(params[:oauth_provider])
+        redirect_to oauth_providers_path
+      else
+        render action: :edit
+      end
+    end
+
+  end
+end

data/app/controllers/project_options_controller.rb

@@ -4,14 +4,14 @@ class ProjectOptionsController < ApplicationController
 
 
   def update
-    project.view_options = project.view_options.merge(params[:options])
+    project.props.merge! params[:options]
     project.save!
     head :ok
   end
 
 
   def destroy
-    project.view_options = project.view_options.except(params[:key])
+    project.props.delete! params[:key]
     project.save!
     head :ok
   end

data/app/controllers/projects_controller.rb

@@ -31,13 +31,13 @@ class ProjectsController < ApplicationController
   def new_from_github
     authorize! :create, Project
 
-    existing_projects = Project.unscoped.where("extended_attributes->'git_location' LIKE '%github.com%'")
+    existing_projects = Project.unscoped.where("props->>'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"]) }
+        [repo.git_url, repo.ssh_url, repo.clone_url].member?(project.props["git.location"]) }
       { name: repo.name,
         owner: repo.owner.login,
         full_name: repo.full_name,
@@ -60,7 +60,7 @@ class ProjectsController < ApplicationController
           name: title,
           slug: name,
           version_control_name: "Git",
-          extended_attributes: {"git_location" => "git@github.com:#{repo}.git"})
+          props: {"git.location" => "git@github.com:#{repo}.git"})
       end
     end
 

data/app/controllers/releases_controller.rb

@@ -75,12 +75,12 @@ class ReleasesController < ApplicationController
     @title = "Release #{@release.release_date.strftime("%b %-d")} • #{@project.name}"
 
     if request.format.oembed?
-      render json: {
+      render json: MultiJson.dump({
         version: "1.0",
         type: "link",
-        author_name: "#{@project.slug} / #{@release.environment_name}",
+        provider_name: "#{@project.slug} / #{@release.environment_name}",
         title: format_release_subject(@release),
-        html: format_release_description(@release) }
+        html: format_release_description(@release) })
     end
   end
 

data/app/controllers/user_options_controller.rb

@@ -3,14 +3,14 @@ class UserOptionsController < ApplicationController
 
 
   def update
-    current_user.view_options = current_user.view_options.merge(params[:options])
+    current_user.props.merge! params[:options]
     current_user.save!
     head :ok
   end
 
 
   def destroy
-    current_user.view_options = current_user.view_options.except(params[:key])
+    current_user.props.delete! params[:key]
     current_user.save!
     head :ok
   end

data/app/controllers/users_controller.rb

@@ -44,7 +44,6 @@ class UsersController < ApplicationController
       User.invite!(params[:user])
     else
       @user.administrator = @administrator
-      @user.skip_password = true
       @user.save!
     end
 
@@ -62,7 +61,7 @@ class UsersController < ApplicationController
 
     attributes = params[:user]
     attributes[:alias_emails] = attributes.fetch(:alias_emails, "").split.map(&:strip)
-    attributes[:view_options] = @user.view_options.merge(attributes[:view_options] || {})
+    @user.props.merge! attributes.delete(:props) if attributes.key?(:props)
 
     if @user.update_attributes(attributes)
       redirect_to @user, notice: 'User was successfully updated.'

data/app/helpers/application_helper.rb

@@ -45,23 +45,69 @@ module ApplicationHelper
 
 
 
-  def format_time(time)
+  def format_time(time, options={})
     if time.nil?
       date, time = ["", "Never"]
     elsif time.to_date == Date.today
-      date, time = ["Today", time.strftime("%l:%M %p")]
+      date, time = [options[:today] ? "Today" : "", time.strftime("%l:%M %p")]
     elsif time.to_date == Date.today - 1
       date, time = ["Yesterday", time.strftime("%l:%M %p")]
     else
       date, time = [time.strftime("%b %e"), time.strftime("%l:%M %p")]
     end
 
-    <<-HTML.html_safe
+    <<-HTML.strip.html_safe
     <span class="time-date">#{date}</span>
     <span class="time-time">#{time.gsub(" AM", "a").gsub(" PM", "p")}</span>
     HTML
   end
 
+  def format_boolean(boolean)
+    if boolean
+      '<i class="fa fa-check success"></i>'.html_safe
+    else
+      '<i class="fa fa-times failure"></i>'.html_safe
+    end
+  end
+
+  def format_job_state(job)
+    if job.in_progress?
+      '<i class="fa fa-spinner fa-pulse"></i>'.html_safe
+    elsif job.succeeded?
+      '<i class="fa fa-check success"></i>'.html_safe
+    else
+      '<i class="fa fa-times failure"></i>'.html_safe
+    end
+  end
+
+  MINUTE = 60
+  HOUR = MINUTE * 60
+  DAY = HOUR * 24
+
+  def format_duration(seconds)
+    if seconds.nil?
+      return "&mdash;".html_safe
+    elsif seconds < 1
+      "#{(seconds * 1000).floor}ms"
+    elsif seconds < MINUTE
+      "%.2f seconds" % seconds
+    elsif seconds < HOUR
+      format_duration_with_units(seconds / MINUTE, 'minute')
+    elsif seconds < DAY
+      format_duration_with_units(seconds / HOUR, 'hour')
+    else
+      format_duration_with_units(seconds / DAY, 'day')
+    end
+  end
+
+  def format_duration_with_units(quantity, unit)
+    quantity = quantity.floor
+    unit << 's' unless quantity == 1
+    "#{quantity} #{unit}"
+  end
+
+
+
   def format_date_with_year(date)
     return "" if date.nil?
     "#{date.strftime("%b %d")}<span class=\"year\">#{date.strftime("%Y")}</span>".html_safe

data/app/helpers/email_helper.rb

@@ -1,7 +1,7 @@
 module EmailHelper
 
   def render_scss(relative_path)
-    asset = Rails.application.assets.find_asset(relative_path)
+    asset = sprockets_env.find_asset(relative_path)
     raise "Asset not found #{relative_path.inspect}" unless asset
     asset.to_s.html_safe
   end
@@ -10,4 +10,22 @@ module EmailHelper
     @for_email == true
   end
 
+  def sprockets_env
+    # In environments where assets.compile = false, Sprockets will no longer
+    # instantiate the Sprockets environment at Rails.application.assets.
+    #
+    # See how different gems worked around this change:
+    #    https://github.com/Compass/compass-rails/issues/257#issuecomment-174819398
+    #    https://github.com/wwidea/font-awesome-rails/pull/2
+    #    https://github.com/rails/sprockets-rails/issues/311#issuecomment-172395232
+    #
+    # The last seems to be the recommended solution; but not all assets show up
+    # in the manifest; and it will still give an error ("manifest requires
+    # environment for compilation"). Therefore, we'll create the compilation
+    # environment for the sake of the mailer.
+    return Rails.application.assets if Rails.application.assets
+    return @sprockets_env if defined?(@sprockets_env)
+    @sprockets_env = Sprockets::Railtie.build_environment(Rails.application)
+  end
+
 end

data/app/helpers/release_helper.rb

@@ -10,7 +10,7 @@ module ReleaseHelper
 
   def format_release_description(release)
     ordered_by_tag(release.release_changes)
-      .map { |change| "#{change.tag.name.upcase}   #{change.description}" }
+      .map { |change| "#{change.tag.name.upcase}\t#{change.description}" }
       .join("\r\n")
       .html_safe
   end

data/app/helpers/ticket_helper.rb

@@ -35,36 +35,4 @@ module TicketHelper
     link_to "##{number}", goldmine_case_number_url(number), target: "_blank"
   end
 
-
-
-  MINUTE = 60
-  HOUR = MINUTE * 60
-  DAY = HOUR * 24
-
-  def format_duration(seconds)
-    if seconds < HOUR
-      format_duration_with_units(seconds / MINUTE, 'minute')
-    elsif seconds < DAY
-      format_duration_with_units(seconds / HOUR, 'hour')
-    else
-      format_duration_with_units(seconds / DAY, 'day')
-    end
-  end
-
-  def format_duration_with_units(quantity, unit)
-    quantity = quantity.floor
-    unit << 's' unless quantity == 1
-    "#{quantity} #{unit}"
-  end
-
-  def class_for_age(seconds)
-    if    seconds < 6.hours;        'infant'
-    elsif seconds < 2.days;         'child'
-    elsif seconds < 7.days;         'adult'
-    elsif seconds < 4.weeks;        'senior'
-    elsif seconds < 26.weeks;       'old'
-    else                            'ancient'
-    end
-  end
-
 end

data/app/interactors/cache_key_dependencies.rb

@@ -4,11 +4,7 @@ class CacheKeyDependencies
   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
+      self.new(project).perform!
     end
   end
 
@@ -19,10 +15,9 @@ class CacheKeyDependencies
   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)
+      project.props["keyDependency.#{dependency.slug}"] = version
     end
-    project.update_column :extended_attributes, project.extended_attributes
+    project.update_column :props, project.props.to_h
   end
 
 end

data/app/mailers/view_mailer.rb

@@ -16,14 +16,14 @@ class ViewMailer < ActionMailer::Base
 
   class_attribute :stylesheets
   self.stylesheets = %w{
-    core/colors.scss.erb
-    core/avatars.scss
-    core/scores.scss
-    application/emoji.scss
-    application/markdown.scss
-    application/test_run.scss
-    application/releases.scss
-    application/follow_up.scss
+    houston/core/colors.scss.erb
+    houston/core/avatars.scss
+    houston/core/scores.scss
+    houston/application/emoji.scss
+    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/authorization.rb

@@ -0,0 +1,54 @@
+class Authorization < ActiveRecord::Base
+
+  belongs_to :provider, class_name: "Oauth::Provider"
+
+  validates :name, :provider_id, presence: true
+
+  def self.[](name)
+    find_by(name: name)
+  end
+
+  def self.set_access_token!(params)
+    Authorization.find(params.fetch(:state)).tap do |authorization|
+      authorization.get_access_token! params.fetch(:code)
+    end
+  end
+
+  def granted?
+    expires_in.present?
+  end
+
+  def authorize_url(params={})
+    provider.authorize_url params.merge(scope: scope, state: id)
+  end
+
+  def refresh!
+    merge! provider.refresh_access_token(self)
+  end
+
+  def get_access_token!(code)
+    merge! provider.redeem_access_token(code)
+  end
+
+  def access_token
+    refresh! if expired?
+    super
+  end
+
+  def expired?
+    return false unless granted?
+    Time.now >= expires_at
+  end
+
+private
+
+  def merge!(new_token)
+    self.access_token = new_token.token
+    self.expires_in = new_token.expires_in
+    self.expires_at = expires_in.seconds.from_now
+    self.refresh_token = new_token.refresh_token if new_token.respond_to?(:refresh_token)
+    self.secret = new_token.secret if new_token.respond_to?(:secret)
+    save!
+  end
+
+end