git-issue 0.8.5 → 0.8.6

data/lib/git_issue.rb

@@ -1,7 +1,11 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
-$KCODE="UTF8" if RUBY_VERSION < '1.9.0'
+if RUBY_VERSION < '1.9.0'
+  $KCODE = "UTF8"
+else
+  Encoding.default_external = Encoding.find('UTF-8')
+end
 
 require 'pp'
 require 'rubygems'
@@ -18,6 +22,8 @@ require 'active_support/all'
 require 'shellwords'
 require 'term/ansicolor'
 
+Term::ANSIColor::coloring = STDOUT.isatty && RUBY_PLATFORM.downcase !~ /mswin(?!ce)|mingw|bccwin|cygwin/
+
 module GitIssue
   class Command
     attr_reader :name, :short_name, :description

data/lib/git_issue/base.rb

@@ -77,6 +77,33 @@ class GitIssue::Base
     system "git checkout #{cb}"
   end
 
+  def cherry(option = {})
+    upstream = options[:upstream]
+    head = options[:head]
+
+    commits = %x(git cherry -v #{upstream} #{head}).split(/\n/).map{|s|
+      s.scan(/^([+-])\s(\w+)\s(.*)/).first
+    }.select{|_, _, msg| msg =~ /#[0-9]+/ }.map{|diff, sha1, msg|
+      msg.scan(/#([0-9]+)/).flatten.map{|ticket| [diff, sha1, msg, ticket]}
+    }.flatten(1)
+
+    commits.group_by{|d, _, _, n| [d, n]}.each do |k, records|
+      diff, ticket = k
+      c = case diff
+          when "-" then :red
+          when "+" then :green
+      end
+
+      issue = fetch_issue(ticket, options)
+
+      puts "#{apply_colors(diff, c)} #{oneline_issue(issue, options)}"
+      if options[:verbose]
+        records.each {|_, sha1, msg| puts "  #{sha1} #{msg}" }
+        puts ""
+      end
+    end
+  end
+
   def commands
     [
     GitIssue::Command.new(:show,   :s, 'show given issue summary. if given no id,  geuss id from current branch name.'),
@@ -86,6 +113,7 @@ class GitIssue::Base
     GitIssue::Command.new(:add,    :a, 'create issue.'),
     GitIssue::Command.new(:update, :u, 'update issue properties. if given no id, geuss id from current branch name.'),
     GitIssue::Command.new(:branch, :b, "checout to branch using specified issue id. if branch dose'nt exisits, create it. (ex ticket/id/<issue_id>)"),
+    GitIssue::Command.new(:cherry, :chr, 'find issue not merged upstream.'),
 
     GitIssue::Command.new(:publish,:pub, "push branch to remote repository and set upstream "),
     GitIssue::Command.new(:rebase, :rb,  "rebase branch onto specific newbase"),
@@ -252,6 +280,9 @@ 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("--upstream=VALUE",   'on cherry, upstream branch to compare against. default is tracked remote branch') {|v| @options[:upstream] = v}
+      opts.on("--head=VALUE",       'on cherry, working branch. defaults to HEAD') {|v| @options[:head] = v}
+
       opts.on("--no-color", "turn off colored output"){@no_color = true }
       opts.on("--debug", "debug print"){@debug= true }
     }
@@ -269,5 +300,16 @@ class GitIssue::Base
   def apply_colors(str, *colors)
     @no_color.present? ? str : (colors.map(&method(:send)) + [str, reset]).join
   end
+
+  def connection(host, port)
+    env = ENV['http_proxy'] || ENV['HTTP_PROXY']
+    if env
+      uri = URI(env)
+      proxy_host, proxy_port = uri.host, uri.port
+      Net::HTTP::Proxy(proxy_host, proxy_port).new(host, port)
+    else
+      Net::HTTP.new(host, port)
+    end
+  end
 end
 

data/lib/git_issue/github.rb

@@ -267,7 +267,7 @@ class GitIssue::Github < GitIssue::Base
       puts '-' * 80
     end
 
-    https = Net::HTTP.new(uri.host, uri.port)
+    https = connection(uri.host, uri.port)
     https.use_ssl = true
     https.verify_mode = @ssl_options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_NONE
 

data/lib/git_issue/redmine.rb

@@ -39,13 +39,29 @@ class Redmine < GitIssue::Base
 
   def list(options = {})
     url = to_url('issues')
-    params = {"limit" => options[:max_count] || 100 }
+    params = {"limit" => options[:max_count] || "100" }
     params.merge!("assigned_to_id" => "me") if options[:mine]
     params.merge!(Hash[*(options[:query].split("&").map{|s| s.split("=") }.flatten)]) if options[:query]
 
-    json = fetch_json(url, params)
+    param_list = Hash[*params.map{|k,v| [k,v.split(/,/)] }.flatten(1)]
+    keys = param_list.keys
+    pl,*pls = param_list.values
+
+    jsons = pl.product(*pls).map{|vs| Hash[*keys.zip(vs).flatten]}.map{|p|
+      fetch_json(url, p)['issues']
+    }.flatten
+
+    known_ids = []
+    issues = jsons.reject{|i|
+      known = known_ids.include?(i["id"])
+      known_ids << i['id'] unless known
+      known
+    }
+
+    # json = fetch_json(url, params)
 
-    output_issues(json['issues'])
+    # output_issues(json['issues'])
+    output_issues(issues)
   end
 
   def mine(options = {})
@@ -135,12 +151,15 @@ class Redmine < GitIssue::Base
   end
 
   def local(option = {})
-
-    brances = %x(git branch).split(/\n/).map{|b| b.scan(/.*ticket\D*(\d+).*/).first }.reject{|r| r.nil?}.map{|r| r.first }
-
-    issues = brances.map{|ticket_id| fetch_issue(ticket_id) }
-
-    output_issues(issues)
+    branches = %x(git branch).split(/\n/).select{|b| b.scan(/(\d+)_/).present?}.map{|b| b.gsub(/^(\s+|\*\s+)/, "")}
+    branches.each do |b|
+      puts b
+      issues = b.scan(/(\d+)_/).map{|ticket_id| fetch_issue(ticket_id) rescue nil}.compact
+      issues.each do |i|
+        puts "  #{oneline_issue(i, options)}"
+      end
+      puts ""
+    end
   end
 
   def project(options = {})
@@ -203,7 +222,7 @@ class Redmine < GitIssue::Base
       puts '-' * 80
     end
 
-    http = Net::HTTP.new(uri.host, uri.port)
+    http = connection(uri.host, uri.port)
     if uri.scheme == 'https'
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -262,7 +281,7 @@ class Redmine < GitIssue::Base
   end
 
   def oneline_issue(issue, options = {})
-    "##{issue['id']} #{issue['subject']}"
+    "#{apply_fmt_colors(:id, "##{issue['id']}")} #{issue['subject']}"
   end
 
   def format_issue(issue, options)
@@ -471,7 +490,12 @@ class Redmine < GitIssue::Base
   end
 
   def output_issues(issues)
-    if options[:raw_id]
+
+    if options[:oneline]
+      issues.each do |i|
+        puts oneline_issue(i, options)
+      end
+    elsif options[:raw_id]
       issues.each do |i|
         puts i['id']
       end
@@ -568,6 +592,7 @@ MSG
     opts.on("--supperss_changesets", "-c", "do not show issue changesets"){|v| @options[:supperss_changesets] = true}
     opts.on("--query=VALUE",'-q=VALUE', "filter query of listing tickets") {|v| @options[:query] = v}
 
+    opts.on("--mine", "lists issues assigned_to me"){|v| @options[:mine] = true}
     opts.on("--project_id=VALUE", "use the given value to create subject"){|v| @options[:project_id] = v}
     opts.on("--description=VALUE", "use the given value to create subject"){|v| @options[:description] = v}
     opts.on("--subject=VALUE", "use the given value to create/update subject"){|v| @options[:subject] = v}

data/lib/git_issue/version.rb

@@ -1,3 +1,3 @@
 module GitIssue
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-issue
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Tomohito Ozaki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 +09:00
+date: 2012-10-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency