abt-cli 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df400d04c979d979ab2ead353d68374b8266c0fff678103991cc6443512b703b
-  data.tar.gz: 0345141c38eae6904d11f40a3045fccd048d8009b70fe9714f5e0986f1779861
+  metadata.gz: 295db35510e60a5b46ea7f20caa01aaad247bb30cb60e61b912cab5f754637ac
+  data.tar.gz: e686eb40fc1ac88315c138eac56b96500c29c3f012b4bdb1d97f993a507f80b7
 SHA512:
-  metadata.gz: 1979110cbd58f0bc71b83ad7211b86e17c5b078e842d4f99ca839c88a88d627ab92506736cd83b6e414cbea2ec2a82592f6e8b3f1effdbd2b57df7decd63793e
-  data.tar.gz: 6af0e9bb436b304cda9d3acf6c86733050c9a7acffb691017d968e89e3f4e8e51b9fa4cdf5e3a85373ff2f684fa61e41afce0c1b9011d2e6b5551935b40530ea
+  metadata.gz: f18aa2b4f33bb6b51689522bca357ddb0fbe7a2d2e968bcc6754959f01bf6d54b9f93c387e8a050d165063cad26e6b360f245d2e7fa317bc1fbad8c0fa0d3379
+  data.tar.gz: ab46d17a29d4e447472c8c4d9242aa2e96bd5195bad4083d0476054f312d358ad5555526b44edacdf2512713e646435200689f82e8a097c1dfa306ff2ae1c4df

data/lib/abt/ari.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Abt
+  class Ari
+    attr_reader :scheme, :path, :flags
+
+    def initialize(scheme:, path: nil, flags: [])
+      @scheme = scheme
+      @path = path
+      @flags = flags
+    end
+
+    def to_s
+      str = scheme
+      str += ":#{path}" if path
+
+      [str, *flags].join(' ')
+    end
+  end
+end

data/lib/abt/ari_list.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Abt
+  class AriList < Array
+    def to_s
+      map(&:to_s).join(' -- ')
+    end
+
+    def -(other)
+      AriList.new(to_a - other)
+    end
+  end
+end

data/lib/abt/base_command.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Abt
+  class BaseCommand
+    extend Forwardable
+
+    def self.usage
+      raise NotImplementedError, 'Command classes must implement .usage'
+    end
+
+    def self.description
+      raise NotImplementedError, 'Command classes must implement .description'
+    end
+
+    def self.flags
+      []
+    end
+
+    attr_reader :ari, :cli, :flags
+
+    def_delegators(:@cli, :warn, :puts, :print, :abort, :exit_with_message)
+
+    def initialize(ari:, cli:)
+      @cli = cli
+      @ari = ari
+      @flags = parse_flags(ari.flags)
+    end
+
+    def perform
+      raise NotImplementedError, 'Command classes must implement #perform'
+    end
+
+    private
+
+    def parse_flags(flags)
+      result = {}
+
+      flag_parser.parse!(flags.dup, into: result)
+
+      exit_with_message(flag_parser.help) if result[:help]
+
+      result
+    rescue OptionParser::InvalidOption => e
+      abort e.message
+    end
+
+    def flag_parser
+      @flag_parser ||= OptionParser.new do |opts|
+        opts.banner = <<~TXT
+          #{self.class.description}
+
+          Usage: #{self.class.usage}
+        TXT
+
+        opts.on('-h', '--help')
+
+        self.class.flags.each do |(*flag)|
+          opts.on(*flag)
+        end
+      end
+    end
+  end
+end

data/lib/abt/cli.rb

@@ -17,7 +17,6 @@ module Abt
       @output = output
       @err_output = err_output
       @prompt = Abt::Cli::Prompt.new(output: err_output)
-
       @aris = ArgumentsParser.new(sanitized_piped_args + remaining_args).parse
     end
 
@@ -105,26 +104,24 @@ module Abt
 
     def process_aris
       used_schemes = []
-      aris.each do |ari|
-        scheme = ari.scheme
-        path = ari.path
 
-        if used_schemes.include?(scheme)
+      aris.each do |ari|
+        if used_schemes.include?(ari.scheme)
           warn "Dropping command for already used scheme: #{ari}"
           next
         end
 
-        command_class = get_command_class(scheme)
+        command_class = get_command_class(ari.scheme)
         next if command_class.nil?
 
         print_command(command, ari) if output.isatty
         begin
