jira-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf31b62944c6318cc60e62393171499223c81557
-  data.tar.gz: 78e2f534aa333c215c8d3128689c664331563f30
+  metadata.gz: 8113060c03e8b470d3c0582958c574651b0aa650
+  data.tar.gz: a9ed25712ca61c36f13e263b129922579cf78f46
 SHA512:
-  metadata.gz: 5893c0f57f13ce2dd62a8c1254de8ae190520c86eb13ebb1fae90b99058b1b2befea144735f9082d6fcbba2e5f2141114c6329c837cfe628267f6ef1e193b824
-  data.tar.gz: 35c45ba31d312511bdf68be0021ee7a3460130ec6d4260785c1d28c3610d7f65ee5faf3333222ab0b28e3e5cf98446d5b1ea180e9fc545ef532d01fac736676d
+  metadata.gz: 7fc9c0bcc93c5f425bbcc1dd076656d7b3ca3c50e2111ac814a34d7d10a02574c74f70c0202b55af585871bf29e1ac0c1bc5975252971cdcc79892733bb1471c
+  data.tar.gz: 5ee4cb4c5adc1f38f3f4dece433a0b52cfadd3257c99e48e1b7d4073476f044a6b14eda73e5663233a674540325937eb9b00d4de72e88352acdf78deed18730a

data/lib/jira.rb

