opsask 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4099fc148662eee57087e8482a7e36512272aa36
-  data.tar.gz: 9a8170b65cc5411bb96eab501858d221e3a5dda4
+  metadata.gz: 304c06840c5d03e0b041393f9bc6d222ae604862
+  data.tar.gz: d2e63923eba54bd061c47c152ebb58e99cf4ca68
 SHA512:
-  metadata.gz: 2d7638602a869e99673f95c984f3e19bd5dfce868f5c63cf4c7c4285816f26e7d4c39a6816c524d51d12929ab7fef25cf4d6d376df7ee15e311d72dbbaf3aa1a
-  data.tar.gz: 691af7ecd4002f394d28b745c3a6368440accf818faea91ab35adda3169bfabb84208318b3c5263f45e66f84ed93003becad91bdbec34cb44a429546654956b1
+  metadata.gz: 4515de2701c1cca3e3bca8e778c66fd522e5fee71accd05b07f93f1a447878e6172d36feee9163a26c457e30cfd1b1af2be7c3a030b528c8ad313dbc271307f7
+  data.tar.gz: 78a0f241594b0b585fdc4ca75f2d47e5e9950fb1cdaee8d40e49f23c42f9eafd1f5ac02a7f0760f6b8e6d47fb09526d25a93b69bef3606c9a8f5660693eaa5dd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opsask (2.0.6)
+    opsask (2.0.7)
       curb (~> 0.8)
       rack (~> 1)
       rack-flash3 (~> 1)

data/VERSION

@@ -1 +1 @@
-2.0.7
+2.0.8

data/lib/opsask/app.rb

@@ -62,13 +62,13 @@ module OpsAsk
         sprint: sprint,
         ask_stats: stats_for(
           asks_in_sprint(num),
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) AND resolution is not EMPTY", nil)}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) AND resolution is EMPTY",  nil)}"
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) and resolution is not empty", nil)}",
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) and resolution is empty",  nil)}"
         ),
         sprint_stats: stats_for(
           items_in_sprint(num),
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} AND resolution is not EMPTY", nil)}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} AND resolution is EMPTY", nil)}"
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} and resolution is not empty", nil)}",
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} and resolution is empty", nil)}"
         ),
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -82,13 +82,13 @@ module OpsAsk
         sprint: current_sprint,
         ask_stats: stats_for(
           asks_in_current_sprint,
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) AND resolution is not EMPTY", nil)}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) AND resolution is EMPTY", nil)}"
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) and resolution is not empty", nil)}",
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("labels in (Sprint#{num}) and resolution is empty", nil)}"
         ),
         sprint_stats: stats_for(
           items_in_current_sprint,
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} AND resolution is not EMPTY", nil)}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} AND resolution is EMPTY", nil)}"
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} and resolution is not empty", nil)}",
+          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape normalized_jql("sprint = #{id} and resolution is empty", nil)}"
         ),
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -423,9 +423,9 @@ module OpsAsk
     def jiras_for date
       return [] unless logged_in?
       unless ops?
-        return @jira_client.Issue.jql normalized_jql("due = #{date} AND type != Change AND labels in (OpsAsk) AND labels not in (OpsOnly)"), max_results: 100
+        return @jira_client.Issue.jql normalized_jql("due = #{date} and type != Change and labels in (OpsAsk) and labels not in (OpsOnly)"), max_results: 100
       end
-      return @jira_client.Issue.jql normalized_jql("due = #{date} AND labels in (OpsAsk) AND type != Change"), max_results: 100
+      return @jira_client.Issue.jql normalized_jql("due = #{date} and labels in (OpsAsk) and type != Change"), max_results: 100
     end
 
     def jira_count_for date
@@ -560,7 +560,7 @@ module OpsAsk
         "due < #{today}",
         "resolution = unresolved",
         "assignee = denimcores"
-      ].join(' AND ')
+      ].join(' and ')
       @jira_client.Issue.jql(normalized_jql(constraints), max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
@@ -573,7 +573,7 @@ module OpsAsk
         "labels in (OpsAsk)",
         "resolution = unresolved",
         "assignee != denimcores"
-      ].join(' AND ')
+      ].join(' and ')
       @jira_client.Issue.jql(normalized_jql(constraints), max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
@@ -640,9 +640,9 @@ module OpsAsk
       require_label=settings.config[:require_label],
       ignore_label=settings.config[:ignore_label]
     # ...
-      query += " AND project = #{project}" if project
-      query += " AND labels in (#{require_label})" if require_label
-      query += " AND (labels not in (#{ignore_label}) OR labels is EMPTY)" if ignore_label
+      query += %Q| and project = #{project}| if project
+      query += %Q| and labels = #{require_label}| if require_label
+      query += %Q| and (labels != #{ignore_label} OR labels is empty)| if ignore_label
       return query
     end
   end

data/public/css/style.css

@@ -128,6 +128,10 @@ h3.ops-queues-are-full {
   color: #c60f13;
 }
 
+h3.empty {
+  color: #333;
+}
+
 p.ops-queues-are-full {
   font-size: 1.1em;
   color: #ccc;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsask
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor