jira-cli 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 406cae0998f9674bbe8734a161b0c1b53b9b923d
-  data.tar.gz: 76589c20dff0f392572616955716dd31fa10cbb2
+  metadata.gz: 98c9095d9dabba5b2edb2df0aba0d887448af1df
+  data.tar.gz: dd2ebf4eb6bfcead3fa14b3f1e810c055f29a212
 SHA512:
-  metadata.gz: a4d4af396cc9cdaf1ff6c980a8ca97f26bbaaf0c6bfc97b5b4204b91b6b8adb4d90ce038c1da98a8a0591995fd80da10121f0de173c08af8a6026b3039db3ff3
-  data.tar.gz: 5b1f38ac95332f74f8898507bd3762ea7c6a45a526ad1943c711fe0ebe012110db513ed23f3556a2e4550085c34332d301290c22b31b9df12bb039774f0821ad
+  metadata.gz: 702a29b1122007deb53f149417ff354fcfc9b21c38ecec14d365a22380a277e00fd3ebcdaa7f7380d64867eab74f5ba02e7a809d36db85dd5b32261ac649f945
+  data.tar.gz: ddb3495e48300b0e7c09d60ad30b5008829ee414b615f612aa070c7bed1d2dbfd5188788b11527613c76f8cfbf3b5f47072a961faa81c6c3c0a87caf6dc60c15

data/README.md

@@ -13,6 +13,7 @@ Ruby gem CLI tool used to manage JIRA workflows leveraging git
     jira all                # Describes all local branches that match JIRA ticketing syntax
     jira assign             # Assign a ticket to a user
     jira attachments        # View ticket attachments
+    jira checkout <ticket>  # Checks out a ticket from JIRA in the git branch
     jira comment <command>  # Commands for comment operations in JIRA
     jira delete             # Deletes a ticket in JIRA and the git branch
     jira describe           # Describes the input ticket

data/lib/jira/command.rb

@@ -26,9 +26,9 @@ module Jira
       end
 
       # TODO: Move this to relevant subcommand Base
-      def body
+      def body(text=nil)
         @body ||= (
-          comment = io.ask("Leave a comment for ticket #{ticket}:", default: 'Empty comment').strip
+          comment = text || 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/assign.rb

@@ -2,8 +2,9 @@ module Jira
   class CLI < Thor
 
     desc "assign", "Assign a ticket to a user"
+    method_option :assignee, aliases: "-a", type: :string, default: nil, lazy_default: "auto", banner: "ASSIGNEE"
     def assign(ticket=Jira::Core.ticket)
-      Command::Assign.new(ticket).run
+      Command::Assign.new(ticket, options).run
     end
 
   end
@@ -11,10 +12,11 @@ module Jira
   module Command
     class Assign < Base
 
-      attr_accessor :ticket
+      attr_accessor :ticket, :options
 
-      def initialize(ticket)
+      def initialize(ticket, options={})
         self.ticket = ticket
+        self.options = options
       end
 
       def run
@@ -53,7 +55,7 @@ module Jira
 
       def assignee
         @assignee ||= (
-          assignee = io.ask('Assignee?', default: 'auto')
+          assignee = options['assignee'] || io.ask('Assignee?', default: 'auto')
           assignee == 'auto' ? '-1' : assignee
         )
       end

data/lib/jira/commands/attachments.rb

@@ -31,7 +31,7 @@ module Jira
             puts "#{Jira::Format.user(name)} #{url}"
           end
         else
-          puts "No attachments found"
+          puts "No attachments found for ticket #{ticket}."
         end
       end
 

data/lib/jira/commands/checkout.rb

@@ -0,0 +1,87 @@
+module Jira
+  class CLI < Thor
+
+    desc "checkout <ticket>", "Checks out a ticket from JIRA in the git branch"
+    method_option :remote, aliases: "-r", type: :string, default: nil, lazy_default: "", banner: "REMOTE"
+    def checkout(ticket)
+      Command::Checkout.new(ticket, options).run
+    end
+
+  end
+
+  module Command
+    class Checkout < Base
+
+      attr_accessor :ticket, :options
+
+      def initialize(ticket, options)
+        self.ticket = ticket
+        self.options = options
+      end
+
+      def run
+        return unless Jira::Core.ticket?(ticket)
+        return if metadata.empty?
+        unless metadata['errorMessages'].nil?
+          on_failure
+          return
+        end
+        unless remote?
+          on_failure
+          return
+        end
+
+        create_branch unless branches.include?(ticket)
+        checkout_branch
+        reset_branch unless branches.include?(ticket)
+        on_success
+      end
+
+    private
+
+      def on_success
+        puts "Ticket #{ticket} checked out."
+      end
+
+      def on_failure
+        puts "No ticket checked out."
+      end
+
+      def branches
+        @branches ||= `git branch --list 2> /dev/null`.split(' ')
+        @branches.delete("*")
+        @branches
+      end
+
+      def create_branch
+        `git branch #{ticket} 2> /dev/null`
+      end
+
+      def checkout_branch
+        `git checkout #{ticket} 2> /dev/null`
+      end
+
+      def metadata
+        @metadata ||= api.get("issue/#{ticket}")
+      end
+
+      def remote
+        @remote ||= options['remote'] || io.select('Remote?', remotes)
+      end
+
+      def remotes
+        @remotes ||= `git remote 2> /dev/null`.split(' ')
+      end
+
+      def remote?
+        return true if remotes.include?(remote)
+        false
+      end
+
+      def reset_branch
+        `git reset --hard #{remote} 2> /dev/null`
+      end
+
+    end
+  end
+end

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

@@ -2,8 +2,9 @@ module Jira
   class Comment < Thor
 
     desc 'add', 'Add a comment to the input ticket'
+    method_option :text, aliases: "-t", type: :string, default: nil, lazy_default: "", banner: "TEXT"
     def add(ticket=Jira::Core.ticket)
-      Command::Comment::Add.new(ticket).run
+      Command::Comment::Add.new(ticket, options).run
     end
 
   end
@@ -12,14 +13,15 @@ module Jira
     module Comment
       class Add < Base
 
-        attr_accessor :ticket
+        attr_accessor :ticket, :options
 
-        def initialize(ticket)
+        def initialize(ticket, options)
           self.ticket = ticket
+          self.options = options
         end
 
         def run
-          return if body.empty?
+          return if text.empty?
           api.post "issue/#{ticket}/comment",
             params:  params,
             success: on_success,
@@ -29,7 +31,11 @@ module Jira
       private
 
         def params
-          { body: body }
+          { body: text }
+        end
+
+        def text
+          body(options['text'])
         end
 
         def on_success

data/lib/jira/commands/log/add.rb

@@ -2,8 +2,9 @@ module Jira
   class Log < Thor
 
     desc 'add', 'Logs work against the input ticket'
+    method_option :time, aliases: "-t", type: :string, default: nil, lazy_default: "", banner: "TIME"
     def add(ticket=Jira::Core.ticket)
-      Command::Log::Add.new(ticket).run
+      Command::Log::Add.new(ticket, options).run
     end
 
   end
@@ -12,10 +13,11 @@ module Jira
     module Log
       class Add < Base
 
-        attr_accessor :ticket
+        attr_accessor :ticket, :options
 
-        def initialize(ticket)
+        def initialize(ticket, options)
           self.ticket = ticket
+          self.options = options
         end
 
         def run
@@ -33,7 +35,7 @@ module Jira
         end
 
         def time_spent
-          @time_spent ||= io.ask("Time spent on ticket #{ticket}:")
+          @time_spent ||= options['time'] || io.ask("Time spent on ticket #{ticket}:")
         end
 
         def on_success

data/lib/jira/commands/new.rb

@@ -2,8 +2,15 @@ module Jira
   class CLI < Thor
 
     desc "new", "Creates a new ticket in JIRA and checks out the git branch"
+    method_option :project, aliases: "-p", type: :string, default: nil, banner: "PROJECT"
+    method_option :components, aliases: "-c", type: :array, default: nil, lazy_default: [], banner: "COMPONENTS"
+    method_option :issuetype, aliases: "-i", type: :string, default: nil, banner: "ISSUETYPE"
+    method_option :parent, type: :string, default: nil, lazy_default: "", banner: "PARENT"
+    method_option :summary, aliases: "-s", type: :string, default: nil, banner: "SUMMARY"
+    method_option :description, aliases: "-d", type: :string, default: nil, lazy_default: "", banner: "DESCRIPTION"
+    method_option :assignee, aliases: "-a", type: :string, default: nil, lazy_default: "auto", banner: "ASSIGNEE"
     def new
-      Command::New.new.run
+      Command::New.new(options).run
     end
 
   end
@@ -11,12 +18,18 @@ module Jira
   module Command
     class New < Base
 
+      attr_accessor :options
+
+      def initialize(options)
+        self.options = options
+      end
+
       def run
         return if metadata.empty?
-        return if project.empty?
+        return if project.nil? || project.empty?
         return if project_metadata.empty?
         components # Select components if any after a project
-        return if issue_type.empty?
+        return if issue_type.nil? || issue_type.empty?
         return if assign_parent? && parent.empty?
         return if summary.empty?
 
@@ -47,13 +60,13 @@ module Jira
         ->(json) do
           self.ticket = json['key']
           io.say("Ticket #{ticket} created.")
-          assign?
-          create_branch? && checkout_branch?
+          assign? if options.empty? || !options['assignee'].nil?
+          create_branch? && checkout_branch? if options.empty?
         end
       end
 
       def assign?
-        Command::Assign.new(ticket).run if io.yes?('Assign?')
+        Command::Assign.new(ticket, options).run if !options['assignee'].nil? || io.yes?('Assign?')
       end
 
       def create_branch?
@@ -79,7 +92,7 @@ module Jira
 
       def project
         @project ||= projects[
-          io.select("Select a project:", projects.keys)
+          options['project'] || io.select("Select a project:", projects.keys)
         ]
       end
 
@@ -108,24 +121,30 @@ module Jira
             components[component['name']] = { 'id' => component['id'] }
           end
           unless components.empty?
-            io.multi_select("Select component(s):", components)
+            if options['components'].nil?
+              components = io.multi_select("Select component(s):", components)
+            else
+              components.select! { |k| options['components'].include?(k) }
+              components = components.values
+            end
           end
+          components.to_a
         )
       end
 
       def assign_parent?
         return false unless issue_type['subtask']
