houston-core 0.8.4 → 0.9.0.rc1

data/app/assets/stylesheets/houston/application/actions.scss

@@ -8,6 +8,28 @@ td.action-reliability {
   padding-right: 16px !important;
 }
 
+.action-errors {
+  .action-duration { display: none; }
+  .action-started { display: none; }
+  .action-finished { display: none; }
+}
+.action-show {
+  .action-name { display: none; }
+}
+.action-running {
+  .action-created { display: none; }
+  .action-finished { display: none; }
+  .action-succeeded { display: none; }
+  .action-exception { display: none; }
+}
+.action-unqueued {
+  .action-started { display: none; }
+  .action-finished { display: none; }
+  .action-duration { display: none; }
+  .action-succeeded { display: none; }
+  .action-exception { display: none; }
+}
+
 .action-params {
   pre {
     border: none;

data/app/assets/stylesheets/houston/application/navigation.scss

@@ -222,7 +222,7 @@ $current-project-active-bg: #222;
   font-size: 2em;
 
 
-  a.btn { color: white ;}
+  a.btn { font-weight: normal; }
 
   .buttons { float: right; }
 
@@ -249,6 +249,6 @@ body {
   padding-top: $navbar-height + $project-navbar-height
 }
 
-#body {
+.project-banner + #body {
   padding-top: 105px;
 }

data/app/assets/stylesheets/houston/application/{freight_train.css.scss → nested_resources.scss}

@@ -16,6 +16,7 @@
     }
   }
 }
+
 .nested.editor.headings div {
   padding-top: 5px;
   margin-top: 0;

data/app/assets/stylesheets/houston/core/alerts.scss

@@ -1,7 +1,3 @@
-html.tester-bar {
-  .alertify-logs { bottom: 52px; }
-}
-
 .alertify-log {
   background: rgba(9, 151, 196, 0.75);
   text-shadow: none;

data/app/assets/stylesheets/houston/core/timeline.scss

@@ -0,0 +1,204 @@
+$lightGray: #eee;
+
+.timeline {
+
+  .timeline-date {
+    width: 38px;
+    font-size: 0.75em;
+    text-align: right;
+    border-right: 2px solid $lightGray;
+    padding-right: 12px;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    line-height: 1em;
+    position: relative;
+    color: #888;
+
+    &::after {
+      content: '.';
+      width: 8px;
+      height: 2px;
+      background: $lightGray;
+      display: block;
+      color: transparent;
+      position: absolute;
+      right: 0;
+      top: 1.25em;
+    }
+
+    .weekday { display: block; }
+    .year { display: none; }
+  }
+
+  .timeline-date-gap {
+    margin-left: 50px;
+    padding-left: 12px;
+    border-left: dashed 2px $lightGray;
+    height: 48px;
+  }
+
+  .timeline-event {
+    margin-left: 50px;
+    padding: 4px 4px 4px 70px;
+    border-left: solid 2px $lightGray;
+    position: relative;
+    font-size: 0.92em;
+    text-indent: -57px;
+    line-height: 1.25em;
+
+    .timeline-event-time {
+      font-size: 10px;
+      text-align: right;
+      line-height: 1em;
+      position: absolute;
+      left: -14px;
+      top: 10px;
+      color: $lightGray;
+    }
+
+    a {
+      color: #333;
+      font-weight: 300;
+
+      &:hover {
+        text-decoration: none;
+        background: #EDF9FF;
+      }
+
+      b { font-weight: 400; }
+    }
+
+    .ticket-number a { color: #0088cc !important; }
+
+    .bubble {
+      border-radius: 13px;
+      width: 13px;
+      height: 13px;
+      position: relative;
+      top: 2px;
+      text-indent: 0;
+      margin: 0 4px;
+    }
+
+    .timeline-event-type {
+      color: white;
+      font-size: 9px;
+      display: inline-block;
+      width: 12px;
+      text-indent: 0;
+      position: absolute;
+      top: 2px;
+      left: 1px;
+      text-align: center;
+    }
+
+    &::after {
+      content: '.';
+      width: 7px;
+      height: 7px;
+      border-radius: 7px;
+      border: solid 2px $lightGray;
+      display: block;
+      background: white;
+      color: transparent;
+      position: absolute;
+      left: -6px;
+      top: 10px;
+    }
+
+    &::before {
+      content: '.';
+      width: 12px;
+      height: 2px;
+      background: $lightGray;
+      display: block;
+      color: transparent;
+      position: absolute;
+      left: 0;
+      top: 14px;
+    }
+
+    &.timeline-event-audit {
+      padding-left: 37px;
+
+      em {
+        background: #ffd;
+        font-style: normal;
+      }
+    }
+
+    &.timeline-event-release,
+    &.timeline-event-ticket-created,
+    &.timeline-event-ticket-closed {
+      padding-right: 100px;
+    }
+
+    &.timeline-event-release {
+      font-size: 1.10em;
+
+      a { font-weight: 400;
+        b { font-weight: 700; }
+      }
+
+      .bubble {
+        width: 21px;
+        height: 21px;
+        left: -4px;
+        border-radius: 21px;
+        top: 6px;
+        margin-right: -4px;
+      }
+
+      .timeline-event-type {
+        font-size: 15px;
+        left: 2px;
+        top: 3px;
+      }
+
+      .timeline-event-time {
+        top: 14px;
+      }
+
+      &::before { top: 19px; width: 8px; }
+      &::after { top: 15px; }
+    }
+
+    .timeline-event-actor {
+      width: 20px;
+      display: inline-block;
+      text-indent: 0;
+      margin: 0 4px;
+      position: relative;
+      top: -1px;
+    }
+
+    .commit-range {
+      display: block;
+      position: absolute;
+      top: 11px;
+      right: 0;
+      text-indent: 0;
+      font-size: 10px;
+      letter-spacing: 1px;
+
+      a { color: #0088cc !important; }
+    }
+
+    .ticket-resolution {
+      font-size: 0.88em;
+      font-weight: 700;
+      color: #aaa;
+
+      &::after { content: ':'; }
+    }
+
+    .ticket-number {
+      display: block;
+      position: absolute;
+      top: 4px;
+      right: 0;
+      text-indent: 0;
+      font-size: 0.88em;
+    }
+  }
+}

data/app/assets/templates/houston/teams/roles/index.hbs

@@ -0,0 +1 @@
+<ol id="roles"></ol>

data/app/assets/templates/houston/teams/roles/show.hbs

@@ -0,0 +1,19 @@
+<input data-attr="id" type="hidden" value="{{id}}" name="team[roles_attributes][{{index}}][id]">
+
+<input data-attr="_destroy" type="hidden" value="{{#if destroyed}}1{{else}}0{{/if}}" attr="team[roles_attributes][{{index}}][_destroy]" name="team[roles_attributes][{{index}}][_destroy]">
+
+<select name="team[roles_attributes][{{index}}][user_id]">
+  {{#each options.users}}
+    <option {{#ifEql id ../userId}}selected{{/ifEql}} value="{{id}}">{{name}}</option>
+  {{/each}}
+</select>
+
+{{#each options.roles}}
+  <label style="display: inline-block">
+    <input type="checkbox" name="team[roles_attributes][{{../index}}][roles][]" {{#ifIn this ../roles}}checked{{/ifIn}} value="{{this}}">
+    {{this}}
+  </label>
+{{/each}}
+
+<span class="delete-nested"><a class="delete-link delete-button delete-nested-link" href="#" title="Delete">Delete</a></span>
+<span class="add-nested"><a class="add-link add-nested-link" href="#" title="Add">Add</a></span>

data/app/channels/events_channel.rb

@@ -10,7 +10,7 @@ class EventsChannel < ApplicationCable::Channel
     events = params[:events] if params.key?(:events)
 
     events.each do |event|
-      unless Houston.registered_event?(event)
+      unless Houston.events.registered?(event)
         Rails.logger.info "\e[31m[subscriber] \e[1m#{event}\e[0;31m is not a registered event\e[0m"
         next
       end

data/app/concerns/houston/props.rb

@@ -15,9 +15,10 @@ module Houston
 
 
     module ClassMethods
-      def with_prop(prop_name, value)
+      def with_prop(prop_name, *args)
         Houston::Props.valid_prop_name!(prop_name)
-        where(["props->>? = ?", prop_name, value.to_s])
+        return where(["props ? :key", { key: prop_name }]) if args.empty?
+        where(["props->>? = ?", prop_name, args.first.to_s])
       end
 
       def find_by_prop(prop_name, value)

data/app/controllers/actions_controller.rb

@@ -29,13 +29,18 @@ class ActionsController < ApplicationController
     authorize! :read, Action
     @action_name = params[:slug]
     @actions = Action.where(name: @action_name).preload(:error).limit(50)
-    @actions = @actions.where(Action.arel_table[:started_at].lt(params[:before])) if params[:before]
+    @actions = @actions.where(Action.arel_table[:created_at].lt(params[:before])) if params[:before]
     render partial: "actions/actions" if request.xhr?
   end
 
   def running
     authorize! :read, Action
-    @actions = Action.where(finished_at: nil)
+    @actions = Action.running
+  end
+
+  def unqueued
+    authorize! :read, Action
+    @actions = Action.unqueued
   end
 
   def run
@@ -48,7 +53,7 @@ class ActionsController < ApplicationController
     authorize! :run, Action
     action = Action.find(params[:id])
     action.retry!
-    redirect_to "/actions/#{action.name}", notice: "#{action.name} is running"
+    redirect_to :back
   end
 
 end

data/app/controllers/application_controller.rb

@@ -26,18 +26,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  rescue_from UserCredentials::MissingCredentials do
-    head 401, "X-Credentials" => "Missing Credentials"
-  end
-
-  rescue_from UserCredentials::InvalidCredentials do
-    head 401, "X-Credentials" => "Invalid Credentials"
-  end
-
-  rescue_from UserCredentials::InsufficientPermissions do |exception|
-    render plain: exception.message, status: 401
-  end
-
   rescue_from ActiveRecord::RecordNotFound do
     render file: Houston.root.join("public/404"), layout: false
   end
@@ -139,6 +127,15 @@ class ApplicationController < ActionController::Base
 
 
 
+  def oauth_authorize!(klass, scope:, redirect_to: nil)
+    authorization = klass.for(current_user).find_or_create_by!(scope: scope)
+    raise ArgumentError, "authorization already exists" if authorization.granted?
+    session["#{authorization.id}_granted_redirect_url"] = redirect_to if redirect_to
+    redirect_to authorization.url
+  end
+
+
+
   def no_cache
     response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate"
     response.headers["Pragma"] = "no-cache"

data/app/controllers/authorizations_controller.rb

@@ -1,9 +1,18 @@
 class AuthorizationsController < ApplicationController
+  before_action :authenticate_user!
+  before_action :find_authorization, only: [:edit, :update, :destroy, :grant, :granted]
 
   def index
     @title = "Authorizations"
-    authorize! :read, Authorization
-    @authorizations = Authorization.all
+    authorize! :read, :all_authorizations
+    @authorizations = Authorization.all.preload(:user)
+  end
+
+  def mine
+    @title = "My Authorizations"
+    authorize! :create, Authorization
+    @authorizations = current_user.authorizations
+    render action: :index
   end
 
   def new
@@ -13,49 +22,67 @@ class AuthorizationsController < ApplicationController
   end
 
   def create
-    @authorization = Authorization.new(params[:authorization])
+    @authorization = current_user.authorizations.build(params[:authorization])
     authorize! :create, @authorization
 
     if @authorization.save
-      redirect_to authorizations_path
+      redirect_to my_authorizations_path
     else
-      render action: :new
+      render action: :new, error: @authorization.errors.full_messages.to_sentence
     end
   end
 
   def edit
     @title = "Edit Authorization"
-    @authorization = Authorization.find params[:id]
-    authorize! :update, Authorization
+    authorize! :update, @authorization
   end
 
   def update
-    @authorization = Authorization.find params[:id]
-    authorize! :update, Authorization
+    authorize! :update, @authorization
 
     if @authorization.update_attributes(params[:authorization])
-      redirect_to authorizations_path
+      redirect_to my_authorizations_path
     else
       render action: :new
     end
   end
 
+  def destroy
+    authorize! :destroy, @authorization
+
+    @authorization.destroy
+    redirect_to my_authorizations_path, notice: "Authorization to #{@authorization.provider.name} revoked"
+  end
+
   def grant
-    @authorization = Authorization.find(params[:id])
     if @authorization.granted?
       redirect_to authorizations_url, notice: "Already Granted"
     else
-      puts "\e[96;4m#{@authorization.authorize_url}\e[0m"
       redirect_to @authorization.authorize_url
     end
   end
 
   def oauth2_callback
-    authorization = Authorization.set_access_token! params
-    redirect_to authorization_granted_url(authorization)
+    if params.key?(:code) && params.key?(:state)
+      authorization = Authorization.set_access_token! params
+      redirect_to authorization_granted_url(authorization)
+    else
+      @error = params.fetch(:error, "An unknown error occurred")
+    end
   end
 
   def granted
+    redirect_to session[granted_redirect] if session.key?(granted_redirect)
+  end
+
+private
+
+  def granted_redirect
+    "#{@authorization.id}_granted_redirect_url"
+  end
+
+  def find_authorization
+    @authorization = Authorization.find(params[:id])
   end
 
 end