opsask 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89132fdc953500cb0c632aaf392488db90b93377
-  data.tar.gz: 5e970e273dde8a2bd2c6a564159524c6afc74640
+  metadata.gz: 75097b91c96acd45e9e062c321d28fa89853675e
+  data.tar.gz: 22a2612de1a3f395f367d6adda5df21097af4329
 SHA512:
-  metadata.gz: fbdd5dbf1e9412869e6f0c6828d7071396e12699af7a8e5236e31fed45b4ac7afe803344325ebd2163dc5e23a6c841d8a8556be990c15e8b7988fd41ef992d3d
-  data.tar.gz: 54afc4d82b2df6bb5a5e2c787a1610aeadfe7655005456484e9fd6b0d73eeda699b4fc8c84a245b807d36b99c2cafd29b30affba3ff2e284c4f6fc408cea965d
+  metadata.gz: 1e467bb33932be0df2a37b5dbfc671dd66fe38f10183622eb3ca8e0d4381eaaa3eec72e1ad8220e72478051f6695664e47250a52fd5273566390485301ba0303
+  data.tar.gz: 9f2775c5d956cbdbd5c7dff1e3019d40f4e60564084c37383b83410e28420a1ad169269cd94550669b28451afac0e5d2ae1b04ab002ffca4eefd8a74e0a41f40

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

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 "labels in (Sprint#{num}) AND resolution is not EMPTY"}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape "labels in (Sprint#{num}) AND resolution is EMPTY"}"
+          "#{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 "sprint = #{id} AND resolution is not EMPTY"}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape "sprint = #{id} AND resolution is EMPTY"}"
+          "#{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 "labels in (Sprint#{num}) AND resolution is not EMPTY"}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape "labels in (Sprint#{num}) AND resolution is EMPTY"}"
+          "#{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 "sprint = #{id} AND resolution is not EMPTY"}",
-          "#{settings.config[:jira_url]}/issues/?jql=#{URI::escape "sprint = #{id} AND resolution is EMPTY"}"
+          "#{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
@@ -287,7 +287,7 @@ module OpsAsk
       return [] unless logged_in?
       issues = []
       id = get_sprint(num)['id']
-      @jira_client.Issue.jql("sprint = #{id}", max_results: 500).each do |i|
+      @jira_client.Issue.jql(normalized_jql("sprint = #{id}", nil), max_results: 500).each do |i|
         issues << i.attrs
       end
       return issues
@@ -300,7 +300,7 @@ module OpsAsk
     def asks_in_sprint num
       return [] unless logged_in?
       issues = []
-      @jira_client.Issue.jql("labels in (Sprint#{num})", max_results: 500).each do |i|
+      @jira_client.Issue.jql(normalized_jql("labels in (Sprint#{num})", nil), max_results: 500).each do |i|
         issues << i.attrs
       end
       return issues
@@ -410,9 +410,9 @@ module OpsAsk
     def jiras_for date
       return [] unless logged_in?
       unless ops?
-        return @jira_client.Issue.jql("due = #{date} AND project = #{settings.config[:project_name]} 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("due = #{date} AND project = #{settings.config[:project_name]} 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
@@ -498,6 +498,7 @@ module OpsAsk
       components = [ { name: component } ] unless component
       labels     = [ 'OpsAsk', current_sprint_name ].compact
       labels    << 'OpsOnly' if ops_only
+      labels    << settings.config[:require_label] if settings.config[:require_label]
       data       = {
         fields: {
           project: { key: settings.config[:project_key] },
@@ -543,12 +544,11 @@ module OpsAsk
     def untracked_issues
       return [] unless logged_in?
       constraints = [
-        "project = #{settings.config[:project_name]}",
         "due < #{today}",
         "resolution = unresolved",
         "assignee = denimcores"
       ].join(' AND ')
-      @jira_client.Issue.jql(constraints, max_results: 100).sort_by do |jira|
+      @jira_client.Issue.jql(normalized_jql(constraints), max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
     end
@@ -556,20 +556,19 @@ module OpsAsk
     def straggling_issues
       return [] unless logged_in?
       constraints = [
-        "project = #{settings.config[:project_name]}",
         "due < #{today}",
         "labels in (OpsAsk)",
         "resolution = unresolved",
         "assignee != denimcores"
       ].join(' AND ')
-      @jira_client.Issue.jql(constraints, max_results: 100).sort_by do |jira|
+      @jira_client.Issue.jql(normalized_jql(constraints), max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
     end
 
     def epics
       data = {
-        jql: "type = Epic AND project = #{settings.config[:project_name]}",
+        jql: normalized_jql("type = Epic"),
         startAt: 0,
         maxResults: 1000
       }
@@ -622,5 +621,11 @@ module OpsAsk
         'name' => response['fields']['customfield_10351'] || response['fields']['summary']
       }
     end
+
+    def normalized_jql query, project=settings.config[:project_name], label=settings.config[:require_label]
+      query += " AND project = #{project}" if project
+      query += " AND labels in (#{label})" if label
+      return query
+    end
   end
 end

data/lib/opsask/main.rb

@@ -41,7 +41,8 @@ module OpsAsk
         version: 'Un-targeted',
         jira_private_key: 'opsask.pem',
         jira_consumer_key: 'opsask-test',
-        app_version: OpsAsk::VERSION
+        app_version: OpsAsk::VERSION,
+        require_label: nil
       }
 
       if options[:config]

metadata

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