@@ -9,19 +9,5 @@ Dir.glob(
 module Jira
   class CLI < Thor
 
-    def initialize(args=[], options={}, config={})
-      super
-      self.suppress{ Jira::Core.setup }
-      self.suppress{ self.api }
-    end
-
-    protected
-
-      def suppress
-        yield
-      rescue GitException
-      rescue InstallationException
-      end
-
   end
 end

data/lib/jira/api.rb

@@ -1,100 +1,69 @@
+require 'faraday'
+require 'faraday_middleware'
+
 module Jira
   class API
 
-    TYPES = [
-      :rest,
-      :agile
-    ].freeze
+    def get(path, options={})
+      response = client.get(path, options[:params] || {}, headers)
+      process(response, options)
+    end
 
-    ENDPOINTS = {
-      rest:  'rest/api/2',
-      agile: 'rest/greenhopper/latest'
-    }.freeze
+    def post(path, options={})
+      response = client.post(path, options[:params] || {}, headers)
+      process(response, options)
+    end
 
-    #
-    # Initialize Jira::API
-    #
-    # @param type [Symbol]
-    #
-    def initialize(type)
-      @type = type
-      @client = Faraday.new
-      @client.basic_auth(Jira::Core.username, Jira::Core.password)
+    def patch(path, options={})
+      response = client.put(path, options[:params] || {}, headers)
+      process(response, options)
+    end
 
-      self.define_actions
+    def delete(path, options={})
+      response = client.delete(path, options[:params] || {}, headers)
+      process(response, options)
     end
 
-    protected
+  private
 
-      #
-      # Defines the API DELETE, GET, POST, PUT interaction methods
-      #
-      def define_actions
-        #
-        # def method(path, params={})
-        #
-        # Issue an API DELETE, GET, POST, or PUT request and return parse JSON
-        #
-        # @param path [String] API path
-        # @param params [Hash] params to send
-        #
-        # @yield(Hash) yields to a success block
-        #
-        # @return [JSON] parased API response
-        #
-        [:delete, :get, :post, :put].each do |method|
-          self.class.send(:define_method, method) do |path, params=nil, verbose=true, &block|
-            params = params.to_json if !params.nil?
-            response = @client.send(
-              method,
-              self.endpoint(path),
-              params,
-              self.headers
-            )
-            json = response.body.to_s.from_json
-            if self.errorless?(json, verbose)
-              block.call(json)
-            end
-          end
-        end
+    def process(response, options)
+      json = response.body || {}
+      if response.success? && json['errorMessages'].nil?
+        respond_to(options[:success], json)
+      else
+        puts json['errorMessages'].join('. ') unless json['errorMessages'].nil?
+        respond_to(options[:failure], json)
       end
+      json
+    end
 
-      #
-      # If any, outputs all API errors described by the input JSON
-      #
-      # @param json [Hash] API response JSON
-      # @param verbose [Boolean] true if errors should be output
-      #
-      # @return [Boolean] true if no errors exist
-      #
-      def errorless?(json, verbose=true)
-        errors = json['errorMessages']
-        if !errors.nil?
-          puts errors.join('. ') if verbose
-          return false
-        end
-        return true
+    def respond_to(block, json)
+      return if block.nil?
+      case block.arity
+      when 0
+        block.call
+      when 1
+        block.call(json)
       end
+    end
 
-      #
-      # Returns the full JIRA REST API endpoint
-      #
-      # @param path [String] API path
-      #
-      # @return [String] API endpoint
-      #
-      def endpoint(path)
-        "#{Jira::Core.url}/#{ENDPOINTS[@type]}/#{path}"
+    def client
+      @client ||= Faraday.new(endpoint) do |faraday|
+        faraday.request  :basic_auth, Jira::Core.username, Jira::Core.password unless Jira::Core.password.nil?
+        faraday.request  :token_auth, Jira::Core.token unless Jira::Core.token.nil?
+        faraday.request  :json
+        faraday.response :json
+        faraday.adapter  :net_http
       end
+    end
 
-      #
-      # Returns the default API headers
-      #
-      # @return [Hash] API headers
-      #
-      def headers
-        { 'Content-Type' => 'application/json' }
-      end
+    def endpoint
+      "#{Jira::Core.url}/rest/api/2"
+    end
+
+    def headers
+      { 'Content-Type' => 'application/json' }
+    end
 
   end
 end

data/lib/jira/command.rb

@@ -0,0 +1,36 @@
+require 'tty-table'
+
+module Jira
+  module Command
+    class Base
+
+      def run
+        raise NotImplementedError
+      end
+
+    protected
+
+      def api
+        @api ||= Jira::API.new
+      end
+
+      def sprint_api
+        @sprint_api ||= Jira::SprintAPI.new
+      end
+
+      def io
+        @io ||= TTY::Prompt.new
+      end
+
+      def render_table(header, rows)
+        puts TTY::Table.new(header, rows).render(:ascii, padding: [0,1])
+      end
+
+      def truncate(string, limit=80)
+        return string if string.length < limit
+        string[0..limit-3] + '...'
+      end
+
+    end
+  end
+end

data/lib/jira/commands/all.rb

@@ -0,0 +1,75 @@
+module Jira
+  class CLI < Thor
+
+    desc "all", "Describes all local branches that match JIRA ticketing syntax"
+    def all
+      Command::All.new.run
+    end
+
+  end
+
+  module Command
+    class All < Base
+
+      def run
+        puts 'No tickets' and return if tickets.empty?
+        return if json.empty?
+        return if errored?
+        render_table(header, rows)
+      end
+
+    private
+
+      def header
+        [ 'Ticket', 'Assignee', 'Status', 'Summary' ]
+      end
+
+      def rows
+        json['issues'].map do |issue|
+          [
+            issue['key'],
+            issue['fields']['assignee']['name'],
+            issue['fields']['status']['name'],
+            truncate(issue['fields']['summary'], 45)
+          ]
+        end
+      end
+
+      def errored?
+        return false if errors.empty?
+        puts errors
+        true
+      end
+
+      def errors
+        @errors ||= (json['errorMessages'] || []).join('. ')
+      end
+
+      def json
+        @json ||= api.get "search", params: params
+      end
+
+      def params
+        {
+          jql: "key in (#{tickets.join(',')})"
+        }
+      end
+
+      def tickets
+        @tickets ||= (
+          tickets = []
+          branches.each do |branch|
+            ticket = branch.delete('*').strip
+            tickets << ticket if Jira::Core.ticket?(ticket, false)
+          end
+          tickets
+        )
+      end
+
+      def branches
+        `git branch`.strip.split("\n")
+      end
+
+    end
+  end
+end

data/lib/jira/commands/assign.rb

@@ -1,17 +1,63 @@
+require_relative '../command'
+
 module Jira
   class CLI < Thor
 
     desc "assign", "Assign a ticket to a user"
     def assign(ticket=Jira::Core.ticket)
-      # determine assignee
-      assignee = self.io.ask("Assignee (default auto)").strip
-      assignee = "-1" if assignee.empty? # automatic assignee is used
+      Command::Assign.new(ticket).run
+    end
+
+  end
+
+  module Command
+    class Assign < Base
+
+      attr_accessor :ticket
 
-      self.api.put("issue/#{ticket}/assignee", { name: assignee }) do |json|
-        return
+      def initialize(ticket)
+        self.ticket = ticket
+      end
+
+      def run
+        api.patch path,
+          params:  params,
+          success: on_success,
+          failure: on_failure
+      end
+
+      def on_success
+        -> do
+          puts "Ticket #{ticket} assigned to #{name}."
+        end
       end
-      puts "Ticket #{ticket} not assigned."
-    end
 
+      def on_failure
+        ->(json) do
+          message = (json['errors'] || {})['assignee']
+          puts message || "Ticket #{ticket} was not assigned."
+        end
+      end
+
+      def path
+        "issue/#{ticket}/assignee"
+      end
+
+      def params
+        { name: assignee }
+      end
+
+      def name
+        assignee == '-1' ? 'default user' : "'#{assignee}'"
+      end
+
+      def assignee
+        @assignee ||= (
+          assignee = io.ask('Assignee?', default: 'auto')
+          assignee == 'auto' ? '-1' : assignee
+        )
+      end
+
+    end
   end
 end

data/lib/jira/commands/attachments.rb

@@ -3,9 +3,27 @@ module Jira
 
     desc "attachments", "View ticket attachments"
     def attachments(ticket=Jira::Core.ticket)
-      self.api.get("issue/#{ticket}") do |json|
-        attachments=json['fields']['attachment']
-        if attachments.count > 0
+      Command::Attachments.new(ticket).run
+    end
+
+  end
+
+  module Command
+    class Attachments < Base
+
+      attr_accessor :ticket
+
+      def initialize(ticket)
+        self.ticket = ticket
+      end
+
+      def run
+        return if ticket.empty?
+        return if metadata.empty?
+        return if metadata['fields'].nil?
+
+        attachments=metadata['fields']['attachment']
+        if !attachments.nil? and attachments.count > 0
           attachments.each do |attachment|
             name=attachment['filename']
             url=attachment['content']
@@ -16,7 +34,12 @@ module Jira
           puts "No attachments found"
         end
       end
-    end
 
+      private
+
+      def metadata
+        @metadata ||= api.get("issue/#{ticket}")
+      end
+    end
   end
 end

data/lib/jira/commands/comment.rb

@@ -47,7 +47,7 @@ module Jira
     protected
 
       def comment_delete(ticket)
-        comments(ticket) if self.io.agree("List comments for ticket #{ticket}")
+        comments(ticket) if self.io.yes?("List comments for ticket #{ticket}?")
 
         index = self.get_type_of_index("comment", "delete")
         puts "No comment deleted." and return if index < 0
@@ -66,7 +66,7 @@ module Jira
       end
 
       def comment_update(ticket)
-        comments(ticket) if self.io.agree("List comments for ticket #{ticket}")
+        comments(ticket) if self.io.yes?("List comments for ticket #{ticket}?")
 
         index = self.get_type_of_index("comment", "update")
         puts "No comment updated." and return if index < 0
@@ -92,7 +92,7 @@ module Jira
       # @return comment [String] asked comment body
       #
       def get_comment_body(ticket)
-        comment = self.io.ask("Leave a comment for ticket #{ticket}").strip
+        comment = self.io.ask("Leave a comment for ticket #{ticket}:").strip
         temp = comment.gsub(/\@[a-zA-Z]+/,'[~\0]')
         temp = comment if temp.nil?
         temp = temp.gsub('[~@','[~')

data/lib/jira/commands/delete.rb

@@ -1,40 +1,94 @@
+require_relative '../command'
+
 module Jira
   class CLI < Thor
 
     desc "delete", "Deletes a ticket in JIRA and the git branch"
     method_option :force, type: :boolean, default: false
     def delete(ticket=Jira::Core.ticket)
-      force = options[:force]
-      self.api.get("issue/#{ticket}") do |json|
-        issue_type = json['fields']['issuetype']
-        if !issue_type['subtask']
-          if !json['fields']['subtasks'].empty? && !force
-            force = self.io.agree("Delete all sub-tasks for ticket #{ticket}")
-            puts "No ticket deleted." and return if !force
-          end
+      Command::Delete.new(ticket, options[:force]).run
+    end
+
+  end
+
+  module Command
+    class Delete < Base
+
+      attr_accessor :ticket, :force
+
+      def initialize(ticket, force)
+        self.ticket = ticket
+        self.force = force
+      end
+
+      def run
+        return if ticket.empty?
+        return if metadata.empty?
+        return if metadata['fields'].nil?
+        return if subtasks_failure?
+
+        api.delete "issue/#{ticket}?deleteSubtasks=#{force}",
+          success: on_success,
+          failure: on_failure
+      end
+
+      private
+
+      def on_success
+        -> do
+          on_failure and return unless create_branch?
+          on_failure and return unless delete_branch?
+        end
+      end
+
+      def on_failure
+        -> { puts "No change made to ticket #{ticket}." }
+      end
+
+      def branches
+        branches = `git branch --list 2> /dev/null`.split(' ')
+        branches.delete("*")
+        branches.delete("#{ticket}")
+        branches
+      end
+
+      def create_branch?
+        response = io.yes?("Create branch?")
+
+        if branches.count == 1 or response
+          io.say("Creating a new branch.")
+          new_branch = io.ask("Branch?").strip
+          new_branch.delete!(" ")
+          on_failure and return false if new_branch.empty?
+          `git branch #{new_branch} 2> /dev/null`
         end
+        true
+      end
 
-        self.api.delete("issue/#{ticket}?deleteSubtasks=#{force}") do |json|
-          branches = `git branch --list 2> /dev/null`.split(' ')
-          branches.delete("*")
-          branches.delete("#{ticket}")
-          create_branch = self.io.agree("Create branch") if branches.count > 1
-          if branches.count == 1 or create_branch
-            puts "Creating a new branch."
-            new_branch = self.io.ask("Branch").strip
-            new_branch.delete!(" ")
-            puts "No ticket deleted." and return if new_branch.empty?
-            `git branch #{new_branch} 2> /dev/null`
-            branches << new_branch
-          end
-          chosen_branch = self.io.choose("Select a branch", branches)
-          `git checkout #{chosen_branch} 2> /dev/null`
-          `git branch -D #{ticket} 2> /dev/null`
-          return
+      def delete_branch?
+        response = self.io.select("Select a branch:", branches)
+        `git checkout #{response} 2> /dev/null`
+        `git branch -D #{ticket} 2> /dev/null`
+        true
+      end
+
+      def subtasks_failure?
+        return false unless subtask?
+        if !metadata['fields']['subtasks'].empty? && !force
+          self.force = io.yes?("Delete all sub-tasks for ticket #{ticket}?")
+          return true unless force
         end
+        false
+      end
+
+      def subtask?
+        metadata['fields']['issuetype']['subtask']
       end
-      puts "No ticket deleted."
-    end
 
+      def metadata
+        @metadata ||= api.get("issue/#{ticket}")
+      end
+
+    end
   end
 end