git-issue 0.7.8 → 0.8.0

data/lib/git_issue.rb

@@ -15,6 +15,7 @@ require 'json'
 require 'optparse'
 require 'tempfile'
 require 'active_support/all'
+require 'shellwords'
 
 module GitIssue
   class Command
@@ -56,7 +57,72 @@ module GitIssue
       end
     end
 
-    module_function :configured_value, :global_configured_value, :configure_error, :its_klass_of
+    def git_editor
+      # possible: ~/bin/vi, $SOME_ENVIRONMENT_VARIABLE, "C:\Program Files\Vim\gvim.exe" --nofork
+      editor = `git var GIT_EDITOR`
+      editor = ENV[$1] if editor =~ /^\$(\w+)$/
+      editor = File.expand_path editor if (editor =~ /^[~.]/ or editor.index('/')) and editor !~ /["']/
+      editor.shellsplit
+    end
+
+    def git_dir
+      `git rev-parse -q --git-dir`.strip
+    end
+
+    def split_head_and_body(text)
+      title, body = '', ''
+      text.each_line do |line|
+        next if line.index('#') == 0
+        ((body.empty? and line =~ /\S/) ? title : body) << line
+      end
+      title.tr!("\n", ' ')
+      title.strip!
+      body.strip!
+
+      [title =~ /\S/ ? title : nil, body =~ /\S/ ? body : nil]
+    end
+
+    def read_body(file)
+      f = open(file)
+      body = f.read
+      f.close
+      body.strip
+    end
+
+    def get_title_and_body_from_editor(message=nil)
+      open_editor(message) do |text|
+        title, body = split_head_and_body(text)
+        abort "Aborting due to empty issue title" unless title
+        [title, body]
+      end
+    end
+
+    def get_body_from_editor(message=nil)
+      open_editor(message) do |text|
+        abort "Aborting due to empty message" if text.empty?
+        text
+      end
+    end
+
+    def open_editor(message = nil, abort_if_not_modified = true , &block)
+      message_file = File.join(git_dir, 'ISSUE_MESSAGE')
+      File.open(message_file, 'w') { |msg|
+        msg.puts message
+      }
+      edit_cmd = Array(git_editor).dup
+      edit_cmd << '-c' << 'set ft=gitcommit' if edit_cmd[0] =~ /^[mg]?vim$/
+      edit_cmd << message_file
+
+      system(*edit_cmd)
+      abort "can't open text editor for issue message" unless $?.success?
+
+      text = read_body(message_file)
+      abort "Aborting cause messages didn't modified." if message == text && abort_if_not_modified
+
+      yield text
+    end
+
+    module_function :configured_value, :global_configured_value, :configure_error, :its_klass_of, :get_title_and_body_from_editor, :get_body_from_editor
   end
 
   def self.main(argv)

data/lib/git_issue/base.rb

@@ -179,13 +179,11 @@ class GitIssue::Base
     s.split(//u).each do |c|
       next if cnt > n
       chars << c
-      cnt += 1
-      cnt += 1 if c.length > 1
+      cnt += c =~ /^[^ -~｡-ﾟ]*$/ ? 2 : 1
     end
     if cnt > n
       chars.pop
-      cnt -= 1
-      cnt -= 1 if chars.last.length > 1
+      cnt -= chars.last =~ /^[^ -~｡-ﾟ]*$/ ? 2 : 1
     end
     chars << " " * (n - cnt) if n > cnt
     chars.join
@@ -266,5 +264,6 @@ class GitIssue::Base
     @syserr.puts msg
   end
 
+
 end
 

data/lib/git_issue/github.rb

@@ -7,10 +7,6 @@ class GitIssue::Github < GitIssue::Base
   def initialize(args, options = {})
     super(args, options)
 
-    @apikey = options[:apikey] || configured_value('apikey')
-    @apikey = global_configured_value('github.token') if @apikey.blank?
-    configure_error('apikey', "git config issue.apikey some_api_key") if @apikey.blank?
-
     url = `git config remote.origin.url`.strip
     @repo = url.match(/github.com[:\/](.+)\.git/)[1]
 
@@ -27,6 +23,7 @@ class GitIssue::Github < GitIssue::Base
   def commands
     cl = super
     cl << GitIssue::Command.new(:mention, :men, 'create a comment to given issue')
+    cl << GitIssue::Command.new(:close , :cl, 'close an issue with comment. comment is optional.')
   end
 
   def show(options = {})
@@ -89,9 +86,14 @@ class GitIssue::Github < GitIssue::Base
   def add(options = {})
     property_names = [:title, :body, :assignee, :milestone, :labels]
 
-    required_properties = [:title]
-    required_properties.each do |name|
-      options[name] = prompt(name) unless options[name]
+    message = <<-MSG
+### Write title here ###
+
+### descriptions here ###
+    MSG
+
+    unless options[:title]
+      options[:title], options[:body] = get_title_and_body_from_editor(message)
     end
 
     json = build_issue_json(options, property_names)
@@ -107,6 +109,12 @@ class GitIssue::Github < GitIssue::Base
 
     property_names = [:title, :body, :assignee, :milestone, :labels, :state]
 
+    if options.slice(*property_names).empty?
+      issue = fetch_issue(ticket)
+      message = "#{issue['title']}\n\n#{issue['body']}"
+      options[:title], options[:body] = get_title_and_body_from_editor(message)
+    end
+
     json = build_issue_json(options, property_names)
     url = to_url("repos", @repo, 'issues', ticket)
 
@@ -119,8 +127,8 @@ class GitIssue::Github < GitIssue::Base
     ticket = options[:ticket_id]
     raise 'ticket_id is required.' unless ticket
 
-    body = options[:body]
-    raise 'commnet body is required.' unless body
+    body = options[:body] || get_body_from_editor("### comment here ###")
+    raise 'comment body is required.' if body.empty?
 
     json = { :body => body }
     url = to_url("repos", @repo, 'issues', ticket, 'comments')
@@ -151,6 +159,24 @@ class GitIssue::Github < GitIssue::Base
     show(options)
   end
 
+  def close(options = {})
+    ticket = options[:ticket_id]
+    raise 'ticket_id is required.' unless ticket
+
+    body = options[:body] || get_body_from_editor("### comment here ###")
+
+    json = {:state => 'closed' }
+    url = to_url("repos", @repo, 'issues', ticket)
+
+    issue = post_json(url, json, options)
+
+    comment_json = { :body => body }
+    comment_url = to_url("repos", @repo, 'issues', ticket, 'comments')
+    post_json(comment_url, comment_json, options)
+
+    puts "closed issue #{oneline_issue(issue)}"
+  end
+
   private
 
   ROOT = 'https://api.github.com/'
@@ -367,7 +393,7 @@ class GitIssue::Github < GitIssue::Base
     opts.on("--direction=VALUE", "Query of listing issues, (asc or desc,  default: desc.)"){|v| @options[:direction] = v }
     opts.on("--since=VALUE", "Query of listing issue, (Optional string of a timestamp in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ)"){|v| @options[:since] = v }
 
-    opts.on("--password=VALUE", "For Authorizaion of create/update issue.  Github API v3 does'nt supports API token base authorization for now. then, use Basic Authorizaion instead token." ){|v| @options[:password]}
+    opts.on("--password=VALUE", "For Authorizaion of create/update issue.  Github API v3 doesn't supports API token base authorization for now. then, use Basic Authorizaion instead token." ){|v| @options[:password]}
     opts.on("--sslnoverify", "don't verify SSL"){|v| @options[:sslNoVerify] = true}
     opts
   end

data/lib/git_issue/redmine.rb

@@ -71,6 +71,14 @@ class Redmine < GitIssue::Base
   def add(options = {})
     property_names = [:project_id, :subject, :description, :done_ratio, :status_id, :priority_id, :tracker_id, :assigned_to_id, :category_id, :fixed_version_id, :notes]
 
+    project_id = options[:project_id] || Helper.configured_value('project')
+    if options.slice(*property_names).empty?
+      issue = read_issue_from_editor({"project" => {"id" => project_id}}, options)
+      description = issue.delete(:notes)
+      issue[:description] = description
+      options.merge!(issue)
+    end
+
     required_properties = [:subject, :description]
     required_properties.each do |name|
       options[name] = prompt(name) unless options[name]
@@ -91,6 +99,13 @@ class Redmine < GitIssue::Base
 
     property_names = [:subject, :done_ratio, :status_id, :priority_id, :tracker_id, :assigned_to_id, :category_id, :fixed_version_id, :notes]
 
+    if options.slice(*property_names).empty?
+      org_issue = fetch_issue(ticket, options)
+      update_attrs = read_issue_from_editor(org_issue, options)
+      update_attrs = update_attrs.reject{|k,v| v.present? && org_issue[k] == v}
+      options.merge!(update_attrs)
+    end
+
     json = build_issue_json(options, property_names)
 
     url = to_url('issues', ticket)
@@ -421,7 +436,7 @@ class Redmine < GitIssue::Base
   end
 
   def build_issue_json(options, property_names)
-    json = {"issue" => property_names.inject({}){|h,k| h[k] = options[k] if options[k]; h} }
+    json = {"issue" => property_names.inject({}){|h,k| h[k] = options[k] if options[k].present?; h} }
 
     if custom_fields = options[:custom_fields]
       json['custom_fields'] = custom_fields.split(",").map{|s| k,*v = s.split(":");{'id' => k.to_i, 'value' => v.join }}
@@ -429,6 +444,62 @@ class Redmine < GitIssue::Base
     json
   end
 
+  def read_issue_from_editor(issue, options = {})
+    id_of = lambda{|name| issue[name] ? issue[name]["id"] : ""}
+
+    message = <<-MSG
+#{issue["subject"].present? ? issue["subject"].chomp : "### subject here ###"}
+
+Project  : #{id_of.call("project")}
+Tracker  : #{id_of.call("tracker")}
+Status   : #{id_of.call("status")}
+Priority : #{id_of.call("priority")}
+Category : #{id_of.call("category")}
+Assigned : #{id_of.call("assigned_to")}
+Version  : #{id_of.call("fixed_version")}
+
+### notes here ###
+MSG
+    body =  get_body_from_editor(message)
+
+    subject, dummy, project_id, tracker_id, status_id, priority_id, category_id, assigned_to_id, fixed_version_id, dummy, *notes = body.lines.to_a
+
+    notes = if notes.present?
+      notes.reject{|line| line.chomp == "### notes here ###"}.join("")
+    else
+      nil
+    end
+
+    if @debug
+      puts "------"
+      puts "sub: #{subject}"
+      puts "pid: #{project_id}"
+      puts "tid: #{tracker_id}"
+      puts "sid: #{status_id}"
+      puts "prd: #{priority_id}"
+      puts "cat: #{category_id}"
+      puts "ass: #{assigned_to_id}"
+      puts "vss: #{fixed_version_id}"
+      puts "nos: #{notes}"
+      puts "------"
+    end
+
+    take_id = lambda{|s|
+      x, i = s.chomp.split(":")
+      i.present? ? i.strip.to_i : nil
+    }
+
+    { :subject => subject.chomp, :project_id => take_id.call(project_id),
+      :tracker_id => take_id.call(tracker_id),
+      :status_id => take_id.call(status_id),
+      :priority_id => take_id.call(priority_id),
+      :category_id => take_id.call(category_id),
+      :assigned_to_id => take_id.call(assigned_to_id),
+      :fixed_version_id => take_id.call(fixed_version_id),
+      :notes => notes
+    }
+  end
+
   def opt_parser
     opts = super
     opts.on("--supperss_journals",   "-j", "do not show issue journals"){|v| @options[:supperss_journals] = true}

data/lib/git_issue/version.rb

@@ -1,3 +1,3 @@
 module GitIssue
-  VERSION = "0.7.8"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-issue
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
   - 8
-  version: 0.7.8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Tomohito Ozaki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 +09:00
+date: 2012-03-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency