abt-cli 0.0.17 → 0.0.22

data/lib/abt/git_config.rb

@@ -6,28 +6,26 @@ module Abt
 
     class UnsafeNamespaceError < StandardError; end
 
-    LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND = 'git config --local -l'
+    def initialize(scope = "local", namespace = "")
+      @namespace = namespace
 
-    def self.local_available?
-      return @local_available if instance_variables.include?(:@local_available)
+      raise ArgumentError, 'scope must be "local" or "global"' unless %w[local global].include?(scope)
 
-      @local_available = begin
-        success = false
-        Open3.popen3(LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND) do |_i, _o, _e, thread|
-          success = thread.value.success?
-        end
-        success
-      end
+      @scope = scope
     end
 
-    def initialize(namespace: '', scope: 'local')
-      @namespace = namespace
-
-      unless %w[local global].include? scope
-        raise ArgumentError, 'scope must be "local" or "global"'
+    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
 
-      @scope = scope
+      @available
     end
 
     def [](key)
@@ -49,28 +47,8 @@ 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?
+      raise UnsafeNamespaceError, "Keys can only be cleared within a namespace" if namespace.empty?
 
       keys.each do |key|
         output&.puts "Clearing #{scope}: #{key_with_namespace(key)}"
@@ -80,10 +58,14 @@ 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'
+      raise StandardError, "Local configuration is not available outside a git repository"
     end
 
     def key_with_namespace(key)

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

@@ -4,8 +4,8 @@ module Abt
   module Providers
     module Asana
       class Api
-        API_ENDPOINT = 'https://app.asana.com/api/1.0'
-        VERBS = %i[get post put].freeze
+        API_ENDPOINT = "https://app.asana.com/api/1.0"
+        VERBS = [:get, :post, :put].freeze
 
         attr_reader :access_token
 
@@ -15,7 +15,7 @@ module Abt
 
         VERBS.each do |verb|
           define_method(verb) do |*args|
-            request(verb, *args)['data']
+            request(verb, *args)["data"]
           end
         end
 
@@ -24,10 +24,10 @@ module Abt
 
           loop do
             result = request(:get, path, query.merge(limit: 100))
-            records += result['data']
-            break if result['next_page'].nil?
+            records += result["data"]
+            break if result["next_page"].nil?
 
-            path = result['next_page']['path'][1..-1]
+            path = result["next_page"]["path"][1..-1]
           end
 
           records
@@ -40,15 +40,15 @@ module Abt
             Oj.load(response.body)
           else
             error_class = Abt::HttpError.error_class_for_status(response.status)
-            encoded_response_body = response.body.force_encoding('utf-8')
+            encoded_response_body = response.body.force_encoding("utf-8")
             raise error_class, "Code: #{response.status}, body: #{encoded_response_body}"
           end
         end
 
         def connection
           @connection ||= Faraday.new(API_ENDPOINT) do |connection|
-            connection.headers['Authorization'] = "Bearer #{access_token}"
-            connection.headers['Content-Type'] = 'application/json'
+            connection.headers["Authorization"] = "Bearer #{access_token}"
+            connection.headers["Content-Type"] = "application/json"
           end
         end
       end

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

@@ -3,63 +3,41 @@
 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?'
-          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 project. Did you initialize Asana and pick a task?") if project_gid.nil?
+          abort("No current/specified task. Did you pick an Asana task?") if task_gid.nil?
         end
 
         def print_project(project)
-          cli.print_scheme_argument('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_scheme_argument('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?
+          project = { "gid" => project } if project.is_a?(String)
+          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

@@ -6,20 +6,25 @@ module Abt
       module Commands
         class Add < BaseCommand
           def self.usage
-            'abt add asana[:<project-gid>]'
+            "abt add asana[:<project-gid>]"
           end
 
           def self.description
-            'Create a new task for the current/specified Asana project'
+            "Create a new task for the current/specified Asana project"
           end
 
           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,39 +38,37 @@ module Abt
                   projects: [project_gid]
                 }
               }
-              cli.warn 'Creating task'
-              api.post('tasks', Oj.dump(body, mode: :json))
+              api.post("tasks", Oj.dump(body, mode: :json))
             end
           end
 
           def move_task
-            body = { data: { task: task['gid'] } }
+            body = { data: { task: task["gid"] } }
             body_json = Oj.dump(body, mode: :json)
             api.post("sections/#{section['gid']}/addTask", body_json)
           end
 
           def name
-            @name ||= cli.prompt.text 'Enter task description'
+            @name ||= cli.prompt.text("Enter task description")
           end
 
           def notes
-            @notes ||= cli.prompt.text '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,
+                                           nil_option: ["q", "Don't add to section"])
           end
 
           def sections
             @sections ||= begin
-              cli.warn 'Fetching sections...'
-              api.get_paged("projects/#{project_gid}/sections", opt_fields: 'name')
-                          rescue Abt::HttpError::HttpError
-                            []
+              warn("Fetching sections...")
+              api.get_paged("projects/#{project_gid}/sections", opt_fields: "name")
             end
           end
         end

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

@@ -6,36 +6,41 @@ module Abt
       module Commands
         class BranchName < BaseCommand
           def self.usage
-            'abt branch-name asana[:<project-gid>/<task-gid>]'
+            "abt branch-name asana[:<project-gid>/<task-gid>]"
           end
 
           def self.description
-            'Suggest a git branch name for the current/specified task.'
+            "Suggest a git branch name for the current/specified task."
           end
 
           def perform
             require_task!
             ensure_current_is_valid!
 
-            cli.puts name
+            puts name
           end
 
           private
 
           def name
-            task['name'].downcase.gsub(/[^\w]+/, '-')
+            task["name"].downcase.gsub(/[^\w]+/, "-").gsub(/(^-|-$)/, "")
           end
 
           def ensure_current_is_valid!
-            cli.abort "Invalid task gid: #{task_gid}" if task.nil?
+            abort("Invalid task gid: #{task_gid}") if task.nil?
 
-            return if task['memberships'].any? { |m| m.dig('project', 'gid') == project_gid }
+            return if task["memberships"].any? { |m| m.dig("project", "gid") == project_gid }
 
-            cli.abort "Invalid project gid: #{project_gid}"
+            abort("Invalid or unmatching project gid: #{project_gid}")
           end
 
           def task
-            @task ||= api.get("tasks/#{task_gid}", opt_fields: 'name,memberships.project')
+            @task ||= begin
+              warn("Fetching task...")
+              api.get("tasks/#{task_gid}", opt_fields: "name,memberships.project")
+            rescue Abt::HttpError::NotFoundError
+              nil
+            end
           end
         end
       end

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

@@ -6,27 +6,28 @@ module Abt
       module Commands
         class Clear < BaseCommand
           def self.usage
-            'abt clear asana'
+            "abt clear asana"
           end
 
           def self.description
-            'Clear asana configuration'
+            "Clear asana configuration"
           end
 
           def self.flags
             [
-              ['-g', '--global', 'Clear global instead of local asana configuration (credentials etc.)'],
-              ['-a', '--all', 'Clear all asana configuration']
+              ["-g", "--global",
+               "Clear global instead of local asana configuration (credentials etc.)"],
+              ["-a", "--all", "Clear all asana configuration"]
             ]
           end
 
           def perform
-            if flags[:global] && flags[:all]
-              abort('Flags --global and --all cannot be used at the same time')
-            end
+            abort("Flags --global and --all cannot be used at the same time") if flags[:global] && flags[:all]
 
             config.clear_local unless flags[:global]
             config.clear_global if flags[:global] || flags[:all]
+
+            warn("Configuration cleared")
           end
         end
       end

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

@@ -6,68 +6,53 @@ module Abt
       module Commands
         class Current < BaseCommand
           def self.usage
-            'abt current asana[:<project-gid>[/<task-gid>]]'
+            "abt current asana[:<project-gid>[/<task-gid>]]"
           end
 
           def self.description
-            'Get or set project and or task for current git repository'
+            "Get or set project and or task for current git repository"
           end
 
           def perform
+            abort("Must be run inside a git repository") unless config.local_available?
+
             require_project!
+            ensure_valid_configuration!
 
-            if same_args_as_config? || !config.local_available?
-              show_current_configuration
-            else
-              cli.warn 'Updating configuration'
-              update_configuration
+            if path != config.path
+              config.path = path
+              warn("Configuration updated")
             end
-          end
 
-          private
-
-          def show_current_configuration
-            if task_gid.nil?
-              print_project(project)
-            else
-              print_task(project, task)
-            end
+            print_configuration
           end
 
-          def update_configuration
-            ensure_project_is_valid!
-            config.project_gid = project_gid
-
-            if task_gid.nil?
-              print_project(project)
-              config.task_gid = nil
-            else
-              ensure_task_is_valid!
-              config.task_gid = task_gid
-
-              print_task(project, task)
-            end
-          end
+          private
 
-          def ensure_project_is_valid!
-            cli.abort "Invalid project: #{project_gid}" if project.nil?
+          def print_configuration
+            task_gid.nil? ? print_project(project) : print_task(project, task)
           end
 
-          def ensure_task_is_valid!
-            cli.abort "Invalid task: #{task_gid}" if task.nil?
+          def ensure_valid_configuration!
+            abort("Invalid project: #{project_gid}") if project.nil?
+            abort("Invalid task: #{task_gid}") if task_gid && task.nil?
           end
 
           def project
             @project ||= begin
-              cli.warn 'Fetching project...'
-              api.get("projects/#{project_gid}", opt_fields: 'name,permalink_url')
+              warn("Fetching project...")
+              api.get("projects/#{project_gid}", opt_fields: "name,permalink_url")
+            rescue Abt::HttpError::NotFoundError
+              nil
             end
           end
 
           def task
             @task ||= begin
-              cli.warn 'Fetching task...'
-              api.get("tasks/#{task_gid}", opt_fields: 'name,permalink_url')
+              warn("Fetching task...")
+              api.get("tasks/#{task_gid}", opt_fields: "name,permalink_url")
+            rescue Abt::HttpError::NotFoundError
+              nil
             end
           end
         end