ghi 0.9.0.dev1 → 0.9.0.20120627

data/lib/ghi/commands/edit.rb

@@ -1,7 +1,7 @@
 module GHI
   module Commands
     class Edit < Command
-      attr_accessor :edit
+      attr_accessor :editor
 
       def options
         OptionParser.new do |opts|
@@ -12,7 +12,7 @@ EOF
           opts.on(
             '-m', '--message [<text>]', 'change issue description'
           ) do |text|
-            next self.edit = true if text.nil?
+            next self.editor = true if text.nil?
             assigns[:title], assigns[:body] = text.split(/\n+/, 2)
           end
           opts.on(
@@ -20,6 +20,9 @@ EOF
           ) do |assignee|
             assigns[:assignee] = assignee
           end
+          opts.on '--claim', 'assign to yourself' do
+            assigns[:assignee] = Authorization.username
+          end
           opts.on(
             '-s', '--state <in>', %w(open closed),
             {'o'=>'open', 'c'=>'closed'}, "'open' or 'closed'"
@@ -34,36 +37,100 @@ EOF
           opts.on(
             '-L', '--label <labelname>...', Array, 'associate with label(s)'
           ) do |labels|
-            assigns[:labels] = labels
+            (assigns[:labels] ||= []).concat labels
+          end
+          opts.separator ''
+          opts.separator 'Pull request options'
+          opts.on(
+            '-H', '--head [[<user>:]<branch>]',
+            'branch where your changes are implemented',
+            '(defaults to current branch)'
+          ) do |head|
+            self.action = 'pull'
+            assigns[:head] = head
+          end
+          opts.on(
+            '-b', '--base [<branch>]',
+            'branch you want your changes pulled into', '(defaults to master)'
+          ) do |base|
+            self.action = 'pull'
+            assigns[:base] = base
           end
           opts.separator ''
         end
       end
 
       def execute
-        require_issue
+        self.action = 'edit'
         require_repo
+        require_issue
         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
+        case action
+        when 'edit'
+          begin
+            if editor || assigns.empty?
+              i = throb { api.get "/repos/#{repo}/issues/#{issue}" }.body
+              e = Editor.new "GHI_ISSUE_#{issue}"
+              message = e.gets format_editor(i)
+              e.unlink "There's no issue." if message.nil? || message.empty?
+              assigns[:title], assigns[:body] = message.split(/\n+/, 2)
+            end
+            if assigns[:title] && i
+              titles_match = assigns[:title].strip == i['title'].strip
+              if assigns[:body]
+                bodies_match = assigns[:body].to_s.strip == i['body'].to_s.strip
+              end
+              if titles_match && bodies_match
+                e.unlink if e
+                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
+            e.unlink if e
+          rescue Client::Error => e
+            raise unless error = e.errors.first
+            abort "%s %s %s %s." % [
+              error['resource'],
+              error['field'],
+              [*error['value']].join(', '),
+              error['code']
+            ]
+          end
+        when 'pull'
+          begin
+            assigns[:issue] = issue
+            assigns[:base] ||= 'master'
+            head = begin
+              if ref = %x{
+                git rev-parse --abbrev-ref HEAD@{upstream} 2>/dev/null
+              }.chomp!
+                ref.split('/').last if $? == 0
+              end
+            end
+            assigns[:head] ||= head
+            if assigns[:head]
+              assigns[:head].sub!(/:$/, ":#{head}")
+            else
+              abort <<EOF.chomp
+fatal: HEAD can't be null. (Is your current branch being tracked upstream?)
+EOF
+            end
+            throb { api.post "/repos/#{repo}/pulls", assigns }
+            base = [repo.split('/').first, assigns[:base]].join ':'
+            puts 'Issue #%d set up to track remote branch %s against %s.' % [
+              issue, assigns[:head], base
+            ]
+          rescue Client::Error => e
+            raise unless error = e.errors.last
+            abort error['message'].sub /^base /, ''
           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

@@ -76,7 +76,7 @@ EOF
         if issue
           uri = "/repos/#{repo}/issues/#{issue}/labels"
         else
-          uri = "/repos/#{repo}/labels"  
+          uri = "/repos/#{repo}/labels"
         end
         labels = throb { api.get uri }.body
         if labels.empty?

data/lib/ghi/commands/list.rb

@@ -1,9 +1,9 @@
-require 'curses'
 require 'date'
 
 module GHI
   module Commands
     class List < Command
+      attr_accessor :web
       attr_accessor :reverse
       attr_accessor :quiet
 
@@ -23,7 +23,7 @@ module GHI
           opts.on(
             '-L', '--label <labelname>...', Array, 'by label(s)'
           ) do |labels|
-            assigns[:labels] = labels.join ','
+            (assigns[:labels] ||= []).concat labels
           end
           opts.on(
             '-S', '--sort <by>', %w(created updated comments),
@@ -45,9 +45,8 @@ module GHI
               raise OptionParser::InvalidArgument, e.message
             end
           end
-          opts.on '-v', '--verbose' do
-            self.verbose = true
-          end
+          opts.on('-v', '--verbose') { self.verbose = true }
+          opts.on('-w', '--web') { self.web = true }
           opts.separator ''
           opts.separator 'Global options'
           opts.on(
@@ -69,13 +68,14 @@ module GHI
           opts.on(
             '-u', '--[no-]assignee [<user>]', 'assigned to specified user'
           ) do |assignee|
+            assignee = assignee.sub /^@/, ''
             assigns[:assignee] = any_or_none_or assignee
           end
           opts.on '--mine', 'assigned to you' do
             assigns[:assignee] = Authorization.username
           end
           opts.on(
-            '-U', '--mentioned [<user>]', 'mentioning you or specified user' 
+            '-U', '--mentioned [<user>]', 'mentioning you or specified user'
           ) do |mentioned|
             assigns[:mentioned] = mentioned || Authorization.username
           end
@@ -84,32 +84,43 @@ module GHI
       end
 
       def execute
+        if index = args.index { |arg| /^@/ === arg }
+          assigns[:assignee] = args.delete_at(index)[1..-1]
+        end
+
         begin
           options.parse! args
         rescue OptionParser::InvalidOption => e
           fallback.parse! e.args
           retry
         end
+        assigns[:labels] = assigns[:labels].join ',' if assigns[:labels]
         if reverse
           assigns[:sort] ||= 'created'
           assigns[:direction] = 'asc'
         end
-        unless quiet
-          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 }
-        page header && "\r#{CURSOR[:up][1]}#{header}" do
-          issues = res.body
-          if verbose
-            puts issues.map { |i| format_issue i }
-          else
-            puts format_issues(issues, repo.nil?)
+        if web
+          Web.new(repo || 'dashboard').open 'issues', assigns
+        else
+          assigns[:per_page] = 100
+          unless quiet
+            print header = format_issues_header
+            print "\n" unless paginate?
+          end
+          res = throb(
+            0, format_state(assigns[:state], quiet ? CURSOR[:up][1] : '#')
+          ) { api.get uri, assigns }
+          print "\r#{CURSOR[:up][1]}" if header && paginate?
+          page header do
+            issues = res.body
+            if verbose
+              puts issues.map { |i| format_issue i }
+            else
+              puts format_issues(issues, repo.nil?)
+            end
+            break unless res.next_page
+            res = throb { api.get res.next_page }
           end
-          break unless res.next_page
-          res = throb { api.get res.next_page }
         end
       rescue Client::Error => e
         if e.response.code == '422'
@@ -124,7 +135,7 @@ module GHI
       private
 
       def uri
-        repo ? "/repos/#{repo}/issues" : '/issues'
+        (repo ? "/repos/#{repo}" : '') << '/issues'
       end
 
       def fallback

data/lib/ghi/commands/milestone.rb

@@ -3,7 +3,9 @@ require 'date'
 module GHI
   module Commands
     class Milestone < Command
+      attr_accessor :edit
       attr_accessor :reverse
+      attr_accessor :web
 
       #--
       # FIXME: Opt for better interface, e.g.,
@@ -39,12 +41,15 @@ EOF
           opts.on '-v', '--verbose', 'list milestones verbosely' do
             self.verbose = true
           end
+          opts.on('-w', '--web') { self.web = true }
           opts.separator ''
           opts.separator 'Milestone modification options'
           opts.on(
-            '-m', '--message <text>', 'change milestone description'
+            '-m', '--message [<text>]', 'change milestone description'
           ) do |text|
             self.action = 'create'
+            self.edit = true
+            next unless text
             assigns[:title], assigns[:description] = text.split(/\n+/, 2)
           end
           # FIXME: We already describe --[no-]closed; describe this, too?
@@ -76,6 +81,7 @@ EOF
 
       def execute
         self.action = 'index'
+        require_repo
         extract_milestone
 
         begin
@@ -96,32 +102,83 @@ EOF
 
         case action
         when 'index'
-          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, assigns }
-          page do
-            milestones = res.body
-            if verbose
-              puts milestones.map { |m| format_milestone m }
-            else
-              puts format_milestones(milestones)
+          if web
+            Web.new(repo).open 'issues/milestones', assigns
+          else
+            assigns[:per_page] = 100
+            state = assigns[:state] || 'open'
+            print format_state state, "# #{repo} #{state} milestones"
+            print "\n" unless paginate?
+            res = throb(0, format_state(state, '#')) { api.get uri, assigns }
+            page do
+              milestones = res.body
+              if verbose
+                puts milestones.map { |m| format_milestone m }
+              else
+                puts format_milestones(milestones)
+              end
+              break unless res.next_page
+              res = throb { api.get res.next_page }
             end
-            break unless res.next_page
-            res = throb { api.get res.next_page }
           end
         when 'show'
-          m = throb { api.get uri }.body
-          print format_milestone(m)
-          puts 'Issues:'
-          List.execute %W(-q -M #{milestone} -- #{repo})
+          if web
+            List.execute %W(-w -M #{milestone} -- #{repo})
+          else
+            m = throb { api.get uri }.body
+            page do
+              puts format_milestone(m)
+              puts 'Issues:'
+              args.unshift(*%W(-q -M #{milestone} -- #{repo}))
+              args.unshift '-v' if verbose
+              List.execute args
+              break
+            end
+          end
         when 'create'
-          m = throb { api.post uri, assigns }.body
-          puts 'Milestone #%d created.' % m['number']
+          if web
+            Web.new(repo).open 'issues/milestones/new'
+          else
+            if assigns[:title].nil?
+              e = Editor.new 'GHI_MILESTONE'
+              message = e.gets format_milestone_editor
+              e.unlink 'Empty milestone.' if message.nil? || message.empty?
+              assigns[:title], assigns[:description] = message.split(/\n+/, 2)
+            end
+            m = throb { api.post uri, assigns }.body
+            puts 'Milestone #%d created.' % m['number']
+            e.unlink if e
+          end
         when 'update'
-          throb { api.patch uri, assigns }
-          puts 'Milestone updated.'
+          if web
+            Web.new(repo).open "issues/milestones/#{milestone}/edit"
+          else
+            if edit || assigns.empty?
+              m = throb { api.get "/repos/#{repo}/milestones/#{milestone}" }.body
+              e = Editor.new "GHI_MILESTONE_#{milestone}"
+              message = e.gets format_milestone_editor(m)
+              e.unlink 'Empty milestone.' if message.nil? || message.empty?
+              assigns[:title], assigns[:description] = message.split(/\n+/, 2)
+            end
+            if assigns[:title] && m
+              t_match = assigns[:title].strip == m['title'].strip
+              if assigns[:description]
+                b_match = assigns[:description].strip == m['description'].strip
+              end
+              if t_match && b_match
+                e.unlink if e
+                abort 'No change.' if assigns.dup.delete_if { |k, v|
+                  [:title, :description].include? k
+                }
+              end
+            end
+            m = throb { api.patch uri, assigns }.body
+            puts format_milestone(m)
+            puts 'Updated.'
+            e.unlink if e
+          end
         when 'destroy'
+          require_milestone
           throb { api.delete uri }
           puts 'Milestone deleted.'
         end

data/lib/ghi/commands/open.rb

@@ -1,12 +1,10 @@
 module GHI
   module Commands
     class Open < Command
+      attr_accessor :editor
+      attr_accessor :web
+
       def options
-        #--
-        # TODO: Support shortcuts, e.g,
-        #
-        #   ghi open "Issue Title"
-        #++
         OptionParser.new do |opts|
           opts.banner = <<EOF
 usage: ghi open [options]
@@ -16,16 +14,24 @@ EOF
           opts.on '-l', '--list', 'list open tickets' do
             self.action = 'index'
           end
+          opts.on('-w', '--web') { self.web = true }
           opts.separator ''
           opts.separator 'Issue modification options'
           opts.on '-m', '--message [<text>]', 'describe issue' do |text|
-            assigns[:title], assigns[:body] = text.split(/\n+/, 2)
+            if text
+              assigns[:title], assigns[:body] = text.split(/\n+/, 2)
+            else
+              self.editor = true
+            end
           end
           opts.on(
             '-u', '--[no-]assign [<user>]', 'assign to specified user'
           ) do |assignee|
             assigns[:assignee] = assignee
           end
+          opts.on '--claim', 'assign to yourself' do
+            assigns[:assignee] = Authorization.username
+          end
           opts.on(
             '-M', '--milestone <n>', 'associate with milestone'
           ) do |milestone|
@@ -34,7 +40,7 @@ EOF
           opts.on(
             '-L', '--label <labelname>...', Array, 'associate with label(s)'
           ) do |labels|
-            assigns[:labels] = labels
+            (assigns[:labels] ||= []).concat labels
           end
           opts.separator ''
         end
@@ -57,17 +63,36 @@ EOF
             args.unshift assigns[:assignee] if assigns[:assignee]
             args.unshift '-u'
           end
+          args.unshift '-w' if web
           List.execute args.push('--', repo)
         when 'create'
-          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)
+          if web
+            Web.new(repo).open 'issues/new'
+          else
+            unless args.empty?
+              assigns[:title], assigns[:body] = args.join(' '), assigns[:title]
+            end
+            assigns[:title] = args.join ' ' unless args.empty?
+            if assigns[:title].nil? || editor
+              e = Editor.new 'GHI_ISSUE'
+              message = e.gets format_editor(assigns)
+              e.unlink "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
+            e.unlink if e
+            puts format_issue(i)
+            puts 'Opened.'
           end
-          i = throb { api.post "/repos/#{repo}/issues", assigns }.body
-          puts format_issue(i)
-          puts 'Opened.'
         end
+      rescue Client::Error => e
+        raise unless error = e.errors.first
+        abort "%s %s %s %s." % [
+          error['resource'],
+          error['field'],
+          [*error['value']].join(', '),
+          error['code']
+        ]
       end
     end
   end