ifocustt 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dfe2365976e3a78b145968a9fab127547b5ac71
-  data.tar.gz: baa95c3b6ef52e3ce59fdb2b1dc8c3d3c44a61a3
+  metadata.gz: 22f03cae719f85527a009f572e56a83656de450d
+  data.tar.gz: 908196a2a331ea2bd9fbfa925ad71cadab6a08d8
 SHA512:
-  metadata.gz: c40175f09eb1a141a0e9ed408b65749f619431070a422e5ee1a9bd5be45c1e42867dad4390cbbcdfd8d72992dfd5833e652df197494651a111b0304bdeffc69d
-  data.tar.gz: 616585264fe4dda64aa48cd16f07a795f17e69dbcaf9ac6137fa517a90c9d195660df4159ff8cb832d3b80d8493f482cca1aa6f03c76a655724bd9e6c4fb3546
+  metadata.gz: 38199fdef0d916b4008d57ca34be834f9ece7fe7b5feb720a88c42a28d4a89af4896262a8939fc464abd9f3dca9f853f40d986be7b9c2a8510146c2fcf704d7b
+  data.tar.gz: a7619afde1039e458d07b4a2852f1ec61b713471d7bef3cd73316e1b94aac812d418ee4c9cca3a9d6828a4aee2bca016fc2bbd04799450e578582caab9845ef7

data/lib/focus/action.rb

@@ -4,9 +4,39 @@ require "interactor"
 module Focus
   class FailedActionError < StandardError; end
 
+  # A small wrapper to an Action's context.
+  # If an attribute is defined in the context, it will be returned.
+  # Otherwise, a lookup within Focus::Config will take place.
+  class ContextualConfiguration
+    attr_reader :context
+
+    def initialize(context)
+      @context = context
+    end
+
+    def method_missing(m, *args, &block) # rubocop:disable MethodMissing
+      context.send(m) || Config.send(m, *args, &block)
+    end
+  end
+
   class Action
     include Interactor
 
+    def perform; end
+
+    def error_message
+      "#{self.class.to_s.split('::').last} failed"
+    end
+
+    # This method is used internally and should not be used within actions.
+    def call
+      perform
+    end
+
+    def config
+      ContextualConfiguration.new(context)
+    end
+
     private
 
     def focus_target
@@ -29,26 +59,27 @@ module Focus
       focus_seconds * 0.2
     end
 
-    def evaluate_step(klass, args)
+    def fail_action!(opts = {})
+      raise ArgumentError, "An `:error` key must be provided to fail an action" unless (opts.keys & [:error, "error"]).any?
+      context.fail!(opts.merge(action: self.class.to_s.split("::").last))
+    end
+
+    def _evaluate_step(klass, args)
       action = klass.to_s.gsub(/^.*::/, "")
       step = "Running #{action}..."
 
       Focus::STDOUT.step(step, quiet: context.quiet) do
         result = klass.call(args)
-        raise FailedActionError, error_message(result) unless result.success?
+        raise FailedActionError, _failed_action_error(result) unless result.success?
       end
     end
 
-    def error_message(obj)
+    def _failed_action_error(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/change_blink_color.rb

@@ -1,15 +1,9 @@
 module Focus
   class ChangeBlinkColor < Action
-    def call
-      context.fail! unless perform
-    end
-
-    private
-
     def perform
-      url = "#{Config.blink_server}/fadeToRGB?rgb=%#{context.color}"
-      res = HTTParty.get(url)
-      res.code == 200
+      url = "#{config.blink_server}/fadeToRGB?rgb=%#{context.color}"
+      res = Utils::WebClient.get(url)
+      fail_action!(error: "Could not change blink(1) color.") unless res.success?
     end
   end
 end

data/lib/focus/actions/change_slack_do_not_disturb.rb

@@ -1,15 +1,12 @@
 module Focus
   class ChangeSlackDoNotDisturb < Action
-    def call
-      context.fail! unless perform
+    def perform
+      res = Utils::WebClient.post(url)
+      fail_action!(error: res) unless res.success?
     end
 
     private
 
-    def perform
-      Config.slack_token ? HTTParty.post(url) : true
-    end
-
     def url
       if context.enabled
         "#{base_url}&num_minutes=#{focus_minutes}"
@@ -19,7 +16,7 @@ module Focus
     end
 
     def base_url
-      "#{Config.slack_api_url}/#{action}?token=#{Config.slack_token}"
+      "#{config.slack_api_url}/#{action}?token=#{config.slack_token}"
     end
 
     def action

data/lib/focus/actions/change_slack_presence.rb

@@ -1,20 +1,18 @@
 module Focus
   class ChangeSlackPresence < Action
-    def call
-      context.fail! unless perform
+    def perform
+      res = Utils::WebClient.post url
+      fail_action!(error: res) unless res.success?
     end
 
     private
 
-    def perform
-      token = Config.slack_token
-      if token
-        url = "#{Config.slack_api_url}/users.setPresence?token=#{token}&presence=#{presence}"
-        res = HTTParty.post url
-        res.code == 200
-      else
-        true
-      end
+    def token
+      config.slack_token
+    end
+
+    def url
+      "#{config.slack_api_url}/users.setPresence?token=#{token}&presence=#{presence}"
     end
 
     def presence

data/lib/focus/actions/log_focus_time.rb

@@ -1,14 +1,14 @@
 require "fileutils"
 module Focus
   class LogFocusTime < Action
-    def call
+    def perform
       update_log
     end
 
     private
 
     def update_log
-      file = File.expand_path Config.focus_history_file
+      file = File.expand_path config.focus_history_file
       new_file = File.exist?(file)
 
       File.open(file, "a") do |fo|

data/lib/focus/actions/log_work_for_jira.rb

@@ -1,14 +1,14 @@
 module Focus
   class PostWorkLogToJira < Action
-    def call
+    def perform
       return unless jira_ticket && seconds_focused >= 60
-      HTTParty.post(issue_url, options)
+      Utils::WebClient.post(issue_url, options)
     end
 
     private
 
     def issue_url
-      "#{Config.jira_url}/issue/#{jira_ticket}/worklog"
+      "#{config.jira_url}/issue/#{jira_ticket}/worklog"
     end
 
     def options
@@ -24,7 +24,7 @@ module Focus
     end
 
     def auth
-      { username: Config.jira_username, password: Config.jira_password }
+      { username: config.jira_username, password: config.jira_password }
     end
 
     def headers

data/lib/focus/actions/run_shell_command.rb

@@ -1,6 +1,6 @@
 module Focus
   class RunShellCommand < Action
-    def call
+    def perform
       system(context.command.to_s)
     end
   end

data/lib/focus/actions/start_blink_server.rb

@@ -1,8 +1,8 @@
 module Focus
   class StartBlinkServer < Action
-    def call
+    def perform
       verify_blink_server_installed
-      HTTParty.get(Config.blink_server)
+      Utils::WebClient.get(config.blink_server)
     rescue Errno::ECONNREFUSED
       start_blink_server
     end
@@ -13,7 +13,7 @@ module Focus
       error_msg = \
         "Blink server not installed. Run `npm install -g node-blink1-server`."
 
-      raise ArgumentError, error_msg unless blink_server_installed?
+      fail_action!(error: error_msg) unless blink_server_installed?
     end
 
     def blink_server_installed?
@@ -22,7 +22,7 @@ module Focus
 
     def start_blink_server
       fork do
-        system("blink1-server #{Config.blink_port} &>/dev/null")
+        system("blink1-server #{config.blink_port} &>/dev/null")
       end
     end
   end

data/lib/focus/actions/start_focus_time.rb

@@ -7,8 +7,10 @@ module Focus
 
     attr_reader :action
 
-    def call
+    def perform
       context.actions = ConfigLoader.load("actions")
+      parse_jira_ticket
+      Focus::STDOUT.puts_line "Starting focus..."
       context.daemonize ? fork { _actions } : _actions
     end
 
@@ -25,6 +27,11 @@ module Focus
       happy_message
     end
 
+    def parse_jira_ticket
+      context.jira_ticket = Utils::ParseJiraTicketFromGitBranch.call.jira_ticket
+      Focus::STDOUT.puts_line "Working on JIRA ticket: '#{context.jira_ticket}'" if context.jira_ticket
+    end
+
     def focus
       @action = :focus
       perform_actions "OnFocus"
@@ -95,7 +102,7 @@ module Focus
           klass = constantize(action)
           args  = downcase(keyword_arguments)
 
-          evaluate_step klass, with_default_context(args)
+          _evaluate_step klass, with_default_context(args)
         end
       end
     end

data/lib/focus/actions/start_rescue_time.rb

@@ -1,19 +1,18 @@
 module Focus
   class StartRescueTime < Action
-    def call
-      context.fail! unless perform
+    def perform
+      res = Utils::WebClient.post url
+      fail_action!(error: res) unless res.success?
     end
 
     private
 
-    def perform
-      token = Config.ifttt_maker_key
-      if token
-        url = "https://maker.ifttt.com/trigger/#{event}/with/key/#{token}"
-        HTTParty.post url
-      else
-        true
-      end
+    def token
+      config.ifttt_maker_key
+    end
+
+    def url
+      "https://maker.ifttt.com/trigger/#{event}/with/key/#{token}"
     end
 
     def event

data/lib/focus/actions/strobe_blink_color.rb

@@ -1,15 +1,14 @@
 module Focus
   class StrobeBlinkColor < Action
-    def call
-      context.fail! unless perform
+    def perform
+      res = Utils::WebClient.get(url)
+      fail_action!(error: res) unless res.success?
     end
 
     private
 
-    def perform
-      url = "#{Config.blink_server}/pattern?rgb=%#{context.color}&time=1.5&repeats=0"
-      res = HTTParty.get(url)
-      res.code == 200
+    def url
+      "#{config.blink_server}/pattern?rgb=%#{context.color}&time=1.5&repeats=0"
     end
   end
 end

data/lib/focus/actions/toggle_mac_notification_center.rb

@@ -1,11 +1,16 @@
 module Focus
   class ToggleMacNotificationCenter < Action
-    def call
-      toggle if uname == "Darwin"
+    def perform
+      fail_action!(error: "This action only works on MacOSX") unless mac?
+      toggle
     end
 
     private
 
+    def mac?
+      uname == "Darwin"
+    end
+
     def uname
       `uname`.chomp
     end

data/lib/focus/cli.rb

@@ -32,6 +32,7 @@ module Focus
           end
 
           opts.on("-t", "--target=TARGET", "Specify what you are focusing on") do |t|
+            raise ArgumentError, "#{t} is not a valid target name" if t =~ /^\d+(\.\d)?$/
             args.target = t
           end
 

data/lib/focus/config.rb

@@ -6,15 +6,18 @@ module Focus
   class Config < OpenStruct
     class << self
       def method_missing(m, *args, &block) # rubocop:disable MethodMissing
-        config.env(m) || config.send(m, *args, &block) || raise_undefined_config(m)
+        config = new
+        config.send(m, *args, &block) || env(m) || raise_undefined_config(m)
       end
 
-      def config
-        @config ||= new
+      private
+
+      def env(m)
+        ENV[m.to_s.upcase]
       end
 
       def raise_undefined_config(m)
-        error = "(#{m}) neither `ENV['#{m.to_s.upcase}']` or `.focus.yml#config.#{m}` are defined"
+        error = "(#{m}) neither `.focus.yml#config.#{m}` or `ENV['#{m.to_s.upcase}']` are defined"
         raise MissingConfiguration, error
       end
     end
@@ -25,10 +28,6 @@ module Focus
       ingest _hardcoded
     end
 
-    def env(m)
-      ENV[m.to_s.upcase]
-    end
-
     private
 
     def configurations

data/lib/focus/utils/web_client.rb

@@ -0,0 +1,13 @@
+module Focus
+  module Utils
+    class WebClient < Util
+      class << self
+        %i(get post).each do |action|
+          define_method(action) do |url, opts = {}|
+            HTTParty.send(action, url, opts)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/focus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifocustt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -92,7 +92,6 @@ files:
 - LICENSE.txt
 - assets/focus.jpg
 - bin/focus
-- bin/focus.sh
 - config/default.yml
 - lib/focus.rb
 - lib/focus/action.rb
@@ -117,6 +116,7 @@ files:
 - lib/focus/util.rb
 - lib/focus/utils.rb
 - lib/focus/utils/parse_jira_ticket_from_git_branch.rb
+- lib/focus/utils/web_client.rb
 - lib/focus/version.rb
 homepage: http://github.com/binarymason/ifocustt
 licenses:

data/bin/focus.sh

@@ -1,136 +0,0 @@
-#!/bin/sh
-#
-# USAGE:
-#
-# focus [minutes=25] [target=?|JIRA ticket in git branch]
-
-git_branch_name() { git rev-parse --abbrev-ref HEAD 2>/dev/null; }
-jira_ticket() {
-  local branch=$(git_branch_name)
-  local ticket=$(echo $branch | sed 's/.*\([a-zA-Z]\{2\}-[0-9]\{2\}\)/\1/') # TODO
-  if [ "$ticket" == "$branch" ]
-  then
-    echo "?"
-  else
-    echo "$ticket"
-  fi
-}
-
-FOCUS_MINUTES="${1-25}"
-FOCUS_TARGET="${2-$(jira_ticket)}"
-FOCUS_HISTORY_FILE="$HOME/.focus_history"
-
-info() { printf -- "\033[00;34m..\033[0m  %s " "$*"; }
-ok() { echo "\033[00;32m✓\033[0m"; }
-abort() { echo "!!! $*" >&2; exit 1; }
-epoch() { date +%s; }
-print_line() { printf "%-15s %-15s %-15s\n" "$1" "$2" "$3"; }
-title() { print_line "EPOCH" "FOCUS_TIME" "TARGET"; }
-event() { print_line "$(epoch)" "$FOCUS_MINUTES" "$@"; }
-add_to_history() { "$@" >> "$FOCUS_HISTORY_FILE"; }
-
-log_focus() {
-  info "Updating ~/.focus_history"
-  if [ ! -f "$FOCUS_HISTORY_FILE" ]; then add_to_history title; fi
-  add_to_history event "$FOCUS_TARGET"
-  ok
-}
-
-quietly() {
-  "$@" &>/dev/null
-}
-
-SLACK_TOKEN=$(cat ~/.secrets/slack-token 2>/dev/null)
-SLACK_AWAY="away"
-SLACK_AVAILABLE="auto"
-
-change_slack_presence() {
-  if [ -n "$SLACK_TOKEN" ]
-  then
-    local presence="$1"
-    info "Changing slack presence to $presence"
-    local setpresenceurl="https://slack.com/api/users.setPresence?token=$SLACK_TOKEN&presence=$presence&pretty=1"
-    curl -X POST "$setpresenceurl" &>/dev/null && ok
-  fi
-}
-
-BLINK_PORT="8754"
-BLINK_SERVER="http://localhost:$BLINK_PORT/blink1"
-BLINK_RED="23EA5B5B"
-BLINK_GREEN="233AF23A"
-BLINK_ORANGE="23FFBF00"
-start_blink_server() {
-  if ! command -v blink1-server &> /dev/null
-  then
-    abort 'Blink server not installed. Run `npm install -g node-blink1-server`.'
-  else
-    quietly curl "$BLINK_SERVER" || blink1-server "$BLINK_PORT" &
-  fi
-}
-
-change_blink_color() {
-  local color="$1"
-  info "Changing blink to $color"
-  curl "$BLINK_SERVER/fadeToRGB?rgb=%$color" &>/dev/null && ok
-}
-
-strobe_blink_color() {
-  local color="$1"
-  local seconds="$2"
-  local blink_rate="0.5" # both on and off together finishes in one second
-  curl "$BLINK_SERVER/blink?rgb=%$color&time=$blink_rate&repeats=$seconds" &>/dev/null && ok
-}
-
-IFTTT_MAKER_KEY=$(cat ~/.secrets/ifttt-maker 2>/dev/null)
-start_rescue_time() {
-  if [ -n "$IFTTT_MAKER_KEY" ]
-  then
-    local event="rescue_time_focus_start"
-    info "Firing $event blink(1) event to IFTT"
-    curl -X POST https://maker.ifttt.com/trigger/${event}/with/key/${IFTTT_MAKER_KEY} &>/dev/null && ok
-  fi
-}
-
-start_slack_do_not_disturb() {
-  if [ -n "$SLACK_TOKEN" ]
-  then
-    local url="https://slack.com/api/dnd.setSnooze?token=$SLACK_TOKEN&num_minutes=$FOCUS_MINUTES&pretty=1"
-    info "Changing slack to do not disturb for $FOCUS_MINUTES minutes"
-    curl -X POST "$url" &>/dev/null && ok
-  fi
-}
-
-disable_mac_notification_center() {
-  if [ "$(uname)" == "Darwin" ]
-  then
-    info "Disabling Mac OSX notification center"
-    quietly launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist
-    ok
-  fi
-}
-
-enable_mac_notification_center() {
-  if [ "$(uname)" == "Darwin" ]
-  then
-    launchctl load -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist
-  fi
-}
-
-cleanup(){
-  local focus_seconds=$(echo "$FOCUS_MINUTES * 60" | bc)
-  local break_seconds=$(echo "$focus_seconds * .2" | bc)
-  sleep "$focus_seconds" && quietly strobe_blink_color "$BLINK_ORANGE" "$break_seconds"
-  sleep "$break_seconds" && \
-    quietly change_slack_presence "$SLACK_AVAILABLE"
-    quietly enable_mac_notification_center
-    quietly change_blink_color "$BLINK_GREEN"
-}
-
-disable_mac_notification_center
-start_rescue_time
-start_blink_server
-change_slack_presence "$SLACK_AWAY"
-start_slack_do_not_disturb
-log_focus
-change_blink_color "$BLINK_RED"
-cleanup &