ghi 0.9.0.dev → 0.9.0.dev1

data/lib/ghi.rb

@@ -4,6 +4,7 @@ module GHI
   autoload :Authorization, 'ghi/authorization'
   autoload :Client,        'ghi/client'
   autoload :Commands,      'ghi/commands'
+  autoload :Editor,        'ghi/editor'
   autoload :Formatting,    'ghi/formatting'
 
   class << self

data/lib/ghi/authorization.rb

@@ -22,7 +22,7 @@ module GHI
             :note_url => 'https://github.com/stephencelis/ghi'
           )
         }
-        @token = res['token']
+        @token = res.body['token']
         
         run = []
         unless username

data/lib/ghi/client.rb

@@ -2,9 +2,8 @@ require 'cgi'
 require 'net/https'
 
 unless defined? Net::HTTP::Patch
-  Net::HTTP::Patch = Class.new Net::HTTP::Post do
-    METHOD = 'PATCH'
-  end
+  # PATCH support for 1.8.7.
+  Net::HTTP::Patch = Class.new(Net::HTTP::Post) { METHOD = 'PATCH' }
 end
 
 module GHI

data/lib/ghi/commands/close.rb

@@ -12,7 +12,7 @@ EOF
           end
           opts.separator ''
           opts.separator 'Issue modification options'
-          opts.on '-m', '--message <text>', 'close with message' do |text|
+          opts.on '-m', '--message [<text>]', 'close with message' do |text|
             assigns[:comment] = text
           end
           opts.separator ''
