terjira 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 046f6b4a0d275e738467f4943cad18704099fd46
-  data.tar.gz: edc47213f38ef1f61a3f821d267fb8685e720b50
+  metadata.gz: f11a8a9fa0c0931b13e265d38d66666ea03a650c
+  data.tar.gz: e6efe989e6b5675eca1d6a90172c65ceeb45962e
 SHA512:
-  metadata.gz: 897effd0059c257a5c1dc3395e560952f2d57be60030c3386f7f88812e8b11d8a010069b2d1988497e2a04d8f869ae37fabc2acfd0bd482393b85b6c084039d4
-  data.tar.gz: 94b7ccc46b256f99dffcb52b54bbbf7a5db57ef76942e7faca6edd09e8e7d1175ed0bddacbadf076971436baebec343a96976aa328c8e3428904358814885f65
+  metadata.gz: 5f89121e0d5ac1ad6c38d665aa365a24c2804a9edd809cfda43bdf6d8b9911cf477fb403fc87b57cebf79b57ecd9131c1b7a12136f650e8c90f98d1b37a752b8
+  data.tar.gz: 38da5187eb7c15064293049120340d2f6c74702e70ab41c05f1eca7f7074a938a57e9d45ba1c6c0413458043ec4a71101dc851814942b25ad447310f1329e9d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terjira (0.3.9)
+    terjira (0.4.1)
       activesupport (= 4.1.11)
       jira-ruby (= 1.5.0)
       thor (~> 0.19.0)
@@ -25,7 +25,7 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     equatable (0.5.0)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jira-ruby (1.5.0)
       activesupport
@@ -33,7 +33,7 @@ GEM
       oauth (~> 0.5, >= 0.5.0)
     json (1.8.6)
     method_source (0.8.2)
-    minitest (5.10.3)
+    minitest (5.11.3)
     multipart-post (2.0.0)
     necromancer (0.4.0)
     oauth (0.5.4)
@@ -82,7 +82,7 @@ GEM
       tty-screen (~> 0.5.0)
       unicode-display_width (~> 1.1.0)
       verse (~> 0.5.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.3)
     unicode_utils (1.4.0)
@@ -104,4 +104,4 @@ DEPENDENCIES
   terjira!
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/README.md

@@ -72,6 +72,8 @@ Issue:
   jira issue attach_file [ISSUE_KEY] ([FILE_PATH])  #Attach a file to issue
   jira issue comment [ISSUE_KEY]     # Write comment on the issue
                                      #   pass `-E` or `--editor` to open system default editor for composing comment
+  jira issue edit_comment [ISSUE_KEY] ([COMMENT_ID])     # Edit user's comment on the issue.
+                                     #   If COMMENT_ID is not given, it will choose user's last 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

data/lib/terjira/client/issue.rb

@@ -47,6 +47,11 @@ module Terjira
           find(issue)
         end
 
+        def edit_comment(issue, comment_id, message)
+          api_put("issue/#{issue.key_value}/comment/#{comment_id}", { body: message }.to_json)
+          find(issue)
+        end
+
         def create(options = {})
           params = extract_to_fields_params(options)
           resp = api_post 'issue', params.to_json

data/lib/terjira/issue_cli.rb

@@ -94,6 +94,31 @@ module Terjira
       render_issue_detail(issue)
     end
 
+    desc 'edit_comment [ISSUE_KEY] ([COMMENT_ID])',
+         "Edit user's comment on the issue.
+          If COMMENT_ID is not given, it will choose user's last comment"
+    jira_options :comment_id, :editable_comment
+    def edit_comment(issue, comment_id = '')
+      opts = suggest_options(
+        resources: { issue: issue, comment_id: comment_id },
+        required: [:editable_comment]
+      )
+
+      if opts['editable_comment'].present?
+        selected_comment = opts['editable_comment']['selected_comment']
+        new_content = opts['editable_comment']['new_content']
+
+        issue = client_class.edit_comment(
+          issue,
+          selected_comment.id,
+          new_content
+        )
+        render_issue_detail(issue)
+      else
+        render("You don't have any editable comment.")
+      end
+    end
+
     desc 'attach_file [ISSUE_KEY] [FILE]', 'Attach a file to the issue'
     jira_options :file
     def attach_file(issue, file)

data/lib/terjira/option_support/editor.rb

@@ -2,13 +2,15 @@
 
 module Terjira
   class Editor
-    def self.editor_text
+    def self.editor_text(content = '')
       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')
+      tmp_file.write(content)
+      tmp_file.close
       success = system "#{editor} #{tmp_file.path}"
       content = File.read(tmp_file.path) if success
 

data/lib/terjira/option_support/option_selector.rb

@@ -19,9 +19,12 @@ module Terjira
     def select_project
       fetch :project do
         projects = fetch(:projects) { Client::Project.all }
-        option_select_prompt.select('Choose project?', per_page: per_page(projects)) do |menu|
-          projects.each { |project| menu.choice project_choice_title(project), project }
-        end
+        selected_project =
+          option_select_prompt.select('Choose project?', per_page: per_page(projects)) do |menu|
+            projects.each { |project| menu.choice project_choice_title(project), project }
+          end
+
+        Client::Project.find(selected_project.id)
       end
     end
 
@@ -150,6 +153,18 @@ module Terjira
       end
     end
 
+    def update_comment
+      fetch(:editable_comment) do
+        selected_comment = user_comment
+
+        if selected_comment.present?
+          new_content = Editor.editor_text(selected_comment.body)
+
+          { 'selected_comment' => selected_comment, 'new_content' => new_content }
+        end
+      end
+    end
+
     def write_description
       fetch(:description) do
         if with_editor?
@@ -170,6 +185,31 @@ module Terjira
 
     private
 
+    def user_comment
+      comment_id = get(:comment_id)
+
+      if comment_id.present?
+        user_comments.detect do |c|
+          c.id == comment_id && c.author['name'] == current_username
+        end
+      else
+        user_comments.reverse.detect do |c|
+          c.author['name'] == current_username
+        end
+      end
+    end
+
+    def user_comments
+      issue = Client::Issue.find(get(:issue))
+
+      unless issue.comments.empty?
+        issue
+          .comments
+          .reverse
+          .select { |c| c.author['name'] == current_username }
+      end || []
+    end
+
     def prompt_multiline(prompt_for)
       result = option_prompt.multiline("#{prompt_for}?")
       result.join("") if result

data/lib/terjira/option_supportable.rb

@@ -24,7 +24,8 @@ module Terjira
       priority: :select_priority,
       resolution: :select_resolution,
       epiclink: :write_epiclink_key,
-      comment: :write_comment
+      comment: :write_comment,
+      editable_comment: :update_comment
     }.freeze
 
     # Transforming and clening options

data/lib/terjira/presenters/issue_presenter.rb

@@ -122,8 +122,13 @@ module Terjira
         <%= pastel.dim('- ' + remain_comments.size.to_s + ' previous comments exist -') %>
       <% end -%>
       <% visiable_comments.each do |comment| -%>
+
+        <% id = comment.id -%>
+        <% author = comment.author['displayName'] -%>
+        <% created_at = formatted_date(comment.created) -%>
+
         <%= comment.body %>
-        - <%= comment.author['displayName'] %> <%= formatted_date(comment.created) %>
+        - (ID: <%= id %>) <%= author %> <%= created_at %>
       <% end -%>
       """
     end

data/lib/terjira/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terjira
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jaehyun Shin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor