terjira 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97c9557a99f1b46a945bd05365da442a2a287778
-  data.tar.gz: 906a3aa5aee440f7cc4bb10c062958de17a7598f
+  metadata.gz: 81619376a1f94486a87bad473155828c7df19ffb
+  data.tar.gz: cb695455adb913a7a34f62f4aac32e09786132b4
 SHA512:
-  metadata.gz: 5755cb8806706a2431cec1e2104f3e6b3627710bdcb1f9557d33c976db9675a4c4501a5228fb19d5d6848f84c0f2042b5164cd8be474b7de256694c413267534
-  data.tar.gz: 867fc972c7115b3a4d52bd2c1a1961cbdf6b97732a33acf2877ade2f38dc8c4c4fc206d4f2f72e8e9532bdf9b2a9f46de260918fc292855640e4355c0e4b60b6
+  metadata.gz: 92ccea746712cc915a5b77785a1a960deb9e7ad5a8f839ded15ceaa3819ebb818987b69d5897f05806fb2d09845706e3e2dcf7efd41ec2436745a44243d1df10
+  data.tar.gz: e72c0f6b9efbfe35161bbaf139ef598d2a824a8e101d75c3493ec5dc30635b8da62d8768e836adfc828094175acdcbf6cb596d8c0ba7eaffdd3f450e1fc1281e

data/.travis.yml

@@ -7,7 +7,7 @@ addons:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.10
   - 2.2.0
   - 2.3.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terjira (0.3.5)
+    terjira (0.3.7)
       activesupport (= 4.0.13)
       jira-ruby (~> 1.1.3)
       thor (~> 0.19.0)

data/README.md

@@ -70,9 +70,12 @@ Issue:
   jira issue [ISSUE_KEY]             # Show detail of the issue
   jira issue assign [ISSUE_KEY] ([ASSIGNEE])  # Assign the issue to user
   jira issue comment [ISSUE_KEY]     # Write comment on the issue
+                                     #   pass `-E` or `--editor` to open system default editor for composing comment
   jira issue delete [ISSUE_KEY]      # Delete the issue
   jira issue edit [ISSUE_KEY]        # Edit the issue
+                                     #   pass `-E` or `--editor` to open system default editor for composing issue description
   jira issue new                     # Create an issue
+                                     #   pass `-E` or `--editor` to open system default editor for composing issue description
   jira issue open [ISSUE_KEY]        # Open browser
   jira issue take [ISSUE_KEY]        # Assign the issue to self
   jira issue trans [ISSUE_KEY] ([STATUS])     # Do transition

data/bin/terjira

@@ -2,7 +2,7 @@
 
 # Do I need bundler setup?
 require 'bundler/setup'
-require 'terjira'
+require_relative '../lib/terjira'
 require 'json'
 require 'pastel'
 
@@ -19,5 +19,6 @@ rescue JIRA::HTTPError => e
     puts pastel.red(message['errors'].map { |k, v| "#{k}: #{v}" }.join(", "))
   end
 rescue => e
+  puts e.backtrace
   puts Pastel.new.dim(e.message)
 end

data/lib/terjira/issue_cli.rb

@@ -53,7 +53,7 @@ module Terjira
 
     desc 'new', 'Create an issue'
     jira_options :summary, :description, :project, :issuetype,
-                 :priority, :assignee, :parent, :epiclink
+                 :priority, :assignee, :parent, :epiclink, :editor
     def new
       opts = suggest_options(required: [:project, :summary, :issuetype])
 
@@ -65,7 +65,7 @@ module Terjira
 
     desc 'edit [ISSUE_KEY]', 'Edit the issue'
     jira_options :summary, :description, :project, :issuetype,
-                 :priority, :assignee, :epiclink
+                 :priority, :assignee, :epiclink, :editor
     def edit(issue)
       return puts "Pass options you need to update" if options.blank?
       issue = client_class.find(issue)
@@ -83,7 +83,7 @@ module Terjira
     end
 
     desc 'comment [ISSUE_KEY]', 'Write comment on the issue'
