tempest_time 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0b28efca7d86aa211972f46715abbc9280b68b9ef899964601d31b22175240
-  data.tar.gz: 9f244e11657b42344c22275331bde8538a247117a4c098519355f6e766bdf89d
+  metadata.gz: 0f7ea036a16a00b115c43380947acca1d3ed7d1b8b3e6f15ad61aec1306291a0
+  data.tar.gz: 2f3b83981753b1f81b75a33b5399421f967fad33898e7c5e66f25bbb270d1e3e
 SHA512:
-  metadata.gz: 314dc7529baf6ff390c05d6429da13244015ecf6d89d840bab1063a53cddeb067fd0275a036d63320617b9de527bdfa896c409682a33c51cc0ec6313b19e0d8e
-  data.tar.gz: 1de292852bc3af692ed108442edf035d4adae2f49a686bb12986d66413f76170d4ee13708dfb84a4e8cad124580270d47c0d76480b397ae0f92f684ba3bbd1bf
+  metadata.gz: b27a2c26d4dd0c4e908001649eb59c514f4a6cdf9ea8b03d2c55826e46caf5e56af1101fab6f8d7383821c577e8ab699142bd4d0e21322b792e85eeef6087a59
+  data.tar.gz: e522e503832c6dd7e4704c0fd2e76815e68f75f4dd6a3af0725b14a7fa82ae34dc492bc1df6a2b232f78ada460dabbb0a4c1c3c9a6301f41998fa91a70373bd0

data/lib/tempest_time/api/jira_api/models/user.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module JiraAPI
+  module Models
+    class User
+      def initialize(user)
+        @user_data = user
+      end
+
+      def name
+        @name ||= user_data['displayName']
+      end
+
+      def username
+        @username ||= user_data['name']
+      end
+
+      def email
+        @email ||= user_data['emailAddress']
+      end
+
+      def account_id
+        @account_id ||= user_data['accountId']
+      end
+
+      private
+
+      attr_reader :user_data
+    end
+  end
+end

data/lib/tempest_time/api/jira_api/request.rb

@@ -31,7 +31,7 @@ module JiraAPI
       Response
     end
 
-    def user
+    def auth_user
       credentials.fetch(:email, nil)
     end
 

data/lib/tempest_time/api/jira_api/requests/get_user_issues.rb

@@ -4,11 +4,11 @@ require_relative '../responses/get_user_issues'
 module JiraAPI
   module Requests
     class GetUserIssues < JiraAPI::Request
-      attr_reader :requested_user
+      attr_reader :user
 
-      def initialize(requested_user: nil)
+      def initialize(user:)
         super
-        @requested_user = requested_user || username
+        @user = user
       end
 
       private
@@ -23,7 +23,7 @@ module JiraAPI
 
       def query_params
         {
-          'jql' => "assignee=#{requested_user} AND resolution is EMPTY",
+          'jql' => "assignee=#{user.username} AND resolution is EMPTY",
           'maxResults' => 100,
         }
       end

data/lib/tempest_time/api/jira_api/requests/search_users.rb

@@ -0,0 +1,33 @@
+require_relative '../request'
+require_relative '../responses/search_users'
+
+module JiraAPI
+  module Requests
+    class SearchUsers < JiraAPI::Request
+      def initialize(query: nil)
+        super
+        @query = query
+      end
+
+      private
+
+      def request_method
+        'get'
+      end
+
+      def request_path
+        "/user/search"
+      end
+
+      def query_params
+        {
+          'query' => @query,
+        }
+      end
+
+      def response_klass
+        JiraAPI::Responses::SearchUsers
+      end
+    end
+  end
+end

data/lib/tempest_time/api/jira_api/responses/get_current_user.rb

@@ -1,9 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../response'
+require_relative '../models/user'
 
 module JiraAPI
   module Responses
-    class GetCurrentUser < JiraAPI::Response; end
+    class GetCurrentUser < JiraAPI::Response
+      def user
+        @user ||= JiraAPI::Models::User.new(raw_response)
+      end
+    end
   end
 end

data/lib/tempest_time/api/jira_api/responses/search_users.rb

@@ -0,0 +1,12 @@
+require_relative '../response'
+require_relative '../models/user'
+
+module JiraAPI
+  module Responses
+    class SearchUsers < JiraAPI::Response
+      def users
+        @users ||= raw_response.parsed_response.map { |user| JiraAPI::Models::User.new(user) }
+      end
+    end
+  end
+end

data/lib/tempest_time/api/request.rb

@@ -61,7 +61,7 @@ module TempestTime
         authorization_klass.new.credentials
       end
 
-      def user
+      def auth_user
         credentials.fetch(:user, nil)
       end
 
@@ -82,7 +82,7 @@ module TempestTime
       end
 
       def basic_auth
-        { username: user, password: token }
+        { username: auth_user, password: token }
       end
     end
   end

data/lib/tempest_time/api/tempo_api/authorization.rb

@@ -5,7 +5,7 @@ module TempoAPI
     private
 
     def url
-      'https://api.tempo.io/2'
+      'https://api.tempo.io/core/3'
     end
 
     def user

data/lib/tempest_time/api/tempo_api/request.rb

@@ -15,6 +15,7 @@ module TempoAPI
         body: request_body.empty? ? request_body : request_body.to_json,
         query: query_params
       )
+
       response
     end
 

data/lib/tempest_time/api/tempo_api/requests/create_worklog.rb

@@ -12,11 +12,12 @@ module TempoAPI
         @message = options[:message]
         @date = options[:date] ? options[:date] : Date.today
         @billable = options[:billable]
+        @user = options[:user]
       end
 
       private
 
-      attr_reader :issue, :remaining, :seconds, :message, :date, :billable
+      attr_reader :issue, :remaining, :seconds, :message, :date, :billable, :user
 
       def request_method
         'post'
@@ -38,7 +39,7 @@ module TempoAPI
           "remainingEstimateSeconds": remaining,
           "startDate": date.strftime('%Y-%m-%d'),
           "startTime": '12:00:00',
-          "authorUsername": user,
+          "authorAccountId": user.account_id,
           "description": message,
         }
       end

data/lib/tempest_time/api/tempo_api/requests/get_user_schedule.rb

@@ -6,23 +6,23 @@ module TempoAPI
     class GetUserSchedule < TempoAPI::Request
       attr_reader :start_date, :end_date
 
-      def initialize(start_date:, end_date:, requested_user:)
+      def initialize(start_date:, end_date:, user:)
         super
         @start_date = start_date
         @end_date = end_date || start_date
-        @requested_user = requested_user || user
+        @user = user
       end
 
       private
 
-      attr_reader :requested_user
+      attr_reader :user
 
       def request_method
         'get'
       end
 
       def request_path
-        "/user-schedule/#{requested_user}"
+        "/user-schedule/#{user.account_id}"
       end
 
       def query_params

data/lib/tempest_time/api/tempo_api/requests/list_worklogs.rb

@@ -8,16 +8,16 @@ module TempoAPI
     class ListWorklogs < TempoAPI::Request
       attr_reader :start_date, :end_date
 
-      def initialize(start_date, end_date: nil, requested_user: nil)
+      def initialize(start_date, end_date: nil, user: nil)
         super
         @start_date = start_date
         @end_date = end_date || start_date
-        @requested_user = requested_user || user
+        @user = user
       end
 
       private
 
-      attr_reader :requested_user
+      attr_reader :user
 
       def response_klass
         TempoAPI::Responses::ListWorklogs
@@ -28,7 +28,7 @@ module TempoAPI
       end
 
       def request_path
-        "/worklogs/user/#{requested_user}"
+        "/worklogs/user/#{user.account_id}"
       end
 
       def query_params

data/lib/tempest_time/api/tempo_api/requests/submit_timesheet.rb

@@ -7,10 +7,11 @@ module TempoAPI
     class SubmitTimesheet < TempoAPI::Request
       include TempestTime::Helpers::TimeHelper
 
-      attr_reader :reviewer, :dates
+      attr_reader :submitter, :reviewer, :dates
 
-      def initialize(reviewer, dates)
+      def initialize(submitter:, reviewer:, dates:)
         super
+        @submitter = submitter
         @reviewer = reviewer
         @dates = dates
       end
@@ -22,7 +23,7 @@ module TempoAPI
       end
 
       def request_path
-        "/timesheet-approvals/user/#{user}/submit"
+        "/timesheet-approvals/user/#{submitter.account_id}/submit"
       end
 
       def response_klass
@@ -38,7 +39,7 @@ module TempoAPI
 
       def request_body
         {
-          reviewerUsername: reviewer,
+          reviewerAccountId: reviewer.account_id,
         }
       end
     end

data/lib/tempest_time/api/tempo_api/responses/submit_timesheet.rb

@@ -6,7 +6,7 @@ module TempoAPI
       private
 
       def success_message
-        "Timesheet submitted successfully to #{request.reviewer}!"
+        "Timesheet submitted successfully to #{request.reviewer.name}!"
       end
     end
   end

data/lib/tempest_time/command.rb

@@ -5,6 +5,8 @@ require 'forwardable'
 require_relative 'helpers/time_helper'
 require_relative 'helpers/formatting_helper'
 require_relative 'helpers/git_helper'
+require_relative 'api/jira_api/requests/get_current_user'
+require_relative 'api/jira_api/requests/search_users'
 
 module TempestTime
   class Command
@@ -90,5 +92,31 @@ module TempestTime
         s.error(pastel.red(response.message))
       end
     end
