opsask 2.1.9 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3245625d9bf275d4572fdfc4fa5201a137e968
-  data.tar.gz: 8ac79891039bab1e396b2a98908012fb8e9a28ab
+  metadata.gz: 39de33ba0a9dba8e6de6179eecf083507bf82457
+  data.tar.gz: 2a6d56152445dbf4f2747bb71eb69b488ccaac47
 SHA512:
-  metadata.gz: 14251899fadd6128bb20fbbb26ca1319e98a7799db5d34beb02949bbd352ef31531b30deaa94ab7704bd5f7c956d512ec8e59fb1d8238991217ef0e4dd8f65dc
-  data.tar.gz: 0440bde8b454f4a86213f0e66a94edd97c426f1db06a8c91188be647d33ef97e64356c36afcb84ffaa27f2f9346d3d27f1d87121c42b46ca427ba9af978ef63a
+  metadata.gz: 20b178f635d9337c99cb2098665bd4f0cc64db6d92d435ac5de720faa4d68e4cb599ede166b493d2e8fa96b889c086188299e80ca3df629507fd164d5e0a93da
+  data.tar.gz: 980a1b120ec1d936754d830266f2c1951228705377a27dff6514ddb7be0bdc9c9408ae67720ea683b724b7b9169c036e72ef09c50ad424557dcf2d447ddf9a08

data/VERSION

@@ -1 +1 @@
-2.1.9
+2.2.0

data/lib/opsask/app.rb

@@ -4,6 +4,7 @@ require 'sinatra/partial'
 require 'rack-flash'
 require 'json'
 require 'jira'
+require 'tilt/erb'
 
 require_relative 'helpers'
 require_relative 'metadata'
@@ -35,9 +36,24 @@ module OpsAsk
     end
 
     get '/glance' do
