abt-cli 0.0.14 → 0.0.19

data/lib/abt/docs.rb

@@ -7,52 +7,59 @@ end
 module Abt
   module Docs
     class << self
-      def examples # rubocop:disable Metrics/MethodLength
+      def basic_examples
         {
           '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 init asana harvest' => 'Setup asana and harvest project for local git repo',
+            'abt pick harvest' => 'Pick harvest task. This will likely stay the same throughout the project',
+            'abt pick asana | abt start harvest' => 'Pick asana task and start tracking time',
             'abt stop harvest' => 'Stop time tracker',
-            'abt start asana harvest' => 'Continue working, e.g. after a break',
+            'abt start asana harvest' => 'Continue working, e.g., after a break',
             'abt finalize asana' => 'Finalize the selected asana task'
+          }
+        }
+      end
+
+      def extended_examples
+        {
+          'Tracking meetings (without switching current task setting):' => {
+            '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'
           },
-          'Tracking meetings (without changing the config):' => {
-            'abt tasks asana | grep -i standup | abt track harvest' => 'Track on asana meeting task without changing any configuration',
-            'abt tasks harvest | grep -i comment | abt track harvest' => 'Track on harvest "Comment"-task (will prompt for a comment)'
-          },
-          'Command output can be piped, e.g.:' => {
+          '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',
+            'abt start harvest -c "comment" -- asana' => 'Use -- to end a list of flags, so that it can be followed by another ARI',
+            'abt pick harvest | abt start -c "comment"' => 'Flags placed directly after a command applies to the piped in ARI'
           }
         }
       end
 
       def providers
-        provider_definitions
+        @providers ||= Abt.schemes.sort.each_with_object({}) do |scheme, definition|
+          definition[scheme] = command_definitions(scheme)
+        end
       end
 
       private
 
-      def provider_definitions
-        Abt.provider_names.sort.each_with_object({}) do |name, definition|
-          provider_module = Abt.provider_module(name)
-
-          definition[name] = command_definitions(provider_module)
-        end
-      end
-
-      def command_definitions(provider_module)
-        provider_module.command_names.each_with_object({}) do |name, definition|
-          command_class = provider_module.command_class(name)
+      def command_definitions(scheme)
+        provider = Abt.scheme_provider(scheme)
+        provider.command_names.each_with_object({}) do |name, definition|
+          command_class = provider.command_class(name)
+          full_name = "abt #{name} #{scheme}"
 
-          if command_class.respond_to?(:command) && command_class.respond_to?(:description)
-            definition[command_class.command] = command_class.description
+          if command_class.respond_to?(:usage) && command_class.respond_to?(:description)
+            definition[full_name] = [command_class.usage, command_class.description]
           end
         end
       end

data/lib/abt/docs/cli.rb

@@ -4,23 +4,54 @@ module Abt
   module Docs
     module Cli
       class << self
-        def content
+        def help
           <<~TXT
-            Usage: abt <command> [<provider[:<arguments>]>...]
+            Usage: #{usage_line}
 
-            #{example_commands}
+            <command>   Name of command to execute, e.g. start, finalize etc.
+            <ARI>       A URI-like resource identifier with a scheme and an optional path
+                        in the format: <scheme>[:<path>]. E.g., harvest:11111111/22222222
+            <options>   Optional flags for the command and ARI
 
-            Available commands:
-            #{providers_commands}
+            #{formatted_examples(Docs.basic_examples)}
+
+            For detailed examples/commands try:
+               abt examples
+               abt commands
+          TXT
+        end
+
+        def examples
+          <<~TXT
+            Printing examples
+
+            #{formatted_examples(Docs.basic_examples)}
+
+            #{formatted_examples(Docs.extended_examples)}
+          TXT
+        end
+
+        def commands
+          <<~TXT
+            Printing commands
+
+            Run commands with --help flag to see detailed usage and flags, e.g.:
+               abt track harvest -h
+
+            #{commands_per_provider}
           TXT
         end
 
         private
 
-        def example_commands
+        def usage_line
+          'abt <command> [<ARI>] [<options> --] [<ARI>] ...'
+        end
+
+        def formatted_examples(example_groups)
           lines = []
 
-          Docs.examples.each_with_index do |(title, examples), index|
+          example_groups.each_with_index do |(title, examples), index|
             lines << '' unless index.zero?
             lines << title
 
@@ -33,16 +64,16 @@ module Abt
           lines.join("\n")
         end
 
-        def providers_commands
+        def commands_per_provider
           lines = []
 
-          Docs.providers.each_with_index do |(provider_name, commands_definition), index|
+          Docs.providers.each_with_index do |(scheme, commands_definition), index|
             lines << '' unless index.zero?
-            lines << "#{inflector.humanize(provider_name)}:"
+            lines << "#{inflector.humanize(scheme)}:"
 
             max_length = commands_definition.keys.map(&:length).max
 
-            commands_definition.each do |(command, description)|
+            commands_definition.each do |(command, (_usage, description))|
               lines << "   #{command.ljust(max_length)}   #{description}"
             end
           end

data/lib/abt/docs/markdown.rb

@@ -4,18 +4,44 @@ module Abt
   module Docs
     module Markdown
       class << self
-        def content
+        def readme
           <<~MD
             # Abt
-            This readme was generated with `abt help-md > README.md`
+
+            Abt makes re-occuring tasks easily accessible from the terminal:
+            - Moving asana tasks around
+            - Tracking work/meetings in harvest
+            - Consistently naming branches
+
+            ## How does abt work?
+
+            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`
+
+            And having a single highly advanced script that does everything with a single command:
+            - `start xxxx/yyyy aaaa/bbbb`
+
+            Abt looks like one command, but works like a bunch of light scripts:
+            - `abt start asana:xxxx/yyyy harvest:aaaa/bbbb`
 
             ## Usage
-            `abt <command> [<provider[:<arguments>]>...]`
+            `abt <command> [<ARI>] [<options> --] [<ARI>] ...`
+
+            Definitions:
+            - `<command>`: Name of command to execute, e.g. `start`, `finalize` etc.
+            - `<ARI>`: A URI-like resource identifier with a scheme and an optional path in the format: `<scheme>[:<path>]`. E.g., `harvest:11111111/22222222`
+            - `<options>`: Optional flags for the command and ARI
 
             #{example_commands}
 
-            ## Available commands:
+            ## Commands:
+
+            Some commands have `[options]`. Run such a command with `--help` flag to view supported flags, e.g: `abt track harvest -h`
+
             #{provider_commands}
+
+            #### This readme was generated with `abt readme > README.md`
           MD
         end
 
@@ -24,7 +50,8 @@ module Abt
         def example_commands
           lines = []
 
-          Docs.examples.each_with_index do |(title, commands), index|
+          examples = Docs.basic_examples.merge(Docs.extended_examples)
+          examples.each_with_index do |(title, commands), index|
             lines << '' unless index.zero?
             lines << title
 
@@ -40,17 +67,17 @@ module Abt
         def provider_commands # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           lines = []
 
-          Docs.providers.each_with_index do |(provider_name, commands), index|
+          Docs.providers.each_with_index do |(scheme, commands), index|
             lines << '' unless index.zero?
-            lines << "### #{inflector.humanize(provider_name)}"
+            lines << "### #{inflector.humanize(scheme)}"
             lines << '| Command | Description |'
             lines << '| :------ | :---------- |'
 
-            max_length = commands.keys.map(&:length).max
+            max_length = commands.values.map(&:first).map(&:length).max
 
-            commands.each do |(command, description)|
-              adjusted_command = "`#{command}`".ljust(max_length + 2)
-              lines << "| #{adjusted_command} | #{description} |"
+            commands.each do |(_command, (usage, description))|
+              adjusted_usage = "`#{usage}`".ljust(max_length + 2)
+              lines << "| #{adjusted_usage} | #{description} |"
             end
           end
 

data/lib/abt/git_config.rb

@@ -4,21 +4,9 @@ module Abt
   class GitConfig
     attr_reader :namespace, :scope
 
-    LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND = 'git config --local -l'
+    class UnsafeNamespaceError < StandardError; end
 
-    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
@@ -28,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
@@ -47,30 +49,23 @@ 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 clear(output: nil)
+      raise UnsafeNamespaceError, 'Keys can only be cleared within a namespace' if namespace.empty?
 
-    def global
-      @global ||= begin
-        if scope == 'global'
-          self
-        else
-          self.class.new(namespace: namespace, scope: 'global')
-        end
+      keys.each do |key|
+        output&.puts "Clearing #{scope}: #{key_with_namespace(key)}"
+        self[key] = nil
       end
     end
 
     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
-        attr_reader :arg_str, :project_gid, :task_gid, :cli, :config
+      class BaseCommand < Abt::BaseCommand
+        extend Forwardable
+
+        attr_reader :path, :config
+
+        def_delegators(:@path, :project_gid, :task_gid)
+
+        def initialize(ari:, cli:)
+          super
 
-        def initialize(arg_str:, cli:)
-          @arg_str = arg_str
           @config = Configuration.new(cli: cli)
 
-          if arg_str.nil?
-            use_current_args
-          else
-            use_arg_str(arg_str)
-          end
-          @cli = cli
+          @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_provider_command('asana', project['gid'], project['name'])
-          cli.warn project['permalink_url'] if project.key?('permalink_url') && cli.output.isatty
+          cli.print_ari('asana', project['gid'], project['name'])
+          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 = config.project_gid
-          @task_gid = config.task_gid
-        end
-
-        def use_arg_str(arg_str)
-          args = arg_str.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?
+          cli.print_ari('asana', "#{project['gid']}/#{task['gid']}", task['name'])
+          warn task['permalink_url'] if task.key?('permalink_url') && cli.output.isatty
         end
 
         def api

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

@@ -5,21 +5,26 @@ module Abt
     module Asana
       module Commands
         class Add < BaseCommand
-          def self.command
-            'add asana[:<project-gid>]'
+          def self.usage
+            'abt add asana[:<project-gid>]'
           end
 
           def self.description
             'Create a new task for the current/specified Asana project'
           end
 
-          def call
+          def perform
             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
@@ -45,27 +49,25 @@ module Abt
           end
 
           def name
-            @name ||= cli.prompt 'Enter task description'
+            @name ||= cli.prompt.text 'Enter task description'
           end
 
           def notes
-            @notes ||= cli.prompt 'Enter task notes'
+            @notes ||= cli.prompt.text 'Enter task notes'
           end
 
           def project
-            @project ||= api.get("projects/#{project_gid}")
+            @project ||= api.get("projects/#{project_gid}", opt_fields: 'name')
           end
 
           def section
-            @section ||= cli.prompt_choice 'Add to section?', sections, ['q', 'Don\'t add to section']
+            @section ||= cli.prompt.choice 'Add to section?', sections, ['q', 'Don\'t add to section']
           end
 
           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