tempest_time 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0741b1d3f1af0e3145fbcb9039d3856135c455d
-  data.tar.gz: f8c88a25127cfb070a31b6ad76da191306e49faf
+SHA256:
+  metadata.gz: 5f0b28efca7d86aa211972f46715abbc9280b68b9ef899964601d31b22175240
+  data.tar.gz: 9f244e11657b42344c22275331bde8538a247117a4c098519355f6e766bdf89d
 SHA512:
-  metadata.gz: 6243e1801cdcc99e376cc1a57ad36022c3ef7cd2077adbb584c5a6c3d505308523ad6e63fa2f4813d9aec99fe71261957834b1ac5a8fb914a6f6966a7b8ccd8e
-  data.tar.gz: f1fa740661e844fca870aa50848560e93eb5ec309a8ccaa9380ee94f5af4ef7f1e4180970958c52341f62d014b4f4be1bd2fbbf40003f9d887236bbc18f79e83
+  metadata.gz: 314dc7529baf6ff390c05d6429da13244015ecf6d89d840bab1063a53cddeb067fd0275a036d63320617b9de527bdfa896c409682a33c51cc0ec6313b19e0d8e
+  data.tar.gz: 1de292852bc3af692ed108442edf035d4adae2f49a686bb12986d66413f76170d4ee13708dfb84a4e8cad124580270d47c0d76480b397ae0f92f684ba3bbd1bf

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

@@ -7,11 +7,11 @@ module TempoAPI
       def initialize(seconds, options)
         super
         @seconds = seconds
-        @remaining = options['remaining']
-        @issue = options['issue']
-        @message = options['message']
-        @date = options['date'] ? options['date'] : Date.today
-        @billable = options['billable']
+        @remaining = options[:remaining]
+        @issue = options[:issue]
+        @message = options[:message]
+        @date = options[:date] ? options[:date] : Date.today
+        @billable = options[:billable]
       end
 
       private

data/lib/tempest_time/cli.rb

@@ -52,8 +52,9 @@ module TempestTime
     end
 
     desc 'report', 'Generate a user or team report.'
-    option :week, aliases: '-w', type: :numeric
     option :team, aliases: '-t', type: :string
+    option :start, aliases: '-s', type: :string
+    option :end, aliases: '-e', type: :string
     def report(*users)
       require_relative 'commands/report'
       TempestTime::Commands::Report.new(users, options).execute

data/lib/tempest_time/commands/report.rb

@@ -13,6 +13,8 @@ module TempestTime
       def initialize(users, options)
         @users = users || []
         @team = options[:team]
+        @start_date = options[:start] ? Date.parse(options[:start]) : nil
+        @end_date = options[:end] ? Date.parse(options[:end]) : nil
         @teams = TempestTime::Settings::Teams.new
       end
 
@@ -24,7 +26,11 @@ module TempestTime
         @users.push(@teams.members(@team)) if @team
         abort('No users specified.') unless @users.any?
 
-        @week = week_prompt('Please select the week to report.')
+        if @start_date.nil? || @end_date.nil?
+          @week = week_prompt('Please select the week to report.')
+        else
+          validate_date_input
+        end
 
         with_spinner('Generating report...') do |spinner|
           table = render_table
@@ -72,6 +78,10 @@ module TempestTime
         @end_date ||= week_dates(@week).last
       end
 
+      def validate_date_input
+        abort('Start date must come before end date.') unless start_date < end_date
+      end
+
       def required_seconds
         @required_seconds ||= TempoAPI::Requests::GetUserSchedule.new(
           start_date: start_date,

data/lib/tempest_time/commands/timer/delete.rb

@@ -13,7 +13,8 @@ module TempestTime
         end
 
         def execute!
-          timer.delete ? deleted_message : no_timer_message
+          timer.exists? ? deleted_message : no_timer_message
+          timer.delete
         end
 
         private
@@ -21,11 +22,15 @@ module TempestTime
         attr_reader :issue, :timer
 
         def deleted_message
-          prompt.say('baleeted')
+          prompt.say(
+            pastel.yellow(
+              "Timer #{issue} deleted at #{formatted_time_long(timer.runtime)}"
+            )
+          )
         end
 
         def no_timer_message
-          prompt.say('noleeted')
+          prompt.say(pastel.red("Timer #{issue} does not exist!"))
         end
       end
     end

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

@@ -33,9 +33,9 @@ module TempestTime
 
         def action_prompt(timer)
           if timer.running?
-            prompt.select('', %w(Pause Track))
+            prompt.select('', %w(Pause Track Delete))
           else
-            prompt.select('', %w(Resume Track))
+            prompt.select('', %w(Resume Track Delete))
           end
         end
 
@@ -50,6 +50,9 @@ module TempestTime
           when 'Track'
             require_relative './track'
             TempestTime::Commands::Timer::Track.new(issue).execute
+          when 'Delete'
+            require_relative './delete'
+            TempestTime::Commands::Timer::Delete.new(issue).execute
           else
             abort
           end

data/lib/tempest_time/commands/timer/track.rb

@@ -38,8 +38,8 @@ module TempestTime
           Commands::Track.new(
             parsed_time(time),
             [issue],
-            'message' => message,
-            'billable' => billable
+            message: message,
+            billable: billable
           ).execute
         end
       end

data/lib/tempest_time/commands/track.rb

@@ -18,6 +18,7 @@ module TempestTime
 
       def execute!
         dates
+
         unless options[:autoconfirm]
           confirm_prompt
         end
@@ -31,13 +32,13 @@ module TempestTime
       private
 
       def track_time(time, options)
-        message = "Tracking #{formatted_time(time)} to #{options['issue']}..."
+        message = "Tracking #{formatted_time(time)} to #{options[:issue]}..."
         with_success_fail_spinner(message) do
-          options['remaining'] = if options['remaining'].nil?
-                                   remaining_estimate(options['issue'], time)
-                                 else
-                                   parsed_time(options['remaining'])
-                                 end
+          options[:remaining] = if options[:remaining].nil?
+                                  remaining_estimate(options[:issue], time)
+                                else
+                                  parsed_time(options[:remaining])
+                                end
           TempoAPI::Requests::CreateWorklog.new(time, options).send_request
         end
       end
@@ -71,7 +72,7 @@ module TempestTime
       end
 
       def billability(options)
-        options['billable'] ? 'billed' : 'non-billed'
+        options[:billable] ? 'billed' : 'non-billed'
       end
     end
   end

data/lib/tempest_time/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tempest_time
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Devan Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -346,8 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Smart CLI for Jira Cloud.