-      erb :glance, locals: {
-        jiras_for_today: issues_for(today),
-        jiras_for_tomorrow: issues_for(tomorrow),
+      erb :days, locals: {
+        jiras_by_day: issues_for_days(2),
+        untracked_jiras: untracked_issues,
+        stragglers: straggling_issues
+      }
+    end
+
+    get '/week' do
+      erb :days, locals: {
+        jiras_by_day: issues_for_days(4),
+        untracked_jiras: untracked_issues,
+        stragglers: straggling_issues
+      }
+    end
+
+    get '/days/:n' do
+      erb :days, locals: {
+        jiras_by_day: issues_for_days(params[:n].to_i),
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
       }

data/lib/opsask/helpers.rb

@@ -4,6 +4,12 @@ module OpsAsk
       !!session[:jira_auth]
     end
 
+    def no_ops jiras
+      jiras.reject do |jira|
+        jira.fields['labels'].include? 'OpsOnly'
+      end
+    end
+
     def ops?
       return false unless logged_in?
       @myself['groups']['items'].each do |i|
@@ -281,6 +287,21 @@ module OpsAsk
       return "#{idx}-#{jira.key}"
     end
 
+    def today? date
+      Time.new.to_date.strftime('%Y-%m-%d') == date
+    end
+
+    def issues_for_days n
+      now = Time.new.to_date
+      0.upto(n-1).inject({}) do |h,i|
+        date = (now + i).strftime('%Y-%m-%d')
+        h[date] = jiras_for(date).sort_by do |jira|
+          sorting_key_for(jira)
+        end.reverse
+        h
+      end
+    end
+
     def issues_for date
       jiras_for(date).sort_by do |jira|
         sorting_key_for(jira)

data/views/_count.erb

@@ -1,11 +1,9 @@
-<% unless ops? %>
-  <% if count >= settings.config[:queue_size] %>
-    <span class="count label alert radius">full</span>
-  <% elsif today and now.hour >= settings.config[:cutoff_hour] %>
-    <span class="count label alert radius">cutoff</span>
-  <% elsif count > 0 && count < settings.config[:queue_size] %>
-    <span class="count label radius"><%= count %> of <%= settings.config[:queue_size] %></span>
-  <% else # count == 0 %>
-    <span class="count label radius">empty</span>
-  <% end %>
+<% if count >= settings.config[:queue_size] %>
+  <span class="count label alert radius">full</span>
+<% elsif today and now.hour >= settings.config[:cutoff_hour] %>
+  <span class="count label alert radius">cutoff</span>
+<% elsif count > 0 && count < settings.config[:queue_size] %>
+  <span class="count label radius"><%= count %> of <%= settings.config[:queue_size] %></span>
+<% else # count == 0 %>
+  <span class="count label radius">empty</span>
 <% end %>

data/views/days.erb

@@ -0,0 +1,14 @@
+<div class="row">
+  <% c = 12.0 / jiras_by_day.keys.length.to_f ; c = c.floor %>
+  <% i = 0 %>
+  <% jiras_by_day.each do |date, jiras| %>
+    <div id="ops-queue-<%= i %>" class="ops-queue small-<%= c %> columns">
+      <h2>
+        <%= date %>
+        <%= partial :count, locals: { count: no_ops(jiras).length, today: today?(date) } %>
+      </h2>
+      <%= partial :queue, locals: { jiras: jiras } %>
+    </div>
+    <% i += 1 %>
+  <% end %>
+</div>

data/views/index.erb

@@ -1,28 +1,24 @@
 <div class="row">
   <% if its_the_weekend? %>
     <div id="ops-queue-for-coming-week" class="ops-queue small-8 columns">
-      <h2><%= name_for_coming_week %> <%= partial :count, locals: { count: jira_count_for_today, today: false } %></h2>
+      <h2><%= name_for_coming_week %> <%= partial :count, locals: { count: no_ops(jiras_for_today).length, today: false } %></h2>
       <%= partial :queue, locals: { jiras: jiras_for_today } %>
     </div>
 
   <% else %>
     <div id="ops-queue-for-today" class="ops-queue small-4 columns">
-      <h2><%= name_for_today %> <%= partial :count, locals: { count: jira_count_for_today, today: true } %></h2>
+      <h2><%= name_for_today %> <%= partial :count, locals: { count: no_ops(jiras_for_today).length, today: true } %></h2>
       <%= partial :queue, locals: { jiras: jiras_for_today } %>
     </div>
 
     <div id="ops-queue-for-tomorrow" class="ops-queue small-4 columns">
-      <h2><%= name_for_tomorrow %> <%= partial :count, locals: { count: jira_count_for_tomorrow, today: false } %></h2>
+      <h2><%= name_for_tomorrow %> <%= partial :count, locals: { count: no_ops(jiras_for_tomorrow).length, today: false } %></h2>
       <%= partial :queue, locals: { jiras: jiras_for_tomorrow } %>
     </div>
   <% end %>
 
   <section id="ops-ask" class="small-4 columns">
-    <h2>Create JIRA
-      <% unless logged_in? && ops? && room_for_new_jiras?(true) %>
-        <span id="opsonly-full" class="alert label radius">Full</span>
-      <% end %>
-    </h2>
+    <h2>Create JIRA</h2>
     <%= partial :form, locals: {
       jiras_for_today: jiras_for_today,
       jiras_for_tomorrow: jiras_for_tomorrow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsask
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -180,7 +180,7 @@ files:
 - views/_flash.erb
 - views/_form.erb
 - views/_queue.erb
-- views/glance.erb
+- views/days.erb
 - views/index.erb
 - views/layout.erb
 - views/stats.erb

data/views/glance.erb

@@ -1,19 +0,0 @@
-<div class="row">
-  <% if its_the_weekend? %>
-    <div id="ops-queue-for-coming-week" class="ops-queue small-6 small-offset-3 columns">
-      <h2><%= name_for_coming_week %> <%= partial :count, locals: { count: jira_count_for_today, today: false } %></h2>
-      <%= partial :queue, locals: { jiras: jiras_for_today } %>
-    </div>
-
-  <% else %>
-    <div id="ops-queue-for-today" class="ops-queue small-6 columns">
-      <h2><%= name_for_today %> <%= partial :count, locals: { count: jira_count_for_today, today: true } %></h2>
-      <%= partial :queue, locals: { jiras: jiras_for_today } %>
-    </div>
-
-    <div id="ops-queue-for-tomorrow" class="ops-queue small-6 columns">
-      <h2><%= name_for_tomorrow %> <%= partial :count, locals: { count: jira_count_for_tomorrow, today: false } %></h2>
-      <%= partial :queue, locals: { jiras: jiras_for_tomorrow } %>
-    </div>
-  <% end %>
-</div>