stephencelis-ghi 0.0.6 → 0.0.7

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 0.0.7 / 2009-04-25
+
+* 1 major enhancement
+
+  * Labels! Label and un-label at your whim.
+
+
+* 1 minor enhancement
+
+  * Tail arguments are sometimes parsed. E.g., ghi -om "Issue message parsed".
+
+
 === 0.0.6 / 2009-04-25
 
 * 2 minor enhancements

data/README.rdoc

@@ -15,21 +15,25 @@ Get:
 
 Go:
 
-  % ghi
   Usage: ghi [options]
       -l, --list [state|term|number]
           --search, --show
-      -o, --open, --reopen [number]
+      -o, --open [title|number]
+          --reopen
       -c, --closed, --close [number]
       -e, --edit [number]
       -r, --repo, --repository [name]
       -m, --comment [number|comment]
+      -t, --label [number] [label]
           --claim [number]
+      -d, --unlabel [number] [label]
+      -V, --version
+      -h, --help
 
 
 == EXAMPLE?
 
-ghi works simply from within the directory. Some short examples:
+ghi works simply from within a repository. Some short examples:
 
   ghi -l                    # Lists all open issues
   ghi -lc                   # Lists all closed issues
@@ -45,6 +49,8 @@ ghi works simply from within the directory. Some short examples:
   ghi -c1 -m "Comment"      # Closes issue with specified comment
   ghi -o1                   # Reopens 1 (accepts comments, too)
   ghi -m1                   # Comments on issue 1 (in your $EDITOR)
+  ghi -t1 "tag"             # Labels issue 1 with "tag"
+  ghi -d1 "tag"             # Removes the label, "tag"
   ghi --claim 1             # Tags issue 1 with your GitHub username
 
 

data/lib/ghi.rb

@@ -2,7 +2,7 @@ require "net/http"
 require "yaml"
 
 module GHI
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   def self.login
     return @login if defined? @login

data/lib/ghi/api.rb

@@ -67,6 +67,8 @@ class GHI::API
     res = YAML.load Net::HTTP.get(URI.parse(url(*args) + auth(true)))
     raise ResponseError, errors(res) if res["error"]
     res
+  rescue ArgumentError, URI::InvalidURIError
+    raise ResponseError, "GitHub hiccuped on your request"
   end
 
   def post(*args)
@@ -75,6 +77,8 @@ class GHI::API
     res = YAML.load Net::HTTP.post_form(URI.parse(url(*args)), params).body
     raise ResponseError, errors(res) if res["error"]
     res
+  rescue ArgumentError, URI::InvalidURIError
+    raise ResponseError, "GitHub hiccuped on your request"
   end
 
   def errors(response)

data/lib/ghi/cli.rb

@@ -136,10 +136,15 @@ module GHI::CLI #:nodoc:
     include FileHelper, FormattingHelper
 
     attr_reader :message, :user, :repo, :api, :action, :state, :search_term,
-      :number, :title, :body, :label
+      :number, :title, :body, :label, :args
 
     def initialize
-      option_parser.parse!(ARGV)
+      @args = option_parser.parse!(ARGV)
+
+      if action.nil?
+        puts option_parser
+        exit
+      end
 
       `git config --get remote.origin.url`.match %r{([^:/]+)/([^/]+).git$}
       @user ||= $1
@@ -147,17 +152,16 @@ module GHI::CLI #:nodoc:
       @api = GHI::API.new user, repo
 
       case action
-        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
+        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 :label, :claim then add_label
+        when :unlabel       then remove_label
       end
     rescue GHI::API::InvalidConnection
       warn "#{File.basename $0}: not a GitHub repo"
@@ -208,7 +212,7 @@ module GHI::CLI #:nodoc:
             @action = :list
             @state = :open
           when /^m$/
-            raise OptionParser::AmbiguousOption # TODO: Parse args for message.
+            @title = ARGV * " "
           else
             @title = v
           end
@@ -222,6 +226,8 @@ module GHI::CLI #:nodoc:
           when /^l/, nil
             @action = :list
             @state = :closed
+          when nil
+            raise OptionParser::MissingArgument
           else
             raise OptionParser::InvalidOption
           end
@@ -233,10 +239,10 @@ module GHI::CLI #:nodoc:
             @action = :edit
             @state = :closed
             @number = v.to_i
-          when /^m$/
-            raise OptionParser::AmbiguousOption # TODO: Parse args for message.
-          else
+          when nil
             raise OptionParser::MissingArgument
+          else
+            raise OptionParser::InvalidOption
           end
         end
 
@@ -257,12 +263,29 @@ module GHI::CLI #:nodoc:
           end
         end
 
+        opts.on("-t", "--label [number] [label]") do |v|
+          raise OptionParser::MissingArgument if v.nil?
+          @action ||= :label
+          @number = v.to_i
+        end
+
         opts.on("--claim [number]") do |v|
+          raise OptionParser::MissingArgument if v.nil?
           @action = :claim
           @number = v.to_i
           @label = GHI.login
         end
 
+        opts.on("-d", "--unlabel [number] [label]") do |v|
+          @action = :unlabel
+          case v
+          when /^\d+$/
+            @number = v.to_i
+          when /^\w+$/
+            @label = v
+          end
+        end
+
         opts.on_tail("-V", "--version") do
           puts "#{File.basename($0)}: v#{GHI::VERSION}"
           exit
@@ -334,16 +357,18 @@ module GHI::CLI #:nodoc:
       puts "(comment #{comment["status"]})" if comment
     end
 
-    def label
-      labels = api.add_label label, number
+    def add_label
+      new_label = label || body || @args * " "
+      labels = api.add_label new_label, number
       puts action_format
       puts indent(labels.join(", "))
     end
 
-    def unlabel
-      labels = api.add_label label, number
+    def remove_label
+      new_label = label || body || @args * " "
+      labels = api.remove_label new_label, number
       puts action_format
-      puts indent(labels.join(", "))
+      puts indent(labels.empty? ? "no labels" : labels.join(", "))
     end
 
     def comment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stephencelis-ghi
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Stephen Celis