abt-cli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08875790c31e73415b7e1317db284d1fe5b62ff9d2c3e66449c457c757bfe56
-  data.tar.gz: cb9857e53d577777371b669f5b253fe48ded2530976fc7c76982d6fef3e660e3
+  metadata.gz: 1c8beb7e6080443354e8ddb0d8f00106694731d931283494e1337daee0547c9a
+  data.tar.gz: df7840006160bbdb850bdd475496202848080ec118753be8df00f99bc5aa7c3f
 SHA512:
-  metadata.gz: e24c4f96b42d0eab847c1c5bdef2b79b3847c51db8b862c236f82d61217b295fcfc754933f4f998510b0377b0847f754cf3a6e2d4f937c73b95a8992ad7962f1
-  data.tar.gz: 2a41173f1fddbd52084dbc8943b6ebcb893a81a47ffd5a07e1194c4b518d042d6c2407c6babc8774c69822d3093b6d0d306ad864edc06302797002594bad3715
+  metadata.gz: e6f1c8df5509096dc414acff24952b57d656b064c95777f2741ada1164576c9ef6fe20bd7a13a50c8a0d30784c92d1d56ff000bf853972c5f8ee8334e69c538d
+  data.tar.gz: 8d3c36f885f175927efb5418547e782fcd864e81646602d8473b435222f3405f89973337b9368b718ff8413b8a8a0e714d90d2ce0e784fe62cbf02bc98bf734c

data/bin/abt

@@ -4,6 +4,7 @@
 require 'dry-inflector'
 require 'faraday'
 require 'oj'
+require 'open3'
 
 require_relative '../lib/abt.rb'
 

data/lib/abt/cli.rb

@@ -31,8 +31,10 @@ module Abt
       process_providers
     end
 
-    def print_provider_command(provider, arg_str, description)
-      puts "#{provider}:#{arg_str} # #{description}"
+    def print_provider_command(provider, arg_str, description = nil)
+      command = "#{provider}:#{arg_str}"
+      command += " # #{description}" unless description.nil?
+      output.puts command
     end
 
     private
@@ -60,9 +62,14 @@ module Abt
 
       return [] if input.nil?
 
-      input.split("\n").map do |line|
-        line.split(' # ').first # Exclude comment part of piped input lines
+      # Exclude comment part of piped input lines
+      lines_without_comments = input.lines.map do |line|
+        line.split(' # ').first
       end
+
+      # Allow multiple provider arguments on a single piped input line
+      joined_lines = lines_without_comments.join(' ').strip
+      joined_lines.split(/\s+/)
     end
 
     def process_providers
@@ -88,12 +95,14 @@ module Abt
       command = provider.command_class(command_name)
       return false if command.nil?
 
-      if output.isatty
-        warn "===== #{command_name} #{provider_name}#{arg_str.nil? ? '' : ":#{arg_str}"} =====".upcase
-      end
+      print_command(command_name, provider_name, arg_str) if output.isatty
 
       command.new(arg_str: arg_str, cli: self).call
       true
     end
+
+    def print_command(name, provider, arg_str)
+      warn "===== #{name} #{provider}#{arg_str.nil? ? '' : ":#{arg_str}"} =====".upcase
+    end
   end
 end

data/lib/abt/cli/dialogs.rb

@@ -4,10 +4,26 @@ module Abt
   class Cli
     module Dialogs
       def prompt(question)
-        print "#{question}: "
+        err_output.print "#{question}: "
         read_user_input.strip
       end
 
+      def prompt_boolean(text)
+        warn text
+
+        loop do
+          err_output.print '(y / n): '
+
+          case read_user_input.strip
+          when 'y', 'Y' then return true
+          when 'n', 'N' then return false
+          else
+            warn 'Invalid choice'
+            next
+          end
+        end
+      end
+
       def prompt_choice(text, options, allow_back_option = false)
         if options.one?
           warn "Selected: #{options.first['name']}"
@@ -44,7 +60,7 @@ module Abt
       end
 
       def read_option_number(options_length, allow_back_option)
-        print "(1-#{options_length}#{allow_back_option ? ', q: back' : ''}): "
+        err_output.print "(1-#{options_length}#{allow_back_option ? ', q: back' : ''}): "
 
         input = read_user_input
 

data/lib/abt/cli/io.rb

@@ -3,16 +3,18 @@
 module Abt
   class Cli
     module Io
-      %i[puts print].each do |method_name|
-        define_method(method_name) do |*args|
-          output.puts(*args)
-        end
-      end
-
       def warn(*args)
         err_output.puts(*args)
       end
 
+      def puts(*args)
+        output.puts(*args)
+      end
+
+      def print(*args)
+        output.print(*args)
+      end
+
       def abort(message)
         raise AbortError, message
       end

data/lib/abt/docs.rb

