git-issue 0.8.2 → 0.8.3

data/Gemfile

@@ -3,3 +3,4 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in named_let.gemspec
 gem 'activesupport'
 gem 'pit'
+gem 'term-ansicolor'

data/README.markdown

@@ -21,7 +21,7 @@ now available issue-tracker system is Redmine and Github-issues.
     $ gem install jeweler
     $ rake install
 
-## Configuration
+## Configuration(Redmine)
 
 set type of issue traking system(redmine or github)
 
@@ -43,6 +43,16 @@ set your account name if using github.
 
     $ git config issue.user yuroyoro
 
+## Configuration(Github Issues)
+
+set type of issue traking system(redmine or github)
+
+    $ git config issue.type github
+
+set user and password of github(for authentication)
+
+    $ EDITOR=vim pit set github
+
 ## Usage(Redmine)
 
     git issue <command> [ticket_id] [<args>]

data/lib/git_issue.rb

@@ -16,6 +16,7 @@ require 'optparse'
 require 'tempfile'
 require 'active_support/all'
 require 'shellwords'
+require 'term/ansicolor'
 
 module GitIssue
   class Command
@@ -39,8 +40,9 @@ module GitIssue
 
 
     def configured_value(name, trim = true)
-      res = `git config issue.#{name}`
-      trim ? res.strip : res
+      res = `git config #{name}`
+      res = trim ? res.strip : res
+      res
     end
 
     def global_configured_value(name)
@@ -129,7 +131,7 @@ module GitIssue
     status = true
 
     begin
-      its_type = Helper.configured_value('type')
+      its_type = Helper.configured_value('issue.type')
 
       # Use global config for hub
       if its_type.blank?

data/lib/git_issue/base.rb

@@ -2,6 +2,7 @@
 
 class GitIssue::Base
   include GitIssue::Helper
+  include Term::ANSIColor
 
   attr_reader :apikey, :command, :tickets, :options
   attr_accessor :sysout, :syserr
@@ -251,6 +252,7 @@ class GitIssue::Base
       opts.on("--remote=VALUE",     'on publish, remote repository to push branch ') {|v| @options[:remote] = v}
       opts.on("--onto=VALUE",       'on rebase, start new branch with HEAD equal to "newbase" ') {|v| @options[:onto] = v}
 
+      opts.on("--no-color", "turn off colored output"){@no_color = true }
       opts.on("--debug", "debug print"){@debug= true }
     }
 
@@ -264,6 +266,8 @@ class GitIssue::Base
     @syserr.puts msg
   end
 
-
+  def apply_colors(str, *colors)
+    @no_color.present? ? str : (colors.map(&method(:send)) + [str, reset]).join
+  end
 end
 

data/lib/git_issue/github.rb

@@ -7,17 +7,28 @@ class GitIssue::Github < GitIssue::Base
   def initialize(args, options = {})
     super(args, options)
 
-    url = `git config remote.origin.url`.strip
-    @repo = url.match(/github.com[:\/](.+)\.git/)[1]
+    @repo = configured_value('issue.repo')
+    if @repo.blank?
+      url = `git config remote.origin.url`.strip
+      @repo = url.match(/github.com[:\/](.+)\.git/)[1]
+    end
 
-    @user = options[:user] || configured_value('user')
+    @user = options[:user] || configured_value('issue.user')
     @user = global_configured_value('github.user') if @user.blank?
     @user = Pit.get("github", :require => {
         "user" => "Your user name in GitHub",
     })["user"] if @user.blank?
 
     configure_error('user', "git config issue.user yuroyoro")  if @user.blank?
-    @sslNoVerify = @options[:sslNoVerify] &&  RUBY_VERSION < '1.9.0'
+    @ssl_options = {}
+    if @options.key?(:sslNoVerify) && RUBY_VERSION < "1.9.0"
+      @ssl_options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE
+    elsif configured_value('http.sslVerify') == "false"
+      @ssl_options[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE
+    end
+    if (ssl_cert = configured_value('http.sslCert'))
+      @ssl_options[:ssl_ca_cert] = ssl_cert
+    end
   end
 
   def commands
@@ -54,7 +65,7 @@ class GitIssue::Github < GitIssue::Base
 
     url = to_url("repos", @repo, 'issues')
 
-    issues = fetch_json(url, params)
+    issues = fetch_json(url, options, params)
     issues = issues.sort_by{|i| i['number'].to_i} unless params[:sort] || params[:direction]
 
     t_max = issues.map{|i| mlength(i['title'])}.max
@@ -64,12 +75,12 @@ class GitIssue::Github < GitIssue::Base
     or_zero = lambda{|v| v.blank? ? "0" : v }
 
     issues.each do |i|
-      puts sprintf("#%-4d  %s  %s  %s  %s c:%s v:%s p:%s %s %s",
-                   i['number'].to_i,
-                   i['state'],
+      puts sprintf("%s  %s  %s  %s  %s c:%s v:%s p:%s %s %s",
+                   apply_fmt_colors(:id, sprintf('#%-4d', i['number'].to_i)),
+                   apply_fmt_colors(:state, i['state']),
                    mljust(i['title'], t_max),
-                   mljust(i['user']['login'], u_max),
-                   mljust(i['labels'].map{|l| l['name']}.join(','), l_max),
+                   apply_fmt_colors(:login, mljust(i['user']['login'], u_max)),
+                   apply_fmt_colors(:labels, mljust(i['labels'].map{|l| l['name']}.join(','), l_max)),
                    or_zero.call(i['comments']),
                    or_zero.call(i['votes']),
                    or_zero.call(i['position']),
@@ -185,18 +196,9 @@ class GitIssue::Github < GitIssue::Base
     URI.join(ROOT, path_list.join("/"))
   end
 
-  def fetch_json(url, params = {})
-    url += "?" + params.map{|k,v| "#{k}=#{v}"}.join("&") unless params.empty?
-
-    puts url if @debug
-
-    password = options[:password] || get_password(@user)
-    opt = {"Authorization" => "Basic " + Base64.encode64("#{@user}:#{password}")}
-
-    opt[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE if @sslNoVerify
-    json = open(url, opt) {|io|
-      JSON.parse(io.read)
-    }
+  def fetch_json(url, options = {}, params = {})
+    response = send_request(url, {},options, params, :get)
+    json = JSON.parse(response.body)
 
     if @debug
       puts '-' * 80
@@ -210,8 +212,8 @@ class GitIssue::Github < GitIssue::Base
 
   def fetch_issue(ticket_id, params = {})
     url = to_url("repos", @repo, 'issues', ticket_id)
-    url += "?" + params.map{|k,v| "#{k}=#{v}"}.join("&") unless params.empty?
-    json = fetch_json(url)
+    # url += "?" + params.map{|k,v| "#{k}=#{v}"}.join("&") unless params.empty?
+    json = fetch_json(url, {}, params)
 
     issue = json['issue'] || json
     raise "no such issue #{ticket} : #{base}" unless issue
@@ -231,7 +233,7 @@ class GitIssue::Github < GitIssue::Base
   end
 
   def post_json(url, json, options, params = {})
-    response = send_json(url, json, options, params, :post)
+    response = send_request(url, json, options, params, :post)
     json = JSON.parse(response.body)
 
     raise error_message(json) unless response_success?(response)
@@ -239,7 +241,7 @@ class GitIssue::Github < GitIssue::Base
   end
 
   def put_json(url, json, options, params = {})
-    response = send_json(url, json, options, params, :put)
+    response = send_request(url, json, options, params, :put)
     json = JSON.parse(response.body)
 
     raise error_message(json) unless response_success?(response)
@@ -252,7 +254,7 @@ class GitIssue::Github < GitIssue::Base
     msg.join("\n  ")
   end
 
-  def send_json(url, json, options, params = {}, method = :post)
+  def send_request(url, json = {}, options = {}, params = {}, method = :post)
     url = "#{url}"
     uri = URI.parse(url)
 
@@ -265,8 +267,23 @@ class GitIssue::Github < GitIssue::Base
 
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = true
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    https.verify_mode = @ssl_options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_NONE
+
+    store = OpenSSL::X509::Store.new
+    if @ssl_options[:ssl_ca_cert].present?
+      if File.directory? @ssl_options[:ssl_ca_cert]
+        store.add_path @ssl_options[:ssl_ca_cert]
+      else
+        store.add_file @ssl_options[:ssl_ca_cert]
+      end
+      http.cert_store = store
+    else
+      store.set_default_paths
+    end
+    https.cert_store = store
+
     https.set_debug_output $stderr if @debug && https.respond_to?(:set_debug_output)
+
     https.start{|http|
 
       path = "#{uri.path}"
@@ -275,6 +292,7 @@ class GitIssue::Github < GitIssue::Base
       request = case method
         when :post then Net::HTTP::Post.new(path)
         when :put  then Net::HTTP::Put.new(path)
+        when :get  then Net::HTTP::Get.new(path)
         else raise "unknown method #{method}"
       end
 
@@ -287,7 +305,7 @@ class GitIssue::Github < GitIssue::Base
       request.basic_auth @user, password
 
       request.set_content_type("application/json")
-      request.body = json.to_json
+      request.body = json.to_json if json.present?
 
       response = http.request(request)
       if @debug
@@ -331,7 +349,7 @@ class GitIssue::Github < GitIssue::Base
       end
     end
 
-    msg << sprintf("%s : %s", mljust('labels', 18), issue['labels'].map{|l| l['name']}.join(","))
+    msg << sprintf("%s : %s", mljust('labels', 18), apply_fmt_colors(:labels, issue['labels'].map{|l| l['name']}.join(",")))
     msg << sprintf("%s : %s", mljust('html_url', 18), issue['html_url'])
     msg << sprintf("%s : %s", mljust('updated_at', 18), Time.parse(issue['updated_at']))
 
@@ -352,14 +370,14 @@ class GitIssue::Github < GitIssue::Base
   end
 
   def issue_title(issue)
-    "[#{issue['state']}] ##{issue['number']} #{issue['title']}"
+    "[#{apply_fmt_colors(:state, issue['state'])}] #{apply_fmt_colors(:id, "##{issue['number']}")} #{issue['title']}"
   end
 
   def issue_author(issue)
     author     = issue['user']['login']
     created_at = issue['created_at']
 
-    msg = "#{author} opened this issue #{Time.parse(created_at)}"
+    msg = "#{apply_fmt_colors(:login, author)} opened this issue #{Time.parse(created_at)}"
     msg
   end
 
@@ -399,5 +417,14 @@ class GitIssue::Github < GitIssue::Base
     opts
   end
 
+  def apply_fmt_colors(key, str)
+    fmt_colors[key.to_sym] ? apply_colors(str, *Array(fmt_colors[key.to_sym])) : str
+  end
+
+  def fmt_colors
+    @fmt_colors ||= { :id => [:bold, :cyan], :state => :blue,
+      :login => :magenta, :labels => :yellow}
+  end
+
 end
 end

data/lib/git_issue/redmine.rb

@@ -6,15 +6,15 @@ class Redmine < GitIssue::Base
   def initialize(args, options = {})
     super(args, options)
 
-    @apikey = options[:apikey] || configured_value('apikey')
+    @apikey = options[:apikey] || configured_value('issue.apikey')
     configure_error('apikey', "git config issue.apikey some_api_key") if @apikey.blank?
 
-    @url = options[:url] || configured_value('url')
+    @url = options[:url] || configured_value('issue.url')
     configure_error('url', "git config issue.url http://example.com/redmine")  if @url.blank?
   end
 
   def default_cmd
-    Helper.configured_value('project').blank? ? :list : :project
+    Helper.configured_value('issue.project').blank? ? :list : :project
   end
 
   def commands
@@ -71,7 +71,7 @@ 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')
+    project_id = options[:project_id] || Helper.configured_value('issue.project')
     if options.slice(*property_names).empty?
       issue = read_issue_from_editor({"project" => {"id" => project_id}}, options)
       description = issue.delete(:notes)
@@ -85,7 +85,7 @@ class Redmine < GitIssue::Base
     end
 
     json = build_issue_json(options, property_names)
-    json["issue"][:project_id] ||= Helper.configured_value('project')
+    json["issue"][:project_id] ||= Helper.configured_value('issue.project')
 
     url = to_url('issues')
 
@@ -144,7 +144,7 @@ class Redmine < GitIssue::Base
   end
 
   def project(options = {})
-    project_id = Helper.configured_value('project')
+    project_id = Helper.configured_value('issue.project')
     project_id = options[:ticket_id] if project_id.blank?
     raise 'project_id is required.' unless project_id
     list(options.merge(:query => "project_id=#{project_id}"))
@@ -204,6 +204,10 @@ class Redmine < GitIssue::Base
     end
 
     http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
     http.set_debug_output $stderr if @debug && http.respond_to?(:set_debug_output)
     http.start{|http|
 
@@ -238,7 +242,7 @@ class Redmine < GitIssue::Base
 
 
   def issue_title(issue)
-    "[#{issue['project']['name']}] #{issue['tracker']['name']} ##{issue['id']} #{issue['subject']}"
+    "[#{apply_colors(issue['project']['name'], :green)}] #{apply_colors(issue['tracker']['name'], :yellow)} #{apply_fmt_colors(:id, "##{issue['id']}")} #{issue['subject']}"
   end
 
   def issue_author(issue)
@@ -246,7 +250,7 @@ class Redmine < GitIssue::Base
     created_on = issue['created_on']
     updated_on = issue['updated_on']
 
-    msg = "#{author}が#{time_ago_in_words(created_on)}に追加"
+    msg = "#{apply_fmt_colors(:assigned_to, author)}が#{time_ago_in_words(created_on)}に追加"
     msg += ", #{time_ago_in_words(updated_on)}に更新" unless created_on == updated_on
     msg
   end
@@ -276,13 +280,13 @@ class Redmine < GitIssue::Base
     add_prop = Proc.new{|name|
       title = property_title(name)
       value = issue[name] || ""
-      props << [title, value]
+      props << [title, value, name]
     }
     add_prop_name = Proc.new{|name|
       title = property_title(name)
       value = ''
       value = prop_name.call(name)
-      props << [title, value]
+      props << [title, value, name]
     }
 
     add_prop_name.call('status')
@@ -297,12 +301,13 @@ class Redmine < GitIssue::Base
     # acd custom_fields if it have value.
     if custom_fields = issue[:custom_fields] && custom_fields.reject{|cf| cf['value'].nil? || cf['value'].empty? }
       custom_fields.each do |cf|
-        props << [cf['name'], cf['value']]
+        props << [cf['name'], cf['value'], cf['name']]
       end
     end
 
     props.each_with_index do |p,n|
-      row = sprintf("%s : %s", mljust(p.first, 18), mljust(p.last.to_s, 24))
+      title, value, name = p
+      row = sprintf("%s : %s", mljust(title, 18), apply_fmt_colors(name, mljust(value.to_s, 24)))
       if n % 2 == 0
         msg << row
       else
@@ -367,7 +372,7 @@ class Redmine < GitIssue::Base
   def format_jounal(j, n)
     jnl = []
 
-    jnl << "##{n + 1} - #{j['user']['name']}が#{time_ago_in_words(j['created_on'])}に更新"
+    jnl << "##{n + 1} - #{apply_fmt_colors(:assigned_to, j['user']['name'])}が#{time_ago_in_words(j['created_on'])}に更新"
     jnl << "-" * 78
     j['details'].each do |d|
       log = "#{property_title(d['name'])}を"
@@ -385,7 +390,7 @@ class Redmine < GitIssue::Base
   def format_changesets(changesets)
     cs = []
     changesets.sort_by{|c| c['committed_on'] }.each do |c|
-      cs << "リビジョン: #{c['revision'][0..10]} #{c['user']['name']}が#{time_ago_in_words(c['committed_on'])}に追加"
+      cs << "リビジョン: #{apply_colors(c['revision'][0..10], :cyan)} #{apply_fmt_colors(:assigned_to, c['user']['name'])}が#{time_ago_in_words(c['committed_on'])}に追加"
       cs +=  c['comments'].split("\n").to_a
       cs << ""
     end
@@ -395,10 +400,12 @@ class Redmine < GitIssue::Base
   def format_relations(relations)
     relations.map{|r|
       issue = fetch_issue(r['issue_id'])
-      "#{relations_label(r['relation_type'])} #{issue_title(issue)} #{issue['status']['name']} #{issue['start_date']} "
+      "#{relations_label(r['relation_type'])} #{issue_title(issue)} #{apply_fmt_colors(:status, issue['status']['name'])} #{issue['start_date']} "
     }
   end
 
+  DEFAULT_FORMAT = "%I  %S | %A | %s %T %P | %V %C |"
+
   def format_issue_tables(issues_json)
     name_of = lambda{|issue, name| issue[name]['name'] rescue ""}
 
@@ -429,7 +436,9 @@ class Redmine < GitIssue::Base
       :subject => 80
     }
 
-    fmt = configured_value('defaultformat', false)
+    fmt = configured_value('issue.defaultformat', false)
+    fmt = DEFAULT_FORMAT unless fmt.present?
+
     fmt_chars =  { :I => :id, :S => :subject,
       :A => :assigned_to, :s => :status,  :T => :tracker,
       :P => :priority,    :p => :project, :V => :version,
@@ -440,7 +449,9 @@ class Redmine < GitIssue::Base
       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]
+          str = max ? mljust(i[v], max) : i[v]
+          colored =  fmt_colors[v] ? apply_fmt_colors(v, str) : str
+          colored
         end
       end
       res
@@ -449,6 +460,16 @@ class Redmine < GitIssue::Base
     issues.map{|i| format_to.call(i) }
   end
 
+  def apply_fmt_colors(key, str)
+    fmt_colors[key.to_sym] ? apply_colors(str, *Array(fmt_colors[key.to_sym])) : str
+  end
+
+  def fmt_colors
+    @fmt_colors ||= { :id => [:bold, :cyan], :status => :blue,
+      :priority => :green, :assigned_to => :magenta,
+      :tracker => :yellow}
+  end
+
   def output_issues(issues)
     if options[:raw_id]
       issues.each do |i|
@@ -482,7 +503,7 @@ class Redmine < GitIssue::Base
   def read_issue_from_editor(issue, options = {})
     id_of = lambda{|name| issue[name] ? sprintf('%2s : %s', issue[name]["id"] , issue[name]['name'] ): ""}
 
-    memofile = configured_value('memofile')
+    memofile = configured_value('issue.memofile')
     memo = File.open(memofile).read.lines.map{|l| "# #{l}"}.join("") unless memofile.blank?
 
     message = <<-MSG

data/lib/git_issue/version.rb

@@ -1,3 +1,3 @@
 module GitIssue
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-issue
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Tomohito Ozaki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 +09:00
+date: 2012-06-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency