generate-email-summary.rb in opsask-2.3.5

- old
+ new

@@ -18,20 +18,23 @@
 USER, PASS = ARGV[0], ARGV[1]
 
 
 def ask_jira constraints=nil
   constraints = "AND #{constraints}" unless constraints.nil?
-  return %Q| curl -sL \
+  jql = {
+    'jql' => "project = Infrastructure #{constraints} ORDER BY created"
+  }
+  curl = %Q| curl -sL \
     -u "#{USER}:#{PASS}" \
     -XPOST "#{JIRA}/rest/api/latest/search" \
-    -H "Content-Type: application/json" -d '{
-      "jql": "project = Infrastructure #{constraints} ORDER BY created"
-    }'
+    -H "Content-Type: application/json" -d '#{JSON.generate(jql)}'
   |
+  return curl
 end
 
 def inf_issues_where constraints=nil
+  # $stderr.puts constraints
   JSON::parse(`#{ask_jira constraints}`)['issues']
 end
 
 def write_out title, issues
   return if issues.empty?
@@ -45,21 +48,26 @@
 end
 
 untracked_today = inf_issues_where('due = endOfDay() AND resolution  = unresolved AND assignee  = denimcores')
 tracked_today   = inf_issues_where('due = endOfDay() AND resolution  = unresolved AND assignee != denimcores')
 resolved_today  = inf_issues_where('due = endOfDay() AND resolution != unresolved')
+uncategorized   = inf_issues_where('due = endOfDay() AND "Ops Work Category" is EMPTY')
 stragglers      = inf_issues_where('due < startOfDay() AND labels in (OpsAsk) AND resolution = unresolved AND assignee != denimcores')
 
 exit if untracked_today.empty? \
      && tracked_today.empty?   \
      && resolved_today.empty?  \
+     && uncategorized.empty?  \
      && stragglers.empty?
 
+# $stderr.puts uncategorized.inspect
+
 write_out 'Untracked',  untracked_today
 write_out 'Tracking',   tracked_today
 write_out 'Resolved',   resolved_today
 write_out 'Stragglers', stragglers
+write_out 'Uncategorized', uncategorized
 
 num_untracked_today = untracked_today.length
 num_untracked       = inf_issues_where('due < endOfDay() AND resolution = unresolved AND assignee = denimcores').length
 
 if num_untracked == 1 && num_untracked_today == 0
@@ -68,6 +76,6 @@
   puts %Q|<b>There is another <a href="#{UNTRACKED}">untracked issue</a> from the past</b>|
 elsif  num_untracked > 1 && num_untracked_today == 0
   puts %Q|<b>There are <a href="#{UNTRACKED}">#{num_untracked} untracked issues</a> from the past</b>|
 elsif  num_untracked > 1 && num_untracked_today > 0
   puts %Q|<b>There are <a href="#{UNTRACKED}">#{num_untracked} additional untracked issues</a> from the past</b>|
-end
\ No newline at end of file
+end