@@ -9,15 +9,22 @@ module Abt
     class << self
       def examples # rubocop:disable Metrics/MethodLength
         {
-          'Multiple providers and arguments can be passed, e.g.:' => {
-            'abt init asana harvest' => nil,
-            'abt pick-task asana harvest' => nil,
-            'abt start asana harvest' => nil,
-            'abt clear asana harvest' => nil
+          'Getting started:' => {
+            'abt init asana harvest' => 'Setup asana and harvest project git repo in working dir',
+            'abt pick harvest' => 'Pick harvest tasks, for most projects this will stay the same',
+            'abt pick asana | abt start harvest' => 'Pick asana task and start working',
+            'abt stop harvest' => 'Stop time tracker',
+            'abt start asana harvest' => 'Continue working, e.g. after a break',
+            'abt finalize asana' => 'Finalize the selected asana task'
           },
           'Command output can be piped, e.g.:' => {
             'abt tasks asana | grep -i <name of task>' => nil,
             'abt tasks asana | grep -i <name of task> | abt start' => nil
+          },
+          'Sharing configuration:' => {
+            'abt share asana harvest | tr "\n" " "' => 'Print current configuration',
+            'abt share asana harvest | tr "\n" " " | pbcopy' => 'Copy configuration (mac only)',
+            'abt start <shared configuration>' => 'Start a shared configuration'
           }
         }
       end

data/lib/abt/docs/cli.rb

@@ -6,7 +6,7 @@ module Abt
       class << self
         def content
           <<~TXT
-            Usage: abt <command> [<provider:arguments>...]
+            Usage: abt <command> [<provider[:<arguments>]>...]
 
             #{example_commands}
 

data/lib/abt/docs/markdown.rb

@@ -10,7 +10,7 @@ module Abt
             This readme was generated with `abt help-md > README.md`
 
             ## Usage
-            `abt <command> [<provider:arguments>...]`
+            `abt <command> [<provider[:<arguments>]>...]`
 
             #{example_commands}
 

data/lib/abt/git_config.rb

@@ -2,76 +2,82 @@
 
 module Abt
   class GitConfig
-    class << self
-      def local(*args)
-        git_config(true, *args)
-      end
-
-      def global(*args)
-        git_config(false, *args)
-      end
+    attr_reader :namespace, :scope
 
-      def prompt_local(*args)
-        prompt_for_config(true, *args)
+    def self.local_available?
+      @local_available ||= begin
+        status = nil
+        Open3.popen3('git config --local -l') do |_i, _o, _e, thread|
+          status = thread.value
+        end
+        status.success?
       end
+    end
 
-      def prompt_global(*args)
-        prompt_for_config(false, *args)
-      end
+    def initialize(namespace: '', scope: 'local')
+      @namespace = namespace
 
-      def unset_local(key)
-        unset(true, key)
+      unless %w[local global].include? scope
+        raise ArgumentError, 'scope must be "local" or "global"'
       end
 
-      def unset_global(key)
-        unset(false, key)
-      end
+      @scope = scope
+    end
 
-      private
+    def [](key)
+      get(key)
+    end
 
-      def unset(local, key)
-        `git config --#{local ? 'local' : 'global'} --unset #{key.inspect}`
-      end
+    def []=(key, value)
+      set(key, value)
+    end
 
-      def git_config(local, key, value = nil)
-        if value
-          `git config --#{local ? 'local' : 'global'} --replace-all #{key.inspect} #{value.inspect}`
-          value
+    def local
+      @local ||= begin
+        if scope == 'local'
+          self
         else
-          git_value = `git config --get #{key.inspect}`.strip
-          git_value.empty? ? nil : git_value
+          self.class.new(namespace: namespace, scope: 'local')
         end
       end
+    end
 
-      def prompt(msg)
-        STDERR.print "#{msg} > "
-        value = read_user_input.strip
-        warn
-        value
+    def global
+      @global ||= begin
+        if scope == 'global'
+          self
+        else
+          self.class.new(namespace: namespace, scope: 'global')
+        end
       end
+    end
 
-      def prompt_for_config(local, key, prompt_msg, remedy = '') # rubocop:disable Metrics/MethodLength
-        value = git_config(local, key)
+    private
 
-        return value unless value == '' || value.nil?
+    def key_with_namespace(key)
+      namespace.empty? ? key : "#{namespace}.#{key}"
+    end
 
-        warn <<~TXT
-          Missing git config "#{key}":
-          To find this value:
-          #{remedy}
-        TXT
+    def get(key)
+      if scope == 'local' && !self.class.local_available?
+        raise StandardError, 'Local configuration is not available outside a git repository'
+      end
 
-        new_value = prompt(prompt_msg)
+      git_value = `git config --#{scope} --get #{key_with_namespace(key).inspect}`.strip
+      git_value.empty? ? nil : git_value
+    end
 
-        if new_value.empty?
-          abort 'Empty value, aborting'
-        else
-          git_config(local, key, new_value)
-        end
+    def set(key, value)
+      if scope == 'local' && !self.class.local_available?
+        raise StandardError, 'Local configuration is not available outside a git repository'
       end
 
-      def read_user_input
-        open('/dev/tty', &:gets)
+      if value.nil? || value.empty?
+        `git config --#{scope} --unset #{key_with_namespace(key).inspect}`
+        nil
+      else
+        `git config --#{scope} --replace-all #{key_with_namespace(key).inspect} #{value.inspect}`
+        value
       end
     end
   end

data/lib/abt/providers/asana/api.rb

@@ -5,7 +5,7 @@ module Abt
     module Asana
       class Api
         API_ENDPOINT = 'https://app.asana.com/api/1.0'
-        VERBS = %i[get post patch].freeze
+        VERBS = %i[get post put].freeze
 
         attr_reader :access_token
 

data/lib/abt/providers/asana/base_command.rb

@@ -20,19 +20,24 @@ module Abt
 
         private
 
+        def same_args_as_config?
+          project_gid == config.project_gid && task_gid == config.task_gid
+        end
+
         def print_project(project)
           cli.print_provider_command('asana', project['gid'], project['name'])
+          cli.warn project['permalink_url'] if project.key?('permalink_url') && cli.output.isatty
         end
 
         def print_task(project, task)
+          project = { 'gid' => project } if project.is_a?(String)
           cli.print_provider_command('asana', "#{project['gid']}/#{task['gid']}", task['name'])
+          cli.warn task['permalink_url'] if task.key?('permalink_url') && cli.output.isatty
         end
 
         def use_current_args
-          @project_gid = Abt::GitConfig.local('abt.asana.projectGid').to_s
-          @project_gid = nil if project_gid.empty?
-          @task_gid = Abt::GitConfig.local('abt.asana.taskGid').to_s
-          @task_gid = nil if task_gid.empty?
+          @project_gid = config.project_gid
+          @task_gid = config.task_gid
         end
 
         def use_arg_str(arg_str)

data/lib/abt/providers/asana/commands/current.rb

@@ -14,7 +14,7 @@ module Abt
           end
 
           def call
-            if arg_str.nil?
+            if same_args_as_config? || !config.local_available?
               show_current_configuration
             else
               cli.warn 'Updating configuration'
@@ -43,7 +43,7 @@ module Abt
               config.task_gid = nil
             else
               ensure_task_is_valid!
-              config.task_gid task_gid
+              config.task_gid = task_gid
 
               print_task(project, task)
             end
@@ -58,11 +58,17 @@ module Abt
           end
 
           def project
-            @project ||= api.get("projects/#{project_gid}")
+            @project ||= begin
+              cli.warn 'Fetching project...'
+              api.get("projects/#{project_gid}", opt_fields: 'name,permalink_url')
+            end
           end
 
           def task
-            @task ||= api.get("tasks/#{task_gid}")
+            @task ||= begin
+              cli.warn 'Fetching task...'
+              api.get("tasks/#{task_gid}", opt_fields: 'name,permalink_url')
+            end
           end
         end
       end

data/lib/abt/providers/asana/commands/finalize.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Abt
+  module Providers
+    module Asana
+      module Commands
+        class Finalize < BaseCommand
+          def self.command
+            'finalize asana[:<project-gid>/<task-gid>]'
+          end
+
+          def self.description
+            'Move current/specified task to section (column) for finalized tasks'
+          end
+
+          def call
+            unless config.local_available?
+              cli.abort 'This is a no-op for tasks outside the current project'
+            end
+            cli.abort 'No current or specified task' if task.nil?
+            print_task(project_gid, task)
+
+            if task_already_in_finalized_section?
+              cli.warn "Task already in section: #{current_task_section['name']}"
+            else
+              cli.warn "Moving task to section: #{finalized_section['name']}"
+              move_task
+            end
+          end
+
+          private
+
+          def task_already_in_finalized_section?
+            !task_section_membership.nil?
+          end
+
+          def current_task_section
+            task_section_membership&.dig('section')
+          end
+
+          def task_section_membership
+            task['memberships'].find do |membership|
+              membership.dig('section', 'gid') == config.finalized_section_gid
+            end
+          end
+
+          def finalized_section
+            @finalized_section ||= api.get("sections/#{config.finalized_section_gid}",
+                                           opt_fields: 'name')
+          end
+
+          def move_task
+            body = { data: { task: task_gid } }
+            body_json = Oj.dump(body, mode: :json)
+            api.post("sections/#{config.finalized_section_gid}/addTask", body_json)
+          end
+
+          def task
+            @task ||= begin
+              if task_gid.nil?
+                nil
+              else
+                api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.section.name,permalink_url')
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end