houston-core 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baaf1dd02fe0e6a89799650205ddcb173a4e91b3
-  data.tar.gz: 5aabee4c509624eefc8bf87358631814a38b04b6
+  metadata.gz: bf0ac73eb3d8a6d5977d5ddbc3fa9e0fb3606963
+  data.tar.gz: 66f2cd060849457e67edf8aa391cd22a526bb23b
 SHA512:
-  metadata.gz: 95d5b8cca3bdc4acc0db433c33ffa4e4fef717fccabc70fe97c3ce8c9603c432c1a98766c7a0522fac6e207d27121c93025e0c12a3024ca6a610fca4c832de21
-  data.tar.gz: 62a96ab002967a8152abe8727f127e80bfaf721bb021229376164539322a3b1c5317178b5201465e67f617c9765deb4bd7c916a60eddaa2efedda317c546f3a6
+  metadata.gz: 8b6cbfb3977ab6a5fc3e3975a298bbd4663dbc529cc815b2604e2ddc969628d05d19d0f49c5c28d150656208ea1799a3f1e533a0ed80a9a16b5f574c365bcf27
+  data.tar.gz: 7bf5d4111369ac82f6cf90bae84ac075cc0095f0b7c743955bb1dcfb7fb8aea8b0ebddde30cd4809f092eecdf5b10b5cfb8306f43a9c85c4d659b46215cf331d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.8.1)
+    houston-core (0.8.2)
       activerecord-import
       activerecord-pluck_in_batches (~> 0.2.0)
       addressable (~> 2.3.8)

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

@@ -1,3 +1,8 @@
 .modal-body.noscroll {
   overflow-y: visible;
 }
+.modal-header code {
+  background: transparent;
+  color: inherit;
+  padding: 0;
+}

data/app/controllers/actions_controller.rb

@@ -44,4 +44,11 @@ class ActionsController < ApplicationController
     redirect_to "/actions", notice: "#{params[:slug]} is running"
   end
 
+  def retry
+    authorize! :run, Action
+    action = Action.find(params[:id])
+    action.retry!
+    redirect_to "/actions/#{action.name}", notice: "#{action.name} is running"
+  end
+
 end

data/app/controllers/teams_controller.rb

@@ -5,7 +5,7 @@ class TeamsController < ApplicationController
 
   def index
     @title = "Teams"
-    @teams = Team.all.select { |team| can?(:read, team) }
+    @teams = Team.all.preload(:projects, roles: :user).select { |team| can?(:read, team) }
     authorize! :read, :teams
   end
 

data/app/helpers/actions_helper.rb

@@ -6,8 +6,14 @@ module ActionsHelper
       <div class="action-params-short">
         <pre>{ #{params.keys.map(&:inspect).join(", ")} }</pre>
       </div>
-      <div class="action-params-full">
-        <pre>#{_add_white_space Houston::ParamsSerializer.new.dump(params)}</pre>
+      <div class="action-params-full modal">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h3><code>{ #{params.keys.map(&:inspect).join(", ")} }</code></h3>
+        </div>
+        <div class="modal-body">
+          <pre>#{_add_white_space Houston::ParamsSerializer.new.dump(params)}</pre>
+        </div>
       </div>
     HTML
   end

data/app/models/action.rb

@@ -75,6 +75,10 @@ class Action < ActiveRecord::Base
 
 
 
+  def retry!
+    Houston.actions.run name, params
+  end
+
   def exception=(exception)
     self.error = Error.find_or_create_for_exception(exception) if exception
   end

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

@@ -14,6 +14,7 @@
         <%= action.error.message %>
       <% end %>
     <td>
+    <td class="action-retry"><%= button_to "Retry", retry_action_path(action), class: "btn-retry btn btn-mini btn-default" %></td>
     <td class="table-margin"></td>
   </tr>
 <% end %>

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

@@ -40,7 +40,7 @@
       $('#actions')
         .tablesorter()
         .on('click', '.action-params-short', function() {
-          $(this).hide().next().show();
+          $(this).next().modal();
         });
     });
   </script>

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

@@ -16,6 +16,7 @@
         <th class="action-params">Params</th>
         <th class="action-succeded">Succeeded</th>
         <th class="action-exception">Exception</th>
+        <th class="action-retry">Retry</th>
         <td class="table-margin"></td>
       </tr>
     </thead>
@@ -31,7 +32,7 @@
       $('#actions')
         .tablesorter()
         .on('click', '.action-params-short', function() {
-          $(this).hide().next().show();
+          $(this).next().modal();
         });
     });
     new InfiniteScroll({

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

@@ -11,6 +11,7 @@
       <% end %>
       <%= action.error.message %>
     </td>
+    <td class="action-retry"><%= button_to "Retry", retry_action_path(action), class: "btn-retry btn btn-mini btn-default" %></td>
     <td class="table-margin"></td>
   </tr>
 <% end %>

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

@@ -14,6 +14,7 @@
         <th class="action-trigger">Trigger</th>
         <th class="action-params">Params</th>
         <th class="action-error-message">Message</th>
+        <th class="action-retry">Retry</th>
         <td class="table-margin"></td>
       </tr>
     </thead>
@@ -27,10 +28,10 @@
 <% content_for :javascripts do %>
   <script type="text/javascript">
     $(function() {
-      $('#actions')
+      $('#errors')
         .tablesorter()
         .on('click', '.action-params-short', function() {
-          $(this).hide().next().show();
+          $(this).next().modal();
         });
     });
     new InfiniteScroll({

data/config/routes.rb

@@ -95,6 +95,7 @@ Rails.application.routes.draw do
   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: /[^\/]+/ }
+  post "actions/:id/retry", to: "actions#retry", as: :retry_action
 
 
 

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/templates/new-module/lib/houston/%name%.rb

@@ -33,7 +33,6 @@ module Houston
   #
   #    add_navigation_renderer :<%= name %> do
   #      name "<%= camelized %>"
-  #      icon "fa-thumbs-up"
   #      path { Houston::<%= camelized %>::Engine.routes.url_helpers.<%= name %>_path }
   #      ability { |ability| ability.can? :read, Project }
   #    end
@@ -43,7 +42,6 @@ module Houston
   #
   #    add_project_feature :<%= name %> do
   #      name "<%= camelized %>"
-  #      icon "fa-thumbs-up"
   #      path { |project| Houston::<%= camelized %>::Engine.routes.url_helpers.project_<%= name %>_path(project) }
   #      ability { |ability, project| ability.can? :read, project }
   #    end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston-core
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails