jira-cli 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97bdc67147e5f936b6b9eca1e0153327185fcbaa
-  data.tar.gz: 82a46d41fbe2fefc1c288fe45a0f1bbcbe396a4f
+  metadata.gz: 406cae0998f9674bbe8734a161b0c1b53b9b923d
+  data.tar.gz: 76589c20dff0f392572616955716dd31fa10cbb2
 SHA512:
-  metadata.gz: df959df35c8e949e13d11c2703df4c2ae860b50e61fe40d15df96ca0e4af223b0a94822e6aa41c92fb384016cc29a7a8f58f3d3fa7261d71df0a694b3286744d
-  data.tar.gz: a6bb8e513b9f9ca761a705e29aa23c2377deee7065f4f1b1218e9e0bba1c30323f5afbcf940928e93bea5c1e59d96219418ed008066971d3a92b19bbbac8cf8f
+  metadata.gz: a4d4af396cc9cdaf1ff6c980a8ca97f26bbaaf0c6bfc97b5b4204b91b6b8adb4d90ce038c1da98a8a0591995fd80da10121f0de173c08af8a6026b3039db3ff3
+  data.tar.gz: 5b1f38ac95332f74f8898507bd3762ea7c6a45a526ad1943c711fe0ebe012110db513ed23f3556a2e4550085c34332d301290c22b31b9df12bb039774f0821ad

data/bin/jira

@@ -3,8 +3,8 @@
 require 'jira'
 begin
   Jira::CLI.start
-rescue Faraday::Error
-  puts "JIRA failed connect, you may need to rerun 'jira install'"
+rescue Faraday::Error, UnauthorizedException
+  puts "JIRA failed connect, you may need to rerun 'jira install'" unless Jira::CLI.new.try_install_cookie
 rescue GitException
   puts "JIRA commands can only be run within a git repository."
 rescue InstallationException

data/lib/jira/api.rb

@@ -24,6 +24,7 @@ module Jira
   protected
 
     def process(response, options)
+      raise UnauthorizedException if response.status == 401
       json = response.body || {}
       if response.success? && json['errorMessages'].nil?
         respond_to(options[:success], json)

data/lib/jira/command.rb

@@ -1,6 +1,7 @@
-# internal dependencies
+# external dependencies
 require 'time'
 
+# internal dependencies
 require 'jira/api'
 require 'jira/sprint_api'
 require 'jira/auth_api'
@@ -27,7 +28,7 @@ module Jira
       # TODO: Move this to relevant subcommand Base
       def body
         @body ||= (
-          comment = io.ask("Leave a comment for ticket #{ticket}:").strip
+          comment = io.ask("Leave a comment for ticket #{ticket}:", default: 'Empty comment').strip
           comment = comment.gsub(/\@[a-zA-Z]+/, '[~\0]') || comment
           comment.gsub('[~@', '[~') || comment
         )

data/lib/jira/commands/all.rb

@@ -12,9 +12,12 @@ module Jira
     class All < Base
 
       def run
-        puts 'No tickets' and return if tickets.empty?
+        if tickets.empty?
+          puts 'No tickets'
+          return
+        end
         return if json.empty?
-        return if errored?
+        return unless errors.empty?
         render_table(header, rows)
       end
 
@@ -35,12 +38,6 @@ module Jira
         end
       end
 
-      def errored?
-        return false if errors.empty?
-        puts errors
-        true
-      end
-
       def errors
         @errors ||= (json['errorMessages'] || []).join('. ')
       end

data/lib/jira/commands/comment/delete.rb

@@ -66,12 +66,12 @@ module Jira
         def description_for(comment)
           author = comment['updateAuthor']['displayName']
           updated_at = Jira::Format.time(Time.parse(comment['updated']))
-          body = comment['body'].gsub("\r\n|\r|\n", ";")
+          body = comment['body'].split.join(" ")
           truncate("#{author} @ #{updated_at}: #{body}", 160)
         end
 
         def json
-          @json ||= api.get("issue/#{ticket}/comment")['comments']
+          @json ||= api.get("issue/#{ticket}/comment")['comments'] || {}
         end
 
       end

data/lib/jira/commands/comment/list.rb

@@ -19,6 +19,8 @@ module Jira
         end
 
         def run
+          return if comments.nil?
+
           if comments.empty?
             puts "Ticket #{ticket} has no comments."
             return
@@ -56,7 +58,8 @@ module Jira
         end
 
         def body
-          comment['body']
+          body = comment['body'].gsub("\r\n|\r|\n", ";")
+          truncate(body, 45)
         end
 
         def comments

data/lib/jira/commands/comment/update.rb

@@ -74,7 +74,7 @@ module Jira
         def description_for(comment)
           author = comment['updateAuthor']['displayName']
           updated_at = Jira::Format.time(Time.parse(comment['updated']))
-          body = comment['body'].gsub("\r\n|\r|\n", ";")
+          body = comment['body'].split.join(" ")
           truncate("#{author} @ #{updated_at}: #{body}", 160)
         end
 

data/lib/jira/commands/describe.rb

