ghi 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c253937537d9abb1e9a721c469220a8e2fb95050
-  data.tar.gz: 20c3911c61cbec263eb0347f8a5ce66de3290004
+  metadata.gz: 542fd93fc503609bf5d4cc5a258356d35ee0313c
+  data.tar.gz: 03e5dc1531dd7a57fe02e36e265f54d94c799546
 SHA512:
-  metadata.gz: 39bd93ab895a37ca157602f80183978b7c27895a5b6e0af4962ee7dd076a957575854b46aece1fe8b9e1d87a22a574aecd30b5c03c563855144b1870cebdf60a
-  data.tar.gz: 4d136961fe3a859f1c9958d4e0d9a067d68074e0e48361074a0f84e00331516c5069cf759505d5676631f398c72c82eb2491df91f921792cb43ecd046146a23b
+  metadata.gz: f2984c9e741d600f119935ff9afb7b7a228839987d56caf40311aaaa43358ca000b5fdab2eba6cdea1f551ac0ce5b1d71e8c1cda7d2f43dea3e26b23b126cd30
+  data.tar.gz: 7e0e12147f1c5fc7f6a2cf6563076fa01e4e9648e0e0b9f0a0403627d95fcf405c399b3ce75400d14f489e747126617cf24ad820f56e31f373ae4348ab9999e7

data/lib/ghi/authorization.rb

@@ -18,12 +18,15 @@ module GHI
         return false unless user && pass
         code ||= nil # 2fa
         args = code ? [] : [54, "✔\r"]
