tempest_time 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45634f4e2d1ba9f4f640dbf13d59744f79d60cc8be2018bd5b85b5cba89c347f
-  data.tar.gz: fd570fdd23d0bd81ca05e730a915fbc586bc8cc6e4a69be09b9e8e460e6544ea
+  metadata.gz: 6b26cfdc661706032cc5149b28b05fbf1f322324f0f845c00af8d3e5135546c8
+  data.tar.gz: 1cb5c84cf724531917ec9c759dc83cd47a7fba89a8dc9c74401c65f89b6ea207
 SHA512:
-  metadata.gz: ba9a953f273044cb2ab23902af2c6fb81ec8a6b3efe81139278dd6dbfe75a45d4a1a0e845fd694718a28824819868abe743dbbec3684e121f0d394c48630d747
-  data.tar.gz: c4b70af7542aa5d29d975ce71391c82b3b62277eb16aa7c69f40325cf617ddc9617f651f7c5647b889253a02fdab93706e85d2b48f7ac950bfa3147a252c58ca
+  metadata.gz: 1ac9e54ec617bae5c87fd405b1b1f6c5df82d47d668caa0a26deedfe52dc59352d5ce3e37b7e0cacb376562fbed3fcb670c1d6f92c737a81b911db2ff0658466
+  data.tar.gz: 502bf3a2a0d11b21167d4fa68305d4993477914462f6110d5dc930e44ceb7a8cf7528e98e135c68cee312d166ef75f571a3f2891a7fc9418b9fbcc7ddad5cf0f

data/Gemfile.lock

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

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

@@ -7,11 +7,12 @@ module TempoAPI
     class SubmitTimesheet < TempoAPI::Request
       include TempestTime::Helpers::TimeHelper
 
-      attr_reader :reviewer
+      attr_reader :reviewer, :week_number
 
-      def initialize(reviewer)
+      def initialize(reviewer, week_number)
         super
         @reviewer = reviewer
+        @week_number = week_number
       end
 
       private
@@ -29,9 +30,10 @@ module TempoAPI
       end
 
       def query_params
+        dates = week_dates(week_number)
         {
-          from: week_dates.first.strftime(DATE_FORMAT),
-          to: week_dates.last.strftime(DATE_FORMAT)
+          from: dates.first.strftime(DATE_FORMAT),
+          to: dates.last.strftime(DATE_FORMAT)
         }
       end
 
@@ -40,10 +42,6 @@ module TempoAPI
           reviewerUsername: reviewer
         }
       end
-
-      def week_dates
-        parsed_date_input('week')
-      end
     end
   end
 end

data/lib/tempest_time/commands/report.rb

@@ -12,14 +12,17 @@ module TempestTime
 
       def initialize(users, options)
         @users = users || []
-        @options = options
+        @team = options[:team]
+        @week = options[:week]
       end
 
       def execute(input: $stdin, output: $stdout)
-        team = @options[:team]
-        @users = prompt_for_input if @users.empty? && team.nil?
-        @users.push(TempestTime::Settings::Teams.members(team)) if team
+        @users = user_prompt if @users.empty? && @team.nil?
+        @users.push(TempestTime::Settings::Teams.members(@team)) if @team
         abort('No users specified.') unless @users.any?
+
+        @week ||= week_prompt
+
         with_spinner('Generating report...') do |spinner|
           table = render_table
           spinner.stop(pastel.green('Your report is ready!'))
@@ -35,11 +38,11 @@ module TempestTime
 
       def report
         @report ||= TempestTime::Services::GenerateReport.new(
-          @users.flatten, @options[:week]
+          @users.flatten, @week
         )
       end
 
-      def prompt_for_input
+      def user_prompt
         type = prompt.select(
           "Generate a report for a #{pastel.green('user')} or #{pastel.green('team')}?",
           ['User', 'Team']
@@ -54,6 +57,16 @@ module TempestTime
         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
+        )
+        week_ranges.find_index(week) + 1
+      end
+
       def table_headings
         %w[User COMP% UTIL%] + report.projects
       end

data/lib/tempest_time/commands/submit.rb

@@ -2,10 +2,13 @@
 
 require_relative '../command'
 require_relative '../api/tempo_api/requests/submit_timesheet'
+require_relative '../helpers/time_helper'
 
 module TempestTime
   module Commands
     class Submit < TempestTime::Command
+      include TempestTime::Helpers::TimeHelper
+
       def initialize(options)
         @options = options
       end
@@ -13,14 +16,28 @@ module TempestTime
       def execute(input: $stdin, output: $stdout)
         # Command logic goes here ...
         reviewer = prompt.ask('Who should review this timesheet? (username)')
-        message = "Submit this week's timesheet to " + pastel.green(reviewer) + '?'
+        week_number = week_prompt
+
+        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 this week's timesheet...") do
-          TempoAPI::Requests::SubmitTimesheet.new(reviewer).send_request
+        with_success_fail_spinner("Submitting your timesheet...") do
+          TempoAPI::Requests::SubmitTimesheet.new(reviewer, week_number).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/helpers/time_helper.rb

@@ -21,7 +21,7 @@ module TempestTime
       end
 
       def formatted_date_range(start_date, end_date)
-        return formatted_date(start_date) if end_date.nil? || end_date.empty?
+        return formatted_date(start_date) if end_date.nil?
         "#{formatted_date(start_date)} - #{formatted_date(end_date)}"
       end
 
@@ -35,29 +35,38 @@ module TempestTime
           [Date.today]
         when 'yesterday'
           [Date.today.prev_day]
-        when 'week'
-          this_week
+        when 'week', 'thisweek'
+          week_dates(current_week)
+        when 'lastweek'
+          week_dates(current_week - 1)
         else
           [Date.parse(date_input)]
         end
       end
 
-      def beginning_of_this_week
-        Date.today - Date.today.wday
+      def current_week
+        # Helper method to make weeks start on Sunday instead of Monday.
+        @current_week ||= (Date.today + 1).cweek
       end
 
       def beginning_of_week(week_number)
-        this_week_number = (Date.today + 1).cweek # Add one so weeks begin on Sunday.
-        return false unless week_number <= this_week_number
-        days_in_the_past = (this_week_number - week_number) * 7
-        beginning_of_this_week - days_in_the_past
+        return unless week_number.positive? && week_number < 53
+        (Date.today - Date.today.wday) - ((current_week - week_number) * 7)
       end
 
-      def this_week
-        (0..6).map do |n|
-          beginning_of_this_week + n
+      def week_beginnings
+        @week_beginnings ||= (1..52).map { |week_number| beginning_of_week(week_number) }
+      end
+
+      def week_ranges
+        @week_ranges ||= week_beginnings.map do |start_date|
+          formatted_date_range(start_date, start_date + 6)
         end
       end
+
+      def week_dates(week_number)
+        (0..6).map { |days| beginning_of_week(week_number) + days }
+      end
     end
   end
 end

data/lib/tempest_time/services/generate_report.rb

@@ -12,7 +12,7 @@ module TempestTime
       def initialize(users, week_number)
         @users = users
         @week_number = week_number || Date.today.cweek
-        @reports = build_reports if valid?
+        @reports = build_reports
       end
 
       def projects
@@ -37,17 +37,12 @@ module TempestTime
 
       private
 
-      def valid?
-        return false unless week_number <= Date.today.cweek
-        true
-      end
-
       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

data/lib/tempest_time/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempest_time
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Devan Hurst