opsask 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d841e29ac173b8f44d7a5ff45c7d1e8d4de825aa
-  data.tar.gz: 76c7c5466e88f24c2d6568bc5f76a3e36aff536a
+  metadata.gz: cbff03a2754db23e2c4924d402c479430b57eae0
+  data.tar.gz: 34b9c28797098d3329167157effee3421fde796e
 SHA512:
-  metadata.gz: 5966bee1cc2398ee5f0be1452c6386cd17d10c64ff306671559b1f344143f355edfb319dc10b0505cfcbd0883c7565aa1a05e14f350479dd1451b905fbfd72fe
-  data.tar.gz: 2fd73ba9fb5cc48f741f0a65daf5a487b1bbdc90fae73410326f949e868ddf15df422849e186c4d0d5d1e79e3d0f9a939952814bc703909caa72418dc87b8a2a
+  metadata.gz: 67de8c2f12b86598b6a6d1c6f3a33033bcbcf945710d4b09a456d4bd953dc99a7aabeacc1017a706668e337a51220d6ec9ca94ad0f80d2caf76e852b6db1e3fc
+  data.tar.gz: 9a3d53f75530f62ecdf57d64e6ed6bf578d9fe57c43dea8d5b742b1d84a608037e73e54b09a7710524d9ed172c99e9c07b9d2663005b5aecca9fa018000f2ef0

data/.gitignore

@@ -12,3 +12,4 @@ pkg
 .DS_Store
 config.json
 .bundle
+.yardoc

data/Gemfile.lock

@@ -3,9 +3,9 @@ PATH
   specs:
     opsask (2.0.0)
       curb (~> 0.8)
-      jira-ruby (~> 0.1)
       rack (~> 1)
       rack-flash3 (~> 1)
+      sclemmer-jira-ruby (~> 0.1)
       sinatra (~> 1.4)
       sinatra-partial (~> 0.4)
       thin (~> 1)
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.7)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -25,9 +25,6 @@ GEM
     daemons (1.1.9)
     eventmachine (1.0.3)
     i18n (0.6.11)
-    jira-ruby (0.1.11)
-      activesupport (~> 4.1.4)
-      oauth (~> 0.4.7)
     json (1.8.1)
     method_source (0.8.2)
     minitest (5.4.3)
@@ -43,6 +40,9 @@ GEM
       rack
     rake (10.3.2)
     rubygems-tasks (0.2.4)
+    sclemmer-jira-ruby (0.1.12)
+      activesupport (~> 4.1.4)
+      oauth (~> 0.4.7)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -60,7 +60,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     version (1.0.0)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/opsask/app.rb

@@ -55,18 +55,41 @@ module OpsAsk
     end
 
     get '/sprint/:sprint_num' do
-      erb :agile, locals: {
-        asks: asks_in_sprint(params[:sprint_num]),
-        sprint: get_sprint(params[:sprint_num]),
+      num = params[:sprint_num]
+      sprint = get_sprint(num)
+      id = sprint['id']
+      erb :stats, locals: {
+        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"}"
+        ),
+        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"}"
+        ),
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
       }
     end
 
-    get '/agile' do
-      erb :agile, locals: {
-        asks: asks_in_current_sprint,
-        sprint: current_sprint([]),
+    get '/sprint' do
+      num = current_sprint_num
+      id = current_sprint_id
+      erb :stats, locals: {
+        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"}"
+        ),
+        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"}"
+        ),
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
       }
@@ -216,14 +239,68 @@ module OpsAsk
       return date
     end
 
+    def stats_for issues, resolved_link, unresolved_link
+      return {} unless logged_in?
+      return {} unless issues
+
+      resolved_issues, unresolved_issues = [], []
+
+      issues.map! do |i|
+        key = i['key']
+        status = i['fields']['status']['name']
+        resolution = i['fields']['resolution']['name'] rescue nil
+        points = i['fields']['customfield_10002'].to_i
+
+        issue = {
+          key: key,
+          status: status,
+          resolution: resolution,
+          points: points
+        }
+
+        if resolution.nil?
+          unresolved_issues << issue
+        else
+          resolved_issues << issue
+        end
+      end
+
+      {
+        resolved: {
+          number: resolved_issues.size,
+          points: resolved_issues.map { |i| i[:points] }.reduce(0, :+),
+          link: resolved_link
+        },
+        unresolved: {
+          number: unresolved_issues.size,
+          points: unresolved_issues.map { |i| i[:points] }.reduce(0, :+),
+          link: unresolved_link
+        }
+      }
+    end
+
+    def items_in_current_sprint
+      items_in_sprint current_sprint_num
+    end
+
+    def items_in_sprint num
+      return [] unless logged_in?
+      issues = []
+      id = get_sprint(num)['id']
+      @jira_client.Issue.jql("sprint = #{id}", max_results: 500).each do |i|
+        issues << i.attrs
+      end
+      return issues
+    end
+
     def asks_in_current_sprint
