ifocustt 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd3f3e307098164e09d05812cf24434f68d5e92
-  data.tar.gz: d978c002f1d7749c19adcaa2e125310540127b0e
+  metadata.gz: 0dfe2365976e3a78b145968a9fab127547b5ac71
+  data.tar.gz: baa95c3b6ef52e3ce59fdb2b1dc8c3d3c44a61a3
 SHA512:
-  metadata.gz: 28adf588ebdc02237f7ce06495e96c36e30ff009987f50b306699f7af9ae6697310a09be47c8ee3a6b07b36a82d4782d584ed8281e154632a8351fb0490cf9fa
-  data.tar.gz: 80d221e8b0bdf32f793fcca8bf2f95e5b500e406ff5a6c67da230c4620f07da890303f3d89e869479eb368fb62f4a9174341ab59810ae3f7cf1d53faf873a4bd
+  metadata.gz: c40175f09eb1a141a0e9ed408b65749f619431070a422e5ee1a9bd5be45c1e42867dad4390cbbcdfd8d72992dfd5833e652df197494651a111b0304bdeffc69d
+  data.tar.gz: 616585264fe4dda64aa48cd16f07a795f17e69dbcaf9ac6137fa517a90c9d195660df4159ff8cb832d3b80d8493f482cca1aa6f03c76a655724bd9e6c4fb3546

data/config/default.yml

@@ -6,6 +6,6 @@ actions:
 
   - OnBreak:
 
-  - OnCompletion:
+  - Cleanup:
     - ToggleMacNotificationCenter:
         enabled: true

data/lib/focus/action.rb

@@ -2,6 +2,8 @@ require "httparty"
 require "interactor"
 
 module Focus
+  class FailedActionError < StandardError; end
+
   class Action
     include Interactor
 
@@ -19,6 +21,10 @@ module Focus
       context.minutes.to_f * 60
     end
 
+    def seconds_focused
+      Time.now.to_i - context.focus_start
+    end
+
     def break_seconds
       focus_seconds * 0.2
     end
@@ -28,12 +34,21 @@ module Focus
       step = "Running #{action}..."
 
       Focus::STDOUT.step(step, quiet: context.quiet) do
-        klass.call(args)
+        result = klass.call(args)
+        raise FailedActionError, error_message(result) unless result.success?
       end
     end
 
+    def error_message(obj)
+      "#{obj.action}: #{obj.error}"
+    end
+
     def debug_output(*args)
       Focus::STDOUT.debug_output args
     end
+
+    def fail_action!(opts = {})
+      context.fail!(opts.merge(action: self.class.to_s.split("::").last))
+    end
   end
 end

data/lib/focus/actions/log_work_for_jira.rb

@@ -1,7 +1,7 @@
 module Focus
   class PostWorkLogToJira < Action
     def call
-      return unless jira_ticket && focus_seconds >= 60
+      return unless jira_ticket && seconds_focused >= 60
       HTTParty.post(issue_url, options)
     end
 
@@ -20,7 +20,7 @@ module Focus
     end
 
     def body
-      { timeSpentSeconds: focus_seconds, comment: context.comment.to_s }
+      { timeSpentSeconds: seconds_focused, comment: context.comment.to_s }
     end
 
     def auth

data/lib/focus/actions/start_focus_time.rb

@@ -3,47 +3,43 @@ require "tty"
 
 module Focus
   class StartFocusTime < Action
-    DEFAULT_CONTEXT_KEYS = %i(minutes target quiet daemonize).freeze
+    DEFAULT_CONTEXT_KEYS = %i(minutes target quiet daemonize focus_start).freeze
 
     attr_reader :action
 
     def call
       context.actions = ConfigLoader.load("actions")
+      context.daemonize ? fork { _actions } : _actions
+    end
+
+    private
+
+    def _actions
       focus
       take_break
+    rescue SystemExit, Interrupt
+      context.quiet = false
+      Focus::STDOUT.title "Shutting down gracefully..."
+    ensure
       cleanup
       happy_message
     end
 
-    private
-
     def focus
       @action = :focus