+
+    def find_user(query)
+      return current_user unless query
+
+      users = JiraAPI::Requests::SearchUsers.new(query: query).send_request.users
+      case users.count
+      when 0
+        abort(
+          pastel.red('User not found!') + ' ' \
+          'Please check your query and try again.'
+        )
+      when 1
+        return users.first
+      else
+        require 'tty-prompt'
+        TTY::Prompt.new.select(
+          pastel.yellow('Multiple users match your query. Please select a user.'),
+          users.map { |user| { "#{user.name}: #{user.email}" => user } },
+          per_page: 10
+        )
+      end
+    end
+
+    def current_user
+      @current_user ||= JiraAPI::Requests::GetCurrentUser.new.send_request.user
+    end
   end
 end

data/lib/tempest_time/commands/issue.rb

@@ -8,10 +8,10 @@ module TempestTime
       namespace :issue
 
       desc 'list', 'List unresolved issues.'
-      option :date, type: :string
-      def list(user = nil)
+      option :user, aliases: '-u', type: :string
+      def list
         require_relative 'issue/list'
-        TempestTime::Commands::Issue::List.new(user).execute
+        TempestTime::Commands::Issue::List.new(options).execute
       end
 
       desc 'open', 'Open an issue in your browser. (Default: current branch)'

data/lib/tempest_time/commands/issue/list.rb

@@ -7,13 +7,13 @@ module TempestTime
   module Commands
     class Issue
       class List < TempestTime::Command
-        def initialize(user)
-          @user = user || current_user
+        def initialize(options)
+          @user = find_user(options[:user])
         end
 
         def execute!
-          request = JiraAPI::Requests::GetUserIssues.new(requested_user: @user)
-          message = "Getting issues for #{request.requested_user}"
+          request = JiraAPI::Requests::GetUserIssues.new(user: @user)
+          message = "Getting issues for #{pastel.yellow(@user.name)}"
           response = with_spinner(message) do |spinner|
             request.send_request.tap { spinner.stop }
           end
@@ -38,17 +38,12 @@ module TempestTime
           table.new(
             %w(Status Issue Summary),
             issues.map { |issue| row(issue) }
-          ).render(:ascii, padding: [0, 1], column_widths: [15, 10, 30])
+          ).render(:ascii, padding: [0, 1], column_widths: [15, 15, 45])
         end
 
         def row(issue)
           [issue.status, issue.key, issue.summary]
         end
-
-        def current_user
-          require_relative '../../settings/authorization'
-          TempestTime::Settings::Authorization.new.fetch('username')
-        end
       end
     end
   end

data/lib/tempest_time/commands/list.rb

@@ -7,7 +7,7 @@ module TempestTime
   module Commands
     class List < TempestTime::Command
       def initialize(options)
-        @user = options[:user]
+        @user = find_user(options[:user])
         @dates = options[:date] ? [Date.parse(options[:date])] : nil
       end
 
@@ -18,11 +18,14 @@ module TempestTime
           days_after: 13
         ).sort
         @dates.each do |date|
-          with_spinner("Retrieving logs for #{pastel.yellow(formatted_date(date))}...") do |spin|
+          with_spinner(
+            "Retrieving logs for #{pastel.yellow(@user.name)} "\
+            "on #{pastel.yellow(formatted_date(date))}..."
+          ) do |spin|
             @response = TempoAPI::Requests::ListWorklogs.new(
               date,
               end_date: nil,
-              requested_user: @user
+              user: @user
             ).send_request
             spin.stop(pastel.green('Done!'))
             prompt.say(render_table)
@@ -45,7 +48,7 @@ module TempestTime
         t.render(
           :ascii,
           padding: [0, 1],
-          column_widths: [7, 10, 15, 30],
+          column_widths: [7, 15, 15, 30],
           multiline: true
         )
       end

data/lib/tempest_time/commands/report.rb

@@ -20,7 +20,7 @@ module TempestTime
 
       def execute!
         if @users.empty? && @team.nil?
-          @users = user_prompt
+          @users = user_prompt.map { |user| find_user(user) }
         end
 
         @users.push(@teams.members(@team)) if @team
@@ -86,7 +86,7 @@ module TempestTime
         @required_seconds ||= TempoAPI::Requests::GetUserSchedule.new(
           start_date: start_date,
           end_date: end_date,
-          requested_user: @users.first
+          user: @users.first
         ).send_request.required_seconds
       end
 
@@ -95,7 +95,7 @@ module TempestTime
           worklogs = TempoAPI::Requests::ListWorklogs.new(
             start_date,
             end_date: end_date,
-            requested_user: user
+            user: user
           ).send_request.worklogs
 
           TempestTime::Models::Report.new(
@@ -143,7 +143,7 @@ module TempestTime
 
       def row(data)
         row = [
-          data.user,
+          (data.user.is_a?(String) ? data.user : data.user.name),
           right_align(percentage(data.total_compliance_percentage)),
           right_align(percentage(data.utilization_percentage)),
         ]

data/lib/tempest_time/commands/setup.rb

@@ -72,10 +72,12 @@ module TempestTime
       end
 
       def check_for_validity
-        jira = JiraAPI::Requests::GetCurrentUser.new
-        tempo = TempoAPI::Requests::ListWorklogs.new(Date.today)
-        raise StandardError unless jira.send_request.success?
-        raise StandardError unless tempo.send_request.success?
+        raise StandardError unless JiraAPI::Requests::GetCurrentUser.new.send_request.user
+        raise StandardError unless tempo_token_is_valid?
+      end
+
+      def tempo_token_is_valid?
+        TempoAPI::Requests::ListWorklogs.new(Date.today).send_request.success?
       end
 
       def email

data/lib/tempest_time/commands/submit.rb

@@ -11,15 +11,19 @@ module TempestTime
       end
 
       def execute!
-        reviewer = prompt.ask('Who should review this timesheet? (username)')
+        reviewer = find_user(prompt.ask('Who should review this timesheet?'))
         dates = week_dates(week_prompt('Select a week to submit.'))
 
-        message = 'Submit the selected timesheet to ' + pastel.green(reviewer) + '?'
+        message = 'Submit the selected timesheet to ' + pastel.green(reviewer.name) + '?'
         abort unless prompt.yes?(message)
         abort unless prompt.yes?('Are you sure? No edits can be made once submitted!')
 
         with_success_fail_spinner('Submitting your timesheet...') do
-          TempoAPI::Requests::SubmitTimesheet.new(reviewer, dates).send_request
+          TempoAPI::Requests::SubmitTimesheet.new(
+            submitter: current_user,
+            reviewer: reviewer,
+            dates: dates
+          ).send_request
         end
       end
     end

data/lib/tempest_time/commands/track.rb

@@ -7,13 +7,14 @@ require_relative '../api/tempo_api/requests/create_worklog'
 module TempestTime
   module Commands
     class Track < TempestTime::Command
-      attr_reader :time, :issues, :options
+      attr_reader :time, :issues, :options, :user
 
       def initialize(time, issues, options)
         @options = options
         @issues = issues.any? ? issues.map(&:upcase) : [automatic_issue]
         @time = parsed_time(time) / @issues.count
         @dates = options[:date] ? [Date.parse(options[:date])] : nil
+        @user = current_user
       end
 
       def execute!
@@ -24,7 +25,7 @@ module TempestTime
         end
         dates.each do |date|
           issues.each do |issue|
-            track_time(time, options.merge({ issue: issue, date: date }))
+            track_time(time, options.merge({ issue: issue, date: date, user: user }))
           end
         end
       end
@@ -61,13 +62,12 @@ module TempestTime
       end
 
       def remaining_estimate(issue, time)
-        request = JiraAPI::Requests::GetIssue.new(issue)
-        request.send_request
-        if request.response.failure?
-          abort("There was an issue getting this Jira issue.\n"\
+        response = JiraAPI::Requests::GetIssue.new(issue).send_request
+        if response.failure?
+          abort("There was a problem getting this Jira issue.\n"\
                 'Please check the issue number and your credentials.')
         end
-        remaining = request.response.issue.remaining_estimate || 0
+        remaining = response.issue.remaining_estimate || 0
         remaining > time ? remaining - time : 0
       end
 

data/lib/tempest_time/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TempestTime
-  VERSION = '1.2.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempest_time
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Devan Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -247,14 +247,17 @@ files:
 - lib/tempest_time/api/authorization.rb
 - lib/tempest_time/api/jira_api/authorization.rb
 - lib/tempest_time/api/jira_api/models/issue.rb
+- lib/tempest_time/api/jira_api/models/user.rb
 - lib/tempest_time/api/jira_api/request.rb
 - lib/tempest_time/api/jira_api/requests/get_current_user.rb
 - lib/tempest_time/api/jira_api/requests/get_issue.rb
 - lib/tempest_time/api/jira_api/requests/get_user_issues.rb
+- lib/tempest_time/api/jira_api/requests/search_users.rb
 - lib/tempest_time/api/jira_api/response.rb
 - lib/tempest_time/api/jira_api/responses/get_current_user.rb
 - lib/tempest_time/api/jira_api/responses/get_issue.rb
 - lib/tempest_time/api/jira_api/responses/get_user_issues.rb
+- lib/tempest_time/api/jira_api/responses/search_users.rb
 - lib/tempest_time/api/request.rb
 - lib/tempest_time/api/response.rb
 - lib/tempest_time/api/tempo_api/authorization.rb