@@ -27,11 +27,12 @@ EOF
           List.execute %W(-sc -- #{repo})
         else
           require_issue
-          Edit.execute %W(-sc #{issue} -- #{repo})
-          puts 'Closed.'
-          if assigns[:comment]
-            Comment.execute %W(#{issue} -m #{assigns[:comment]} -- #{repo})
+          if assigns.key? :comment
+            Comment.execute [
+              issue, '-m', assigns[:comment], '--', repo
+            ].compact
           end
+          Edit.execute %W(-sc #{issue} -- #{repo})
         end
       end
 

data/lib/ghi/commands/command.rb

@@ -94,21 +94,6 @@ module GHI
       def any_or_none_or input
         input ? input : { nil => '*', false => 'none' }[input]
       end
-
-      def page? message = 'Load more?'
-        return unless STDIN.tty?
-
-        STDOUT.print "#{message} [Yn] "
-        begin
-          system 'stty raw -echo'
-          # Continue on y, j, <ENTER>, <DOWN>...
-          exit unless [?y, ?Y, ?j, 13, 27].include? STDIN.getc
-          STDOUT.print "\r" + ' ' * columns
-          STDOUT.print "\r  Loading..."
-        ensure
-          system 'stty -raw echo'
-        end
-      end
     end
   end
 end

data/lib/ghi/commands/comment.rb

@@ -15,7 +15,7 @@ EOF
           # opts.on '-v', '--verbose', 'list events, too'
           opts.separator ''
           opts.separator 'Comment modification options'
-          opts.on '-m', '--message <text>', 'comment body' do |text|
+          opts.on '-m', '--message [<text>]', 'comment body' do |text|
             assigns[:body] = text
           end
           opts.on '--amend', 'amend previous comment' do
@@ -40,10 +40,9 @@ EOF
         case action
         when 'list'
           res = index
-          loop do
+          page do
             puts format_comments(res.body)
             break unless res.next_page
-            page?
             res = throb { api.get res.next_page }
           end
         when 'create'
@@ -60,7 +59,7 @@ EOF
             abort 'No recent comment found.'
           end
         when 'close'
-          Close.execute %W(-m #{assigns[:body]} #{issue} -- #{repo})
+          Close.execute [issue, '-m', assigns[:body], '--', repo].compact
         end
       end
 
@@ -72,19 +71,21 @@ EOF
 
       def create
         require_body
-        throb { api.post uri, assigns }
-        puts 'Comment created.'
+        c = throb { api.post uri, assigns }.body
+        puts format_comment c
+        puts 'Commented.'
       end
 
       def update
         require_body
-        throb { api.patch uri, assigns }
-        puts 'Comment updated.'
+        c = throb { api.patch uri, assigns }.body
+        puts format_comment c
+        puts 'Updated.'
       end
 
       def destroy
         throb { api.delete uri }
-        puts 'Comment deleted.'
+        puts 'Deleted.'
       end
 
       private
@@ -94,10 +95,11 @@ EOF
       end
 
       def require_body
-        if assigns[:body].nil?
-          warn 'Missing argument: -m'
-          abort options.to_s
-        end
+        return if assigns[:body]
+        message = Editor.gets format_comment_editor(issue, comment)
+        abort 'No comment.' if message.nil? || message.empty?
+        abort 'No change.' if comment && message.strip == comment['body'].strip
+        assigns[:body] = message if message
       end
     end
   end

data/lib/ghi/commands/edit.rb

@@ -1,6 +1,8 @@
 module GHI
   module Commands
     class Edit < Command
+      attr_accessor :edit
+
       def options
         OptionParser.new do |opts|
           opts.banner = <<EOF
@@ -8,8 +10,9 @@ usage: ghi edit [options] <issueno>
 EOF
           opts.separator ''
           opts.on(
-            '-m', '--message <text>', 'change issue description'
+            '-m', '--message [<text>]', 'change issue description'
           ) do |text|
+            next self.edit = true if text.nil?
             assigns[:title], assigns[:body] = text.split(/\n+/, 2)
           end
           opts.on(
@@ -41,8 +44,26 @@ EOF
         require_issue
         require_repo
         options.parse! args
+        if edit || assigns.empty?
+          i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
+          message = Editor.gets format_editor(i)
+          abort "There's no issue." if message.nil? || message.empty?
+          assigns[:title], assigns[:body] = message.split(/\n+/, 2)
+        end
+        if assigns[:title]
+          titles_match = assigns[:title].strip == i['title'].strip
+          if assigns[:body]
+            bodies_match = assigns[:body].to_s.strip == i['body'].to_s.strip
+          end
+        end
+        if titles_match && bodies_match
+          abort 'No change.' if assigns.dup.delete_if { |k, v|
+            [:title, :body].include? k
+          }
+        end
         i = throb { api.patch "/repos/#{repo}/issues/#{issue}", assigns }.body
         puts format_issue(i)
+        puts 'Updated.'
       end
     end
   end

data/lib/ghi/commands/label.rb

@@ -61,6 +61,7 @@ EOF
         if issue
           self.action ||= 'add'
           self.name = args.shift.to_s.split ','
+          self.name.concat args
         else
           self.action ||= 'create'
           self.name ||= args.shift
@@ -117,7 +118,6 @@ EOF
         labels = throb {
           api.post "/repos/#{repo}/issues/#{issue}/labels", name
         }.body
-        labels.delete_if { |l| !name.include?(l['name']) }
         puts "Issue #%d labeled %s." % [issue, format_labels(labels)]
       end
 
@@ -128,7 +128,11 @@ EOF
           puts "Labels removed."
         when 1
           labels = throb { api.delete "#{base_uri}/#{name.join}" }.body
-          puts "Issue #%d labeled %s." % [issue, format_labels(labels)]
+          if labels.empty?
+            puts "Issue #%d unlabeled." % issue
+          else
+            puts "Issue #%d labeled %s." % [issue, format_labels(labels)]
+          end
         else
           labels = throb {
             api.get "/repos/#{repo}/issues/#{issue}/labels"
@@ -140,7 +144,11 @@ EOF
 
       def replace
         labels = throb { api.put base_uri, name }.body
-        puts "Issue #%d labeled %s." % [issue, format_labels(labels)]
+        if labels.empty?
+          puts "Issue #%d unlabeled." % issue
+        else
+          puts "Issue #%d labeled %s." % [issue, format_labels(labels)]
+        end
       end
 
       private

data/lib/ghi/commands/list.rb

@@ -90,20 +90,18 @@ module GHI
           fallback.parse! e.args
           retry
         end
-
         if reverse
           assigns[:sort] ||= 'created'
           assigns[:direction] = 'asc'
         end
-
         unless quiet
-          print format_issues_header
+          print header = format_issues_header
           print "\n" unless STDOUT.tty?
         end
         res = throb(
           0, format_state(assigns[:state], quiet ? CURSOR[:up][1] : '#')
         ) { api.get uri, assigns }
-        loop do
+        page header && "\r#{CURSOR[:up][1]}#{header}" do
           issues = res.body
           if verbose
             puts issues.map { |i| format_issue i }
@@ -111,9 +109,16 @@ module GHI
             puts format_issues(issues, repo.nil?)
           end
           break unless res.next_page
-          page?
           res = throb { api.get res.next_page }
         end
+      rescue Client::Error => e
+        if e.response.code == '422'
+          e.errors.any? { |err|
+            err['code'] == 'missing' && err['field'] == 'milestone'
+          } and abort 'No such milestone.'
+        end
+
+        raise
       end
 
       private

data/lib/ghi/commands/milestone.rb

@@ -99,8 +99,8 @@ EOF
           state = assigns[:state] || 'open'
           print format_state state, "# #{repo} #{state} milestones"
           print "\n" unless STDOUT.tty?
-          res = throb(0, format_state(state, '#')) { api.get uri }
-          loop do
+          res = throb(0, format_state(state, '#')) { api.get uri, assigns }
+          page do
             milestones = res.body
             if verbose
               puts milestones.map { |m| format_milestone m }
@@ -108,7 +108,6 @@ EOF
               puts format_milestones(milestones)
             end
             break unless res.next_page
-            page?
             res = throb { api.get res.next_page }
           end
         when 'show'

data/lib/ghi/commands/open.rb

@@ -18,11 +18,11 @@ EOF
           end
           opts.separator ''
           opts.separator 'Issue modification options'
-          opts.on '-m', '--message <text>', 'describe issue' do |text|
+          opts.on '-m', '--message [<text>]', 'describe issue' do |text|
             assigns[:title], assigns[:body] = text.split(/\n+/, 2)
           end
           opts.on(
-            '-u', '--[no-]assign <user>', 'assign to specified user'
+            '-u', '--[no-]assign [<user>]', 'assign to specified user'
           ) do |assignee|
             assigns[:assignee] = assignee
           end
@@ -41,11 +41,11 @@ EOF
       end
 
       def execute
+        require_repo
         self.action = 'create'
 
         if extract_issue
-          Edit.new(args.unshift('-so', issue)).execute
-          puts 'Reopened.'
+          Edit.execute args.push('-so', issue, '--', repo)
           exit
         end
 
@@ -53,11 +53,16 @@ EOF
 
         case action
         when 'index'
-          List.new(args).execute
+          if assigns.key? :assignee
+            args.unshift assigns[:assignee] if assigns[:assignee]
+            args.unshift '-u'
+          end
+          List.execute args.push('--', repo)
         when 'create'
-          if assigns[:title].nil? # FIXME: Open $EDITOR
-            warn "Missing argument: -m"
-            abort options.to_s
+          if assigns[:title].nil?
+            message = Editor.gets format_editor
+            abort "There's no issue." if message.nil? || message.empty?
+            assigns[:title], assigns[:body] = message.split(/\n+/, 2)
           end
           i = throb { api.post "/repos/#{repo}/issues", assigns }.body
           puts format_issue(i)

data/lib/ghi/commands/show.rb

@@ -3,7 +3,7 @@ module GHI
     class Show < Command
       def options
         OptionParser.new do |opts|
-          opts.banner = 'usage: ghi show <issueno> [[<user>/]<repo>]'
+          opts.banner = 'usage: ghi show <issueno>'
           opts.separator ''
         end
       end
@@ -12,9 +12,15 @@ module GHI
         require_issue
         require_repo
         i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
-        puts format_issue(i)
-        page? 'Load comments?'
-        Comment.execute %W(-l #{issue} -- #{repo})
+        page do
+          puts format_issue(i)
+          n = i['comments']
+          if n > 0
+            puts "#{n} Comment#{'s' unless n == 1}:\n\n"
+            Comment.execute %W(-l #{issue} -- #{repo})
+          end
+          break
+        end
       end
     end
   end

data/lib/ghi/commands/version.rb

@@ -4,7 +4,7 @@ module GHI
       MAJOR   = 0
       MINOR   = 9
       PATCH   = 0
-      PRE     = 'dev'
+      PRE     = 'dev1'
 
       VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join '.'
 

data/lib/ghi/editor.rb

@@ -0,0 +1,26 @@
+require 'tempfile'
+
+module GHI
+  class Editor
+    class << self
+      def gets prefill
+        Tempfile.open 'GHI_ISSUE' do |f|
+          f << prefill
+          f.rewind
+          system "#{editor} #{f.path}"
+          return File.read(f.path).gsub(/^#.*$\n?/, '').strip
+        end
+      end
+
+      private
+
+      def editor
+        editor   = ENV['GHI_EDITOR']
+        editor ||= ENV['GIT_EDITOR']
+        editor ||= `git config core.editor`.split.first
+        editor ||= ENV['EDITOR']
+        editor ||= 'vi'
+      end
+    end
+  end
+end

data/lib/ghi/formatting.rb

@@ -34,13 +34,25 @@ module GHI
           end
         }
       }
-      stdout, $stdout = $stdout, IO.popen('less -ErX', 'w')
       super strings
+    end
+
+    def page header = nil, throttle = 1
+      $stdout = IO.popen('less -EKrX -b1', 'w') if $stdout == STDOUT
+      puts header if header
+      loop do
+        yield
+        sleep throttle
+      end
     rescue Errno::EPIPE
+      exit
     ensure
-      $stdout.close_write
-      $stdout = stdout
-      print CURSOR[:show]
+      unless $stdout == STDOUT
+        $stdout.close_write
+        $stdout = STDOUT
+        print CURSOR[:show]
+        exit
+      end
     end
 
     def truncate string, reserved
@@ -49,11 +61,11 @@ module GHI
       result
     end
 
-    def indent string, level = 4
+    def indent string, level = 4, maxwidth = columns
       string = string.gsub(/\r/, '')
       string.gsub!(/[\t ]+$/, '')
       string.gsub!(/\n{3,}/, "\n\n")
-      width = columns - level - 1
+      width = maxwidth - level - 1
       lines = string.scan(
         /.{0,#{width}}(?:\s|\Z)|[\S]{#{width},}/ # TODO: Test long lines.
       ).map { |line| " " * level + line.chomp }
@@ -77,7 +89,12 @@ module GHI
       header = "# #{repo || 'Global,'} #{state} issues"
       if repo
         if milestone = assigns[:milestone]
-          header.sub! repo, "#{repo} milestone ##{milestone}"
+          case milestone
+            when '*'    then header << ' with a milestone'
+            when 'none' then header << ' without a milestone'
+          else
+            header.sub! repo, "#{repo} milestone ##{milestone}"
+          end
         end
         if assignee = assigns[:assignee]
           header << case assignee
@@ -143,11 +160,11 @@ module GHI
     end
 
     # TODO: Show milestone, number of comments, pull request attached.
-    def format_issue i
+    def format_issue i, width = columns
       ERB.new(<<EOF).result binding
-<% p = i['pull_request'].key? 'html_url' %>\
-<%= bright { \
-indent '%s%s: %s' % [p ? '↑' : '#', *i.values_at('number', 'title')], 0 } %>
+<% p = i['pull_request']['html_url'] %>\
+<%= bright { no_color { indent '%s%s: %s' % [p ? '↑' : '#', \
+*i.values_at('number', 'title')], 0, width } } %>
 @<%= i['user']['login'] %> opened this <%= p ? 'pull request' : 'issue' %> \
 <%= format_date DateTime.parse(i['created_at']) %>. \
 <%= format_state i['state'], format_tag(i['state']), :bg %>\
@@ -155,7 +172,7 @@ indent '%s%s: %s' % [p ? '↑' : '#', *i.values_at('number', 'title')], 0 } %>
 <% if i['assignee'] %>@<%= i['assignee']['login'] %> is assigned. <% end %>\
 <% unless i['labels'].empty? %><%= format_labels(i['labels']) %><% end %>\
 <% end %>
-<% if i['body'] && !i['body'].empty? %>\n<%= indent i['body'] %>
+<% if i['body'] && !i['body'].empty? %>\n<%= indent i['body'], 4, width %>
 <% end %>
 
 EOF
@@ -166,11 +183,11 @@ EOF
       comments.map { |comment| format_comment comment }
     end
 
-    def format_comment c
+    def format_comment c, width = columns
       <<EOF
 @#{c['user']['login']} commented \
 #{format_date DateTime.parse(c['created_at'])}:
-#{indent c['body']}
+#{indent c['body'], 4, width}
 
 
 EOF
@@ -196,7 +213,8 @@ EOF
 
     def format_milestone m
       ERB.new(<<EOF).result binding
-<%= bright { indent '#%s: %s' % m.values_at('number', 'title'), 0 } %>
+<%= bright { no_color { \
+indent '#%s: %s' % m.values_at('number', 'title'), 0 } } %>
 @<%= m['creator']['login'] %> created this milestone <%= m['created_at'] %>. \
 <%= format_state m['state'], format_tag(m['state']), :bg %>
 <% if m['due_on'] %>\
@@ -204,13 +222,14 @@ EOF
 Due <%= fg((:red if due_on <= DateTime.now)) { format_date due_on } %>.
 <% end %>\
 <% if m['description'] && !m['description'].empty? %>
-<%= indent m['description'] %>\
+<%= indent m['description'] %>
 <% end %>
+
 EOF
     end
 
     def format_state state, string = state, layer = :fg
-      send(layer, state == 'closed' ? :red : :green) { string }
+      send(layer, state == 'closed' ? 'ff0000' : '2cc200') { string }
     end
 
     def format_labels labels
@@ -222,12 +241,62 @@ EOF
       (colorize? ? ' %s ' : '[%s]') % tag
     end
 
+    #--
+    # Helpers:
+    #++
+
+    def format_editor issue = nil
+      message = ERB.new(<<EOF).result binding
+
+Please explain the issue. The first line will become the title. Lines
+starting with '#' will be ignored, and empty messages will not be filed.
+Issues are formatted with GitHub Flavored Markdown (GFM):
+
+  http://github.github.com/github-flavored-markdown
+
+On <%= repo %>
+
+<%= no_color { format_issue issue, columns - 2 if issue } %>
+EOF
+      message.rstrip!
+      message.gsub!(/(?!\A)^.*$/) { |line| "# #{line}".rstrip }
+      message.insert 0, [issue['title'], issue['body']].join("\n\n") if issue
+      message
+    end
+
+    def format_comment_editor issue, comment = nil
+      message = ERB.new(<<EOF).result binding
+
+Leave a comment. Lines starting with '#' will be ignored, and empty messages
+will not be sent. Comments are formatted with GitHub Flavored Markdown (GFM):
+
+  http://github.github.com/github-flavored-markdown
+
+On <%= repo %> issue #<%= issue %>
+
+<%= no_color { format_comment comment, columns - 2 } if comment %>
+EOF
+      message.rstrip!
+      message.gsub!(/(?!\A)^.*$/) { |line| "# #{line}".rstrip }
+      message.insert 0, comment['body'] if comment
+      message
+    end
+
     def format_markdown string, indent = 4
+      c = '268bd2'
+
       # Headers.
       string.gsub!(/^( {#{indent}}\#{1,6} .+)$/, bright{'\1'})
       string.gsub!(
         /(^ {#{indent}}.+$\n^ {#{indent}}[-=]+$)/, bright{'\1'}
       )
+      # Strong.
+      string.gsub!(
+        /(^|\s)(\*{2}\w(?:[^*]*\w)?\*{2})(\s|$)/m, '\1' + bright{'\2'} + '\3'
+      )
+      string.gsub!(
+        /(^|\s)(_{2}\w(?:[^_]*\w)?_{2})(\s|$)/m, '\1' + bright {'\2'} + '\3'
+      )
       # Emphasis.
       string.gsub!(
         /(^|\s)(\*\w(?:[^*]*\w)?\*)(\s|$)/m, '\1' + underline{'\2'} + '\3'
@@ -235,33 +304,32 @@ EOF
       string.gsub!(
         /(^|\s)(_\w(?:[^_]*\w)?_)(\s|$)/m, '\1' + underline{'\2'} + '\3'
       )
-      # Strong.
-      string.gsub!(
-        /(^|\s)(\*{2}\w(?:[^*]*\w)?\*{2})(\s|$)/m, '\1' + bright{'\2'} + '\3'
-      )
+      # Bullets/Blockquotes.
+      string.gsub!(/(^ {#{indent}}(?:[*>-]|\d+\.) )/, fg(c){'\1'})
+      # URIs.
       string.gsub!(
-        /(^|\s)(_{2}\w(?:[^_]*\w)?_{2})(\s|$)/m, '\1' + bright {'\2'} + '\3'
+        %r{\b(<)?(https?://\S+|[^@\s]+@[^@\s]+)(>)?\b},
+        fg(c){'\1' + underline{'\2'} + '\3'}
       )
       # Code.
       string.gsub!(
         /
           (^\ {#{indent}}```.*?$)(.+?^\ {#{indent}}```$)|
           (^|[^`])(`[^`]+`)([^`]|$)
-        /mx,
-        fg(c = '268bd2'){'\1'} + bg(c){'\2'} + '\3' + fg(c){'\4'} + '\5'
-      )
-      # URI.
-      string.gsub!(
-        %r{\b(<)?(https?://[\s]+|\w+@\w+)(>)?\b},
-        '\1' + underline{'\2'} + '\3'
-      )
+        /mx
+      ) {
+        post = $5
+        fg(c){"#$1#$2#$3#$4".gsub(/\e\[[\d;]+m/, '')} + "#{post}"
+      }
       string
     end
 
     def format_date date
       days = (interval = DateTime.now - date).to_i.abs
       string = if days.zero?
-        hours, minutes, seconds = DateTime.day_fraction_to_time interval.abs
+        seconds, _ = interval.divmod Rational(1, 86400)
+        hours, seconds = seconds.divmod 3600
+        minutes, seconds = seconds.divmod 60
         if hours > 0
           "#{hours} hour#{'s' unless hours == 1}"
         elsif minutes > 0
@@ -276,7 +344,7 @@ EOF
     end
 
     def throb position = 0, redraw = CURSOR[:up][1]
-      return yield unless STDOUT.tty?
+      return yield unless $stdout.tty?
 
       throb = THROBBERS[rand(THROBBERS.length)]
       throb.reverse! if rand > 0.5

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ghi
 version: !ruby/object:Gem::Version 
-  hash: -1101288818
+  hash: -4071658224
   prerelease: 6
   segments: 
   - 0
   - 9
   - 0
   - dev
-  version: 0.9.0.dev
+  - 1
+  version: 0.9.0.dev1
 platform: ruby
 authors: 
 - Stephen Celis
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 -07:00
+date: 2012-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +48,7 @@ files:
 - lib/ghi/commands/show.rb
 - lib/ghi/commands/version.rb
 - lib/ghi/commands.rb
+- lib/ghi/editor.rb
 - lib/ghi/formatting/colors.rb
 - lib/ghi/formatting.rb
 - lib/ghi/json.rb