jira-cli 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317a2980fd40942f189582860e629ec9b7ae6c74
-  data.tar.gz: d39be85a427cdb978a596b590fdf8101c09a3201
+  metadata.gz: 049479b74d7e3b923ec62c844e16bc5962540075
+  data.tar.gz: 1033a9b5c1a5f36439e448ea8b7013f7a187c1f6
 SHA512:
-  metadata.gz: 74509f9851e7c59807417a42f54f763bbcab7232d1920ef115bf69ab6d3eebe376831eaef90125d5c50aaf7660ea38f594479e0f8f458c8e23031563b0f4553d
-  data.tar.gz: 5fcee4eb59837605287cf6c7e30671110941f4f82baf7351643988676bac2f7ab23ec4a71ffc54e0b8b8918aedf249e210348c913c70b2d44f5ee301e276eebe
+  metadata.gz: a7001f018aea98d4a5ef97c71fbaaf2771653ccc82ad47e03c58115252fde08b03c4ec66c7266875ff6a32be242e5cfd508253fbee99f98c1316d6a3a7173444
+  data.tar.gz: fd6b4edf8688c04a67d7bf782b7273f0ee97063a753ecf66e2e863c254813df77b8440f7731728c08ff3b13b2364b8a2f6d69205dd2d8bbc27be0fcaadc0c30a

data/README.md

@@ -11,8 +11,9 @@ purposes.
 
 Installation
 ------------
-cd path/to/jira/repo
-jira install
+
+    cd path/to/jira/repo
+    jira install
 
 Note: Authentication files are expected to drastically change. Currently, they
 are completely unencrypted. Use are your own risk... (see disclaimer above)

data/lib/jira.rb

@@ -6,11 +6,11 @@ require 'jira/core'
 require 'jira/api'
 require 'jira/format'
 require 'jira/mixins'
-# command logic
-require 'jira/version'
-require 'jira/install'
-require 'jira/describe'
-require 'jira/comment'
+# include jira/commands/*
+Dir.glob(
+  File.dirname(File.absolute_path(__FILE__)) + '/jira/commands/*',
+  &method(:require)
+)
 
 module Jira
   class CLI < Thor

data/lib/jira/api.rb

@@ -18,7 +18,7 @@ module Jira
     #
     def get(path, params={})
       response = @client.get(self.endpoint(path), params, self.headers)
-      JSON.parse(response.body)
+      return response.body.to_s.from_json
     end
 
     #
@@ -31,7 +31,7 @@ module Jira
     #
     def post(path, params={})
       response = @client.post(self.endpoint(path), params, self.headers)
-      JSON.parse(response.body)
+      return response.body.to_s.from_json
     end
 
     protected

data/lib/jira/commands/browse.rb

@@ -0,0 +1,10 @@
+module Jira
+  class CLI < Thor
+
+    desc "browse", "Opens the current input ticket in your browser"
+    def browse(ticket=Jira::Core.ticket)
+      system("open #{Jira::Core.url}/browse/#{ticket}")
+    end
+
+  end
+end

data/lib/jira/{comment.rb → commands/comment.rb}

@@ -2,8 +2,7 @@ module Jira
   class CLI < Thor
 
     desc "comment", "Add a comment to the input ticket"
-    def comment(ticket=nil)
-      ticket ||= `git rev-parse --abbrev-ref HEAD`.strip
+    def comment(ticket=Jira::Core.ticket)
       comment = self.cli.ask("Leave a comment for ticket #{ticket}:")
       if comment.strip.empty?
         puts "No comment posted."
@@ -12,17 +11,15 @@ module Jira
         if json['errorMessages'].nil?
           puts "Successfully posted your comment."
         else
-          puts json['errorMessages'].first
+          puts json['errorMessages'].join('. ')
         end
       end
     end
 
     desc "comments", "Lists the comments of the input ticket"
-    def comments(ticket=nil)
-      ticket ||= `git rev-parse --abbrev-ref HEAD`.strip
+    def comments(ticket=Jira::Core.ticket)
       json = @api.get("issue/#{ticket}")
       if json['errorMessages'].nil?
-
         comments = json['fields']['comment']['comments']
         if comments.count > 0
           comments.each do |comment|
@@ -30,7 +27,7 @@ module Jira
             time = Time.parse(comment['created'])
             body = comment['body']
 
-            puts "#{Jira::Format.author(author)} @ "\
+            puts "#{Jira::Format.user(author)} @ "\
                  "#{Jira::Format.time(time)}:\n"\
                  "#{Jira::Format.comment(body)}"
           end
@@ -38,7 +35,7 @@ module Jira
           puts "There are no comments on issue #{ticket}."
         end
       else
-        puts json['errorMessages'].first
+        puts json['errorMessages'].join('. ')
       end
     end
 

data/lib/jira/{describe.rb → commands/describe.rb}

@@ -2,8 +2,7 @@ module Jira
   class CLI < Thor
 
     desc "describe", "Describes the input ticket"
-    def describe(ticket=nil)
-      ticket ||= `git rev-parse --abbrev-ref HEAD`
+    def describe(ticket=Jira::Core.ticket)
       puts description(ticket.strip)
     end
 
@@ -58,9 +57,11 @@ module Jira
         json = @api.get("issue/#{ticket}")
         summary = json['fields']['summary']
         status = json['fields']['status']['name']
+        assignee = json['fields']['assignee']['name']
         return Jira::Format.ticket(ticket) +
-               (star ? Jira::Format.star : " ") +
-               Jira::Format.status(status) +
+               (star ? Jira::Format.star : " ") + "  " +
+               ("(" + Jira::Format.user(assignee) + ")").ljust(20) +
+               Jira::Format.status(status).ljust(26) +
                Jira::Format.summary(summary)
       end
 

data/lib/jira/commands/log.rb

@@ -0,0 +1,16 @@
+module Jira
+  class CLI < Thor
+
+    desc "log", "Logs work against the input ticket"
+    def log(ticket=Jira::Core.ticket)
+      time_spent = self.cli.ask("Time spent on #{ticket}: ")
+      json = @api.post("issue/#{ticket}/worklog", { timeSpent: time_spent }.to_json)
+      if json['errorMessages'].nil?
+        puts "Successfully logged #{time_spent} on #{ticket}."
+      else
+        puts json['errorMessages'].join('. ')
+      end
+    end
+
+  end
+end

data/lib/jira/commands/transition.rb

@@ -0,0 +1,48 @@
+module Jira
+  class CLI < Thor
+
+    desc "transition", "Transitions the input ticket to the next state"
+    def transition(ticket=Jira::Core.ticket)
+      json = @api.get("issue/#{ticket}/transitions")
+
+      options = {}
+      json['transitions'].each do |transition|
+        options[transition['name']] = transition['id']
+      end
+      options['Cancel'] = nil
+
+      self.cli.choose do |menu|
+        menu.index = :number
+        menu.index_suffix = ") "
+        menu.header = "Transitions Available For #{ticket}"
+        menu.prompt = "Select a transition: "
+        options.keys.each do |choice|
+          menu.choice choice do
+            transition_id = options[choice]
+            if transition_id.nil?
+              puts "No transition was performed on #{ticket}."
+            else
+              self.api_transition(ticket, transition_id, choice)
+            end
+          end
+        end
+      end
+    end
+
+    protected
+
+      def api_transition(ticket, transition, description)
+        json = @api.post(
+          "issue/#{ticket}/transitions",
+          { transition: { id: transition } }.to_json
+        )
+        if json.empty?
+          puts "Successfully performed transition (#{description}) "\
+               "on ticket #{ticket}."
+        else
+          puts json['errorMessages'].join('. ')
+        end
+      end
+
+  end
+end

data/lib/jira/constants.rb

@@ -1,5 +1,5 @@
 module Jira
 
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
 end

data/lib/jira/core.rb

@@ -33,6 +33,13 @@ module Jira
         @password ||= self.auth.last
       end
 
+      #
+      # @return [String] default ticket is the current branch
+      #
+      def ticket
+        `git rev-parse --abbrev-ref HEAD`.strip
+      end
+
       #
       # Determines whether or not the input ticket matches the expected JIRA
       # ticketing syntax.

data/lib/jira/format.rb

@@ -20,7 +20,7 @@ module Jira
         "#{Thor::Shell::Color::BLUE}"\
         "#{status}"\
         "#{Thor::Shell::Color::CLEAR}"\
-        "]".center(26)
+        "]"
       end
 
       def summary(summary)
@@ -30,9 +30,9 @@ module Jira
         "#{Thor::Shell::Color::CLEAR}"
       end
 
-      def author(author)
+      def user(user)
         "#{Thor::Shell::Color::MAGENTA}"\
-        "#{author}"\
+        "#{user}"\
         "#{Thor::Shell::Color::CLEAR}"
       end
 
@@ -65,7 +65,11 @@ module Jira
       def wrap(text)
         width = 80
         text.split("\n").collect do |line|
-          line.length > width ? line.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n").strip : line
+          if line.length > width
+            line.gsub(/(.{1,#{width}})(\s+|$)/, "\\1\n").strip
+          else
+            line
+          end
         end * "\n"
       end
 

data/lib/jira/mixins.rb

@@ -17,3 +17,13 @@ module Jira
 
   end
 end
+
+class String
+
+  def from_json
+    JSON.parse(self)
+  rescue
+    {}
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jira-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Darren Lin Cheng
@@ -61,15 +61,17 @@ extra_rdoc_files: []
 files:
 - bin/jira
 - lib/jira/api.rb
-- lib/jira/comment.rb
+- lib/jira/commands/browse.rb
+- lib/jira/commands/comment.rb
+- lib/jira/commands/describe.rb
+- lib/jira/commands/install.rb
+- lib/jira/commands/log.rb
+- lib/jira/commands/transition.rb
+- lib/jira/commands/version.rb
 - lib/jira/constants.rb
 - lib/jira/core.rb
-- lib/jira/describe.rb
 - lib/jira/format.rb
-- lib/jira/install.rb
 - lib/jira/mixins.rb
-- lib/jira/transition.rb
-- lib/jira/version.rb
 - lib/jira.rb
 - README.md
 homepage: https://github.com/darrenli/jira-cli

data/lib/jira/transition.rb

@@ -1,10 +0,0 @@
-module Jira
-  class CLI < Thor
-
-    desc "transition", "Transitions the input ticket to the next state"
-    def transition(ticket=nil)
-      puts "Coming soon"
-    end
-
-  end
-end