houston-core 0.7.0.beta4 → 0.7.0

data/app/models/task.rb

@@ -17,7 +17,7 @@ class Task < ActiveRecord::Base
 
   attr_readonly :number
 
-  default_scope { order(:number) }
+  default_scope { order(:number).joins(:ticket) }
 
 
 

data/app/presenters/task_presenter.rb

@@ -22,13 +22,13 @@ class TaskPresenter
     project = ticket.project
     { id: task.id,
 
-      projectId: project.id,
-      projectSlug: project.slug,
-      projectTitle: project.name,
-      projectColor: project.color,
+      projectId: project && project.id,
+      projectSlug: project && project.slug,
+      projectTitle: project && project.name,
+      projectColor: project && project.color,
 
-      ticketSystem: project.ticket_tracker_name,
-      ticketUrl: ticket.ticket_tracker_ticket_url,
+      ticketSystem: project && project.ticket_tracker_name,
+      ticketUrl: project && ticket.ticket_tracker_ticket_url,
       ticketNumber: ticket.number,
       ticketType: ticket.type.to_s.downcase.dasherize,
       ticketSequence: ticket.extended_attributes["sequence"],  # <-- embeds knowledge of Houston::Scheduler

data/app/views/actions/_actions.html.erb

@@ -0,0 +1,12 @@
+<% @actions.each do |action| %>
+  <tr class="action" data-timestamp="<%= action.started_at.iso8601 %>">
+    <td class="table-margin"></td>
+    <td class="action-time"><%= format_time action.started_at %></td>
+    <td class="action-duration"><%= format_duration action.duration %></td>
+    <td class="action-trigger"><%= action.trigger %></td>
+    <td class="action-params"><%= format_action_params action.params %></td>
+    <td class="action-succeded"><%= format_action_state action %></td>
+    <td class="action-exception"><%= action.error.message if action.error %><td>
+    <td class="table-margin"></td>
+  </tr>
+<% end %>

data/app/views/actions/index.html.erb

@@ -16,10 +16,12 @@
       <tr>
         <td class="table-margin"></td>
         <th class="action-name">Name</th>
+        <th class="action-params">Params</th>
         <th class="action-last">Last Run</th>
         <th class="action-reliability">Reliability</th>
+        <th class="action-count">Count</th>
         <th class="action-duration">Duration</th>
-        <!--<td class="action-run-now"></td>-->
+        <td class="action-run-now"></td>
         <td class="table-margin"></td>
       </tr>
     </thead>
@@ -28,24 +30,28 @@
         <tr class="action">
           <td class="table-margin"></td>
           <td class="action-name"><%= link_to action[:name], action_path(slug: action[:name]) %></td>
+          <td class="action-params"><%= action[:required_params].join(", ") %></td>
           <% if action[:last] %>
             <td class="action-last" data-timestamp="<%= action[:last].started_at.iso8601 %>">
               <%= format_time action[:last].started_at, today: false %>
               <%= format_action_state action[:last] %>
             </td>
-            <td class="action-reliability">
+            <td class="action-reliability" data-position="<%= action[:successful_runs].to_f / action[:runs] %>">
               <%= number_to_percentage 100.0 * action[:successful_runs].to_f / action[:runs], precision: 1 %>
-              <span class="action-success-rate">/<%= action[:runs] %></span>
             </td>
+            <td class="action-count"><%= action[:runs] %></td>
             <td class="action-duration" data-position="<%= action[:avg_duration] %>"><%= format_duration action[:avg_duration] %></td>
           <% else %>
-            <td class="action-last">&mdash;</td>
-            <td class="action-reliability">&mdash;</td>
-            <td class="action-duration">&mdash;</td>
+            <td class="action-last" data-timestamp="0">&mdash;</td>
+            <td class="action-reliability" data-position="0">&mdash;</td>
+            <td class="action-count">0</td>
+            <td class="action-duration" data-position="0">&mdash;</td>
           <% end %>
-          <!--<td class="action-run-now">
-            <%= button_to "Run now", run_action_path(slug: action[:name]), :class => "btn btn-default" %>
-          </td>-->
+          <td class="action-run-now">
+            <% if action[:required_params].empty? %>
+              <%= button_to "Run now", run_action_path(slug: action[:name]), :class => "btn btn-default" %>
+            <% end %>
+          </td>
           <td class="table-margin"></td>
         </tr>
       <% end %>
@@ -59,9 +65,10 @@
     $(function() {
       $('#actions').tablesorter({
         headers: {
-          2: { sorter: 'timestamp' },
-          3: { sorter: 'percent' },
-          4: { sorter: 'property' }
+          3: { sorter: 'timestamp' },
+          4: { sorter: 'property' },
+          5: { sorter: 'integer' },
+          6: { sorter: 'property' }
         }
       });
     });

data/app/views/actions/running.html.erb

@@ -0,0 +1,47 @@
+<% content_for :title do %>
+<h1 class="project-banner space-below">
+  Running Actions
+</h1>
+<% end %>
+
+<div class="nomargin">
+  <table id="actions" class="table table-sortable table-striped">
+    <thead>
+      <tr>
+        <td class="table-margin"></td>
+        <th class="action-time">Started</th>
+        <th class="action-duration">Duration</th>
+        <th class="action-name">Action</th>
+        <th class="action-trigger">Trigger</th>
+        <th class="action-params">Params</th>
+        <td class="table-margin"></td>
+      </tr>
+    </thead>
+    <tbody>
+      <% @actions.each do |action| %>
+        <tr class="action">
+          <td class="table-margin"></td>
+          <td class="action-time"><%= format_time action.started_at %></td>
+          <td class="action-duration"><%= format_time_ago action.started_at %></td>
+          <td class="action-name"><%= link_to action[:name], action_path(slug: action[:name]) %></td>
+          <td class="action-trigger"><%= action.trigger %></td>
+          <td class="action-params"><%= format_action_params action.params %></td>
+          <td class="table-margin"></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+
+<% content_for :javascripts do %>
+  <script type="text/javascript">
+    $(function() {
+      $('#actions')
+        .tablesorter()
+        .on('click', '.action-params-short', function() {
+          $(this).hide().next().show();
+        });
+    });
+  </script>
+<% end %>

data/app/views/actions/show.html.erb

@@ -19,19 +19,8 @@
         <td class="table-margin"></td>
       </tr>
     </thead>
-    <tbody>
-      <% @actions.each do |action| %>
-        <tr class="action">
-          <td class="table-margin"></td>
-          <td class="action-time"><%= format_time action.started_at %></td>
-          <td class="action-duration"><%= format_duration action.duration %></td>
-          <td class="action-trigger"><%= action.trigger %></td>
-          <td class="action-params"><%= format_action_params action.params %></td>
-          <td class="action-succeded"><%= format_action_state action %></td>
-          <td class="action-exception"><%= action.error.message if action.error %><td>
-          <td class="table-margin"></td>
-        </tr>
-      <% end %>
+    <tbody class="infinite-scroll">
+      <%= render "actions/actions" %>
     </tbody>
   </table>
 </div>
@@ -39,7 +28,17 @@
 <% content_for :javascripts do %>
   <script type="text/javascript">
     $(function() {
-      $('#actions').tablesorter();
+      $('#actions')
+        .tablesorter()
+        .on('click', '.action-params-short', function() {
+          $(this).hide().next().show();
+        });
+    });
+    new InfiniteScroll({
+      load: function($tbody) {
+        var timestamp = $tbody.find('.action:last').attr('data-timestamp');
+        return $.get(window.location.pathname, {before: timestamp});
+      }
     });
   </script>
 <% end %>

data/app/views/errors/_actions.html.erb

@@ -4,7 +4,7 @@
     <td class="action-time"><%= format_time action.finished_at %></td>
     <td class="action-name"><%= link_to action[:name], action_path(slug: action[:name]) %></td>
     <td class="action-trigger"><%= action.trigger %></td>
-    <td class="action-params"><%# format_action_params action.params %></td>
+    <td class="action-params"><%= format_action_params action.params %></td>
     <td class="action-error-message"><%= action.error.message %></td>
     <td class="table-margin"></td>
   </tr>

data/app/views/errors/index.html.erb

@@ -27,7 +27,11 @@
 <% content_for :javascripts do %>
   <script type="text/javascript">
     $(function() {
-      $('#triggers').tablesorter();
+      $('#actions')
+        .tablesorter()
+        .on('click', '.action-params-short', function() {
+          $(this).hide().next().show();
+        });
     });
     new InfiniteScroll({
       load: function($tbody) {

data/app/views/layouts/_navigation.html.erb

@@ -5,14 +5,19 @@
     <ul class="nav pull-right">
       <% if current_user -%>
 
-        <% if current_user.administrator? %>
+        <% if can?(:manage, User) || can?(:read, Action) %>
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i> <b class="caret"></b></a>
             <ul class="dropdown-menu">
-              <li><%= link_to "Users", main_app.users_path %></li>
-              <li><%= link_to "Actions", main_app.actions_path %></li>
-              <li><%= link_to "Triggers", main_app.triggers_path %></li>
-              <li><%= link_to "Errors", main_app.errors_path %></li>
+              <% if can?(:manage, User) %>
+                <li><%= link_to "Users", main_app.users_path %></li>
+              <% end %>
+              <% if can?(:read, Action) %>
+                <li><%= link_to "Actions", main_app.actions_path %></li>
+                <li><%= link_to "Running Actions", main_app.running_actions_path %></li>
+                <li><%= link_to "Triggers", main_app.triggers_path %></li>
+                <li><%= link_to "Errors", main_app.errors_path %></li>
+              <% end %>
             </ul>
           </li>
         <% end %>

data/config/initializers/add_navigation_renderers.rb

@@ -1,13 +1,15 @@
 Houston.add_navigation_renderer :sprint do
-  if can?(:read, Sprint)
-    render_nav_link "Sprint", main_app.current_sprint_path, icon: "fa-burndown"
-  end
+  name "Sprint"
+  icon "fa-burndown"
+  path { Houston::Application.routes.url_helpers.current_sprint_path }
+  ability { |ability| ability.can?(:read, Sprint) }
 end
 
 Houston.add_navigation_renderer :pulls do
-  if can?(:read, Github::PullRequest)
-    render_nav_link "Pulls", main_app.pulls_path, icon: "octokit-pull-request"
-  end
+  name "Pulls"
+  icon "octokit-pull-request"
+  path { Houston::Application.routes.url_helpers.pulls_path }
+  ability { |ability| ability.can?(:read, Github::PullRequest) }
 end
 
 

data/config/initializers/houston_deliver.rb

@@ -0,0 +1,16 @@
+module Houston
+
+  def self.deliver!(message)
+    Houston.try({max_tries: 3},
+                Errno::ECONNRESET,
+                Errno::EPIPE,
+                Errno::ETIMEDOUT,
+                Net::OpenTimeout,
+                Net::ReadTimeout,
+                Net::SMTPServerBusy,
+                EOFError) do
+        message.deliver_now!
+    end
+  end
+
+end

data/config/routes.rb

@@ -237,6 +237,7 @@ Rails.application.routes.draw do
   # Actions
 
   get "actions", to: "actions#index", as: :actions
+  get "actions/running", to: "actions#running", as: :running_actions
   get "actions/:slug", to: "actions#show", as: :action, constraints: { slug: /[^\/]+/ }
   post "actions/:slug", to: "actions#run", as: :run_action, constraints: { slug: /[^\/]+/ }
 

data/db/structure.sql

@@ -66,7 +66,7 @@ CREATE TABLE actions (
     succeeded boolean,
     error_id integer,
     trigger character varying,
-    params jsonb
+    params text
 );
 
 

data/houston-core.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["bob.lailfamily@gmail.com"]
 
   spec.summary       = %q{Mission Control for your projects and teams}
-  spec.homepage      = "https://github.com/houston/houston"
+  spec.homepage      = "https://github.com/houston/houston-core"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = ["houston"]

data/lib/generators/module_generator.rb

@@ -13,7 +13,6 @@ module Generators
     end
 
     def config
-      template "config/initializers/add_navigation_renderer.rb"
       template "config/database.yml"
       template "config/routes.rb"
       empty_directory_with_keep_file "db"
@@ -41,6 +40,11 @@ module Generators
       # do nothing
     end
 
+    def assets_manifest
+      # do nothing
+      # added in Rails 5; Houston requires ~> 4.2.7
+    end
+
     def readme
       template "README.md"
     end

data/lib/houston/boot/actions.rb

@@ -2,6 +2,9 @@ require "thread_safe"
 
 module Houston
   class Actions
+    class ExecutionContext < ReadonlyHash
+    end
+
 
     def initialize
       @actions = ThreadSafe::Hash.new
@@ -90,7 +93,7 @@ module Houston
     private
 
       def run!(params, options={})
-        params = ReadonlyHash.new(params)
+        params = ExecutionContext.new(params)
         trigger = options.fetch(:trigger, "manual")
 
         ::Action.record name, params, trigger do

data/lib/houston/boot/configuration.rb

@@ -147,7 +147,8 @@ module_function
 
     def navigation(*args)
       @navigation = args if args.any?
-      @navigation ||= []
+      return Houston.available_navigation_renderers unless @navigation
+      @navigation & Houston.available_navigation_renderers
     end
 
     def project_features(*args)
@@ -380,6 +381,12 @@ module_function
     def on(*args, &block)
       event_name, action_name = extract_trigger_and_action!(args)
       event = Houston.get_registered_event(event_name)
+
+      unless event
+        puts "\e[31mUnregistered event: \e[1m#{event_name}\e[0;90m\n#{caller[0]}\e[0m\n\n"
+        return
+      end
+
       action = assert_action! action_name, event.params, &block
       action.assert_required_params! event.params
 

data/lib/houston/boot/extensions.rb

@@ -7,14 +7,26 @@ module Houston
 
 
 
-    def add_navigation_renderer(name, &block)
-      @navigation_renderers[name] = block
+    def available_navigation_renderers
+      @navigation_renderers.keys
     end
 
     def get_navigation_renderer(name)
       @navigation_renderers.fetch(name)
     end
 
+    def add_navigation_renderer(slug, &block)
+      dsl = FeatureDsl.new(GlobalFeature.new)
+      dsl.instance_eval(&block)
+      feature = dsl.feature
+      feature.slug = slug
+      raise ArgumentError, "Renderer must supply name, but #{slug.inspect} doesn't" unless feature.name
+      raise ArgumentError, "Renderer must supply icon, but #{slug.inspect} doesn't" unless feature.icon
+      raise ArgumentError, "Renderer must supply path lambda, but #{slug.inspect} doesn't" unless feature.path_block
+
+      @navigation_renderers[slug] = feature
+    end
+
 
 
 
@@ -23,11 +35,11 @@ module Houston
     end
 
     def get_project_feature(slug)
-      @available_project_features[slug]
+      @available_project_features.fetch(slug)
     end
 
     def add_project_feature(slug, &block)
-      dsl = ProjectFeatureDsl.new
+      dsl = FeatureDsl.new(ProjectFeature.new)
       dsl.instance_eval(&block)
       feature = dsl.feature
       feature.slug = slug
@@ -105,8 +117,21 @@ module Houston
 
   private
 
-    class ProjectFeature
-      attr_accessor :name, :slug, :icon, :path_block, :ability_block, :fields
+    class GlobalFeature
+      attr_accessor :name, :slug, :icon, :path_block, :ability_block
+
+      def path
+        path_block.call
+      end
+
+      def permitted?(ability)
+        return true if ability_block.nil?
+        ability_block.call ability
+      end
+    end
+
+    class ProjectFeature < GlobalFeature
+      attr_accessor :fields
 
       def initialize
         self.fields = []
@@ -115,6 +140,7 @@ module Houston
       def project_path(project)
         path_block.call project
       end
+      alias :path :project_path
 
       def permitted?(ability, project)
         return true if ability_block.nil?
@@ -122,11 +148,11 @@ module Houston
       end
     end
 
-    class ProjectFeatureDsl
+    class FeatureDsl
       attr_reader :feature
 
-      def initialize
-        @feature = ProjectFeature.new
+      def initialize(feature)
+        @feature = feature
       end
 
       def name(value)