opsask 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059273659a5289a1e0780e64270cdc848d11e952
-  data.tar.gz: 35af36122a71a36d9701c9dcde00c42ea626cfe3
+  metadata.gz: fcb3fb4ddc972c43047b7d3054306e24c46bf84b
+  data.tar.gz: d64ef6ee16b59f914430269d709c23b0080aceb5
 SHA512:
-  metadata.gz: 2358424286dc896a03d256401cc0bbbeaa0ed2a30bb28f38e3595da0259b13fa410a13fa4e5111788c8e47a0aeae4cbb51b3aca3e48630a695221a3a1e4dca1b
-  data.tar.gz: 2ebedfaa512641bd2615d95a01d9f8803c3251895b8df271136081f13f3fbbf35f31383cb278047058cd3b81fd315ecea1f93f6441fcb314d71a6371dbcf6fe8
+  metadata.gz: d7ab393965bc433533c93435bbd5147a1ce443507c6daad0d7a9b475102d2519af342c23f9153256f17d387d83fcf5e1f6cf24aae151e2887d957d064d0788ff
+  data.tar.gz: f792aa96fe731563e1b34f5e9483780ac3742fcf239ddca9d7544e04c8419af7694bc35276b2b53527cf32c569af606c932ff92e96e7a90e22311efff81d38cb

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/lib/opsask/app.rb

@@ -5,6 +5,7 @@ require 'rack-flash'
 require 'json'
 require 'jira'
 require 'tilt/erb'
+require 'logger'
 
 require_relative 'helpers'
 require_relative 'metadata'
@@ -14,8 +15,15 @@ module OpsAsk
   class App < Sinatra::Base
     include OpsAsk::Helpers
 
+    @@room = nil
+
     set :root, OpsAsk::ROOT
 
+    enable :logging
+    configure :development do
+      set :logging, Logger::DEBUG
+    end
+
     # Add flash support
     enable :sessions
     use Rack::Flash
@@ -27,6 +35,7 @@ module OpsAsk
 
     # Serve up our form
     get '/' do
+      # $stderr.puts 'get-/'
       erb :index, locals: {
         jiras_for_today: issues_for(today),
         jiras_for_tomorrow: issues_for(tomorrow),
@@ -36,6 +45,7 @@ module OpsAsk
     end
 
     get '/glance' do
+      # $stderr.puts 'get-/glance'
       erb :days, locals: {
         jiras_by_day: issues_for_days(2),
         untracked_jiras: untracked_issues,
@@ -44,6 +54,7 @@ module OpsAsk
     end
 
     get '/week' do
+      # $stderr.puts 'get-/week'
       erb :days, locals: {
         jiras_by_day: issues_for_days(4),
         untracked_jiras: untracked_issues,
@@ -52,6 +63,7 @@ module OpsAsk
     end
 
     get '/days/:n' do
+      # $stderr.puts 'get-/days/:n'
       n, m = params[:n].split('+', 2)
       n = n.to_i
       m = m.nil? ? 0 : m.to_i
@@ -63,16 +75,21 @@ module OpsAsk
     end
 
     get '/room' do
+      # $stderr.puts 'get-/room'
       content_type :json
-      room = {}
-      (0..365).each do |n|
-        date = today n * one_day
-        room[date] = room_for_new_jiras_for? date
+      @@room ||= {}
+      if @@room.empty?
+        # $stderr.puts 'RECALC ROOM!'
+        (0..365).each do |n|
+          date = today n * one_day
+          @@room[date] = room_for_new_jiras_for? date
+        end
       end
-      JSON.pretty_generate(room)
+      JSON.pretty_generate(@@room)
     end
 
     get '/untracked' do
+      # $stderr.puts 'get-/untracked'
       erb :untracked, locals: {
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -80,6 +97,7 @@ module OpsAsk
     end
 
     get '/stragglers' do
+      # $stderr.puts 'get-/stragglers'
       erb :stragglers, locals: {
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -87,6 +105,7 @@ module OpsAsk
     end
 
     get '/sprint/:sprint_num' do
+      # $stderr.puts 'get-/sprint/:n'
       num = params[:sprint_num]
       sprint = get_sprint(num)
       id = sprint['id']
@@ -114,6 +133,7 @@ module OpsAsk
     end
 
     get '/sprint' do
+      # $stderr.puts 'get-/sprint'
       num = current_sprint_num
       id = current_sprint_id
       sprint = current_sprint
@@ -142,11 +162,13 @@ module OpsAsk
 
     # I think everyone should do this
     get '/version' do
+      # $stderr.puts 'get-/version'
       content_type :txt
       "opsask #{settings.config[:app_version]}"
     end
 
     get '/v' do
+      # $stderr.puts 'get-/v'
       content_type :txt
       settings.config[:app_version]
     end
@@ -154,6 +176,7 @@ module OpsAsk
 
     # Try to create a JIRA
     post '/' do
+      # $stderr.puts 'post-/'
       component, summary, description, assign_to_me, epic, ops_only, datepicker = validate_jira_params
 
       if datepicker.nil? || datepicker.empty?
@@ -175,6 +198,7 @@ module OpsAsk
         | ]
       end
 
+      @@room = nil # will recalculate
       redirect '/'
     end
 
@@ -182,11 +206,13 @@ module OpsAsk
     # Public assets
     %w[ css img js fonts ].each do |asset|
       get "/#{asset}/:file" do
+        # $stderr.puts 'get-/%s/:file' % asset
         send_file "public/#{asset}/#{params[:file]}", :disposition => 'inline'
       end
     end
 
     get '/favicon.ico' do
+      # $stderr.puts 'get-/favicon'
       send_file 'public/favicon.ico', :disposition => 'inline'
     end
 
@@ -196,6 +222,7 @@ module OpsAsk
     # OAuth consumer details including the consumer key, private key,
     # site uri, and the request token, access token, and authorize paths
     before do
+      # $stderr.puts 'before-1'
       options = {
         :site               => settings.config[:jira_url],
         :context_path       => '',
@@ -208,9 +235,11 @@ module OpsAsk
         :consumer_key       => settings.config[:jira_consumer_key]
       }
 
+      # $stderr.puts 'before-2'
       @jira_client = JIRA::Client.new(options)
       # @jira_client.consumer.http.set_debug_output($stderr)
 
+      # $stderr.puts 'before-3'
       # Add AccessToken if authorised previously.
       if session[:jira_auth]
         @jira_client.set_access_token(
@@ -223,6 +252,7 @@ module OpsAsk
         end
       end
 
+      # $stderr.puts 'before-4'
       # Keep a pointer to myself
       begin
         response = @jira_client.get(
@@ -234,6 +264,7 @@ module OpsAsk
       end
 
       back_to = request.fullpath
+      # $stderr.puts 'before-5 (back_to=%s)' % back_to.inspect
       case back_to
       when /callback/
       when /login/
@@ -245,31 +276,36 @@ module OpsAsk
     # Retrieves the @access_token then stores it inside a session cookie. In a real app, 
     # you'll want to persist the token in a datastore associated with the user.
     get '/callback/' do
+      # $stderr.puts 'callback-1'
       request_token = @jira_client.set_request_token(
         session[:request_token], session[:request_secret]
       )
+      # $stderr.puts 'callback-2'
       access_token = @jira_client.init_access_token(
         :oauth_verifier => params[:oauth_verifier]
       )
-
+      # $stderr.puts 'callback-3'
       session[:jira_auth] = {
         :access_token => access_token.token,
         :access_key => access_token.secret
       }
-
+      # $stderr.puts 'callback-4'
       session.delete(:request_token)
       session.delete(:request_secret)
       back_to = session.delete(:back_to) || '/'
-
+      # $stderr.puts 'callback-5'
       redirect back_to
     end
 
     # Initialize the JIRA session
     get '/login' do
+      # $stderr.puts 'get-/login-1'
       if logged_in?
+        # $stderr.puts 'get-/login-3 (was logged in)'
         session.clear
         redirect '/logout'
       end
+      # $stderr.puts 'get-/login-2 (was logged out)'
       request_token = @jira_client.request_token
       session[:request_token] = request_token.token
       session[:request_secret] = request_token.secret
@@ -278,7 +314,11 @@ module OpsAsk
 
     # Expire the JIRA session
     get '/logout' do
+      # $stderr.puts 'get-/logout'
       session.delete(:jira_auth)
+      session.delete(:request_token)
+      session.delete(:request_secret)
+      session.delete(:back_to)
       redirect '/'
     end
 

data/lib/opsask/helpers.rb

@@ -356,14 +356,13 @@ module OpsAsk
         params['jira-summary'],
         params['jira-description'],
         !!params['jira-assign_to_me'],
-        params['jira-epic'],
+        nil,
         !!params['jira-ops_only'],
         params['jira-datepicker']
       ]
     end
 
     def create_jira duedate, component, summary, description, assign_to_me, epic, ops_only
-      epic       = 'INF-3091' if epic.nil? # OpsAsk default epic
       assignee   = assign_to_me ? @me : settings.config[:assignee]
       components = []
       components = [ { name: component } ] unless component
@@ -383,7 +382,6 @@ module OpsAsk
           reporter: { name: @me },
           labels: labels,
           customfield_10002: 1, # Story Points = 1
-          # customfield_10350: epic,
           customfield_10040: { id: '-1' } # Release Priority = None
         }
       }
@@ -469,30 +467,6 @@ module OpsAsk
       end
     end
 
-    def epic key
-      url = "#{settings.config[:jira_url]}/rest/api/latest/issue/#{key}"
-      curl_request = Curl::Easy.http_get(url) do |curl|
-        curl.headers['Accept'] = 'application/json'
-        curl.headers['Content-Type'] = 'application/json'
-        curl.http_auth_types = :basic
-        curl.username = settings.config[:jira_user]
-        curl.password = settings.config[:jira_pass]
-        curl.verbose  = true
-      end
-
-      raw_response = curl_request.body_str
-      begin
-        response = JSON::parse raw_response
-      rescue
-        $stderr.puts "Failed to parse response from JIRA: #{raw_response}"
-        return nil
-      end
-      return {
-        'key' => response['key'],
-        'name' => response['fields']['customfield_10351'] || response['fields']['summary']
-      }
-    end
-
     def normalized_jql query, \
       project: settings.config[:project_name], \
       require_label: settings.config[:require_label],

data/views/_components.erb

@@ -1,6 +1,3 @@
 <% components.each do |component| %>
   <span class="label radius"><%= component['name'] %></span>
-<% end unless components.nil? %>
-<% unless epic.nil? %>
-  <span class="label radius"><%= epic['name'] %></span>
-<% end %>
+<% end unless components.nil? %>

data/views/_form.erb

@@ -1,14 +1,6 @@
 <% if not logged_in? %>
   <!-- Nothing to see here... -->
 
-<% elsif not room_for_new_jiras? %>
-  <h3 class="ops-queues-are-full">Sorry, we&#8217;re out of room</h3>
-  <p class="ops-queues-are-full">
-    We've reached the maximum number of OpsAsks filed for the next couple of
-    days. Please send your request to the Network Operations mailing list
-    (<a href="mailto:netops@bluejeans.com">netops@bluejeans.com</a>), and we'll
-    respond shortly. Our apologies for any inconvenience.</p>
-
 <% else %>
   <form method="post" action="/" data-abide>
     <fieldset>

data/views/_queue.erb

@@ -16,7 +16,7 @@
               { 'name' => settings.config[:ignore_label] }
             ]
           %>
-          <h3><%= jira.key %> <%= partial :components, locals: { components: labels, epic: epic(jira.fields['customfield_10350']) } %></h3>
+          <h3><%= jira.key %> <%= partial :components, locals: { components: labels } %></h3>
           <p><%= jira.fields['summary'] %></p>
           <p><%=  %></p>
         </a>

metadata

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