tempest_time 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74bde0bc0ada40a2f0b8b0ddd15e8ac34496bd162b991e6d128955de9f5b063b
-  data.tar.gz: 63aca556189c6448a228e87cea9c66d8d553755a80e02ac2224ced683db02653
+  metadata.gz: bee4c127b0d41d0f31cf49f9b3291c5948060eb44a8e9835720cb94ab9ffd123
+  data.tar.gz: 7d8102ca79d54c07b6ade649135f5a545d6a6e2297564420e1cd762b18980b4d
 SHA512:
-  metadata.gz: 5d996e6427394195f2a0c145a3bb728326b253b245cc242759bfc7d5fd57197639b97d5ae9b6c0b2161bb8a94cf45a2fa05964f8e04349ef5c45031c6f302a28
-  data.tar.gz: bc50f8b3504c5adf0165c7a9906e3a371aa503e0f1691305ccb65531768a842be4eeb403f9a6ae07efc9a39678c9037a7e26c911aa56011e43f086420c94b9ff
+  metadata.gz: 6db29dd83c233f730e47f8226292f305ae8c99c8f640846f271314ab3365c59e0ebbed337910fbf7b28971ccde1e5e645b1f8b19ea0e3cdfd368a2c1b34ec0e2
+  data.tar.gz: c8d4feac6d657e579d0382e72331dd18a33b5a13e024c12baf67c7d7131c2acc6087e95ebceb53a0199cda97888e6e7976462bec2fd4c2992f70613b1c37c2cb

data/.gitignore

@@ -7,4 +7,5 @@
 /spec/reports/
 /tmp/
 .byebug_history
-*.gem
+Gemfile.lock
+*.gem

data/lib/tempest_time/api/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'httparty'
 require 'json'
 
@@ -9,7 +11,7 @@ module TempestTime
     class Request
       include HTTParty
 
-      DATE_FORMAT = "%Y-%m-%d".freeze
+      DATE_FORMAT = "%Y-%m-%d"
 
       def initialize(*args)
         self.class.base_uri credentials.fetch(:url)

data/lib/tempest_time/cli.rb

@@ -81,6 +81,10 @@ module TempestTime
       TempestTime::Commands::Track.new(time, issues, options).execute
     end
 
+    require_relative 'commands/timer'
+    register TempestTime::Commands::Timer,
+             'timer', 'timer [SUBCOMMAND]', 'Start, Stop, Delete, Submit Timers'
+
     map log: :track
   end
 end

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

@@ -25,14 +25,14 @@ module TempestTime
         private
 
         def browser_prompt(issues)
