tempest_time 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b26cfdc661706032cc5149b28b05fbf1f322324f0f845c00af8d3e5135546c8
-  data.tar.gz: 1cb5c84cf724531917ec9c759dc83cd47a7fba89a8dc9c74401c65f89b6ea207
+  metadata.gz: 8fadd5695c98443d2892aac9bdc9a907ff1825d8613c0955ce988af14386f0df
+  data.tar.gz: add6d9dc10500fc6236030b5da61c24003fe57a49896062cf7894e5e9d983372
 SHA512:
-  metadata.gz: 1ac9e54ec617bae5c87fd405b1b1f6c5df82d47d668caa0a26deedfe52dc59352d5ce3e37b7e0cacb376562fbed3fcb670c1d6f92c737a81b911db2ff0658466
-  data.tar.gz: 502bf3a2a0d11b21167d4fa68305d4993477914462f6110d5dc930e44ceb7a8cf7528e98e135c68cee312d166ef75f571a3f2891a7fc9418b9fbcc7ddad5cf0f
+  metadata.gz: 0742fd8630fc7744e7b814ff28b0b6498a0245cdf8b72e3b819d182001eae5281db7cb3785e03d91a8fa199f37e43b98d5078e3fe29921c2d8bfd3ef62426dac
+  data.tar.gz: 53060657cdcf5f6a524dfeb360e78cc38b9b2a6c78963d762d3a0d2acfc2d07ef5b69fa6687510d7b5e33b5563ee22e98fbf151d44a6a2ba3e0783baf2a41f81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tempest_time (0.5.1)
+    tempest_time (0.5.2)
       git (~> 1.5)
       httparty (~> 0.16)
       pastel (~> 0.7.2)

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

@@ -7,12 +7,12 @@ module TempoAPI
     class SubmitTimesheet < TempoAPI::Request
       include TempestTime::Helpers::TimeHelper
 
-      attr_reader :reviewer, :week_number
+      attr_reader :reviewer, :dates
 
-      def initialize(reviewer, week_number)
+      def initialize(reviewer, dates)
         super
         @reviewer = reviewer
-        @week_number = week_number
+        @dates = dates
       end
 
       private
@@ -30,7 +30,6 @@ module TempoAPI
       end
 
       def query_params
-        dates = week_dates(week_number)
         {
           from: dates.first.strftime(DATE_FORMAT),
           to: dates.last.strftime(DATE_FORMAT)

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

@@ -7,7 +7,7 @@ module TempoAPI
     class ListWorklogs < TempoAPI::Response
       include TempestTime::Helpers::TimeHelper
 
-      attr_reader :worklogs
+      attr_reader :worklogs, :total_hours_spent
 
       def worklogs
         @worklogs ||= raw_response['results'].map do |worklog|
@@ -20,18 +20,6 @@ module TempoAPI
         end
       end
 
-      private
-
-      def success_message
-        output = ""
-        output << worklogs_output
-        output << "\nTOTAL TIME LOGGED: #{total_hours_spent} hours."
-      end
-
-      def worklogs_output
-        worklogs.map(&:to_s).join("\n")
-      end
-
       def total_hours_spent
         worklogs.map(&:hours).reduce(:+)&.round(2) || 0
       end

data/lib/tempest_time/cli.rb

@@ -23,17 +23,11 @@ module TempestTime
              'teams', 'teams [SUBCOMMAND]',
              'Add or modify teams.'
 
-    desc 'list [DATE]', 'List worklogs for given date. (Defaults to today.)'
-    long_desc <<-LONGDESC
-      `tempest list` will list a day's worklogs.\n
-      e.g. `tempest list today`\n
-      e.g. `tempest list yesterday`\n
-      e.g. `tempest list 2019-01-31`\n
-      e.g. `tempest list 2019-01-31 --user=jsmith`
-    LONGDESC
-    def list(date = nil)
+    desc 'list', 'List worklogs for a specific date.'
+    option :user, aliases: '-u', type: :string
+    def list
       require_relative 'commands/list'
-      TempestTime::Commands::List.new(date, options).execute
+      TempestTime::Commands::List.new(options).execute
     end
 
 

data/lib/tempest_time/command.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require_relative 'helpers/time_helper'
+require_relative 'helpers/formatting_helper'
 
 module TempestTime
   class Command
     extend Forwardable
+    include TempestTime::Helpers::TimeHelper
+    include TempestTime::Helpers::FormattingHelper
 
     def_delegators :command, :run
 
@@ -30,6 +34,26 @@ module TempestTime
       TTY::Prompt.new(options)
     end
 
+    def week_prompt(message, past_weeks = 51)
+      require 'tty-prompt'
+      weeks = past_week_selections(past_weeks)
+      TTY::Prompt.new.select(
+        message,
+        weeks,
+        per_page: 5
+      )
+    end
+
+    def date_prompt(message, past_days = 6)
+      require 'tty-prompt'
+      dates = past_date_selections(past_days)
+      TTY::Prompt.new.select(
+        message,
+        dates,
+        per_page: 5
+      )
+    end
+
     def spinner
       require 'tty-spinner'
       TTY::Spinner

data/lib/tempest_time/commands/issues.rb

@@ -26,7 +26,7 @@ module TempestTime
         table.new(
           %w[Status Issue Summary],
           issues.map { |issue| row(issue) }
-        ).render(:ascii, padding: [0, 1])
+        ).render(:ascii, padding: [0, 1], column_widths: [15, 10, 30])
       end
 
       def row(issue)

data/lib/tempest_time/commands/list.rb

@@ -9,24 +9,52 @@ module TempestTime
     class List < TempestTime::Command
       include TempestTime::Helpers::TimeHelper
 
-      def initialize(date, options)
-        @date = date
+      def initialize(options)
         @options = options
       end
 
       def execute(input: $stdin, output: $stdout)
-        dates = parsed_date_input(@date)
-        dates.each do |start_date|
-          request = TempoAPI::Requests::ListWorklogs.new(
-            start_date,
-            @options['end_date'],
+        @date ||= date_prompt('Please select a date.')
+
+        with_spinner("Retrieving logs for #{formatted_date(@date)}...") do |spin|
+          @response = TempoAPI::Requests::ListWorklogs.new(
+            @date,
+            nil,
             @options[:user]
+          ).send_request
+          spin.stop(pastel.green('Done!'))
+          prompt.say(render_table)
+          prompt.say(
+            'Total Time Logged: '\
+            "#{pastel.green("#{@response.total_hours_spent} hours")}"
           )
-          request.send_request
-          puts "\nHere are your logs for #{formatted_date_range(start_date, @options['end_date'])}:\n"
-          puts request.response_message
         end
       end
+
+      private
+
+      def table_headings
+        %w[Worklog Issue Time Description]
+      end
+
+      def render_table
+        t = table.new(table_headings, @response.worklogs.map { |r| row(r) })
+        t.render(
+          :ascii,
+          padding: [0, 1],
+          column_widths: [7,10,15,30],
+          multiline: true
+        )
+      end
+
+      def row(worklog)
+        [
+          worklog.id,
+          worklog.issue,
+          formatted_time(worklog.seconds),
+          worklog.description
+        ]
+      end
     end
   end
 end

data/lib/tempest_time/commands/report.rb

@@ -2,8 +2,9 @@
 
 require_relative '../command'
 require_relative '../settings/teams'
-require_relative '../services/generate_report'
 require_relative '../helpers/time_helper'
+require_relative '../api/tempo_api/requests/list_worklogs'
+require_relative '../models/report'
 
 module TempestTime
   module Commands
@@ -13,7 +14,6 @@ module TempestTime
       def initialize(users, options)
         @users = users || []
         @team = options[:team]
-        @week = options[:week]
       end
 
       def execute(input: $stdin, output: $stdout)
@@ -21,14 +21,14 @@ module TempestTime
         @users.push(TempestTime::Settings::Teams.members(@team)) if @team
         abort('No users specified.') unless @users.any?
 
-        @week ||= week_prompt
+        @week = week_prompt('Please select the week to report.')
 
         with_spinner('Generating report...') do |spinner|
           table = render_table
           spinner.stop(pastel.green('Your report is ready!'))
-          date_range = "#{formatted_date(report.start_date)}"\
+          date_range = "#{formatted_date(start_date)}"\
                        ' to '\
-                       "#{formatted_date(report.end_date)}"
+                       "#{formatted_date(end_date)}"
           prompt.say("\nReport for #{pastel.green(date_range)}")
           puts table
         end
@@ -36,61 +36,92 @@ module TempestTime
 
       private
 
-      def report
-        @report ||= TempestTime::Services::GenerateReport.new(
-          @users.flatten, @week
-        )
-      end
-
       def user_prompt
         type = prompt.select(
-          "Generate a report for a #{pastel.green('user')} or #{pastel.green('team')}?",
-          ['User', 'Team']
+          'Generate a report for a '\
+          "#{pastel.green('team')} or a specific #{pastel.green('user')}?",
+          %w[Team User]
         )
-        return [prompt.ask('Which user would you like to analyse?')] if type == 'User'
+
+        if type == 'User'
+          return [
+            prompt.ask("Please enter a #{pastel.green('user')}.")
+          ]
+        end
+
         teams = TempestTime::Settings::Teams
-        abort('You have no teams yet! Go make one! (tempest teams add)') unless teams.keys.any?
+        if teams.keys.empty?
+          abort('You have no teams yet! Go make one! (tempest teams add)')
+        end
+
         team = prompt.select(
-          "Which #{pastel.green('team')} would you like to analyse?",
+          "Please select a #{pastel.green('team')}.",
           teams.keys
         )
         teams.members(team)
       end
 
-      def week_prompt
-        week = TTY::Prompt.new.select(
-          'Please select the week to report.',
-          week_ranges,
-          default: current_week,
-          per_page: 5
+      def start_date
+        @start_date ||= week_dates(@week).first
+      end
+
+      def end_date
+        @end_date ||= week_dates(@week).last
+      end
+
+      def reports
+        @reports ||= @users.map do |user|
+          list = TempoAPI::Requests::ListWorklogs.new(
+            start_date,
+            end_date,
+            user
+          ).send_request
+          TempestTime::Models::Report.new(user, list.worklogs)
+        end || []
+      end
+
+      def aggregate
+        @aggregate ||= TempestTime::Models::Report.new(
+          'TOTAL',
+          reports.flat_map(&:worklogs),
+          @users.count
         )
-        week_ranges.find_index(week) + 1
+      end
+
+      def projects
+        @projects ||= reports.flat_map(&:projects).uniq
       end
 
       def table_headings
-        %w[User COMP% UTIL%] + report.projects
+        %w[User COMP% UTIL%] + projects
       end
 
       def render_table
         t = table.new(
           table_headings,
-          report.reports.map { |r| row(r) } + [row(report.aggregate)]
+          reports.map { |r| row(r) } + [row(aggregate)]
         )
 
         t.render(:ascii, padding: [0, 1])
       end
 
-      def row(r)
+      def row(data)
         row = [
-          r.user,
-          r.total_compliance_percentage.round(2),
-          r.utilization_percentage.round(2)
+          data.user,
+          percentage(data.total_compliance_percentage),
+          percentage(data.utilization_percentage)
         ]
-        report.projects.each do |project|
-          row.push(r.project_compliance_percentages.to_h.fetch(project, 0).round(2))
+        projects.each do |project|
+          row.push(
+            percentage(data.project_compliance_percentages.to_h.fetch(project, 0))
+          )
         end
         row
       end
+
+      def percentage(decimal)
+        (decimal * 100).to_i.to_s + '%'
+      end
     end
   end
 end

data/lib/tempest_time/commands/submit.rb

@@ -16,28 +16,16 @@ module TempestTime
       def execute(input: $stdin, output: $stdout)
         # Command logic goes here ...
         reviewer = prompt.ask('Who should review this timesheet? (username)')
-        week_number = week_prompt
+        dates = week_dates(week_prompt('Select a week to submit.'))
 
         message = 'Submit the selected timesheet to ' + pastel.green(reviewer) + '?'
         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, week_number).send_request
+          TempoAPI::Requests::SubmitTimesheet.new(reviewer, dates).send_request
         end
       end
-
-      private
-
-      def week_prompt
-        week = TTY::Prompt.new.select(
-            'Please select the week to submit.',
-            week_ranges,
-            default: current_week,
-            per_page: 5
-        )
-        week_ranges.find_index(week) + 1
-      end
     end
   end
 end

data/lib/tempest_time/commands/teams.rb

@@ -20,7 +20,7 @@ module TempestTime
         TempestTime::Commands::Teams::Edit.new(options).execute
       end
 
-      desc 'delete', 'Edit a team.'
+      desc 'delete', 'Delete a team.'
       def delete(*)
         require_relative 'teams/delete'
         TempestTime::Commands::Teams::Delete.new(options).execute

data/lib/tempest_time/helpers/time_helper.rb

@@ -13,11 +13,15 @@ module TempestTime
           return time.chomp('m').to_i * 60
         end
 
-        abort("Please provide time in the correct format. e.g. 0.5h, .5h, 30m")
+        abort('Please provide time in the correct format. e.g. 0.5h, .5h, 30m')
       end
 
       def formatted_time(seconds)
-        seconds < 3600 ? "#{seconds / 60} minutes" : "#{(seconds / 3600.to_f).round(2)} hours"
+        if seconds < 3600
+          "#{seconds / 60} minutes"
+        else
+          "#{(seconds / 3600.to_f).round(2)} hours"
+        end
       end
 
       def formatted_date_range(start_date, end_date)
@@ -26,46 +30,45 @@ module TempestTime
       end
 
       def formatted_date(date)
-        "#{Date::DAYNAMES[date.wday]}, #{Date::MONTHNAMES[date.month]} #{date.day}"
+        Date::DAYNAMES[date.wday] +
+          ', ' +
+          Date::MONTHNAMES[date.month] +
+          ' ' +
+          date.day.to_s
       end
 
-      def parsed_date_input(date_input)
-        case date_input
-        when 'today', nil
-          [Date.today]
-        when 'yesterday'
-          [Date.today.prev_day]
-        when 'week', 'thisweek'
-          week_dates(current_week)
-        when 'lastweek'
-          week_dates(current_week - 1)
-        else
-          [Date.parse(date_input)]
-        end
+      def beginning_of_week(weeks_ago = 0)
+        return unless weeks_ago >= 0
+        (Date.today - Date.today.wday) - (weeks_ago * 7)
       end
 
-      def current_week
-        # Helper method to make weeks start on Sunday instead of Monday.
-        @current_week ||= (Date.today + 1).cweek
+      def end_of_week(weeks_ago = 0)
+        beginning_of_week(weeks_ago) + 6
       end
 
-      def beginning_of_week(week_number)
-        return unless week_number.positive? && week_number < 53
-        (Date.today - Date.today.wday) - ((current_week - week_number) * 7)
+      def week_beginnings(number_of_weeks)
+        (0..number_of_weeks).map { |weeks_ago| beginning_of_week(weeks_ago) }
       end
 
-      def week_beginnings
-        @week_beginnings ||= (1..52).map { |week_number| beginning_of_week(week_number) }
+      def past_week_selections(number_of_weeks)
+        weeks = {}
+        week_beginnings(number_of_weeks).each do |beginning|
+          weeks[formatted_date_range(beginning, beginning + 6)] = beginning
+        end
+        weeks
       end
 
-      def week_ranges
-        @week_ranges ||= week_beginnings.map do |start_date|
-          formatted_date_range(start_date, start_date + 6)
+      def past_date_selections(number_of_days)
+        dates = {}
+        (0..number_of_days).each do |n|
+          date = Date.today - n
+          dates[formatted_date(date)] = date
         end
+        dates
       end
 
-      def week_dates(week_number)
-        (0..6).map { |days| beginning_of_week(week_number) + days }
+      def week_dates(first_day)
+        (0..6).map { |days| first_day + days }
       end
     end
   end

data/lib/tempest_time/version.rb

@@ -1,3 +1,3 @@
 module TempestTime
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempest_time
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Devan Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -466,7 +466,6 @@ files:
 - lib/tempest_time/helpers/formatting_helper.rb
 - lib/tempest_time/helpers/time_helper.rb
 - lib/tempest_time/models/report.rb
-- lib/tempest_time/services/generate_report.rb
 - lib/tempest_time/setting.rb
 - lib/tempest_time/settings/authorization.rb
 - lib/tempest_time/settings/teams.rb

data/lib/tempest_time/services/generate_report.rb

@@ -1,49 +0,0 @@
-require_relative '../helpers/time_helper'
-require_relative '../api/tempo_api/requests/list_worklogs'
-require_relative '../models/report'
-
-module TempestTime
-  module Services
-    class GenerateReport
-      include TempestTime::Helpers::TimeHelper
-
-      attr_reader :users, :week_number, :reports
-
-      def initialize(users, week_number)
-        @users = users
-        @week_number = week_number || Date.today.cweek
-        @reports = build_reports
-      end
-
-      def projects
-        @projects ||= reports.flat_map(&:projects).uniq
-      end
-
-      def aggregate
-        @aggregate ||= TempestTime::Models::Report.new(
-          'TOTAL',
-          reports.flat_map(&:worklogs),
-          users.count
-        )
-      end
-
-      def start_date
-        @start_date ||= beginning_of_week(week_number)
-      end
-
-      def end_date
-        @end_date ||= start_date + 6
-      end
-
-      private
-
-      def build_reports
-        users.map do |user|
-          request = TempoAPI::Requests::ListWorklogs.new(start_date, end_date, user)
-          request.send_request
-          TempestTime::Models::Report.new(user, request.response.worklogs)
-        end || []
-      end
-    end
-  end
-end