+        note = %w[ghi]
+        note << "(#{GHI.repo})" if local
+        note << "on #{Socket.gethostname}"
         res = throb(*args) {
           headers = {}
           headers['X-GitHub-OTP'] = code if code
           body = {
             :scopes   => %w(public_repo repo),
-            :note     => 'ghi',
+            :note     => note.join(' '),
             :note_url => 'https://github.com/stephencelis/ghi'
           }
           Client.new(user, pass).post(
@@ -47,7 +50,18 @@ module GHI
           retry
         end
 
-        abort "#{e.message}#{CURSOR[:column][0]}"
+        if e.errors.any? { |err| err['code'] == 'already_exists' }
+          message = <<EOF.chomp
+A ghi token already exists!
+
+Please revoke all previously-generated ghi personal access tokens here:
+
+  https://github.com/settings/applications
+EOF
+        else
+          message = e.message
+        end
+        abort "#{message}#{CURSOR[:column][0]}"
       end
 
       def username

data/lib/ghi/client.rb

@@ -45,7 +45,7 @@ module GHI
       end
     end
 
-    CONTENT_TYPE = 'application/vnd.github+json'
+    CONTENT_TYPE = 'application/vnd.github.beta+json'
     USER_AGENT = 'ghi/%s (%s; +%s)' % [
       GHI::Commands::Version::VERSION,
       RUBY_DESCRIPTION,

data/lib/ghi/commands/command.rb

@@ -88,8 +88,7 @@ module GHI
         if index = args.index { |arg| /^\d+$/ === arg }
           @issue = args.delete_at index
         else
-          @issue = `git symbolic-ref --short HEAD 2>/dev/null`[/^\d+/];
-          warn "(Inferring issue from branch prefix: ##@issue)" if @issue
+          infer_issue_from_branch_prefix
         end
         @issue
       end
@@ -97,6 +96,11 @@ module GHI
       alias milestone         issue
       alias extract_milestone issue
 
+      def infer_issue_from_branch_prefix
+        @issue = `git symbolic-ref --short HEAD 2>/dev/null`[/^\d+/];
+        warn "(Inferring issue from branch prefix: ##@issue)" if @issue
+      end
+
       def require_issue
         raise MissingArgument, 'Issue required.' unless issue
       end
@@ -109,6 +113,10 @@ module GHI
       def any_or_none_or input
         input ? input : { nil => '*', false => 'none' }[input]
       end
+
+      def sort_by_creation(arr)
+        arr.sort_by { |el| el['created_at'] }
+      end
     end
   end
 end

data/lib/ghi/commands/comment.rb

@@ -45,9 +45,11 @@ EOF
 
         case action
         when 'list'
+          get_requests(:index, :events)
           res = index
           page do
-            puts format_comments(res.body)
+            elements = sort_by_creation(res.body + paged_events(events, res))
+            puts format_comments_and_events(elements)
             break unless res.next_page
             res = throb { api.get res.next_page }
           end
@@ -76,7 +78,7 @@ EOF
       protected
 
       def index
-        throb { api.get uri, :per_page => 100 }
+        @index ||= throb { api.get uri, :per_page => 100 }
       end
 
       def create message = 'Commented.'
@@ -96,8 +98,28 @@ EOF
         puts 'Comment deleted.'
       end
 
+      def events
+        @events ||= begin
+          events = []
+          res = api.get(event_uri, :per_page => 100)
+          loop do
+            events += res.body
+            break unless res.next_page
+            res = api.get res.next_page
+          end
+          events
+        end
+      end
+
       private
 
+      def get_requests(*methods)
+        threads = methods.map do |method|
+          Thread.new { send(method) }
+        end
+        threads.each { |t| t.join }
+      end
+
       def uri
         if comment
           comment['url']
@@ -106,6 +128,10 @@ EOF
         end
       end
 
+      def event_uri
+        "/repos/#{repo}/issues/#{issue}/events"
+      end
+
       def require_body
         assigns[:body] = args.join ' ' unless args.empty?
         return if assigns[:body]
@@ -125,6 +151,18 @@ EOF
         assigns[:body] = message if message
         e
       end
+
+      def paged_events(events, comments_res)
+        if comments_res.next_page
+          last_comment_creation = comments_res.body.last['created_at']
+          events_for_this_page, @events = events.partition do |event|
+            event['created_at'] < last_comment_creation
+          end
+          events_for_this_page
+        else
+          events
+        end
+      end
     end
   end
 end

data/lib/ghi/commands/edit.rb

@@ -112,7 +112,7 @@ EOF
               if ref = %x{
                 git rev-parse --abbrev-ref HEAD@{upstream} 2>/dev/null
               }.chomp!
-                ref.split('/').last if $? == 0
+                ref.split('/', 2).last if $? == 0
               end
             end
             assigns[:head] ||= head

data/lib/ghi/commands/label.rb

@@ -15,7 +15,7 @@ module GHI
           opts.banner = <<EOF
 usage: ghi label <labelname> [-c <color>] [-r <newname>]
    or: ghi label -D <labelname>
-   or: ghi label <issueno> [-a] [-d] [-f]
+   or: ghi label <issueno(s)> [-a] [-d] [-f] <label>
    or: ghi label -l [<issueno>]
 EOF
           opts.separator ''
@@ -41,13 +41,13 @@ EOF
           opts.separator ''
           opts.separator 'Issue modification options'
           opts.on '-a', '--add', 'add labels to issue' do
-            self.action = issue ? 'add' : 'create'
+            self.action = issues_present? ? 'add' : 'create'
           end
           opts.on '-d', '--delete', 'remove labels from issue' do
-            self.action = issue ? 'remove' : 'destroy'
+            self.action = issues_present? ? 'remove' : 'destroy'
           end
           opts.on '-f', '--force', 'replace existing labels' do
-            self.action = issue ? 'replace' : 'update'
+            self.action = issues_present? ? 'replace' : 'update'
           end
           opts.separator ''
         end
@@ -58,16 +58,16 @@ EOF
         require_repo
         options.parse! args.empty? ? %w(-l) : args
 
-        if issue
+        if issues_present?
           self.action ||= 'add'
           self.name = args.shift.to_s.split ','
           self.name.concat args
+          multi_action(action)
         else
           self.action ||= 'create'
           self.name ||= args.shift
+          send action
         end
-
-        send action
       end
 
       protected
@@ -156,6 +156,41 @@ EOF
       def base_uri
         "/repos/#{repo}/#{issue ? "issues/#{issue}/labels" : 'labels'}"
       end
+
+      # This method is usually inherited from Command and extracts a single issue
+      # from args - we override it to handle multiple issues at once.
+      def extract_issue
+        @issues = []
+        args.delete_if do |arg|
+          arg.match(/^\d+$/) ? @issues << arg : break
+        end
+        infer_issue_from_branch_prefix unless @issues.any?
+      end
+
+      def issues_present?
+        @issues.any? || @issue
+      end
+
+      def multi_action(action)
+        if @issues.any?
+          override_issue_reader
+          threads = @issues.map do |issue|
+            Thread.new do
+              Thread.current[:issue] = issue
+              send action
+            end
+          end
+          threads.each(&:join)
+        else
+          send action
+        end
+      end
+
+      def override_issue_reader
+        def issue
+          Thread.current[:issue]
+        end
+      end
     end
   end
 end

data/lib/ghi/commands/list.rb

@@ -7,6 +7,7 @@ module GHI
       attr_accessor :reverse
       attr_accessor :quiet
       attr_accessor :exclude_pull_requests
+      attr_accessor :pull_requests_only
 
       def options
         OptionParser.new do |opts|
@@ -42,7 +43,8 @@ module GHI
           opts.on '--reverse', 'reverse (ascending) sort order' do
             self.reverse = !reverse
           end
-          opts.on('-p', '--no-pulls','exclude pull requests') { self.exclude_pull_requests = true }
+          opts.on('-p', '--pulls','list only pull requests') { self.pull_requests_only = true }
+          opts.on('-P', '--no-pulls','exclude pull requests') { self.exclude_pull_requests = true }
           opts.on(
             '--since <date>', 'issues more recent than',
             "e.g., '2011-04-30'"
@@ -136,8 +138,10 @@ module GHI
           print "\r#{CURSOR[:up][1]}" if header && paginate?
           page header do
             issues = res.body
-            if exclude_pull_requests
-              issues = issues.reject {|i| i["pull_request"].any? {|k,v| !v.nil? } }
+
+            if exclude_pull_requests || pull_requests_only
+              prs, issues = issues.partition { |i| i['pull_request'].values.any? }
+              issues = prs if pull_requests_only
             end
             if assigns[:exclude_labels]
               issues = issues.reject  do |i|

data/lib/ghi/commands/open.rb

@@ -82,7 +82,7 @@ EOF
             i = throb { api.post "/repos/#{repo}/issues", assigns }.body
             e.unlink if e
             puts format_issue(i)
-            puts 'Opened.'
+            puts "Opened on #{repo}."
           end
         end
       rescue Client::Error => e

data/lib/ghi/commands/show.rb

@@ -32,6 +32,7 @@ module GHI
             end
           else
             i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
+            determine_merge_status(i) if pull_request?(i)
             page do
               puts format_issue(i)
               n = i['comments']
@@ -44,6 +45,21 @@ module GHI
           end
         end
       end
+
+      private
+
+      def pull_request?(issue)
+        issue['pull_request']['html_url']
+      end
+
+      def determine_merge_status(pr)
+        pr['merged'] = true if pr['state'] == 'closed' && merged?
+      end
+
+      def merged?
+        # API returns with a Not Found error when the PR is not merged
+        api.get "/repos/#{repo}/pulls/#{issue}/merge" rescue false
+      end
     end
   end
 end

data/lib/ghi/commands/version.rb

@@ -3,7 +3,7 @@ module GHI
     module Version
       MAJOR   = 0
       MINOR   = 9
-      PATCH   = 2
+      PATCH   = 3
       PRE     = nil
 
       VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join '.'

data/lib/ghi/formatting.rb

@@ -33,7 +33,7 @@ module GHI
 
     def puts *strings
       strings = strings.flatten.map { |s|
-        s.gsub(/(^| )*@([^@\s]+)/) {
+        s.gsub(/(^| *)@(\w+)/) {
           if $2 == Authorization.username
             bright { fg(:yellow) { "#$1@#$2" } }
           else
@@ -117,7 +117,7 @@ module GHI
     end
 
     def format_issues_header
-      state = assigns[:state] || 'open'
+      state = assigns[:state] ||= 'open'
       header = "# #{repo || 'Global,'} #{state} issues"
       if repo
         if milestone = assigns[:milestone]
@@ -210,6 +210,7 @@ module GHI
 *i.values_at('number', 'title')], 0, width } } %>
 @<%= i['user']['login'] %> opened this <%= p ? 'pull request' : 'issue' %> \
 <%= format_date DateTime.parse(i['created_at']) %>. \
+<% if i['merged'] %><%= format_state 'merged', format_tag('merged'), :bg %><% end %> \
 <%= format_state i['state'], format_tag(i['state']), :bg %> \
 <% unless i['comments'] == 0 %>\
 <%= fg('aaaaaa'){
@@ -233,9 +234,15 @@ Milestone #<%= i['milestone']['number'] %>: <%= i['milestone']['title'] %>\
 EOF
     end
 
-    def format_comments comments
-      return 'None.' if comments.empty?
-      comments.map { |comment| format_comment comment }
+    def format_comments_and_events elements
+      return 'None.' if elements.empty?
+      elements.map do |element|
+        if event = element['event']
+          format_event(element) unless unimportant_event?(event)
+        else
+          format_comment(element)
+        end
+      end.compact
     end
 
     def format_comment c, width = columns
@@ -245,6 +252,16 @@ EOF
 #{indent c['body'], 4, width}
 
 
+EOF
+    end
+
+    def format_event e, width = columns
+      reference = e['commit_id']
+      <<EOF
+#{bright { '⁕' }} #{format_event_type(e['event'])} by @#{e['actor']['login']}\
+#{" through #{underline { reference[0..6] }}" if reference} \
+#{format_date DateTime.parse(e['created_at'])}
+
 EOF
     end
 
@@ -306,7 +323,12 @@ EOF
     end
 
     def format_state state, string = state, layer = :fg
-      send(layer, state == 'closed' ? 'ff0000' : '2cc200') { string }
+      color_codes = {
+        'closed' => 'ff0000',
+        'open'   => '2cc200',
+        'merged' => '511c7d',
+      }
+      send(layer, color_codes[state]) { string }
     end
 
     def format_labels labels
@@ -318,6 +340,17 @@ EOF
       (colorize? ? ' %s ' : '[%s]') % tag
     end
 
+    def format_event_type(event)
+      color_codes = {
+        'reopened' => '2cc200',
+        'closed' => 'ff0000',
+        'merged' => '9677b1',
+        'assigned' => 'e1811d',
+        'referenced' => 'aaaaaa'
+      }
+      fg(color_codes[event]) { event }
+    end
+
     #--
     # Helpers:
     #++
@@ -416,16 +449,15 @@ EOF
         %r{\b(<)?(https?://\S+|[^@\s]+@[^@\s]+)(>)?\b},
         fg(c){'\1' + underline{'\2'} + '\3'}
       )
-      # Code.
-      # string.gsub!(
-      #   /
-      #     (^\ {#{indent}}```.*?$)(.+?^\ {#{indent}}```$)|
-      #     (^|[^`])(`[^`]+`)([^`]|$)
-      #   /mx
-      # ) {
-      #   post = $5
-      #   fg(c){"#$1#$2#$3#$4".gsub(/\e\[[\d;]+m/, '')} + "#{post}"
-      # }
+
+      # Inline code
+      string.gsub!(/`([^`].+?)`(?=[^`])/, inverse { ' \1 ' })
+
+      # Code blocks
+      string.gsub!(/(?<indent>^\ {#{indent}})(```)\s*(?<lang>\w*$)(\n)(?<code>.+?)(\n)(^\ {#{indent}}```$)/m) do |m|
+        highlight(Regexp.last_match)
+      end
+
       string
     end
 
@@ -471,5 +503,11 @@ EOF
         puts "\r#{CURSOR[:column][position]}#{redraw}#{CURSOR[:show]}"
       end
     end
+
+    private
+
+    def unimportant_event?(event)
+      %w{ subscribed unsubscribed mentioned }.include?(event)
+    end
   end
 end

data/lib/ghi/formatting/colors.rb

@@ -37,6 +37,11 @@ module GHI
         escape :inverse, &block
       end
 
+      def highlight(code_block)
+        return code_block unless colorize?
+        highlighter.highlight(code_block)
+      end
+
       def no_color
         old_colorize, Colors.colorize = colorize?, false
         yield
@@ -228,7 +233,11 @@ module GHI
       end
 
       def escape_256 color
-        "8;5;#{to_256(*to_rgb(color))}" if `tput colors` =~ /256/
+        "8;5;#{to_256(*to_rgb(color))}" if supports_256_colors?
+      end
+
+      def supports_256_colors?
+        `tput colors` =~ /256/
       end
 
       def to_256 r, g, b
@@ -294,6 +303,58 @@ module GHI
         return m1 + (m2 - m1) * (2.0/3 - h) * 6 if h * 3 < 2
         return m1
       end
+
+      def highlighter
+        @highlighter ||= begin
+          raise unless supports_256_colors?
+          require 'pygments'
+          Pygmentizer.new
+        rescue
+          FakePygmentizer.new
+        end
+      end
+
+      class FakePygmentizer
+        def highlight(code_block)
+          code_block
+        end
+      end
+
+      class Pygmentizer
+        def initialize
+          @style = GHI.config('ghi.highlight.style') || 'monokai'
+        end
+
+        def highlight(code_block)
+          begin
+            indent = code_block['indent']
+            lang   = code_block['lang']
+            code   = code_block['code']
+
+            output = pygmentize(lang, code)
+            with_indentation(output, indent)
+          rescue
+            code_block
+          end
+        end
+
+        private
+
+        def pygmentize(lang, code)
+          Pygments.highlight(unescape(code), :formatter => '256', :lexer => lang,
+                             :options => { :style => @style })
+        end
+
+        def unescape(str)
+          str.gsub(/\e\[[^m]*m/, '')
+        end
+
+        def with_indentation(string, indent)
+          string.each_line.map do |line|
+            "#{indent}#{line}"
+          end.join
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ghi
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Stephen Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: GitHub Issues command line interface