stephencelis-ghi 0.0.1 → 0.0.2

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.0.2 / 2009-04-22
+
+* 1 major enhancement
+
+  * Add --search flag.
+  * Add --repo flag.
+
+
 === 0.0.1 / 2009-04-21
 
 * 1 major enhancement

data/lib/ghi.rb

@@ -1,5 +1,5 @@
 module GHI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   def self.login
     `git config --get github.user`.chomp

data/lib/ghi/api.rb

@@ -17,54 +17,66 @@ class GHI::API
     @user, @repo = user, repo
   end
 
+  def search(term, state = :open)
+    get(:search, state, term)["issues"].map { |attrs| GHI::Issue.new(attrs) }
+  end
+
   def list(state = :open)
-    res = get :list, state
-    raise ResponseError, res if res["issues"].nil?
-    res["issues"].map { |attrs| GHI::Issue.new(attrs) }
+    get(:list, state)["issues"].map { |attrs| GHI::Issue.new(attrs) }
   end
 
   def show(number)
-    res = get :show, number
-    raise ResponseError, res if res["issue"].nil?
-    GHI::Issue.new res["issue"]
+    GHI::Issue.new get(:show, number)["issue"]
   end
 
   def open(title, body)
-    res = post(:open, :title => title, :body => body)
-    raise ResponseError, res if res["issue"].nil?
-    GHI::Issue.new res["issue"]
+    GHI::Issue.new post(:open, :title => title, :body => body)["issue"]
   end
 
   def edit(number, title, body)
-    res = post(:edit, number, :title => title, :body => body)
-    raise ResponseError, res if res["issue"].nil?
+    res = post :edit, number, :title => title, :body => body
     GHI::Issue.new res["issue"]
   end
 
   def close(number)
-    res = post :close, number
-    raise ResponseError, res if res["issue"].nil?
-    GHI::Issue.new res["issue"]
+    GHI::Issue.new post(:close, number)["issue"]
   end
 
   def reopen(number)
-    res = post :reopen, number
-    raise ResponseError, res if res["issue"].nil?
-    GHI::Issue.new res["issue"]
+    GHI::Issue.new post(:reopen, number)
+  end
+
+  def add_label(label, number)
+    post "label/add", label, number
+    p res
+  end
+
+  def remove_label(label, number)
+    post "label/remove", label, number
+  end
+
+  def comment(number, comment)
+    post(:comment, number, comment)["comment"]
   end
 
   private
 
   def get(*args)
-    res = Net::HTTP.get URI.parse(url(*args) + auth(true))
-    YAML.load res
+    res = YAML.load Net::HTTP.get(URI.parse(url(*args) + auth(true)))
+    raise ResponseError, errors(res) if res["error"]
+    res
   end
 
   def post(*args)
     params = args.last.is_a?(Hash) ? args.pop : {}
     params.update auth
-    res = Net::HTTP.post_form URI.parse(url(*args)), params
-    YAML.load res.body
+    res = YAML.load Net::HTTP.post_form(URI.parse(url(*args)), params).body
+    raise ResponseError, errors(res) if res["error"]
+    res
+  end
+
+  def errors(response)
+    [*response["error"]].map { |e| e["error"] } * ", "
   end
 
   def auth(query = false)
@@ -75,10 +87,10 @@ class GHI::API
     end
   end
 
-  def url(action, option = nil)
+  def url(action, *args)
     @url ||= API_URL.sub(":user", user).sub(":repo", repo)
     uri  = @url.sub ":action", action.to_s
-    uri += "/#{option}" unless option.nil?
+    uri += "/#{args.join("/")}" unless args.empty?
     uri
   end
 end

data/lib/ghi/cli.rb

@@ -5,73 +5,80 @@ require "ghi/api"
 require "ghi/issue"
 
 class GHI::CLI
-  def initialize
-    `git config --get remote.origin.url`.match %r{([^:/]+)/([^/]+).git$}
-    @api = GHI::API.new *(@user, @repo = $1, $2)
+  attr_reader :user, :repo, :api, :action, :state, :number, :title,
+    :search_term
 
+  def initialize
     option_parser.parse!(ARGV)
-    case options[:action]
-      when :list   then list(options[:state])
-      when :show   then show(options[:number])
-      when :open   then open(options[:title])
-      when :edit   then edit(options[:number])
-      when :close  then close(options[:number])
-      when :reopen then reopen(options[:number])
+
+    `git config --get remote.origin.url`.match %r{([^:/]+)/([^/]+).git$}
+    @user ||= $1
+    @repo ||= $2
+    @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
       else puts option_parser
     end
   rescue GHI::API::InvalidConnection
     warn "#{File.basename $0}: not a GitHub repo"
+  rescue GHI::API::ResponseError => e
+    warn "#{File.basename $0}: #{e.message} (#{user}/#{repo})"
   rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
     warn "#{File.basename $0}: #{e.message}"
   end
 
   private
 
-  def options
-    @options ||= {}
-  end
-
   def option_parser
     @option_parser ||= OptionParser.new { |opts|
       opts.banner = "Usage: #{File.basename $0} [options]"
 
-      opts.on("-l", "--list", "--show [number]") do |v|
-        options[:action] = :list
+      opts.on("-l", "--list", "--search", "--show [state|term|number]") do |v|
+        @action = :list
         case v
-        when nil, /^o/
-          options[:state] = :open
+        when nil, /^o$/
+          @state = :open
         when /^\d+$/
-          options[:action] = :show
-          options[:number] = v.to_i
-        when /^c/
-          options[:state] = :closed
+          @action = :show
+          @number = v.to_i
+        when /^c$/
+          @state = :closed
         else
-          raise OptionParser::InvalidOption
+          @action = :search
+          @state ||= :open
+          @search_term = v
         end
       end
 
       opts.on("-o", "--open", "--reopen [number]") do |v|
-        options[:action] = :open
+        @action = :open
         case v
         when /^\d+$/
-          options[:action] = :reopen
-          options[:number] = v.to_i
-        when /^l/
-          options[:action] = :list
-          options[:state] = :open
+          @action = :reopen
+          @number = v.to_i
+        when /^l/, nil
+          @action = :list
+          @state = :open
         else
-          options[:title] = v
+          @title = v
         end
       end
 
       opts.on("-c", "--closed", "--close [number]") do |v|
         case v
         when /^\d+$/
-          options[:action] = :close
-          options[:number] = v.to_i
-        when /^l/
-          options[:action] = :list
-          options[:state] = :closed
+          @action = :close
+          @number = v.to_i
+        when /^l/, nil
+          @action = :list
+          @state = :closed
         else
           raise OptionParser::InvalidOption
         end
@@ -80,14 +87,20 @@ class GHI::CLI
       opts.on("-e", "--edit [number]") do |v|
         case v
         when /^\d+$/
-          options[:action] = :edit
-          options[:state] = :closed
-          options[:number] = v.to_i
+          @action = :edit
+          @state = :closed
+          @number = v.to_i
         else
           raise OptionParser::MissingArgument
         end
       end
 
+      opts.on("-r", "--repo", "--repository [name]") do |v|
+        repo = v.split "/"
+        repo.unshift GHI.login if repo.length == 1
+        @user, @repo = repo
+      end
+
       opts.on("-V", "--version") do
         puts "#{File.basename($0)}: v#{GHI::VERSION}"
         exit
@@ -100,9 +113,19 @@ class GHI::CLI
     }
   end
 
+  def search(term, state)
+    issues = api.search term, state
+    puts "# #{state.to_s.capitalize} #{term.inspect} issues on #{user}/#{repo}"
+    if issues.empty?
+      puts "none"
+    else
+      puts issues.map { |i| "  #{i.number.to_s.rjust(3)}: #{i.title[0,72]}" }
+    end
+  end
+
   def list(state)
-    issues = @api.list state
-    puts "# #{state.to_s.capitalize} issues on #@user/#@repo"
+    issues = api.list state
+    puts "# #{state.to_s.capitalize} issues on #{user}/#{repo}"
     if issues.empty?
       puts "none"
     else
@@ -111,7 +134,7 @@ class GHI::CLI
   end
 
   def show(number)
-    issue = @api.show number
+    issue = api.show number
     puts <<-BODY
   #{issue.number}: #{issue.title} [#{issue.state}]
 
@@ -136,7 +159,7 @@ BODY
 #
 #   http://github.github.com/github-flavored-markdown
 #
-# On #@user/#@repo:
+# On #{user}/#{repo}:
 #
 #         user:  #{GHI.login}
   BODY
@@ -150,7 +173,7 @@ BODY
     else
       title = lines.shift.strip
       body = lines.join.sub(/\b\n\b/, " ").strip
-      issue = @api.open title, body
+      issue = api.open title, body
       puts "  Opened issue #{issue.number}: #{issue.title[0,58]}"
     end
   end
@@ -159,7 +182,7 @@ BODY
     edit = ENV["VISUAL"] || ENV["EDITOR"] || "vi"
     begin
       temp = Tempfile.open("open-issue-")
-      issue = @api.show number
+      issue = api.show number
       temp.write <<-BODY
 #{issue.title}#{"\n\n" + issue.body unless issue.body.to_s.strip == ""}
 # Please explain the issue. The first line will be used as the title.
@@ -193,7 +216,7 @@ BODY
         else
           title = lines.shift.strip
           body = lines.join.sub(/\b\n\b/, " ").strip
-          issue = @api.edit(number, title, body)
+          issue = api.edit number, title, body
           puts "  Updated issue #{issue.number}: #{issue.title[0,58]}"
         end
       end
@@ -203,12 +226,12 @@ BODY
   end
 
   def close(number)
-    issue = @api.close number
+    issue = api.close number
     puts "  Closed issue #{issue.number}: #{issue.title[0,58]}"
   end
 
   def reopen(number)
-    issue = @api.reopen number
+    issue = api.reopen number
     puts "  Reopened issue #{issue.number}: #{issue.title[0,56]}"
   end
 end

metadata

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