shipit-engine 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38e2344717e450b3db3cb9248f16c2b475b2955b
-  data.tar.gz: cc5af413a0c7a25602639dd52be6d620220880e8
+  metadata.gz: a30e953800b45a4493e91c7e8caa2ad53f3dc447
+  data.tar.gz: 16b5dabad1863d6982dbd8736152e37e19a3a671
 SHA512:
-  metadata.gz: b27627cdf81dd03bb8f4f0db181d4e9e00759469350f67d793c99c02fb6dfd9518edda0673bb79c234efb5d5025916b581f0c99b8fb62d1159e9420028c35cec
-  data.tar.gz: 7932b8299a15e244982322f760e700138feb36dfbe2bac6818b547a06c9b82dad57edc82aa7835744fcb0d9c061810e0e129a3c2be2e3445e7e5af76f50d23e0
+  metadata.gz: cb4027d810267d4c983dd26fa0a602af2db1a5015e3371b2b02e2d8d8636d791a596517a5528df4c89b9d95cc6b638a2ee7676a14215eae60fa2cfa9b8e67d27
+  data.tar.gz: 10ff1beb9b067253a7814300ec69b9f7ef7e3c312d3c3b2c122183d0d90a0a97e84f8f267249dc393866fc9374986ce8b0c874d8a97d040e060c64d872ced214

data/app/assets/javascripts/shipit.js.coffee

@@ -20,19 +20,26 @@
 $(document).on 'click', '.disabled, .btn--disabled', (event) ->
   event.preventDefault()
 
-$(document).on 'click', '.enable-notifications .banner__dismiss', (event) ->
+$(document).on 'click', '.banner__dismiss', (event) ->
   $(event.target).closest('.banner').addClass('hidden')
+
+$(document).on 'click', '.enable-notifications .banner__dismiss', (event) ->
   localStorage.setItem("dismissed-enable-notifications", true)
 
+$(document).on 'click', '.github-status .banner__dismiss', (event) ->
+  localStorage.setItem("dismissed-github-status", true)
+
 jQuery ->
-  if(localStorage.getItem("dismissed-enable-notifications"))
-    return
-  $notificationNotice = $('.enable-notifications')
-
-  if $.notifyCheck() == $.NOTIFY_NOT_ALLOWED
-    $button = $notificationNotice.find('button')
-    $button.on 'click', ->
-      $.notifyRequest()
-      $notificationNotice.addClass('hidden')
-    $notificationNotice.removeClass('hidden')
+  unless(localStorage.getItem("dismissed-enable-notifications"))
+    $notificationNotice = $('.enable-notifications')
+
+    if $.notifyCheck() == $.NOTIFY_NOT_ALLOWED
+      $button = $notificationNotice.find('button')
+      $button.on 'click', ->
+        $.notifyRequest()
+        $notificationNotice.addClass('hidden')
+      $notificationNotice.removeClass('hidden')
+
+  unless(localStorage.getItem("dismissed-github-status"))
+    $('.github-status').removeClass('hidden')
 

data/app/jobs/shipit/continuous_delivery_job.rb

@@ -6,6 +6,7 @@ module Shipit
 
     def perform(stack)
       return unless stack.continuous_deployment?
+      return if stack.active_task?
       stack.trigger_continuous_delivery
     end
   end

data/app/models/shipit/github_status.rb

@@ -0,0 +1,15 @@
+module Shipit
+  module GithubStatus
+    CACHE_KEY = 'github::status'.freeze
+
+    class << self
+      def status
+        Rails.cache.read(CACHE_KEY)
+      end
+
+      def refresh_status
+        Rails.cache.write(CACHE_KEY, Shipit.github_api.github_status)
+      end
+    end
+  end
+end

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

@@ -26,6 +26,23 @@
     </div>
   </div>
 
+  <% github_status = Shipit::GithubStatus.status
+     unless github_status.nil? || github_status[:status] == 'good' %>
+    <div class="banner github-status banner--orange hidden">
+      <div class="banner__inner wrapper">
+        <div class="banner__content">
+          <h2 class="banner__title">GitHub is having issues</h2>
+            "<i><%= github_status[:body] %></i>"
+            <% unless github_status[:last_updated].nil? %>
+              <%= time_ago_in_words(github_status[:last_updated]) %> ago
+            <% end %>
+        </div>
+
+        <a class="banner__dismiss">&times;</a>
+      </div>
+    </div>
+  <% end %>
+
   <header class="header">
     <%= link_to "Shipit v#{Shipit::VERSION}", "https://github.com/Shopify/shipit-engine/tree/v#{Shipit::VERSION}", class: 'powered-by' %>
     <div class="wrapper">

data/app/views/shipit/stacks/show.html.erb

@@ -13,7 +13,6 @@
         <%= button_to "Ignore CI", stack_path(@stack, stack: {ignore_ci: true}, return_to: stack_path(@stack)), method: :patch, class: 'banner__btn btn' %>
       </div>
     </div>
-    <a class="banner__dismiss">&times;</a>
   </div>
 <% end %>
 

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

data/lib/tasks/cron.rake

@@ -3,6 +3,7 @@ namespace :cron do
   task minutely: :environment do
     Shipit::Stack.refresh_deployed_revisions
     Shipit::Stack.schedule_continuous_delivery
+    Shipit::GithubStatus.refresh_status
   end
 
   desc "Rolls-up output chunks for completed deploys older than an hour"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -624,6 +624,7 @@ files:
 - app/models/shipit/duration.rb
 - app/models/shipit/ephemeral_commit_checks.rb
 - app/models/shipit/github_hook.rb
+- app/models/shipit/github_status.rb
 - app/models/shipit/hook.rb
 - app/models/shipit/membership.rb
 - app/models/shipit/missing_status.rb