tempest_time 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e479a195a96ae924bc6d8b48ff396e258be6fb20
-  data.tar.gz: 82b865f17b276335ec8527db4e91ecdf269b0824
+  metadata.gz: 97b895b41af4c2e73bd189b4ff68606b3f032b02
+  data.tar.gz: 95548d0b3807c5975808640714ee9d8cb5e6a450
 SHA512:
-  metadata.gz: ee10e2b110b67578753768e0f7eef0f2928bb88e142f0799be8996b402e2e9c27ff54b9e8dc18dd0f3c493f3240fa40555b3922f8d964dc7a1c7fab67a070fca
-  data.tar.gz: 988c454bd0cc4728aa26008c9d9be9173793ac138d86ecf4020c642808da6941fe1a50d4f157fdb0e4dbb61401099a2673f1e4075439dfc7b2d1a8ab112c0456
+  metadata.gz: 1c947e642c9ac21e6762060a2b97bfd1dbbff1e095e0ee9015d0f03b844d7eadcf22869b667834f53a8ec5d57fda4cd3c8780b4179504412f48d4fd875ab07bf
+  data.tar.gz: 1fb03ccc8bc8a8b81bc581854351844aab2e59553b17f5f4ddfa500ba44b0decbcaf51e570bf0ea6ac8e2442b9b08ad204a0d533d91ee809ee18a373d2b84a6d

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

@@ -10,7 +10,7 @@ module TempoAPI
         @remaining = options['remaining']
         @issue = options['issue']
         @message = options['message']
-        @date = options['date'] ? Date.parse(options['date']) : Date.today
+        @date = options['date'] ? options['date'] : Date.today
         @billable = options['billable']
       end
 

data/lib/tempest_time/command.rb

@@ -53,13 +53,14 @@ module TempestTime
       )
     end
 
-    def date_prompt(message, past_days: 6)
+    def date_prompt(message, days_before: 3, days_after: 3)
       require 'tty-prompt'
-      dates = past_date_selections(past_days)
-      TTY::Prompt.new.select(
+      dates = dates_in_range(days_before: days_before, days_after: days_after)
+      TTY::Prompt.new.multi_select(
         message,
         dates,
-        per_page: 5
+        per_page: 5,
+        default: dates.find_index { |k, v| v == Date.today } + 1
       )
     end
 

data/lib/tempest_time/commands/list.rb

@@ -8,24 +8,29 @@ module TempestTime
     class List < TempestTime::Command
       def initialize(options)
         @user = options[:user]
-        @date = options[:date] ? Date.parse(options[:date]) : nil
+        @dates = options[:date] ? [Date.parse(options[:date])] : nil
       end
 
       def execute!
-        @date ||= date_prompt('Please select a date.')
-
-        with_spinner("Retrieving logs for #{formatted_date(@date)}...") do |spin|
-          @response = TempoAPI::Requests::ListWorklogs.new(
-            @date,
-            end_date: nil,
-            requested_user: @user
-          ).send_request
-          spin.stop(pastel.green('Done!'))
-          prompt.say(render_table)
-          prompt.say(
-            'Total Time Logged: '\
-            "#{pastel.green("#{@response.total_hours_spent} hours")}"
-          )
+        @dates ||= date_prompt(
+          'Please select the dates you wish to view.',
+          days_before: 13,
+          days_after: 13
+        ).sort
+        @dates.each do |date|
+          with_spinner("Retrieving logs for #{pastel.yellow(formatted_date(date))}...") do |spin|
+            @response = TempoAPI::Requests::ListWorklogs.new(
+              date,
+              end_date: nil,
+              requested_user: @user
+            ).send_request
+            spin.stop(pastel.green('Done!'))
+            prompt.say(render_table)
+            prompt.say(
+              'Total Time Logged: '\
+              "#{pastel.green("#{@response.total_hours_spent} hours")}"
+            )
+          end
         end
       end
 

data/lib/tempest_time/commands/track.rb

@@ -13,17 +13,19 @@ module TempestTime
         @options = options
         @issues = issues.any? ? issues.map(&:upcase) : [automatic_issue]
         @time = parsed_time(time) / @issues.count
+        @dates = options[:date] ? [Date.parse(options[:date])] : nil
       end
 
       def execute!
-        unless @options[:autoconfirm]
-          prompt_message = "Track #{formatted_time(time)}, "\
-                           "#{billability(options)}, "\
-                           "to #{issues.join(', ')}?"
-          abort unless prompt.yes?(prompt_message, convert: :bool)
+        dates
+        unless options[:autoconfirm]
+          confirm_prompt
+        end
+        dates.each do |date|
+          issues.each do |issue|
+            track_time(time, options.merge({ issue: issue, date: date }))
+          end
         end
-
-        issues.each { |issue| track_time(time, options.merge('issue' => issue)) }
       end
 
       private
@@ -40,6 +42,23 @@ module TempestTime
         end
       end
 
+      def dates
+        @dates ||= if options[:autoconfirm]
+                     [Date.today]
+                   else
+                     date_prompt("Select the day(s) to log this time to.",
+                                 days_before: 13,
+                                 days_after: 365).sort
+                   end
+      end
+
+      def confirm_prompt
+        prompt_message = "Track #{formatted_time(time)}, "\
+                           "#{billability(options)}, "\
+                           "to #{issues.join(', ')}?"
+        abort unless prompt.yes?(prompt_message, convert: :bool)
+      end
+
       def remaining_estimate(issue, time)
         request = JiraAPI::Requests::GetIssue.new(issue)
         request.send_request

data/lib/tempest_time/helpers/time_helper.rb

@@ -64,10 +64,23 @@ module TempestTime
         weeks
       end
 
-      def past_date_selections(number_of_days)
+      def dates_in_range(days_before: 0, days_after: 0)
+        future_dates(days_after).merge(past_dates(days_before))
+      end
+
+      def past_dates(number_of_days)
+        dates = {}
+        (0..number_of_days).each do |num|
+          date = Date.today - num
+          dates[formatted_date(date)] = date
+        end
+        dates
+      end
+
+      def future_dates(number_of_days)
         dates = {}
-        (0..number_of_days).each do |n|
-          date = Date.today - n
+        number_of_days.downto(0).each do |num|
+          date = Date.today + num
           dates[formatted_date(date)] = date
         end
         dates

data/lib/tempest_time/version.rb

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

metadata

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