stephencelis-ghi 0.0.4 → 0.0.5

data/History.rdoc

@@ -1,9 +1,24 @@
+=== 0.0.5 / 2009/04/25
+
+* 3 major enhancements
+
+  * Flag to claim/label issues with your GitHub username (thanks, Jamie).
+  * Flag for commenting on issues.
+  * Prompt for GitHub login and token if absent from gitconfig.
+
+
+* 1 minor enhancement
+
+  * Opening issues with a title bypasses your $EDITOR.
+
+
 === 0.0.4 / 2009-04-24
 
 * 1 major enhancement
 
   * Cache messages created in $EDITOR.
 
+
 * 2 minor enhancements
 
   * Refactoring and cleanup.

data/README.rdoc

@@ -12,12 +12,6 @@ Get:
   % gem install stephencelis-ghi --source=http://gems.github.com
 
 
-Set (http://github.com/blog/180-local-github-config):
-
-  % git config --global github.user username
-  % git config --global github.token 6ef8395fecf207165f1a82178ae1b984
-
-
 Go:
 
   % ghi
@@ -28,6 +22,7 @@ Go:
       -c, --closed, --close [number]
       -e, --edit [number]
       -r, --repo, --repository [name]
+      --claim [number]
 
 
 == EXAMPLE?
@@ -42,9 +37,15 @@ Go:
   ghi -e1               # Edits issue number 1 (in your $EDITOR)
   ghi -c1               # Closes issue 1
   ghi -o1               # Reopens 1
+  ghi --claim 1         # Tags issue 1 with your GitHub username
 
 
 `ghi` also works anywhere:
 
   ghi -rghi -l              # Your fork of "ghi"
   ghi -rstephencelis/ghi -l # Mine: "stephencelis/ghi"
+
+
+== CONTRIBUTORS
+
+* Jamie Macey (http://blog.tracefunc.com)

data/lib/ghi.rb

@@ -1,11 +1,53 @@
+require "net/http"
+require "yaml"
+
 module GHI
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 
   def self.login
-    `git config --get github.user`.chomp
+    return @login if defined? @login
+    @login = `git config --get github.user`.chomp
+    if @login.empty?
+      begin
+        print "Please enter your GitHub username: "
+        @login = gets.chomp
+        valid = user? @login
+        warn "invalid username" unless valid
+      end until valid
+      `git config --global github.user #@login`
+    end
+    @login
   end
 
   def self.token
-    `git config --get github.token`.chomp
+    return @token if defined? @token
+    @token = `git config --get github.token`.chomp
+    if @token.empty?
+      begin
+        print "GitHub token (https://github.com/account): "
+        @token = gets.chomp
+        valid = token? @token
+        warn "invalid token for #{GHI.login}" unless valid
+      end until valid
+      `git config --global github.token #@token`
+    end
+    @token
+  end
+
+  private
+
+  def self.user?(username)
+    url = "http://github.com/api/v2/yaml/user/show/#{username}"
+    !YAML.load(Net::HTTP.get(URI.parse(url)))["user"].nil?
+  rescue ArgumentError # Failure to parse YAML.
+    false
+  end
+
+  def self.token?(token)
+    url  = "http://github.com/api/v2/yaml/user/show/#{GHI.login}"
+    url += "?login=#{GHI.login}&token=#{token}"
+    !YAML.load(Net::HTTP.get(URI.parse(url)))["user"].nil?
+  rescue ArgumentError, NoMethodError # Failure to parse YAML.
+    false
   end
 end

data/lib/ghi/api.rb

@@ -46,20 +46,19 @@ class GHI::API
   end
 
   def reopen(number)
-    GHI::Issue.new post(:reopen, number)
+    GHI::Issue.new post(:reopen, number)["issue"]
   end
 
   def add_label(label, number)
-    post "label/add", label, number
-    p res
+    post("label/add", label, number)["labels"]
   end
 
   def remove_label(label, number)
-    post "label/remove", label, number
+    post("label/remove", label, number)["labels"]
   end
 
   def comment(number, comment)
-    post(:comment, number, comment)["comment"]
+    post(:comment, number, :comment => comment)["comment"]
   end
 
   private

data/lib/ghi/cli.rb

@@ -16,12 +16,13 @@ module GHI::CLI #:nodoc:
       else
         Tempfile.new message_filename, &file_proc(issue)
       end
+      return @message if comment?
       return @message.shift.strip, @message.join.sub(/\b\n\b/, " ").strip
     end
 
     def delete_message
       File.delete message_path
-    rescue TypeError
+    rescue Errno::ENOENT, TypeError
       nil
     end
 
@@ -36,11 +37,7 @@ module GHI::CLI #:nodoc:
     end
 
     def gitdir
-      @gitdir ||= begin
-        dirs = []
-        Dir.pwd.count("/").times { |n| dirs << ([".."] * n << ".git") * "/" }
-        Dir[*dirs].first
-      end
+      @gitdir ||= `git rev-parse --git-dir`.chomp
     end
 
     def message_filename
@@ -79,11 +76,15 @@ module GHI::CLI #:nodoc:
 
     def edit_format(issue)
       l = []
-      l << issue.title                          if issue.title
+      l << issue.title if issue.title && !comment?
       l << ""
-      l << issue.body                           if issue.body
-      l << "# Please explain the issue. The first line will become the title."
-      l << "# Lines beginning '#' will be ignored. Empty issues won't be filed."
+      l << issue.body  if issue.body  && !comment?
+      if comment?
+        l << "# Please enter your comment."
+      else
+        l << "# Please explain the issue. The first line will become the title."
+      end
+      l << "# Lines beginning '#' will be ignored; ghi aborts empty messages."
       l << "# All line breaks will be honored in accordance with GFM:"
       l << "#"
       l << "#   http://github.github.com/github-flavored-markdown"
@@ -104,26 +105,38 @@ module GHI::CLI #:nodoc:
       l << "  updated at:  #{issue.updated_at}" if issue.updated_at
       return l unless verbose
       l << ""
-      l += issue.body.scan(/.{0,75}(?:\s|$)/).map { |line| "    #{line}" }
+      l += indent(issue.body)[0..-2]
     end
 
-    def action_format(issue)
-      key = "#{action.to_s.capitalize.sub(/e?$/, "ed")} issue #{issue.number}"
-      "#{key}: #{truncate issue.title, 78 - key.length}"
+    def action_format(value = nil)
+      key = "#{action.to_s.capitalize.sub(/e?$/, "ed")} issue #{number}"
+      "#{key}: #{truncate value.to_s, 78 - key.length}"
     end
 
     def truncate(string, length)
-      result = string.scan(/.{0,#{length}}(?:\s|$)/).first.strip
+      result = string.scan(/.{0,#{length}}(?:\s|\Z)/).first.strip
       result << "..." if result != string
       result
     end
+
+    def indent(string, level = 4)
+      string.scan(/.{0,#{78 - level}}(?:\s|\Z)/).map { |line|
+        " " * level + line
+      }
+    end
+
+    private
+
+    def comment?
+      ![:open, :edit].include?(action)
+    end
   end
 
   class Executable
     include FileHelper, FormattingHelper
 
-    attr_reader :message, :user, :repo, :api, :action, :state, :number, :title,
-      :search_term
+    attr_reader :message, :user, :repo, :api, :action, :state, :search_term,
+      :number, :title, :body, :label
 
     def initialize
       option_parser.parse!(ARGV)
@@ -134,22 +147,30 @@ module GHI::CLI #:nodoc:
       @api = GHI::API.new user, repo
 
       case action
-        when :search then search search_term, state
-        when :list   then list state
-        when :show   then show number
-        when :open   then open title
-        when :edit   then edit number
-        when :close  then close number
-        when :reopen then reopen number
+        when :search  then search
+        when :list    then list
+        when :show    then show
+        when :open    then open
+        when :edit    then edit
+        when :close   then close
+        when :reopen  then reopen
+        when :comment then comment
+
+        when :claim   then label
         else puts option_parser
       end
     rescue GHI::API::InvalidConnection
       warn "#{File.basename $0}: not a GitHub repo"
       exit 1
-    rescue GHI::API::InvalidRequest, GHI::API::ResponseError => e
+    rescue GHI::API::InvalidRequest => e
       warn "#{File.basename $0}: #{e.message} (#{user}/#{repo})"
+      delete_message
       exit 1
-    rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+    rescue GHI::API::ResponseError => e
+      warn "#{File.basename $0}: #{e.message} (#{user}/#{repo})"
+      exit 1
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument,
+        OptionParser::AmbiguousOption => e
       warn "#{File.basename $0}: #{e.message}"
       exit 1
     end
@@ -177,7 +198,7 @@ module GHI::CLI #:nodoc:
           end
         end
 
-        opts.on("-o", "--open", "--reopen [number]") do |v|
+        opts.on("-o", "--open", "--reopen [title|number]") do |v|
           @action = :open
           case v
           when /^\d+$/
@@ -186,6 +207,8 @@ module GHI::CLI #:nodoc:
           when /^l$/
             @action = :list
             @state = :open
+          when /^m$/
+            raise OptionParser::AmbiguousOption # TODO: Parse args for message.
           else
             @title = v
           end
@@ -210,6 +233,8 @@ module GHI::CLI #:nodoc:
             @action = :edit
             @state = :closed
             @number = v.to_i
+          when /^m$/
+            raise OptionParser::AmbiguousOption # TODO: Parse args for message.
           else
             raise OptionParser::MissingArgument
           end
@@ -221,55 +246,111 @@ module GHI::CLI #:nodoc:
           @user, @repo = repo
         end
 
-        opts.on("-V", "--version") do
+        opts.on("-m", "--comment [number|comment]") do |v|
+          case v
+          when /^\d+$/, nil
+            @action ||= :comment
+            @number ||= v
+            @comment = true
+          else
+            @body = v
+          end
+        end
+
+        opts.on("--claim [number]") do |v|
+          @action = :claim
+          @number = v.to_i
+          @label = GHI.login
+        end
+
+        opts.on_tail("-V", "--version") do
           puts "#{File.basename($0)}: v#{GHI::VERSION}"
           exit
         end
 
-        opts.on("-h", "--help") do
+        opts.on_tail("-h", "--help") do
           puts opts
           exit
         end
       }
     end
 
-    def search(term, state)
-      issues = api.search term, state
-      puts list_format(issues, term)
+    def search
+      issues = api.search search_term, state
+      puts list_format(issues, search_term)
     end
 
-    def list(state)
+    def list
       issues = api.list state
       puts list_format(issues)
     end
 
-    def show(number)
+    def show
       issue = api.show number
       puts show_format(issue)
     end
 
-    def open(title)
-      title, body = gets_from_editor GHI::Issue.new(:title => title)
-      issue = api.open title, body
+    def open
+      if title.nil?
+        new_title, new_body = gets_from_editor GHI::Issue.new("title" => body)
+      elsif @comment && body.nil?
+        new_title, new_body = gets_from_editor GHI::Issue.new("title" => title)
+      end
+      new_title ||= title
+      new_body  ||= body
+      issue = api.open new_title, new_body
       delete_message
-      puts action_format(issue)
+      @number = issue.number
+      puts action_format(issue.title)
     end
 
-    def edit(number)
-      title, body = gets_from_editor api.show(number)
-      issue = api.edit number, title, body
+    def edit
+      shown = api.show number
+      new_title, new_body = gets_from_editor(shown) if body.nil?
+      new_title ||= shown.title
+      new_body  ||= body
+      issue = api.edit number, new_title, new_body
       delete_message
-      puts action_format(issue)
+      puts action_format(issue.title)
     end
 
-    def close(number)
+    def close
       issue = api.close number
-      puts action_format(issue)
+      if @comment
+        body ||= gets_from_editor issue
+        comment = api.comment number, body
+      end
+      puts action_format(issue.title)
+      puts "comment #{comment["status"]}" if comment
     end
 
-    def reopen(number)
+    def reopen
       issue = api.reopen number
-      puts action_format(issue)
+      if @comment
+        body ||= gets_from_editor issue
+        comment = api.comment number, body
+      end
+      puts action_format(issue.title)
+      puts "comment #{comment["status"]}" if comment
+    end
+
+    def label
+      labels = api.add_label label, number
+      puts action_format
+      puts indent(labels.join(", "))
+    end
+
+    def unlabel
+      labels = api.add_label label, number
+      puts action_format
+      puts indent(labels.join(", "))
+    end
+
+    def comment
+      body = gets_from_editor api.show(number)
+      comment = api.comment(number, body)
+      delete_message
+      puts "comment #{comment["status"]}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stephencelis-ghi
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: ghi
 dependencies: []