opsask 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b67250a3b7e7db5e619794065276d5cb8b5967
-  data.tar.gz: 3bdd20e256b8e3c565d5097587c5b59cc4e4a78c
+  metadata.gz: 51d05620360e3e9e71f076a5fd2c5540ebdd32d9
+  data.tar.gz: 5c74ef794d3bbee8af04a29f027ed836563a2f2e
 SHA512:
-  metadata.gz: 34fc0675d2cc43bd15bca002494ebc781e29021c542abb61a55441c2992efa8acc2390b7b17085b5bed550b7ff3ff8835e6f51051cb0b093b205011da18c82af
-  data.tar.gz: 1bfca809319e175787dab642108f3186deb26e2fb2f8c7702084723c913d5c6364f3dfd805b1ca88b872e48d1ddcdd30ef06645166913b2e4af2835feac4f422
+  metadata.gz: 81b22a140fcb111016dac13fe9e669719d41d9d7b492a96e649b2faaadce4059346c71913c2ad1eaf312e2d6c1ecdd2af7b21c856c6fb5d02a1b08f880b49937
+  data.tar.gz: 30efd17d6b0c1b37325ad91045cb492bafb773939ff804bb4f28371df77e7cf14e872a85d1186bf7c06cf9182dd9b8a78478b67fcad83c836a7049bbdc4c7897

data/.gitignore

@@ -11,7 +11,7 @@
 doc
 pkg
 .DS_Store
-config.json
+config*.json
 .bundle
 .yardoc
 etc

data/VERSION

@@ -1 +1 @@
-2.3.2
+2.3.3

data/lib/opsask/app.rb

@@ -36,7 +36,7 @@ module OpsAsk
 
     # Serve up our form
     get '/' do