-      # TODO
+      asks_in_sprint current_sprint_num
     end
 
     def asks_in_sprint num
       return [] unless logged_in?
       issues = []
-      @jira_client.Issue.jql("project = #{settings.config[:project_name]} AND labels in (OpsAsk) and labels in (Sprint#{num})").each do |i|
+      @jira_client.Issue.jql("labels in (Sprint#{num})", max_results: 500).each do |i|
         issues << i.attrs
       end
       return issues
@@ -279,6 +356,14 @@ module OpsAsk
       sprint.nil? ? nil : sprint['name'].gsub(/\s+/, '')
     end
 
+    def current_sprint_num sprint=current_sprint
+      sprint.nil? ? nil : sprint['name'].gsub(/\D+/, '')
+    end
+
+    def current_sprint_id sprint=current_sprint
+      sprint.nil? ? nil : sprint['id']
+    end
+
     def current_sprint keys=[ 'sprintsData', 'sprints', 0 ]
       url = "#{settings.config[:jira_url]}/rest/greenhopper/1.0/xboard/work/allData.json?rapidViewId=#{settings.config[:agile_board]}"
       curl_request = Curl::Easy.http_get(url) do |curl|
@@ -294,11 +379,12 @@ module OpsAsk
       begin
         data = JSON::parse(raw_response)
         keys.each { |k| data = data[k] }
-        return data
+        return data unless data.nil?
       rescue
         $stderr.puts "Failed to parse response from JIRA: #{raw_response}"
       end
-      return nil
+
+      return sprints.last
     end
 
     def today offset=0
@@ -324,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 not in (OpsOnly)")
+        return @jira_client.Issue.jql("due = #{date} AND project = #{settings.config[:project_name]} AND type != Change AND labels not in (OpsOnly)", max_results: 100)
       end
-      return @jira_client.Issue.jql("due = #{date} AND project = #{settings.config[:project_name]} AND type != Change")
+      return @jira_client.Issue.jql("due = #{date} AND project = #{settings.config[:project_name]} AND type != Change", max_results: 100)
     end
 
     def jira_count_for date
@@ -462,7 +548,7 @@ module OpsAsk
         "resolution = unresolved",
         "assignee = denimcores"
       ].join(' AND ')
-      @jira_client.Issue.jql(constraints).sort_by do |jira|
+      @jira_client.Issue.jql(constraints, max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
     end
@@ -476,7 +562,7 @@ module OpsAsk
         "resolution = unresolved",
         "assignee != denimcores"
       ].join(' AND ')
-      @jira_client.Issue.jql(constraints).sort_by do |jira|
+      @jira_client.Issue.jql(constraints, max_results: 100).sort_by do |jira|
         sorting_key_for(jira)
       end.reverse
     end

data/opsask.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'curb', '~> 0.8'
   s.add_runtime_dependency 'rack', '~> 1'
   s.add_runtime_dependency 'sinatra', '~> 1.4'
-  s.add_runtime_dependency 'jira-ruby', '~> 0.1'
   s.add_runtime_dependency 'rack-flash3', '~> 1'
   s.add_runtime_dependency 'sinatra-partial', '~> 0.4'
+  s.add_runtime_dependency 'sclemmer-jira-ruby', '~> 0.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/public/css/style.css