-          command_class.new(path: path, cli: self, flags: ari.flags).perform
+          command_class.new(ari: ari, cli: self).perform
         rescue Exit => e
           puts e.message
         end
 
-        used_schemes << scheme
+        used_schemes << ari.scheme
       end
 
       return unless used_schemes.empty? && output.isatty
@@ -140,7 +137,7 @@ module Abt
     end
 
     def print_command(name, ari)
-      warn "===== #{name} #{ari} =====".upcase
+      warn "===== #{name.upcase} #{ari} ====="
     end
   end
 end

data/lib/abt/cli/arguments_parser.rb

@@ -3,28 +3,6 @@
 module Abt
   class Cli
     class ArgumentsParser
-      class Ari
-        attr_reader :scheme, :path, :flags
-
-        def initialize(scheme:, path:, flags:)
-          @scheme = scheme
-          @path = path
-          @flags = flags
-        end
-
-        def to_s
-          str = scheme
-          str += ":#{path}" if path
-
-          [str, *flags].join(' ')
-        end
-      end
-      class Aris < Array
-        def to_s
-          map(&:to_s).join(' -- ')
-        end
-      end
-
       attr_reader :arguments
 
       def initialize(arguments)
@@ -32,7 +10,7 @@ module Abt
       end
 
       def parse
-        result = Aris.new
+        result = AriList.new
         rest = arguments.dup
 
         until rest.empty?

data/lib/abt/cli/prompt.rb

@@ -69,10 +69,11 @@ module Abt
       end
 
       def read_option_number(options_length, nil_option)
-        output.print '('
-        output.print options_length > 1 ? "1-#{options_length}" : '1'
-        output.print nil_option_string(nil_option)
-        output.print '): '
+        str = '('
+        str += options_length > 1 ? "1-#{options_length}" : '1'
+        str += nil_option_string(nil_option)
+        str += '): '
+        output.print str
 
         input = read_user_input
 

data/lib/abt/docs.rb

@@ -26,14 +26,15 @@ module Abt
             'abt pick asana -d | abt track harvest' => 'Track on asana meeting task',
             'abt pick harvest -d | abt track harvest -c "Name of meeting"' => 'Track on separate harvest-task'
           },
-          'Command output can be piped:' => {
+          'Many commands output ARIs that can be piped into other commands:' => {
             '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'
+          'Sharing ARIs:' => {
+            'abt share asana harvest | tr "\n" " "' => 'Print current asana and harvest ARIs on a single line',
+            'abt share asana harvest | tr "\n" " " | pbcopy' => 'Copy ARIs to clipboard (mac only)',
+            'abt start <ARIs from coworker>' => 'Work on a task your coworker shared with you',
+            'abt current <ARIs from coworker> | abt start' => 'Set task as current, then start it'
           },
           'Flags:' => {
             'abt start harvest -c "comment"' => 'Add command flags after ARIs',

data/lib/abt/docs/markdown.rb

@@ -15,7 +15,7 @@ module Abt
 
             ## How does abt work?
 
-            Abt is a hybrid af having small scripts each doing one thing:
+            Abt is a hybrid of having small scripts each doing one thing:
             - `start-asana --project-gid xxxx --task-gid yyyy`
             - `start-harvest --project-id aaaa --task-id bbbb`
 

data/lib/abt/git_config.rb

@@ -6,21 +6,7 @@ module Abt
 
     class UnsafeNamespaceError < StandardError; end
 
-    LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND = 'git config --local -l'
-
-    def self.local_available?
-      return @local_available if instance_variables.include?(:@local_available)
-
-      @local_available = begin
-        success = false
-        Open3.popen3(LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND) do |_i, _o, _e, thread|
-          success = thread.value.success?
-        end
-        success
-      end
-    end
-
-    def initialize(namespace: '', scope: 'local')
+    def initialize(scope = 'local', namespace = '')
       @namespace = namespace
 
       unless %w[local global].include? scope
@@ -30,6 +16,20 @@ module Abt
       @scope = scope
     end
 
+    def available?
+      unless instance_variables.include?(:available)
+        @available = begin
+          success = false
+          Open3.popen3(availability_check_call) do |_i, _o, _e, thread|
+            success = thread.value.success?
+          end
+          success
+        end
+      end
+
+      @available
+    end
+
     def [](key)
       get(key)
     end
@@ -49,26 +49,6 @@ module Abt
       `git config --#{scope} --get-regexp --name-only ^#{namespace}`.lines.map(&:strip)
     end
 
-    def local
-      @local ||= begin
-        if scope == 'local'
-          self
-        else
-          self.class.new(namespace: namespace, scope: 'local')
-        end
-      end
-    end
-
-    def global
-      @global ||= begin
-        if scope == 'global'
-          self
-        else
-          self.class.new(namespace: namespace, scope: 'global')
-        end
-      end
-    end
-
     def clear(output: nil)
       raise UnsafeNamespaceError, 'Keys can only be cleared within a namespace' if namespace.empty?
 
@@ -80,8 +60,12 @@ module Abt
 
     private
 
+    def availability_check_call
+      "git config --#{scope} -l"
+    end
+
     def ensure_scope_available!
-      return if scope != 'local' || self.class.local_available?
+      return if available?
 
       raise StandardError, 'Local configuration is not available outside a git repository'
     end

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

@@ -3,63 +3,43 @@
 module Abt
   module Providers
     module Asana
-      class BaseCommand < Abt::Cli::BaseCommand
-        attr_reader :project_gid, :task_gid, :config
+      class BaseCommand < Abt::BaseCommand
+        extend Forwardable
 
-        def initialize(path:, cli:, **)
+        attr_reader :path, :config
+
+        def_delegators(:@path, :project_gid, :task_gid)
+
+        def initialize(ari:, cli:)
           super
 
           @config = Configuration.new(cli: cli)
 
-          if path.nil?
-            use_current_path
-          else
-            use_path(path)
-          end
+          @path = ari.path ? Path.new(ari.path) : config.path
         end
 
         private
 
         def require_project!
-          cli.abort 'No current/specified project. Did you initialize Asana?' if project_gid.nil?
+          abort 'No current/specified project. Did you initialize Asana?' if project_gid.nil?
         end
 
         def require_task!
           if project_gid.nil?
-            cli.abort 'No current/specified project. Did you initialize Asana and pick a task?'
+            abort 'No current/specified project. Did you initialize Asana and pick a task?'
           end
-          cli.abort 'No current/specified task. Did you pick an Asana task?' if task_gid.nil?
-        end
-
-        def same_args_as_config?
-          project_gid == config.project_gid && task_gid == config.task_gid
+          abort 'No current/specified task. Did you pick an Asana task?' if task_gid.nil?
         end
 
         def print_project(project)
           cli.print_ari('asana', project['gid'], project['name'])
-          cli.warn project['permalink_url'] if project.key?('permalink_url') && cli.output.isatty
+          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_ari('asana', "#{project['gid']}/#{task['gid']}", task['name'])
-          cli.warn task['permalink_url'] if task.key?('permalink_url') && cli.output.isatty
-        end
-
-        def use_current_path
-          @project_gid = config.project_gid
-          @task_gid = config.task_gid
-        end
-
-        def use_path(path)
-          args = path.to_s.split('/')
-          @project_gid = args[0].to_s
-          @project_gid = nil if project_gid.empty?
-
-          return if project_gid.nil?
-
-          @task_gid = args[1].to_s
-          @task_gid = nil if @task_gid.empty?
+          warn task['permalink_url'] if task.key?('permalink_url') && cli.output.isatty
         end
 
         def api

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

@@ -17,9 +17,14 @@ module Abt
             require_project!
 
             task
-            print_task(project, task)
+            warn 'Task created'
+
+            if section
+              move_task
+              warn "Moved to section: #{section['name']}"
+            end
 
-            move_task if section
+            print_task(project, task)
           end
 
           private
@@ -33,7 +38,6 @@ module Abt
                   projects: [project_gid]
                 }
               }
-              cli.warn 'Creating task'
               api.post('tasks', Oj.dump(body, mode: :json))
             end
           end
@@ -53,7 +57,7 @@ module Abt
           end
 
           def project
-            @project ||= api.get("projects/#{project_gid}")
+            @project ||= api.get("projects/#{project_gid}", opt_fields: 'name')
           end
 
           def section
@@ -62,10 +66,8 @@ module Abt
 
           def sections
             @sections ||= begin
-              cli.warn 'Fetching sections...'
+              warn 'Fetching sections...'
               api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
-                          rescue Abt::HttpError::HttpError
-                            []
             end
           end
         end