@@ -19,7 +19,7 @@ module Jira
 
       def run
         return if json.empty?
-        return if errored?
+        return unless errors.empty?
         render_table(header, [row])
       end
 
@@ -31,12 +31,6 @@ module Jira
         [ ticket, assignee, status, summary ]
       end
 
-      def errored?
-        return false if errors.empty?
-        puts errors
-        true
-      end
-
       def errors
         @errors ||= (json['errorMessages'] || []).join('. ')
       end

data/lib/jira/commands/install.rb

@@ -6,6 +6,18 @@ module Jira
       Command::Install.new.run
     end
 
+    no_commands do
+      def try_install_cookie
+        return false if Jira::Core.cookie.empty?
+        puts "  ... cookie expired, renewing your cookie"
+        Command::Install.new.run_rescue_cookie
+        puts "Cookie renewed, please retry your last command."
+        return true
+      rescue Interrupt, StandardError
+        false
+      end
+    end
+
   end
 
   module Command
@@ -23,7 +35,7 @@ module Jira
         when "token"
           inifile[:global][:token] = token
         when "cookie"
-          response = cookie
+          response = cookie(session_params)
           inifile[:cookie] = {}
           inifile[:cookie][:name] = response['name']
           inifile[:cookie][:value] = response['value']
@@ -31,6 +43,15 @@ module Jira
         inifile.write
       end
 
+      def run_rescue_cookie
+        response = cookie(rescue_cookie_params)
+        config = Jira::Core.config
+        config[:cookie] = {}
+        config[:cookie][:name] = response['name']
+        config[:cookie][:value] = response['value']
+        config.write
+      end
+
     private
 
       def base_params
@@ -40,6 +61,13 @@ module Jira
         }
       end
 
+      def rescue_cookie_params
+        {
+          username: Jira::Core.username,
+          password: password
+        }
+      end
+
       def session_params
         {
           username: username,
@@ -70,8 +98,8 @@ module Jira
         io.ask("JIRA token:")
       end
 
-      def cookie
-        response = auth_api.post('session', params: session_params)
+      def cookie(params)
+        response = auth_api.post('session', params: params)
         return {} unless response['errorMessages'].nil?
         response['session']
       end

data/lib/jira/commands/rename.rb

@@ -43,7 +43,7 @@ module Jira
       end
 
       def summary
-        @summary ||= io.ask("New summary for ticket #{ticket}:")
+        @summary ||= io.ask("New summary for ticket #{ticket}:", default: '')
       end
 
     end

data/lib/jira/commands/tickets.rb

@@ -20,6 +20,8 @@ module Jira
       def run
         return if jql.empty?
         return if metadata.empty?
+        return unless metadata['errorMessages'].nil?
+
         puts "There are no tickets for jql=#{jql}." and return if rows.empty?
         render_table(header, rows)
       end

data/lib/jira/commands/transition.rb

@@ -20,6 +20,7 @@ module Jira
       def run
         return if ticket.empty?
         return if metadata.empty?
+        return unless metadata['errorMessages'].nil?
         return if transition.empty?
         api.post "issue/#{ticket}/transitions",
           params:  params,

data/lib/jira/constants.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Jira
 
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 
 end

data/lib/jira/core.rb

@@ -72,6 +72,13 @@ module Jira
         @cli_path ||= root_path + "/.jira-cli"
       end
 
+      def config
+        @config ||= (
+          raise InstallationException unless File.exist?(cli_path)
+          IniFile.load(cli_path, comment: '#', encoding: 'UTF-8')
+        )
+      end
+
     private
 
       def root_path
@@ -82,13 +89,6 @@ module Jira
         )
       end
 
-      def config
-        @config ||= (
-          raise InstallationException unless File.exist?(cli_path)
-          IniFile.load(cli_path, comment: '#', encoding: 'UTF-8')
-        )
-      end
-
     end
   end
 end

data/lib/jira/exceptions.rb

@@ -1,2 +1,3 @@
-class InstallationException < Exception; end
-class GitException < Exception; end
+class InstallationException < StandardError; end
+class GitException < StandardError; end
+class UnauthorizedException < StandardError; end

data/lib/jira/sprint_api.rb

@@ -2,24 +2,24 @@ module Jira
   class SprintAPI < API
 
     def sprint(rapid_view_id, sprint_id)
-      response = client.get(
-        'rapid/charts/sprintreport',
+      params = {
         rapidViewId: rapid_view_id,
         sprintId:    sprint_id
-      )
-      return response.body if response.success?
+      }
+      json = get('rapid/charts/sprintreport', params: params) || {}
+      return json if json['errorMessages'].nil?
       {}
     end
 
     def sprints(rapid_view_id)
-      response = client.get("sprintquery/#{rapid_view_id}")
-      return response.body if response.success?
+      json = get("sprintquery/#{rapid_view_id}")
+      return json if json['errorMessages'].nil?
       {}
     end
 
     def rapid_views
-      response = client.get("rapidview")
-      return response.body['views'] if response.success?
+      json = get("rapidview")
+      return json['views'] if json['errorMessages'].nil?
       []
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jira-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Darren Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor