git-issue 0.8.0 → 0.8.1

data/lib/git_issue.rb

@@ -38,9 +38,9 @@ module GitIssue
     end
 
 
-    def configured_value(name)
+    def configured_value(name, trim = true)
       res = `git config issue.#{name}`
-      res.strip
+      trim ? res.strip : res
     end
 
     def global_configured_value(name)

data/lib/git_issue/redmine.rb

@@ -278,7 +278,7 @@ class Redmine < GitIssue::Base
     add_prop_name = Proc.new{|name|
       title = property_title(name)
       value = ''
-      value = issue[name]['name'] if issue[name] && issue[name]['name']
+      value = "#{issue[name]['name']}(#{issue[name]['id']})" if issue[name] && issue[name]['name']
       props << [title, value]
     }
 
@@ -396,22 +396,53 @@ class Redmine < GitIssue::Base
   end
 
   def format_issue_tables(issues_json)
-    issues = issues_json.map{ |issue|
-      project     = issue['project']['name']     rescue ""
-      tracker     = issue['tracker']['name']     rescue ""
-      status      = issue['status']['name']      rescue ""
-      assigned_to = issue['assigned_to']['name'] rescue ""
-      [issue['id'], project, tracker, status, issue['subject'], assigned_to, issue['updated_on']]
+    name_of = lambda{|issue, name| issue[name]['name'] rescue ""}
+
+    issues = issues_json.map{ |issue|{
+      :id => sprintf("#%-4d", issue['id']), :subject => issue['subject'],
+      :project     => name_of.call(issue, 'project'),
+      :tracker     => name_of.call(issue, 'tracker'),
+      :status      => name_of.call(issue, 'status'),
+      :assigned_to => name_of.call(issue, 'assigned_to'),
+      :version     => name_of.call(issue, 'fixed_version'),
+      :priority    => name_of.call(issue, 'priority'),
+      :category    => name_of.call(issue, 'category'),
+      :updated_on  => issue['updated_on'].to_date
+    }}
+
+    max_of = lambda{|name, limit|
+      max = issues.map{|i| mlength(i[name])}.max
+      [max, limit].min
+    }
+    max_length = {
+      :project     => max_of.call(:project, 20),
+      :tracker     => max_of.call(:tracker, 20),
+      :status      => max_of.call(:status, 20),
+      :assigned_to => max_of.call(:assigned_to, 20),
+      :version     => max_of.call(:version, 20),
+      :priority    => max_of.call(:priority, 20),
+      :category    => max_of.call(:category, 20),
+      :subject => 80
     }
 
-    p_max = issues.map{|i| mlength(i[1])}.max
-    t_max = issues.map{|i| mlength(i[2])}.max
-    s_max = issues.map{|i| mlength(i[3])}.max
-    a_max = issues.map{|i| mlength(i[5])}.max
-
-    issues.map {|i|
-      sprintf("#%-4d  %s  %s  %s  %s %s  %s",  i[0].to_i, mljust(i[1], p_max), mljust(i[2], t_max), mljust(i[3], s_max),  mljust(i[4], 80), mljust(i[5], a_max), to_date(i[6]))
+    fmt = configured_value('defaultformat', false)
+    fmt_chars =  { :I => :id, :S => :subject,
+      :A => :assigned_to, :s => :status,  :T => :tracker,
+      :P => :priority,    :p => :project, :V => :version,
+      :C => :category,    :U => :updated_on }
+
+    format_to = lambda{|i|
+      res = fmt.dup
+      fmt_chars.each do |k, v|
+        res.gsub!(/\%(\d*)#{k}/) do |s|
+          max = $1.blank? ? max_length[v] : $1.to_i
+          max ? mljust(i[v], max) : i[v]
+        end
+      end
+      res
     }
+
+    issues.map{|i| format_to.call(i) }
   end
 
   def output_issues(issues)
@@ -445,7 +476,10 @@ class Redmine < GitIssue::Base
   end
 
   def read_issue_from_editor(issue, options = {})
-    id_of = lambda{|name| issue[name] ? issue[name]["id"] : ""}
+    id_of = lambda{|name| issue[name] ? sprintf('%2s : %s', issue[name]["id"] , issue[name]['name'] ): ""}
+
+    memofile = configured_value('memofile')
+    memo = File.open(memofile).read.lines.map{|l| "# #{l}"}.join("") unless memofile.blank?
 
     message = <<-MSG
 #{issue["subject"].present? ? issue["subject"].chomp : "### subject here ###"}
@@ -458,14 +492,16 @@ Category : #{id_of.call("category")}
 Assigned : #{id_of.call("assigned_to")}
 Version  : #{id_of.call("fixed_version")}
 
-### notes here ###
+# Please enter the notes for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts.
+#{memo}
 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("")
+      notes.reject{|l| l =~ /^#/}.join("")
     else
       nil
     end
@@ -485,7 +521,7 @@ MSG
     end
 
     take_id = lambda{|s|
-      x, i = s.chomp.split(":")
+      x, i, name = s.chomp.split(":")
       i.present? ? i.strip.to_i : nil
     }
 

data/lib/git_issue/version.rb

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

metadata

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