-        return false if io.no?('Set parent of subtask?')
+        return false if options['parent'].nil? && io.no?('Set parent of subtask?')
         true
       end
 
       def parent
-        @parent ||= io.ask('Subtask parent:', default: Jira::Core.ticket)
+        @parent ||= options['parent'] || io.ask('Subtask parent:', default: Jira::Core.ticket)
       end
 
       def issue_type
         @issue_type ||= issue_types[
-          io.select("Select an issue type:", issue_types.keys)
+            options['issuetype'] || io.select("Select an issue type:", issue_types.keys)
         ]
       end
 
@@ -140,11 +159,14 @@ module Jira
       end
 
       def summary
-        @summary ||= io.ask("Summary:", default: '')
+        @summary ||= options['summary'] || io.ask("Summary:", default: '')
       end
 
       def description
-        @description ||= io.ask("Description:", default: '')
+        @description ||= (
+          description = options['description'] || (io.ask("Description:", default: '') if options['summary'].nil?)
+          description ||= ""
+        )
       end
 
     end

data/lib/jira/commands/rename.rb

@@ -2,8 +2,9 @@ module Jira
   class CLI < Thor
 
     desc "rename", "Updates the summary of the input ticket"
+    method_option :summary, aliases: "-s", type: :string, default: nil, lazy_default: "", banner: "SUMMARY"
     def rename(ticket=Jira::Core.ticket)
-      Command::Rename.new(ticket).run
+      Command::Rename.new(ticket, options).run
     end
 
   end
@@ -11,10 +12,11 @@ module Jira
   module Command
     class Rename < Base
 
-      attr_accessor :ticket
+      attr_accessor :ticket, :options
 
-      def initialize(ticket)
+      def initialize(ticket, options)
         self.ticket = ticket
+        self.options = options
       end
 
       def run
@@ -43,7 +45,7 @@ module Jira
       end
 
       def summary
-        @summary ||= io.ask("New summary for ticket #{ticket}:", default: '')
+        @summary ||= options['summary'] || io.ask("New summary for ticket #{ticket}:", default: '')
       end
 
     end

data/lib/jira/commands/transition.rb

@@ -2,8 +2,9 @@ module Jira
   class CLI < Thor
 
     desc "transition", "Transitions the input ticket to the next state"
+    method_option :transition, aliases: "-t", type: :string, default: nil, lazy_default: "", banner: "TRANSITION"
     def transition(ticket=Jira::Core.ticket)
-      Command::Transition.new(ticket).run
+      Command::Transition.new(ticket, options).run
     end
 
   end
@@ -11,17 +12,18 @@ module Jira
   module Command
     class Transition < Base
 
-      attr_accessor :ticket
+      attr_accessor :ticket, :options
 
-      def initialize(ticket)
+      def initialize(ticket, options)
         self.ticket = ticket
+        self.options = options
       end
 
       def run
         return if ticket.empty?
         return if metadata.empty?
         return unless metadata['errorMessages'].nil?
-        return if transition.empty?
+        return if transition.nil? || transition.empty?
         api.post "issue/#{ticket}/transitions",
           params:  params,
           success: on_success,
@@ -48,7 +50,7 @@ module Jira
 
       def transition
         @transition ||= transitions[
-          io.select("Transition #{ticket} to:", transitions.keys)
+          options['transition'] || io.select("Transition #{ticket} to:", transitions.keys)
         ]
       end
 

data/lib/jira/constants.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jira-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Darren Cheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -140,6 +140,7 @@ files:
 - lib/jira/commands/all.rb
 - lib/jira/commands/assign.rb
 - lib/jira/commands/attachments.rb
+- lib/jira/commands/checkout.rb
 - lib/jira/commands/comment.rb
 - lib/jira/commands/comment/add.rb
 - lib/jira/commands/comment/delete.rb