ghi 0.9.0.dev1 → 0.9.0.20120627

data/lib/ghi/commands/show.rb

@@ -1,25 +1,33 @@
 module GHI
   module Commands
     class Show < Command
+      attr_accessor :web
+
       def options
         OptionParser.new do |opts|
           opts.banner = 'usage: ghi show <issueno>'
           opts.separator ''
+          opts.on('-w', '--web') { self.web = true }
         end
       end
 
       def execute
         require_issue
         require_repo
-        i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
-        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})
+        options.parse! args
+        if web
+          Web.new(repo).open "issues/#{issue}"
+        else
+          i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
+          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
-          break
         end
       end
     end

data/lib/ghi/commands/version.rb

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

data/lib/ghi/editor.rb

@@ -1,26 +1,48 @@
-require 'tempfile'
+require 'tmpdir'
 
 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
+    attr_reader :filename
+    def initialize filename
+      @filename = filename
+    end
+
+    def gets prefill
+      File.open path, 'a+' do |f|
+        f << prefill if File.zero? path
+        f.rewind
+        system "#{editor} #{f.path}"
+        return File.read(f.path).gsub(/(?:^#.*$\n?)+\s*\z/, '').strip
       end
+    end
 
-      private
+    def unlink message = nil
+      File.delete path
+      abort message if message
+    end
 
-      def editor
-        editor   = ENV['GHI_EDITOR']
-        editor ||= ENV['GIT_EDITOR']
-        editor ||= `git config core.editor`.split.first
-        editor ||= ENV['EDITOR']
-        editor ||= 'vi'
-      end
+    private
+
+    def editor
+      editor   = GHI.config 'ghi.editor'
+      editor ||= GHI.config 'core.editor'
+      editor ||= ENV['VISUAL']
+      editor ||= ENV['EDITOR']
+      editor ||= 'vi'
+    end
+
+    def path
+      File.join dir, filename
+    end
+
+    def dir
+      @dir ||= git_dir || Dir.tmpdir
+    end
+
+    def git_dir
+      return unless Commands::Command.detected_repo
+      dir = `git rev-parse --git-dir 2>/dev/null`.chomp
+      dir unless dir.empty?
     end
   end
 end

data/lib/ghi/formatting.rb

@@ -4,6 +4,11 @@ require 'erb'
 
 module GHI
   module Formatting
+    class << self
+      attr_accessor :paginate
+    end
+    self.paginate = true # Default.
+
     autoload :Colors, 'ghi/formatting/colors'
     include Colors
 
@@ -37,9 +42,20 @@ module GHI
       super strings
     end
 
-    def page header = nil, throttle = 1
-      $stdout = IO.popen('less -EKrX -b1', 'w') if $stdout == STDOUT
-      puts header if header
+    def page header = nil, throttle = 0
+      if paginate?
+        pager   = GHI.config('ghi.pager') || GHI.config('core.pager')
+        pager ||= ENV['PAGER']
+        pager ||= 'less'
+        pager  += ' -EKRX -b1' if pager =~ /^less( -[EKRX]+)?$/
+
+        if pager && !pager.empty? && pager != 'cat'
+          $stdout = IO.popen pager, 'w'
+        end
+
+        puts header if header
+      end
+
       loop do
         yield
         sleep throttle
@@ -55,6 +71,10 @@ module GHI
       end
     end
 
+    def paginate?
+      $stdout.tty? && $stdout == STDOUT && Formatting.paginate
+    end
+
     def truncate string, reserved
       result = string.scan(/.{0,#{columns - reserved}}(?:\s|\Z)/).first.strip
       result << "..." if result != string
@@ -141,18 +161,19 @@ module GHI
 
       issues.map { |i|
         n, title, labels = i['number'], i['title'], i['labels']
-        l = 8 + nmax + rmax + no_color { format_labels labels }.to_s.length
+        l = 9 + nmax + rmax + no_color { format_labels labels }.to_s.length
         a = i['assignee'] && i['assignee']['login'] == Authorization.username
         l += 2 if a
         p = i['pull_request']['html_url'] and l += 2
-        c = i['comments'] if i['comments'] > 0 and l += 2
+        c = i['comments']
+        l += c.to_s.length + 1 unless c == 0
         [
           " ",
           (i['repo'].to_s.rjust(rmax) if i['repo']),
           "#{bright { n.to_s.rjust nmax }}:",
           truncate(title, l),
           format_labels(labels),
-          (fg('aaaaaa') { c } if c),
+          (fg('aaaaaa') { c } unless c == 0),
           (fg('aaaaaa') { '↑' } if p),
           (fg(:yellow) { '@' } if a)
         ].compact.join ' '
@@ -161,18 +182,31 @@ module GHI
 
     # TODO: Show milestone, number of comments, pull request attached.
     def format_issue i, width = columns
+      return unless i['created_at']
       ERB.new(<<EOF).result binding
 <% 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 %>\
+<%= format_state i['state'], format_tag(i['state']), :bg %> \
+<% unless i['comments'] == 0 %>\
+<%= fg('aaaaaa'){
+  template = "%d comment"
+  template << "s" unless i['comments'] == 1
+  '(' << template % i['comments'] << ')'
+} %>\
+<% end %>\
 <% if i['assignee'] || !i['labels'].empty? %>
 <% if i['assignee'] %>@<%= i['assignee']['login'] %> is assigned. <% end %>\
 <% unless i['labels'].empty? %><%= format_labels(i['labels']) %><% end %>\
+<% end %>\
+<% if i['milestone'] %>
+Milestone #<%= i['milestone']['number'] %>: <%= i['milestone']['title'] %>\
+<%= " \#{bright{fg(:yellow){'⚠'}}}" if past_due? i['milestone'] %>\
 <% end %>
-<% if i['body'] && !i['body'].empty? %>\n<%= indent i['body'], 4, width %>
+<% if i['body'] && !i['body'].empty? %>
+<%= indent i['body'], 4, width %>
 <% end %>
 
 EOF
@@ -201,33 +235,55 @@ EOF
       }.last['number'].to_s.size
 
       milestones.map { |m|
-        due_on = m['due_on'] && DateTime.parse(m['due_on'])
-        [
-          "  #{bright { m['number'].to_s.rjust max }}:",
-          fg((:red if due_on && due_on <= DateTime.now)) {
-            truncate(m['title'], max + 4)
-          }
-        ].compact.join ' '
+        line = ["  #{m['number'].to_s.rjust max }:"]
+        space = past_due?(m) ? 6 : 4
+        line << truncate(m['title'], max + space)
+        line << '⚠' if past_due? m
+        percent m, line.join(' ')
       }
     end
 
-    def format_milestone m
+    def format_milestone m, width = columns
       ERB.new(<<EOF).result binding
 <%= bright { no_color { \
-indent '#%s: %s' % m.values_at('number', 'title'), 0 } } %>
-@<%= m['creator']['login'] %> created this milestone <%= m['created_at'] %>. \
+indent '#%s: %s' % m.values_at('number', 'title'), 0, width } } %>
+@<%= m['creator']['login'] %> created this milestone \
+<%= format_date DateTime.parse(m['created_at']) %>. \
 <%= format_state m['state'], format_tag(m['state']), :bg %>
 <% if m['due_on'] %>\
 <% due_on = DateTime.parse m['due_on'] %>\
-Due <%= fg((:red if due_on <= DateTime.now)) { format_date due_on } %>.
+<% if past_due? m %>\
+<%= bright{fg(:yellow){"⚠"}} %> \
+<%= bright{fg(:red){"Past due by \#{format_date due_on, false}."}} %>
+<% else %>\
+Due in <%= format_date due_on, false %>.
+<% end %>\
 <% end %>\
+<%= percent m %>
 <% if m['description'] && !m['description'].empty? %>
-<%= indent m['description'] %>
+<%= indent m['description'], 4, width %>
 <% end %>
 
 EOF
     end
 
+    def past_due? milestone
+      return false unless milestone['due_on']
+      DateTime.parse(milestone['due_on']) <= DateTime.now
+    end
+
+    def percent milestone, string = nil
+      open, closed = milestone.values_at('open_issues', 'closed_issues')
+      complete = closed.to_f / (open + closed)
+      complete = 0 if complete.nan?
+      i = (columns * complete).round
+      if string.nil?
+        string = ' %d%% (%d closed, %d open)' % [complete * 100, closed, open]
+      end
+      string = string.ljust columns
+      [bg('2cc200'){string[0, i]}, string[i, columns - i]].join
+    end
+
     def format_state state, string = state, layer = :fg
       send(layer, state == 'closed' ? 'ff0000' : '2cc200') { string }
     end
@@ -245,12 +301,15 @@ EOF
     # Helpers:
     #++
 
+    #--
+    # TODO: DRY up editor formatters.
+    #++
     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):
+Please explain the issue. The first line will become the title. Trailing
+lines starting with '#' (like these) will be ignored, and empty messages will
+not be submitted. Issues are formatted with GitHub Flavored Markdown (GFM):
 
   http://github.github.com/github-flavored-markdown
 
@@ -260,20 +319,45 @@ On <%= repo %>
 EOF
       message.rstrip!
       message.gsub!(/(?!\A)^.*$/) { |line| "# #{line}".rstrip }
-      message.insert 0, [issue['title'], issue['body']].join("\n\n") if issue
+      message.insert 0, [
+        issue['title'] || issue[:title], issue['body'] || issue[:body]
+      ].compact.join("\n\n") if issue
+      message
+    end
+
+    def format_milestone_editor milestone = nil
+      message = ERB.new(<<EOF).result binding
+
+Describe the milestone. The first line will become the title. Trailing lines
+starting with '#' (like these) will be ignored, and empty messages will not be
+submitted. Milestones are formatted with GitHub Flavored Markdown (GFM):
+
+  http://github.github.com/github-flavored-markdown
+
+On <%= repo %>
+
+<%= no_color { format_milestone milestone, columns - 2 } if milestone %>
+EOF
+      message.rstrip!
+      message.gsub!(/(?!\A)^.*$/) { |line| "# #{line}".rstrip }
+      message.insert 0, [
+        milestone['title'], milestone['description']
+      ].join("\n\n") if milestone
       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):
+Leave a comment. The first line will become the title. Trailing lines starting
+with '#' (like these) will be ignored, and empty messages will not be
+submitted. Comments are formatted with GitHub Flavored Markdown (GFM):
 
   http://github.github.com/github-flavored-markdown
 
-On <%= repo %> issue #<%= issue %>
+On <%= repo %> issue #<%= issue['number'] %>
 
+<%= no_color { format_issue issue } if verbose %>\
 <%= no_color { format_comment comment, columns - 2 } if comment %>
 EOF
       message.rstrip!
@@ -312,19 +396,19 @@ EOF
         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}"
-      }
+      # string.gsub!(
+      #   /
+      #     (^\ {#{indent}}```.*?$)(.+?^\ {#{indent}}```$)|
+      #     (^|[^`])(`[^`]+`)([^`]|$)
+      #   /mx
+      # ) {
+      #   post = $5
+      #   fg(c){"#$1#$2#$3#$4".gsub(/\e\[[\d;]+m/, '')} + "#{post}"
+      # }
       string
     end
 
-    def format_date date
+    def format_date date, suffix = true
       days = (interval = DateTime.now - date).to_i.abs
       string = if days.zero?
         seconds, _ = interval.divmod Rational(1, 86400)
@@ -340,11 +424,12 @@ EOF
       else
         "#{days} day#{'s' unless days == 1}"
       end
-      [string, interval < 0 ? 'from now' : 'ago'].join ' '
+      ago = interval < 0 ? 'from now' : 'ago' if suffix
+      [string, ago].compact.join ' '
     end
 
     def throb position = 0, redraw = CURSOR[:up][1]
-      return yield unless $stdout.tty?
+      return yield unless paginate?
 
       throb = THROBBERS[rand(THROBBERS.length)]
       throb.reverse! if rand > 0.5
@@ -352,7 +437,7 @@ EOF
 
       thread = Thread.new do
         dot = lambda do
-          print("\r#{CURSOR[:column][position]}#{throb[i]}#{CURSOR[:hide]}")
+          print "\r#{CURSOR[:column][position]}#{throb[i]}#{CURSOR[:hide]}"
           i = (i + 1) % throb.length
           sleep 0.1 and dot.call
         end

data/lib/ghi/formatting/colors.rb

@@ -240,7 +240,7 @@ module GHI
 
       def offset hex
         h, s, l = rgb_to_hsl(to_rgb(WEB[hex.to_s] || hex))
-        l < 55 && !(40..80).include?(h) ? l *= 1.75 : l /= 2
+        l < 55 && !(40..80).include?(h) ? l *= 1.875 : l /= 3
         hsl_to_rgb([h, s, l]).map { |c| '%02x' % c }.join
       end
 

data/lib/ghi/web.rb

@@ -0,0 +1,26 @@
+require 'uri'
+
+module GHI
+  class Web
+    BASE_URI = 'https://github.com/'
+
+    attr_reader :base
+    def initialize base
+      @base = base
+    end
+
+    def open path = '', params = {}
+      unless params.empty?
+        q = params.map { |k, v| "#{CGI.escape k.to_s}=#{CGI.escape v.to_s}" }
+        path += "?#{q.join '&'}"
+      end
+      system "open '#{uri + path}'"
+    end
+
+    private
+
+    def uri
+      URI(BASE_URI) + "#{base}/"
+    end
+  end
+end

metadata

@@ -1,37 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ghi
-version: !ruby/object:Gem::Version 
-  hash: -4071658224
-  prerelease: 6
-  segments: 
-  - 0
-  - 9
-  - 0
-  - dev
-  - 1
-  version: 0.9.0.dev1
+version: !ruby/object:Gem::Version
+  version: 0.9.0.20120627
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Celis
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2012-07-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ronn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'GitHub Issues on the command line. Use your `$EDITOR`, not your browser.
 
-date: 2012-04-05 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
-description: |
-  GitHub Issues on the command line. Use your `$EDITOR`, not your browser.
-
+'
 email: stephen@stephencelis.com
-executables: 
+executables:
 - ghi
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ghi/authorization.rb
 - lib/ghi/client.rb
 - lib/ghi/commands/assign.rb
@@ -52,43 +72,32 @@ files:
 - lib/ghi/formatting/colors.rb
 - lib/ghi/formatting.rb
 - lib/ghi/json.rb
+- lib/ghi/web.rb
 - lib/ghi.rb
 - bin/ghi
-has_rdoc: true
 homepage: https://github.com/stephencelis/ghi
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: GitHub Issues command line interface
 test_files: []
-
+has_rdoc: false