-      # $stderr.puts 'get-/'
+      debug 'get-/'
       erb :index, locals: {
         jiras_for_today: issues_for(today),
         jiras_for_tomorrow: issues_for(tomorrow),
@@ -46,7 +46,7 @@ module OpsAsk
     end
 
     get '/glance' do
-      # $stderr.puts 'get-/glance'
+      debug 'get-/glance'
       erb :days, locals: {
         jiras_by_day: issues_for_days(2),
         untracked_jiras: untracked_issues,
@@ -55,7 +55,7 @@ module OpsAsk
     end
 
     get '/week' do
-      # $stderr.puts 'get-/week'
+      debug 'get-/week'
       erb :days, locals: {
         jiras_by_day: issues_for_days(4),
         untracked_jiras: untracked_issues,
@@ -64,7 +64,7 @@ module OpsAsk
     end
 
     get '/days/:n' do
-      # $stderr.puts 'get-/days/:n'
+      debug 'get-/days/:n'
       n, m = params[:n].split('+', 2)
       n = n.to_i
       m = m.nil? ? 0 : m.to_i
@@ -76,11 +76,11 @@ module OpsAsk
     end
 
     get '/room' do
-      # $stderr.puts 'get-/room'
+      debug 'get-/room'
       content_type :json
       @@room ||= {}
       if @@room.empty?
-        # $stderr.puts 'RECALC ROOM!'
+        debug 'RECALC ROOM!'
         (0..365).each do |n|
           date = today n * one_day
           @@room[date] = room_for_new_jiras_for? date
@@ -91,7 +91,7 @@ module OpsAsk
     end
 
     get '/untracked' do
-      # $stderr.puts 'get-/untracked'
+      debug 'get-/untracked'
       erb :untracked, locals: {
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -99,7 +99,7 @@ module OpsAsk
     end
 
     get '/stragglers' do
-      # $stderr.puts 'get-/stragglers'
+      debug 'get-/stragglers'
       erb :stragglers, locals: {
         untracked_jiras: untracked_issues,
         stragglers: straggling_issues
@@ -107,7 +107,7 @@ module OpsAsk
     end
 
     get '/sprint/:sprint_num' do
-      # $stderr.puts 'get-/sprint/:n'
+      debug 'get-/sprint/:n'
       num = params[:sprint_num]
       sprint = get_sprint(num)
       id = sprint['id']
@@ -135,7 +135,7 @@ module OpsAsk
     end
 
     get '/sprint' do
-      # $stderr.puts 'get-/sprint'
+      debug 'get-/sprint'
       num = current_sprint_num
       id = current_sprint_id
       sprint = current_sprint
@@ -164,13 +164,13 @@ module OpsAsk
 
     # I think everyone should do this
     get '/version' do
-      # $stderr.puts 'get-/version'
+      debug 'get-/version'
       content_type :txt
       "opsask #{settings.config[:app_version]}"
     end
 
     get '/v' do
-      # $stderr.puts 'get-/v'
+      debug 'get-/v'
       content_type :txt
       settings.config[:app_version]
     end
@@ -178,7 +178,7 @@ module OpsAsk
 
     # Try to create a JIRA
     post '/' do
-      # $stderr.puts 'post-/'
+      debug 'post-/'
       component, summary, description, assign_to_me, epic, ops_only, datepicker = validate_jira_params
 
       if datepicker.nil? || datepicker.empty?
@@ -208,13 +208,13 @@ module OpsAsk
     # Public assets
     %w[ css img js fonts ].each do |asset|
       get "/#{asset}/:file" do
-        # $stderr.puts 'get-/%s/:file' % asset
+        debug 'get-/%s/:file' % asset
         send_file "public/#{asset}/#{params[:file]}", :disposition => 'inline'
       end
     end
 
     get '/favicon.ico' do
-      # $stderr.puts 'get-/favicon'
+      debug 'get-/favicon'
       send_file 'public/favicon.ico', :disposition => 'inline'
     end
 
@@ -224,7 +224,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'
+      debug 'before-1'
       options = {
         :site               => settings.config[:jira_url],
         :context_path       => '',
@@ -237,11 +237,11 @@ module OpsAsk
         :consumer_key       => settings.config[:jira_consumer_key]
       }
 
-      # $stderr.puts 'before-2'
+      debug 'before-2'
       @jira_client = JIRA::Client.new(options)
-      # @jira_client.consumer.http.set_debug_output($stderr)
+      @jira_client.consumer.http.set_debug_output(logger)
 
-      # $stderr.puts 'before-3'
+      debug 'before-3'
       # Add AccessToken if authorised previously.
       if session[:jira_auth]
         @jira_client.set_access_token(
@@ -254,7 +254,7 @@ module OpsAsk
         end
       end
 
-      # $stderr.puts 'before-4'
+      debug 'before-4'
       # Keep a pointer to myself
       begin
         response = @jira_client.get(
@@ -266,10 +266,12 @@ module OpsAsk
       end
 
       back_to = request.fullpath
-      # $stderr.puts 'before-5 (back_to=%s)' % back_to.inspect
+      debug 'before-5 (back_to=%s)' % back_to.inspect
       case back_to
       when /callback/
       when /login/
+      when /logout/
+      when /room/
       else
         session[:back_to] = back_to
       end
@@ -278,49 +280,47 @@ 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'
+      debug 'callback-1'
       request_token = @jira_client.set_request_token(
         session[:request_token], session[:request_secret]
       )
-      # $stderr.puts 'callback-2'
+      debug 'callback-2'
       access_token = @jira_client.init_access_token(
         :oauth_verifier => params[:oauth_verifier]
       )
-      # $stderr.puts 'callback-3'
+      debug 'callback-3'
       session[:jira_auth] = {
         :access_token => access_token.token,
         :access_key => access_token.secret
       }
-      # $stderr.puts 'callback-4'
+      debug 'callback-4'
       session.delete(:request_token)
       session.delete(:request_secret)
       back_to = session.delete(:back_to) || '/'
-      # $stderr.puts 'callback-5'
+      debug 'callback-5'
       redirect back_to
     end
 
     # Initialize the JIRA session
     get '/login' do
-      # $stderr.puts 'get-/login-1'
+      debug 'get-/login-1'
       if logged_in?
-        # $stderr.puts 'get-/login-3 (was logged in)'
+        debug 'get-/login-3 (was logged in)'
         session.clear
         redirect '/logout'
       end
-      # $stderr.puts 'get-/login-2 (was logged out)'
+      debug 'get-/login-2 (was logged out)'
       request_token = @jira_client.request_token
       session[:request_token] = request_token.token
       session[:request_secret] = request_token.secret
+      debug 'get-login-3 request_token: %s' % request_token.inspect
       redirect request_token.authorize_url
     end
 
     # 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)
+      debug 'get-/logout'
+      session.clear
       redirect '/'
     end
 
@@ -334,6 +334,14 @@ module OpsAsk
         else   ; '%s %ss'
         end % [ n, item ]
       end
+
+      def debug message
+        logger.debug JSON.generate({
+          message: message,
+          myself: @myself,
+          me: @me
+        })
+      end
     end
 
   end

metadata

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