@@ -149,4 +149,42 @@ p.ops-queues-are-full {
 input[type="checkbox"] + label {
   color: #bbb;
   margin-left: 0.2em;
+}
+
+#stats h2 {
+  text-align: center;
+}
+
+.stats .stat {
+  padding-top: 2em;
+  padding-bottom: 2em;
+  background-color: #333;
+  text-align: center;
+}
+
+.stat.resolved {
+  color: #fff;
+  background-color: #5da423;
+  margin-top: 0.75em;
+}
+
+.stat.unresolved {
+  color: #000;
+  background-color: #ff005c;
+  margin-top: 2em;
+}
+
+.stat .number {
+  font-size: 1.25em;
+  font-weight: bold;
+}
+
+.stat .points {
+  padding-top: 0.5em;
+}
+
+.stat .about {
+  font-size: 1.5em;
+  padding-top: 0.75em;
+  font-weight: bold;
 }

data/views/stats.erb

@@ -0,0 +1,42 @@
+<div class="row" id="stats">
+  <div class="small-10 columns">
+    <div class="small-5 small-offset-2 columns">
+      <h2>OpsAsk</h2>
+      <div class="stats">
+        <a href="<%= ask_stats[:resolved][:link] rescue '#' %>" target="_blank">
+          <div class="stat resolved">
+            <div class="issues"><span class="number"><%= ask_stats[:resolved][:number] rescue 0 %></span> issues</div>
+            <div class="points"><span class="number"><%= ask_stats[:resolved][:points] rescue 0 %></span> points</div>
+            <div class="about">Resolved</div>
+          </div>
+        </a>
+        <a href="<%= ask_stats[:unresolved][:link] rescue '#' %>" target="_blank">
+          <div class="stat unresolved">
+            <div class="issues"><span class="number"><%= ask_stats[:unresolved][:number] rescue 0 %></span> issues</div>
+            <div class="points"><span class="number"><%= ask_stats[:unresolved][:points] rescue 0 %></span> points</div>
+            <div class="about">Unresolved</div>
+          </div>
+        </a>
+      </div>
+    </div>
+    <div class="small-5 columns">
+      <h2><%= sprint['name'] %></h2>
+      <div class="stats">
+        <a href="<%= sprint_stats[:resolved][:link] rescue '#' %>" target="_blank">
+          <div class="stat resolved">
+            <div class="issues"><span class="number"><%= sprint_stats[:resolved][:number] rescue 0 %></span> issues</div>
+            <div class="points"><span class="number"><%= sprint_stats[:resolved][:points] rescue 0 %></span> points</div>
+            <div class="about">Resolved</div>
+          </div>
+        </a>
+        <a href="<%= sprint_stats[:unresolved][:link] rescue '#' %>" target="_blank">
+          <div class="stat unresolved">
+            <div class="issues"><span class="number"><%= sprint_stats[:unresolved][:number] rescue 0 %></span> issues</div>
+            <div class="points"><span class="number"><%= sprint_stats[:unresolved][:points] rescue 0 %></span> points</div>
+            <div class="about">Unresolved</div>
+          </div>
+        </a>
+      </div>
+    </div>
+  </div>
+</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsask
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -81,47 +81,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: jira-ruby
+  name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: rack-flash3
+  name: sinatra-partial
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: sinatra-partial
+  name: sclemmer-jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
 description: Ask Ops for stuff.
 email: sczizzo@gmail.com
 executables:
@@ -130,10 +130,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".yardoc/checksums"
-- ".yardoc/object_types"
-- ".yardoc/objects/root.dat"
-- ".yardoc/proxy_types"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -184,10 +180,10 @@ files:
 - views/_flash.erb
 - views/_form.erb
 - views/_queue.erb
-- views/agile.erb
 - views/glance.erb
 - views/index.erb
 - views/layout.erb
+- views/stats.erb
 - views/stragglers.erb
 - views/untracked.erb
 homepage: http://git.ops.bluejeans.com/inf/opsask

data/.yardoc/checksums

@@ -1,4 +0,0 @@
-lib/opsask.rb 26167cfdc95bfa320a4682e865fad3fd4294de49
-lib/opsask/app.rb 09e478d4a4a125c5309674b63c524744ba2eef23
-lib/opsask/main.rb 42451dbc69a564cc5b7a5398924a9191982bd75e
-lib/opsask/metadata.rb dd8e240fb7495b0fb35668a8c3625bab7775bc8d

data/views/agile.erb

@@ -1,6 +0,0 @@
-<div class="row" id="asks">
-  <h2><%= JSON::pretty_generate(asks) %></h2>
-</div>
-<div class="row" id="sprint">
-  <h2><%= JSON::pretty_generate(sprint) %></h2>
-</div>