ghi 0.9.0.dev1 → 0.9.0.20120627

data/bin/ghi

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
-require 'ghi'
+autoload :GHI, 'ghi'
 GHI.execute ARGV

data/lib/ghi.rb

@@ -6,28 +6,29 @@ module GHI
   autoload :Commands,      'ghi/commands'
   autoload :Editor,        'ghi/editor'
   autoload :Formatting,    'ghi/formatting'
+  autoload :Web,           'ghi/web'
 
   class << self
     def execute args
       STDOUT.sync = true
 
+      double_dash = args.index { |arg| arg == '--' }
       if index = args.index { |arg| arg !~ /^-/ }
-        command_name = args.delete_at index
-        command_args = args.slice! index, args.length
+        if double_dash.nil? || index < double_dash
+          command_name = args.delete_at index
+          command_args = args.slice! index, args.length
+        end
       end
       command_args ||= []
 
       option_parser = OptionParser.new do |opts|
         opts.banner = <<EOF
-usage: ghi [--version] [--help] <command> [<args>] [ -- [<user>/]<repo>]
+usage: ghi [--version] [-p|--paginate|--no-pager] [--help] <command> [<args>]
+           [ -- [<user>/]<repo>]
 EOF
-#         opts.banner = <<EOF
-# usage: ghi [--version] [-p|--paginate|--no-pager] [--help] <command> [<args>]
-#            [ -- [<user>/]<repo>]
-# EOF
         opts.on('--version') { command_name = 'version' }
         opts.on '-p', '--paginate', '--[no-]pager' do |paginate|
-          
+          GHI::Formatting.paginate = paginate
         end
         opts.on '--help' do
           command_args.unshift(*args)
@@ -38,8 +39,17 @@ EOF
         opts.on '--[no-]color' do |colorize|
           Formatting::Colors.colorize = colorize
         end
-        opts.on('-v') { self.v = true }
-        opts.on('-h') { raise OptionParser::InvalidOption }
+        opts.on '-l' do
+          if command_name
+            raise OptionParser::InvalidOption
+          else
+            command_name = 'list'
+          end
+        end
+        opts.on '-v' do
+          command_name ? self.v = true : command_name = 'version'
+        end
+        opts.on('-V') { command_name = 'version' }
       end
 
       begin
@@ -75,40 +85,46 @@ EOF
           end
         rescue SocketError => e
           abort "Couldn't find internet."
-        rescue Errno::ECONNREFUSED => e
-          abort "Couldn't connect to GitHub."
-        rescue Errno::ETIMEDOUT => e
-          abort 'Timed out looking for GitHub.'
+        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
+          abort "Couldn't find GitHub."
         end
       end
     rescue Authorization::Required => e
       retry if Authorization.authorize!
       warn e.message
       if Authorization.token
-        warn <<EOF
+        warn <<EOF.chomp
 
 Not authorized for this action with your token. To regenerate a new token:
 EOF
       end
       warn <<EOF
 
-Please run 'ghi config --auth <username>:<password>'
+Please run 'ghi config --auth <username>'
 EOF
       exit 1
     end
 
+    def config key
+      var = key.gsub('core', 'git').gsub('.', '_').upcase
+      value = ENV[var] || `git config #{key}`.chomp
+      value unless value.empty?
+    end
+
     attr_accessor :v
     alias v? v
 
     private
 
-    ALIASES = {
-      'c'        => %w(close),
+    ALIASES = Hash.new { |_, key|
+      [key] if /^\d+$/ === key
+    }.update(
       'claim'    => %w(assign),
       'e'        => %w(edit),
       'l'        => %w(list),
       'L'        => %w(label),
       'm'        => %w(comment),
+      'M'        => %w(milestone),
       'o'        => %w(open),
       'reopen'   => %w(open),
       'rm'       => %w(close),
@@ -116,10 +132,21 @@ EOF
       'st'       => %w(list),
       'tag'      => %w(label),
       'unassign' => %w(assign -d)
-    }
+    )
 
     def fetch_alias command, args
       return command unless fetched = ALIASES[command]
+
+      # If the <command> is an issue number, check the options to see if an
+      # edit or show is desired.
+      if fetched.first =~ /^\d+$/
+        edit_options = Commands::Edit.new([]).options.top.list
+        edit_options.reject! { |arg| !arg.is_a?(OptionParser::Switch) }
+        edit_options.map! { |arg| [arg.short, arg.long] }
+        edit_options.flatten!
+        fetched.unshift((edit_options & args).empty? ? 'show' : 'edit')
+      end
+
       command = fetched.shift
       args.unshift(*fetched)
       command

data/lib/ghi/authorization.rb

@@ -1,20 +1,23 @@
+# encoding: utf-8
+
 module GHI
   module Authorization
     extend Formatting
 
     class Required < RuntimeError
+      def message() 'Authorization required.' end
     end
 
     class << self
       def token
         return @token if defined? @token
-        @token = config 'ghi.token'
+        @token = GHI.config 'ghi.token'
       end
 
       def authorize! user = username, pass = password, local = true
         return false unless user && pass
 
-        res = throb {
+        res = throb(54, "✔\r") {
           Client.new(user, pass).post(
             '/authorizations',
             :scopes   => %w(public_repo repo),
@@ -23,12 +26,12 @@ module GHI
           )
         }
         @token = res.body['token']
-        
+
         run = []
         unless username
-          run << "git config#{' --global ' unless local} github.user #{user}"
+          run << "git config#{' --global' unless local} github.user #{user}"
         end
-        run << "git config#{' --global ' unless local} ghi.token #{token}"
+        run << "git config#{' --global' unless local} ghi.token #{token}"
 
         system run.join('; ')
 
@@ -47,24 +50,17 @@ EOF
           end
         end
       rescue Client::Error => e
-        abort e.message
+        abort "#{e.message}#{CURSOR[:column][0]}"
       end
 
       def username
         return @username if defined? @username
-        @username = config 'github.user'
+        @username = GHI.config 'github.user'
       end
 
       def password
         return @password if defined? @password
-        @password = config 'github.password'
-      end
-
-      private
-
-      def config key
-        value = ENV["#{key.upcase.gsub '.', '_'}"] || `git config #{key}`.chomp
-        value unless value.empty?
+        @password = GHI.config 'github.password'
       end
     end
   end

data/lib/ghi/client.rb

@@ -106,9 +106,9 @@ module GHI
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE # FIXME 1.8.7
 
-      GHI.v? and puts "===> #{method.to_s.upcase} #{path} #{req.body}"
+      GHI.v? and puts "\r===> #{method.to_s.upcase} #{path} #{req.body}"
       res = http.start { http.request req }
-      GHI.v? and puts "<=== #{res.code}: #{res.body}"
+      GHI.v? and puts "\r<=== #{res.code}: #{res.body}"
 
       case res
       when Net::HTTPSuccess

data/lib/ghi/commands/close.rb

@@ -1,6 +1,8 @@
 module GHI
   module Commands
     class Close < Command
+      attr_accessor :web
+
       def options
         OptionParser.new do |opts|
           opts.banner = <<EOF
@@ -10,6 +12,7 @@ EOF
           opts.on '-l', '--list', 'list closed issues' do
             assigns[:command] = List
           end
+          opts.on('-w', '--web') { self.web = true }
           opts.separator ''
           opts.separator 'Issue modification options'
           opts.on '-m', '--message [<text>]', 'close with message' do |text|
@@ -24,7 +27,9 @@ EOF
         require_repo
 
         if list?
-          List.execute %W(-sc -- #{repo})
+          args.unshift(*%W(-sc -- #{repo}))
+          args.unshift '-w' if web
+          List.execute args
         else
           require_issue
           if assigns.key? :comment

data/lib/ghi/commands/command.rb

@@ -6,12 +6,16 @@ module GHI
     class Command
       include Formatting
 
-      def self.execute args
-        command = new args
-        if i = args.index('--')
-          command.repo = args.slice!(i, args.length)[1] # Raise if too many?
+      class << self
+        attr_accessor :detected_repo
+
+        def execute args
+          command = new args
+          if i = args.index('--')
+            command.repo = args.slice!(i, args.length)[1] # Raise if too many?
+          end
+          command.execute
         end
-        command.execute
       end
 
       attr_reader :args
@@ -33,8 +37,10 @@ module GHI
 
       def repo
         return @repo if defined? @repo
-        @repo = ENV['GHI_REPO'] || `git config --local ghi.repo`.chomp
-        @repo = detect_repo if @repo.empty?
+        @repo = GHI.config('ghi.repo') || detect_repo
+        if @repo && !@repo.include?('/')
+          @repo = [Authorization.username, @repo].join '/'
+        end
         @repo
       end
       alias extract_repo repo
@@ -57,20 +63,23 @@ module GHI
       end
 
       def detect_repo
-        remotes = `git config --get-regexp remote\..+\.url`.split "\n"
-        remotes.reject! { |r| !r.include? 'github.com'}
+        remote   = remotes.find { |r| r[:remote] == 'upstream' }
+        remote ||= remotes.find { |r| r[:remote] == 'origin' }
+        remote ||= remotes.find { |r| r[:user]   == Authorization.username }
+        Command.detected_repo = true and remote[:repo] if remote
+      end
 
-        remotes.map! { |r|
+      def remotes
+        return @remotes if defined? @remotes
+        @remotes = `git config --get-regexp remote\..+\.url`.split "\n"
+        @remotes.reject! { |r| !r.include? 'github.com'}
+        @remotes.map! { |r|
           remote, user, repo = r.scan(
             %r{remote\.([^\.]+)\.url .*?([^:/]+)/([^/\s]+?)(?:\.git)?$}
           ).flatten
           { :remote => remote, :user => user, :repo => "#{user}/#{repo}" }
         }
-
-        remote   = remotes.find { |r| r[:remote] == 'upstream' }
-        remote ||= remotes.find { |r| r[:remote] == 'origin' }
-        remote ||= remotes.find { |r| r[:user]   == Authorization.username }
-        remote[:repo] if remote
+        @remotes
       end
 
       def issue

data/lib/ghi/commands/comment.rb

@@ -2,6 +2,8 @@ module GHI
   module Commands
     class Comment < Command
       attr_accessor :comment
+      attr_accessor :verbose
+      attr_accessor :web
 
       def options
         OptionParser.new do |opts|
@@ -12,6 +14,7 @@ EOF
           opts.on '-l', '--list', 'list comments' do
             self.action = 'list'
           end
+          opts.on('-w', '--web') { self.web = true }
           # opts.on '-v', '--verbose', 'list events, too'
           opts.separator ''
           opts.separator 'Comment modification options'
@@ -27,6 +30,9 @@ EOF
           opts.on '--close', 'close associated issue' do
             self.action = 'close'
           end
+          opts.on '-v', '--verbose' do
+            self.verbose = true
+          end
           opts.separator ''
         end
       end
@@ -46,7 +52,11 @@ EOF
             res = throb { api.get res.next_page }
           end
         when 'create'
-          create
+          if web
+            Web.new(repo).open "issues/#{issue}#issue_comment_form"
+          else
+            create
+          end
         when 'update', 'destroy'
           res = index
           res = throb { api.get res.last_page } if res.last_page
@@ -66,40 +76,54 @@ EOF
       protected
 
       def index
-        throb { api.get uri }
+        throb { api.get uri, :per_page => 100 }
       end
 
-      def create
-        require_body
+      def create message = 'Commented.'
+        e = require_body
         c = throb { api.post uri, assigns }.body
-        puts format_comment c
-        puts 'Commented.'
+        puts format_comment(c)
+        puts message
+        e.unlink if e
       end
 
       def update
-        require_body
-        c = throb { api.patch uri, assigns }.body
-        puts format_comment c
-        puts 'Updated.'
+        create 'Comment updated.'
       end
 
       def destroy
         throb { api.delete uri }
-        puts 'Deleted.'
+        puts 'Comment deleted.'
       end
 
       private
 
       def uri
-        comment ? comment['url'] : "/repos/#{repo}/issues/#{issue}/comments"
+        if comment
+          comment['url']
+        else
+          "/repos/#{repo}/issues/#{issue}/comments"
+        end
       end
 
       def require_body
+        assigns[:body] = args.join ' ' unless args.empty?
         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
+        if issue && verbose
+          i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
+        else
+          i = {'number'=>issue}
+        end
+        filename = "GHI_COMMENT_#{issue}"
+        filename << "_#{comment['id']}" if comment
+        e = Editor.new filename
+        message = e.gets format_comment_editor(i, comment)
+        e.unlink 'No comment.' if message.nil? || message.empty?
+        if comment && message.strip == comment['body'].strip
+          e.unlink 'No change.'
+        end
         assigns[:body] = message if message
+        e
       end
     end
   end

data/lib/ghi/commands/config.rb

@@ -10,11 +10,9 @@ EOF
           opts.on '--local', 'set for local repo only' do
             assigns[:local] = true
           end
-          opts.on '--auth [<username>:<password>]' do |credentials|
+          opts.on '--auth [<username>]' do |username|
             self.action = 'auth'
-            username, password = credentials.split ':', 2 if credentials
-            assigns[:username] = username
-            assigns[:password] = password
+            assigns[:username] = username || Authorization.username
           end
           opts.separator ''
         end
@@ -25,11 +23,33 @@ EOF
         options.parse! args.empty? ? %w(-h) : args
 
         if self.action == 'auth'
+          assigns[:password] = Authorization.password || get_password
           Authorization.authorize!(
             assigns[:username], assigns[:password], assigns[:local]
           )
         end
       end
+
+      private
+
+      def get_password
+        print "Enter #{assigns[:username]}'s GitHub password (never stored): "
+        current_tty = `stty -g`
+        system 'stty raw -echo -icanon isig' if $?.success?
+        input = ''
+        while char = $stdin.getbyte and not (char == 13 or char == 10)
+          if char == 127 or char == 8
+            input[-1, 1] = '' unless input.empty?
+          else
+            input << char.chr
+          end
+        end
+        input
+      rescue Interrupt
+        print '^C'
+      ensure
+        system "stty #{current_tty}" unless current_tty.empty?
+      end
     end
   end
 end