jira-cli 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98c9095d9dabba5b2edb2df0aba0d887448af1df
-  data.tar.gz: dd2ebf4eb6bfcead3fa14b3f1e810c055f29a212
+  metadata.gz: 83f34562705e57afd8e9b3b3879f478b57d36b39
+  data.tar.gz: c7ae7bec14a6ee79ec7f6798e19801795859fa32
 SHA512:
-  metadata.gz: 702a29b1122007deb53f149417ff354fcfc9b21c38ecec14d365a22380a277e00fd3ebcdaa7f7380d64867eab74f5ba02e7a809d36db85dd5b32261ac649f945
-  data.tar.gz: ddb3495e48300b0e7c09d60ad30b5008829ee414b615f612aa070c7bed1d2dbfd5188788b11527613c76f8cfbf3b5f47072a961faa81c6c3c0a87caf6dc60c15
+  metadata.gz: e1e5a4314e3407e153bdf55408bf48fc49a5124972b6b5c4dc9117ec33d1b57287d95936b9fa4f686a23b8d443c7e1d4ef7522d902cd8804cb5dc8c0451ddefa
+  data.tar.gz: d85dc1edfdf870f8b789446001326f961f17c1f14ade7a84e181ae670da7229972996e4a922abfda7e2a47702f34e87518cc997545f5e19926c36107fce7dac7

data/lib/jira/api.rb

@@ -25,23 +25,24 @@ module Jira
 
     def process(response, options)
       raise UnauthorizedException if response.status == 401
-      json = response.body || {}
+      body = response.body || {}
+      json = (body if body.class == Hash) || {}
       if response.success? && json['errorMessages'].nil?
-        respond_to(options[:success], json)
+        respond_to(options[:success], body)
       else
         puts json['errorMessages'].join('. ') unless json['errorMessages'].nil?
-        respond_to(options[:failure], json)
+        respond_to(options[:failure], body)
       end
-      json
+      body
     end
 
-    def respond_to(block, json)
+    def respond_to(block, body)
       return if block.nil?
       case block.arity
       when 0
         block.call
       when 1
-        block.call(json)
+        block.call(body)
       end
     end
 

data/lib/jira/commands/tickets.rb

@@ -22,7 +22,10 @@ module Jira
         return if metadata.empty?
         return unless metadata['errorMessages'].nil?
 
-        puts "There are no tickets for jql=#{jql}." and return if rows.empty?
+        if rows.empty?
+          puts "There are no tickets for jql=#{jql}."
+          return
+        end
         render_table(header, rows)
       end
 
@@ -36,9 +39,9 @@ module Jira
         metadata['issues'].map do |issue|
           [
             issue['key'],
-            issue['fields']['assignee']['name'] || 'Unassigned',
-            issue['fields']['status']['name'] || 'Unknown',
-            truncate(issue['fields']['summary'], 45)
+            (issue['fields']['assignee']['name'] unless issue['fields']['assignee'].nil?) || 'Unassigned',
+            (issue['fields']['status']['name'] unless issue['fields']['status'].nil?) || 'Unknown',
+            truncate(issue['fields']['summary'] || '', 45)
           ]
         end
       end

data/lib/jira/commands/transition.rb

@@ -3,6 +3,7 @@ module Jira
 
     desc "transition", "Transitions the input ticket to the next state"
     method_option :transition, aliases: "-t", type: :string, default: nil, lazy_default: "", banner: "TRANSITION"
+    method_option :resolution, aliases: "-r", type: :string, default: nil, lazy_default: "", banner: "RESOLUTION"
     def transition(ticket=Jira::Core.ticket)
       Command::Transition.new(ticket, options).run
     end
@@ -24,6 +25,7 @@ module Jira
         return if metadata.empty?
         return unless metadata['errorMessages'].nil?
         return if transition.nil? || transition.empty?
+
         api.post "issue/#{ticket}/transitions",
           params:  params,
           success: on_success,
@@ -33,7 +35,10 @@ module Jira
     private
 
       def params
-        { transition: { id: transition } }
+        {
+          transition: { id: transition[:id] },
+          fields: transition[:resolution?] ? { resolution: { name: resolution } } : {}
+        }
       end
 
       def on_success
@@ -58,14 +63,33 @@ module Jira
         @transitions ||= (
           transitions = {}
           metadata['transitions'].each do |transition|
-            transitions[transition['to']['name']] = transition['id']
+            transitions[transition['to']['name']] = {
+              id: transition['id'],
+              resolution?: !!transition['fields'].fetch('resolution', {})['required']
+            }
           end
           transitions
         )
       end
 
       def metadata
-        @metadata ||= api.get("issue/#{ticket}/transitions")
+        @metadata ||= api.get("issue/#{ticket}/transitions?expand=transitions.fields")
+      end
+
+      def resolution
+        @resolution ||= resolutions[
+          options['resolution'] || io.select("Resolve #{ticket} as:", resolutions.keys)
+        ]
+      end
+
+      def resolutions
+        @resolutions ||= (
+          resolutions = {}
+          api.get("resolution").each do |resolution|
+            resolutions[resolution['name']] = resolution['name']
+          end
+          resolutions
+        )
       end
 
     end

data/lib/jira/constants.rb

@@ -2,6 +2,6 @@
 
 module Jira
 
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.3.5'.freeze
 
 end

metadata

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