-    jira_options :comment
+    jira_options :comment, :editor
     def comment(issue)
       opts = suggest_options(required: [:comment])
       issue = client_class.write_comment(issue, opts[:comment])

data/lib/terjira/option_support/editor.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module Terjira
+  class Editor
+    def self.editor_text
+      editor = ENV['EDITOR']
+      if editor.nil? || editor.empty?
+        raise 'EDITOR environment variable not found. Please set a default editor.'
+      end
+
+      tmp_file = Tempfile.new('content')
+      success = system "#{editor} #{tmp_file.path}"
+      content = File.read(tmp_file.path) if success
+
+      tmp_file.unlink
+
+      raise 'Editor returned a non-zero exit code. Something must have gone wrong' unless success
+
+      content
+    end
+  end
+end

data/lib/terjira/option_support/option_selector.rb

@@ -2,15 +2,24 @@
 
 require 'tty-prompt'
 require_relative 'resource_store'
+require_relative 'editor'
 
 module Terjira
   module OptionSelector
     delegate :get, :set, :fetch, to: :resource_store
 
+    def with_editor=(with_editor = false)
+      @with_editor = with_editor
+    end
+
+    def with_editor?
+      @with_editor || false
+    end
+
     def select_project
       fetch :project do
         projects = fetch(:projects) { Client::Project.all }
-        option_prompt.select('Choose project?', per_page: per_page(projects)) do |menu|
+        option_select_prompt.select('Choose project?', per_page: per_page(projects)) do |menu|
           projects.each { |project| menu.choice project_choice_title(project), project }
         end
       end
@@ -19,7 +28,7 @@ module Terjira
     def select_board(type = nil)
       fetch(:board) do
         boards = fetch(:boards) { Client::Board.all(type: type) }
-        option_prompt.select('Choose board?', per_page: per_page(boards)) do |menu|
+        option_select_prompt.select('Choose board?', per_page: per_page(boards)) do |menu|
           boards.sort_by(&:id).each do |board|
             menu.choice "#{board.key_value} - #{board.name}", board
           end
@@ -31,7 +40,7 @@ module Terjira
       fetch(:sprint) do
         board = select_board('scrum')
         sprints = fetch(:sprints) { Client::Sprint.all(board) }
-        option_prompt.select('Choose sprint?') do |menu|
+        option_select_prompt.select('Choose sprint?') do |menu|
           sort_sprint_by_state(sprints).each do |sprint|
             menu.choice sprint_choice_title(sprint), sprint
           end
@@ -53,7 +62,7 @@ module Terjira
           end
         end
 
-        option_prompt.select('Choose assignee?', per_page: per_page(users)) do |menu|
+        option_select_prompt.select('Choose assignee?', per_page: per_page(users)) do |menu|
           users.each { |user| menu.choice user_choice_title(user), user }
         end
       end
@@ -68,7 +77,7 @@ module Terjira
           set(:project, project)
         end
 
-        option_prompt.select('Choose issue type?') do |menu|
+        option_select_prompt.select('Choose issue type?') do |menu|
           project.issuetypes.each do |issuetype|
             menu.choice issuetype.name, issuetype
           end
@@ -91,7 +100,7 @@ module Terjira
           Client::Status.all(project)
         end
 
-        option_prompt.select('Choose status?') do |menu|
+        option_select_prompt.select('Choose status?') do |menu|
           statuses.each do |status|
             menu.choice status.name, status
           end
@@ -102,7 +111,7 @@ module Terjira
     def select_priority
       fetch(:priority) do
         priorities = fetch(:priorities) { Terjira::Client::Priority.all }
-        option_prompt.select('Choose priority?') do |menu|
+        option_select_prompt.select('Choose priority?') do |menu|
           priorities.each do |priority|
             menu.choice priority.name, priority
           end
@@ -113,7 +122,7 @@ module Terjira
     def select_resolution
       fetch(:resolution) do
         resolutions = fetch(:resolutions) { Terjira::Client::Resolution.all }
-        option_prompt.select('Choose resolution?') do |menu|
+        option_select_prompt.select('Choose resolution?') do |menu|
           resolutions.each do |resolution|
             menu.choice resolution.name, resolution
           end
@@ -133,15 +142,21 @@ module Terjira
 
     def write_comment
       fetch(:comment) do
-        comment = option_prompt.multiline("Comment? (Return empty line for finish)\n")
-        comment.join("") if comment
+        if with_editor?
+          Editor.editor_text
+        else
+          prompt_multiline('Comment')
+        end
       end
     end
 
     def write_description
       fetch(:description) do
-        desc = option_prompt.multiline("Description? (Return empty line for finish)\n")
-        desc.join("") if desc
+        if with_editor?
+          Editor.editor_text
+        else
+          prompt_multiline('Description')
+        end
       end
     end
 
@@ -155,6 +170,11 @@ module Terjira
 
     private
 
+    def prompt_multiline(prompt_for)
+      result = option_prompt.multiline("#{prompt_for}?")
+      result.join("") if result
+    end
+
     def sprint_choice_title(sprint)
       "#{sprint.key_value} - #{sprint.name} (#{sprint.state.capitalize})"
     end
@@ -172,7 +192,27 @@ module Terjira
     end
 
     def option_prompt
-      @option_prompt ||= TTY::Prompt.new
+      @option_prompt ||= TTY::Prompt.new(help_color: :cyan)
+    end
+
+    def option_select_prompt
+      return @_option_select_prompt if @_option_select_prompt
+      @_option_select_prompt = TTY::Prompt.new(help_color: :cyan)
+      @_option_select_prompt.on(:keypress) do |event|
+        # emacs key binding
+        { "\u000E" => :keydown, "\u0010" => :keyup }.each do |key, action|
+          if event.value == key
+            @_option_select_prompt.trigger(action)
+          end
+        end
+        # vim key binding
+        { 'j' => :keydown, 'k' => :keyup, 'h' => :keyleft, 'l' => :keyright }.each do |key, action|
+          if event.value == key
+            @_option_select_prompt.trigger(action)
+          end
+        end
+      end
+      @_option_select_prompt
     end
 
     def per_page(objects)

data/lib/terjira/option_support/shared_options.rb

@@ -58,6 +58,10 @@ module Terjira
       'epiclink' => {
         type: :string,
         aliases: '-e'
+      },
+      'editor' => {
+        type: :boolean,
+        aliases: '-E'
       }
     }.freeze
 

data/lib/terjira/option_supportable.rb

@@ -31,6 +31,7 @@ module Terjira
     # and suggest list of option values
     def suggest_options(opts = {})
       origin = options.dup
+      self.with_editor = origin.delete(:editor)
 
       if opts[:required].is_a? Array
         opts[:required].inject(origin) do |memo, opt|

data/lib/terjira/version.rb

@@ -1,7 +1,7 @@
 require 'terjira/utils/file_cache'
 
 module Terjira
-  VERSION = '0.3.6'.freeze
+  VERSION = '0.3.7'.freeze
 
   class VersionChecker
     VERSION_CHECK_DURATION = (60 * 60 * 24 * 5).freeze

data/terjira.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", "~> 0.19.0"
-  spec.add_dependency "jira-ruby", "~> 1.1.3"
+  spec.add_dependency "jira-ruby", "1.1.3"
   spec.add_dependency "activesupport", "4.0.13"
 
   spec.add_dependency "tty-table", "~> 0.8.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terjira
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jaehyun Shin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,14 +28,14 @@ dependencies:
   name: jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
@@ -225,6 +225,7 @@ files:
 - lib/terjira/client/user.rb
 - lib/terjira/ext/jira_ruby.rb
 - lib/terjira/issue_cli.rb
+- lib/terjira/option_support/editor.rb
 - lib/terjira/option_support/option_selector.rb
 - lib/terjira/option_support/resource_store.rb
 - lib/terjira/option_support/shared_options.rb