-          abort if prompt.no?('Open an issue in your browser?')
-          issue = prompt.select(
+          abort if prompt.no?('Open any issues in your browser?')
+          selections = prompt.multi_select(
             'Select an issue to open in browser, or press ^C to quit.',
             issues.map(&:key),
             per_page: 5
           )
           require_relative 'open'
-          Open.new(issue).execute
+          Open.new(selections).execute
         end
 
         def format_output(issues)

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

@@ -7,13 +7,13 @@ module TempestTime
   module Commands
     class Issue
       class Open < TempestTime::Command
-        def initialize(issue)
-          @issue = issue.upcase
-          @issue = automatic_issue if issue.empty?
+        def initialize(issues)
+          @issues = issues.map(&:upcase)
+          @issues = [automatic_issue] if issues.empty?
         end
 
         def execute(input: $stdin, output: $stdout)
-          command.run("open #{url(@issue)}")
+          @issues.each { |issue| command.run("open #{url(issue)}") }
         end
 
         private

data/lib/tempest_time/commands/issue.rb

@@ -15,9 +15,9 @@ module TempestTime
       end
 
       desc 'open', 'Open an issue in your browser. (Default: current branch)'
-      def open(issue = '')
+      def open(*issues)
         require_relative 'issue/open'
-        TempestTime::Commands::Issue::Open.new(issue).execute
+        TempestTime::Commands::Issue::Open.new(issues).execute
       end
     end
   end

data/lib/tempest_time/commands/submit.rb

@@ -14,7 +14,6 @@ module TempestTime
       end
 
       def execute(input: $stdin, output: $stdout)
-        # Command logic goes here ...
         reviewer = prompt.ask('Who should review this timesheet? (username)')
         dates = week_dates(week_prompt('Select a week to submit.'))
 

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class Delete < TempestTime::Command
+        def initialize(issue)
+          @issue = issue || automatic_issue
+          @timer = TempestTime::Models::Timer.new(@issue)
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          timer.delete ? deleted_message : no_timer_message
+        end
+
+        private
+
+        attr_reader :issue, :timer
+
+        def deleted_message
+          prompt.say('baleeted')
+        end
+
+        def no_timer_message
+          prompt.say('noleeted')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative './status'
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class List < TempestTime::Command
+        def execute(input: $stdin, output: $stdout)
+          all_timers.each do |timer|
+            TempestTime::Commands::Timer::Status.new(timer.issue).execute
+          end
+          issue = prompt.select(
+            'Please select a timer to toggle / track, or enter ^C to exit.',
+            all_timers.map(&:issue)
+          )
+          action = action_prompt(timer(issue))
+          take_action(issue, action)
+        end
+
+        private
+
+        def all_timers
+          @all_timers ||= TempestTime::Models::Timer.all_timers
+        end
+
+        def timer(issue)
+          all_timers.detect { |timer| timer.issue == issue }
+        end
+
+        def action_prompt(timer)
+          if timer.running?
+            prompt.select('', %w[Pause Track])
+          else
+            prompt.select('', %w[Resume Track])
+          end
+        end
+
+        def take_action(issue, action)
+          case action
+          when 'Pause'
+            require_relative './pause'
+            TempestTime::Commands::Timer::Pause.new(issue).execute
+          when 'Resume'
+            require_relative './start'
+            TempestTime::Commands::Timer::Start.new(issue).execute
+          when 'Track'
+            require_relative './track'
+            TempestTime::Commands::Timer::Track.new(issue).execute
+          else
+            abort
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class Pause < TempestTime::Command
+        def initialize(issue)
+          @issue = issue || automatic_issue
+          @timer = TempestTime::Models::Timer.new(@issue)
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          timer.pause
+          TempestTime::Commands::Timer::Status.new(issue).execute
+        end
+
+        private
+
+        attr_reader :issue, :timer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative './status'
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class Start < TempestTime::Command
+        def initialize(issue)
+          @issue = issue || automatic_issue
+          @timer = TempestTime::Models::Timer.new(@issue)
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          timer.start
+          TempestTime::Commands::Timer::Status.new(issue).execute
+        end
+
+        private
+
+        attr_reader :issue, :timer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class Status < TempestTime::Command
+        def initialize(issue)
+          @issue = issue
+          @timer = TempestTime::Models::Timer.new(issue)
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          prompt.say("#{issue}: #{status_message}")
+        end
+
+        private
+
+        attr_reader :issue, :timer
+
+        def status_message
+          if timer.running?
+            pastel.green("#{formatted_time_long(timer.runtime)} running")
+          else
+            pastel.yellow("#{formatted_time_long(timer.runtime)} paused")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative '../track'
+require_relative '../../command'
+require_relative '../../models/timer'
+
+module TempestTime
+  module Commands
+    class Timer
+      class Track < TempestTime::Command
+        attr_reader :timer, :issue
+
+        def initialize(issue)
+          @issue = issue || automatic_issue
+          @timer = TempestTime::Models::Timer.new(@issue)
+        end
+
+        def execute(input: $stdin, output: $stdout)
+          abort(pastel.red("No timer for #{issue}!")) unless timer.exists?
+          timer.pause
+          track_time
+          timer.delete
+        end
+
+        private
+
+        def track_time
+          time = prompt.ask(
+              "How much time should be logged to #{issue}?",
+              default: formatted_time_for_input(timer.runtime)
+          )
+          billable = prompt.yes?('Is this time billable?')
+          message = prompt.ask('Add a message. (optional)')
+          Commands::Track.new(
+              parsed_time(time),
+              [issue],
+              'message' => message,
+              'billable' => billable
+          ).execute
+        end
+      end
+    end
+  end
+end

data/lib/tempest_time/commands/timer.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'thor'
+
+module TempestTime
+  module Commands
+    class Timer < Thor
+
+      namespace :timer
+
+      desc 'start [ISSUE]', 'Start a new timer, or continue a paused timer.'
+      def start(issue = nil)
+        require_relative 'timer/start'
+        TempestTime::Commands::Timer::Start.new(issue).execute
+      end
+
+      desc 'pause [ISSUE]', 'Pause a timer.'
+      def pause(issue = nil)
+        require_relative 'timer/pause'
+        TempestTime::Commands::Timer::Pause.new(issue).execute
+      end
+
+      desc 'track [ISSUE]', 'Stop and track a timer.'
+      def track(issue = nil)
+        require_relative 'timer/track'
+        TempestTime::Commands::Timer::Track.new(issue).execute
+      end
+
+      desc 'delete [ISSUE]', 'Delete current timer.'
+      def delete(issue = nil)
+        require_relative 'timer/delete'
+        TempestTime::Commands::Timer::Delete.new(issue).execute
+      end
+
+      desc 'status [ISSUE]', 'Display timer status.'
+      def status(issue = nil)
+        require_relative 'timer/status'
+        TempestTime::Commands::Timer::Status.new(issue).execute
+      end
+
+      desc 'list', 'Display all timers.'
+      def list
+        require_relative 'timer/list'
+        TempestTime::Commands::Timer::List.new.execute
+      end
+    end
+  end
+end

data/lib/tempest_time/commands/track.rb

@@ -2,9 +2,8 @@
 
 require_relative '../command'
 require_relative '../helpers/time_helper'
-
-require_relative '../api/tempo_api/requests/create_worklog'
 require_relative '../api/jira_api/requests/get_issue'
+require_relative '../api/tempo_api/requests/create_worklog'
 
 module TempestTime
   module Commands
@@ -27,7 +26,7 @@ module TempestTime
         end
 
         issues.each do |issue|
-          track_time(time, @options.merge(issue: issue))
+          track_time(time, @options.merge('issue' => issue))
         end
       end
 

data/lib/tempest_time/helpers/time_helper.rb

@@ -21,6 +21,15 @@ module TempestTime
         "#{(seconds / 3600.to_f).round(2)} hours"
       end
 
+      def formatted_time_for_input(seconds)
+        return "#{(seconds / 60).to_i}m" if seconds < 3600
+        "#{(seconds / 3600.to_f).round(2)}h"
+      end
+
+      def formatted_time_long(seconds)
+        Time.at(seconds).utc.strftime("%H:%M:%S")
+      end
+
       def formatted_date_range(start_date, end_date)
         return formatted_date(start_date) if end_date.nil?
         "#{formatted_date(start_date)} - #{formatted_date(end_date)}"

data/lib/tempest_time/models/report.rb

@@ -13,7 +13,6 @@ module TempestTime
         @user = user
         @worklogs = worklogs
         @number_of_users = number_of_users
-        require 'byebug'; byebug
       end
 
       def project_total_times

data/lib/tempest_time/models/timer.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+
+module TempestTime
+  module Models
+    class Timer
+      TEMP_DIR = '/tmp/timer/logs'
+      FILE_EXT = '.timer'
+      PREFIX_SEPARATOR = '___'
+
+      class << self
+        def all_timers
+          issues = Dir.glob("#{TEMP_DIR}/*#{FILE_EXT}").map do |file|
+            file.delete(TEMP_DIR).split(PREFIX_SEPARATOR).first
+          end
+
+          issues.uniq.sort.map { |issue| new(issue) }
+        end
+      end
+
+      attr_reader :issue
+
+      def initialize(issue)
+        ensure_tmp_dir
+        @issue = issue || automatic_issue
+      end
+
+      def start
+        return false if running?
+        Tempfile.create([log_file_prefix, FILE_EXT], TEMP_DIR)
+      end
+
+      def pause
+        log_files.each do |log|
+          FileUtils.touch(log) if log_running?(log)
+        end
+      end
+
+      def delete
+        return false unless exists?
+        log_files.each { |log| File.unlink log }
+      end
+
+      def runtime
+        @logs ||= log_files.each_with_object([]) do |log, array|
+          start_time = File.birthtime(log)
+          end_time = log_running?(log) ? Time.now : File.mtime(log)
+
+          array << (end_time - start_time)
+        end.sum
+      end
+
+      def running?
+        log_files.any? { |log| log_running?(log) }
+      end
+
+      def exists?
+        log_files.any?
+      end
+
+      private
+
+      def log_file_prefix
+        "#{issue}#{PREFIX_SEPARATOR}"
+      end
+
+      def log_running?(log)
+        File.birthtime(log).eql? File.mtime(log)
+      end
+
+      def log_files
+        @log_files ||= Dir.glob("#{TEMP_DIR}/#{issue}*#{FILE_EXT}")
+      end
+
+      def ensure_tmp_dir
+        FileUtils.mkdir_p TEMP_DIR unless File.directory? TEMP_DIR
+      end
+    end
+  end
+end

data/lib/tempest_time/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TempestTime
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tempest_time
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Devan Hurst
@@ -463,11 +463,19 @@ files:
 - lib/tempest_time/commands/teams/add.rb
 - lib/tempest_time/commands/teams/delete.rb
 - lib/tempest_time/commands/teams/edit.rb
+- lib/tempest_time/commands/timer.rb
+- lib/tempest_time/commands/timer/delete.rb
+- lib/tempest_time/commands/timer/list.rb
+- lib/tempest_time/commands/timer/pause.rb
+- lib/tempest_time/commands/timer/start.rb
+- lib/tempest_time/commands/timer/status.rb
+- lib/tempest_time/commands/timer/track.rb
 - lib/tempest_time/commands/track.rb
 - lib/tempest_time/helpers/formatting_helper.rb
 - lib/tempest_time/helpers/git_helper.rb
 - lib/tempest_time/helpers/time_helper.rb
 - lib/tempest_time/models/report.rb
+- lib/tempest_time/models/timer.rb
 - lib/tempest_time/setting.rb
 - lib/tempest_time/settings/app.rb
 - lib/tempest_time/settings/authorization.rb