-
-      if context.daemonize
-        fork { perform_actions "OnFocus" }
-      else
-        perform_actions "OnFocus"
-        handle_progress_bar
-      end
+      perform_actions "OnFocus"
+      context.focus_start = Time.now.to_i
+      handle_progress_bar
     end
 
     def take_break
       @action = :break
-      if context.daemonize
-        fork { perform_actions "OnBreak" }
-      else
-        perform_actions "OnBreak"
-        handle_progress_bar
-      end
+      perform_actions "OnBreak"
+      handle_progress_bar
     end
 
     def cleanup
-      if context.daemonize
-        fork { perform_actions "OnCompletion" }
-      else
-        perform_actions "OnCompletion"
-      end
+      perform_actions "Cleanup"
     end
 
     def progress_bar
@@ -75,18 +71,22 @@ module Focus
 
       while Time.now < end_time
         timestamp = Time.now
-        yield
+        yield if block_given?
         interval = 1 - (Time.now - timestamp)
         sleep(interval) if interval.positive?
       end
     end
 
     def handle_progress_bar
-      every_second { progress_bar.advance unless context.daemonize }
+      if context.daemonize
+        every_second # sleep
+      else
+        every_second { progress_bar.advance }
+      end
     end
 
     def perform_actions(event)
-      actions = context.actions.shift[event]
+      actions = actions_to_perform(event)
       return unless actions
       Focus::STDOUT.print_line "Starting #{event}...\r", quiet: context.quiet
 
@@ -100,6 +100,11 @@ module Focus
       end
     end
 
+    def actions_to_perform(event)
+      actions = context.actions.find { |x| x.keys.include? event }
+      actions[event] if actions
+    end
+
     def with_default_context(args)
       hsh = args.to_h
       hsh.merge default_hsh
@@ -125,8 +130,7 @@ module Focus
 
     def happy_message
       return if context.quiet
-      Focus::STDOUT.puts_line nil
-      Focus::STDOUT.puts_line "Complete!"
+      Focus::STDOUT.puts_line "\nProcess complete."
     end
 
     def constantize(str)

data/lib/focus/config.rb

@@ -1,15 +1,22 @@
 require "dotenv"
 
 module Focus
+  class MissingConfiguration < ArgumentError; end
+
   class Config < OpenStruct
     class << self
       def method_missing(m, *args, &block) # rubocop:disable MethodMissing
-        ENV[m.to_s.upcase] || config.send(m, *args, &block)
+        config.env(m) || config.send(m, *args, &block) || raise_undefined_config(m)
       end
 
       def config
         @config ||= new
       end
+
+      def raise_undefined_config(m)
+        error = "(#{m}) neither `ENV['#{m.to_s.upcase}']` or `.focus.yml#config.#{m}` are defined"
+        raise MissingConfiguration, error
+      end
     end
 
     def initialize
@@ -18,6 +25,10 @@ module Focus
       ingest _hardcoded
     end
 
+    def env(m)
+      ENV[m.to_s.upcase]
+    end
+
     private
 
     def configurations
@@ -61,5 +72,6 @@ module Focus
       return unless File.exist?(path)
       Dotenv.load path
     end
+
   end
 end

data/lib/focus/formatter.rb

@@ -9,7 +9,7 @@ module Focus
     end
 
     def error(error)
-      red("!!! Error:") + " #{error}"
+      " " + red("!!! Error:") + " #{error}"
     end
 
     def blue(string)

data/lib/focus/stdout.rb

@@ -14,8 +14,17 @@ module Focus
       def step(string, opts = { quiet: false })
         quiet = opts[:quiet]
         print_line(Focus::Formatter.step(string), quiet: quiet)
-        yield
+        yield if block_given?
         puts_line Focus::Formatter.ok, quiet: quiet
+      rescue FailedActionError, MissingConfiguration => error
+        puts_line Focus::Formatter.error error.to_s
+      end
+
+      def title(string)
+        puts
+        puts "-" * 50
+        puts string
+        puts "-" * 50
       end
 
       def debug_output(str)

data/lib/focus/version.rb

@@ -1,3 +1,3 @@
 module Focus
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ifocustt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - John Mason