stephencelis-ghi 0.0.8 → 0.0.9

data/README.rdoc

@@ -28,6 +28,7 @@ Go:
           --claim [number]
       -d, --unlabel [number] [label]
       -u, --url [number]
+          --[no-]colors
       -V, --version
       -h, --help
 
@@ -63,6 +64,9 @@ ghi also works anywhere:
   ghi -rstephencelis/ghi -l # Mine: "stephencelis/ghi"
 
 
+ghi uses ANSI colors if you use them in git.
+
+
 == CONTRIBUTORS
 
 * Jamie Macey (http://blog.tracefunc.com)

data/bin/ghi

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require "ghi/cli"
-GHI::CLI::Executable.new
+GHI::CLI::Executable.new.parse!(ARGV)

data/lib/ghi/cli.rb

@@ -130,22 +130,53 @@ module GHI::CLI #:nodoc:
     def comment?
       ![:open, :edit].include?(action)
     end
+
+    def puts(*args)
+      args = args.flatten.each { |arg|
+        arg.gsub!(/(state:)?(# Open.*|  open)$/) { "#$1\e[32m#$2\e[0m" }
+        arg.gsub!(/(state:)?(# Closed.*|  closed)$/) { "#$1\e[31m#$2\e[0m" }
+        marked = [GHI.login, search_term, tag, "(?:#|gh)-\d+"].compact * "|"
+        unless arg.include? "\e"
+          arg.gsub!(/(#{marked})/i) { "\e[1;4;33m#{$&}\e[0m" }
+        end
+      } if colorize?
+    rescue NoMethodError
+      # Do nothing.
+    ensure
+      Kernel.puts(*args)
+    end
+
+    def colorize?
+      return false unless $stdout.isatty
+      return @colorize if defined? @colorize
+      @colorize = !`git config --get-regexp color`.chomp.empty?
+    end
   end
 
   class Executable
     include FileHelper, FormattingHelper
 
     attr_reader :message, :user, :repo, :api, :action, :state, :search_term,
-      :number, :title, :body, :label, :args
+      :number, :title, :body, :tag, :args
 
-    def initialize
-      @args = option_parser.parse!(ARGV)
+    def parse!(*argv)
+      @args = argv
+      option_parser.parse!(*args)
 
       if action.nil?
         puts option_parser
         exit
       end
 
+      run!
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument,
+        OptionParser::AmbiguousOption => e
+      warn "#{File.basename $0}: #{e.message}"
+      puts option_parser
+      exit 1
+    end
+
+    def run!
       `git config --get remote.origin.url`.match %r{([^:/]+)/([^/]+).git$}
       @user ||= $1
       @repo ||= $2
@@ -159,10 +190,9 @@ module GHI::CLI #:nodoc:
         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
-
+        when :comment       then prepare_comment && comment
+        when :label, :claim then prepare_label   && label
+        when :unlabel       then prepare_label   && unlabel
         when :url           then url
       end
     rescue GHI::API::InvalidConnection
@@ -175,10 +205,10 @@ module GHI::CLI #:nodoc:
     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
+
+    def commenting?
+      @commenting
     end
 
     private
@@ -216,7 +246,7 @@ module GHI::CLI #:nodoc:
             @action = :list
             @state = :open
           when /^m$/
-            @title = ARGV * " "
+            @title = args * " "
           when /^u$/
             @action = :url
           else
@@ -227,16 +257,16 @@ module GHI::CLI #:nodoc:
         opts.on("-c", "--closed", "--close [number]") do |v|
           case v
           when /^\d+$/
-            @action ||= :close
+            @action = :close
             @number = v.to_i unless v.nil?
-          when /^l$/, nil
+          when /^l$/
             @action = :list
             @state = :closed
-          when /^u$/, nil
+          when /^u$/
             @action = :url
             @state = :closed
           when nil
-            raise OptionParser::MissingArgument
+            @action = :close
           else
             raise OptionParser::InvalidOption
           end
@@ -246,7 +276,6 @@ module GHI::CLI #:nodoc:
           case v
           when /^\d+$/
             @action = :edit
-            @state = :closed
             @number = v.to_i
           when nil
             raise OptionParser::MissingArgument
@@ -256,17 +285,22 @@ module GHI::CLI #:nodoc:
         end
 
         opts.on("-r", "--repo", "--repository [name]") do |v|
-          repo = v.split "/"
-          repo.unshift GHI.login if repo.length == 1
-          @user, @repo = repo
+          case v
+          when nil
+            raise OptionParser::MissingArgument
+          else
+            repo = v.split "/"
+            repo.unshift GHI.login if repo.length == 1
+            @user, @repo = repo
+          end
         end
 
         opts.on("-m", "--comment [number|comment]") do |v|
           case v
           when /^\d+$/, nil
             @action ||= :comment
-            @number ||= v
-            @comment = true
+            @number ||= v.to_i unless v.nil?
+            @commenting = true
           else
             @body = v
           end
@@ -282,7 +316,7 @@ module GHI::CLI #:nodoc:
           raise OptionParser::MissingArgument if v.nil?
           @action = :claim
           @number = v.to_i
-          @label = GHI.login
+          @tag = GHI.login
         end
 
         opts.on("-d", "--unlabel [number] [label]") do |v|
@@ -291,20 +325,26 @@ module GHI::CLI #:nodoc:
           when /^\d+$/
             @number = v.to_i
           when /^\w+$/
-            @label = v
+            @tag = v
           end
         end
 
-        opts.on("-u", "--url [number]") do |v|
+        opts.on("-u", "--url [state|number]") do |v|
           @action = :url
           case v
           when /^\d+$/
             @number = v.to_i
-          when /^c/
+          when /^c(?:losed)?$/
             @state = :closed
+          when /^u(?:nread)?$/
+            @state = :unread
           end
         end
 
+        opts.on("--[no-]color") do |v|
+          @colorize = v
+        end
+
         opts.on_tail("-V", "--version") do
           puts "#{File.basename($0)}: v#{GHI::VERSION}"
           exit
@@ -335,7 +375,7 @@ module GHI::CLI #:nodoc:
     def open
       if title.nil?
         new_title, new_body = gets_from_editor GHI::Issue.new("title" => body)
-      elsif @comment && body.nil?
+      elsif @commenting && body.nil?
         new_title, new_body = gets_from_editor GHI::Issue.new("title" => title)
       end
       new_title ||= title
@@ -357,8 +397,9 @@ module GHI::CLI #:nodoc:
     end
 
     def close
+      raise GHI::API::InvalidRequest, "need a number" if number.nil?
       issue = api.close number
-      if @comment || new_body = body
+      if @commenting || new_body = body
         new_body ||= gets_from_editor issue
         comment = api.comment number, new_body
       end
@@ -368,7 +409,7 @@ module GHI::CLI #:nodoc:
 
     def reopen
       issue = api.reopen number
-      if @comment || new_body = body
+      if @commenting || new_body = body
         new_body ||= gets_from_editor issue
         comment = api.comment number, new_body
       end
@@ -376,22 +417,32 @@ module GHI::CLI #:nodoc:
       puts "(comment #{comment["status"]})" if comment
     end
 
-    def add_label
-      new_label = label || body || @args * " "
-      labels = api.add_label new_label, number
+    def prepare_label
+      @tag ||= (body || args * " ")
+      raise GHI::API::InvalidRequest, "need a label" if @tag.empty?
+      true
+    end
+
+    def label
+      labels = api.add_label tag, number
       puts action_format
       puts indent(labels.join(", "))
     end
 
-    def remove_label
-      new_label = label || body || @args * " "
-      labels = api.remove_label new_label, number
+    def unlabel
+      labels = api.remove_label tag, number
       puts action_format
       puts indent(labels.empty? ? "no labels" : labels.join(", "))
     end
 
+    def prepare_comment
+      @body = args.flatten.first
+      @commenting = false unless body.nil?
+      true
+    end
+
     def comment
-      body = gets_from_editor api.show(number)
+      @body ||= gets_from_editor api.show(number)
       comment = api.comment(number, body)
       delete_message
       puts "(comment #{comment["status"]})"

data/lib/ghi.rb

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

data/spec/ghi/api_spec.rb

@@ -1,8 +1,6 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "ghi"
 require "ghi/api"
 require "ghi/issue"
-include GHI
 
 ISSUES_YAML = <<-YAML
 ---
@@ -54,15 +52,15 @@ YAML
 
 describe GHI::API do
   it "should require user and repo" do
-    proc { API.new(nil, nil) }.should raise_error(API::InvalidConnection)
-    proc { API.new("u", nil) }.should raise_error(API::InvalidConnection)
-    proc { API.new(nil, "r") }.should raise_error(API::InvalidConnection)
-    proc { API.new("u", "r") }.should_not raise_error(API::InvalidConnection)
+    proc { GHI::API.new(nil, nil) }.should raise_error(GHI::API::InvalidConnection)
+    proc { GHI::API.new("u", nil) }.should raise_error(GHI::API::InvalidConnection)
+    proc { GHI::API.new(nil, "r") }.should raise_error(GHI::API::InvalidConnection)
+    proc { GHI::API.new("u", "r") }.should_not raise_error(GHI::API::InvalidConnection)
   end
 
   describe "requests" do
     before :all do
-      @api = API.new "stephencelis", "ghi"
+      @api = GHI::API.new "stephencelis", "ghi"
       GHI.stub!(:login).and_return "stephencelis"
       GHI.stub!(:token).and_return "token"
     end
@@ -106,7 +104,7 @@ describe GHI::API do
       Net::HTTP.stub!(:get).and_return ISSUES_YAML
       issues = @api.search "me"
       issues.should be_an_instance_of(Array)
-      issues.each { |issue| issue.should be_an_instance_of(Issue) }
+      issues.each { |issue| issue.should be_an_instance_of(GHI::Issue) }
     end
 
     it "should search closed" do
@@ -120,7 +118,7 @@ describe GHI::API do
       Net::HTTP.stub!(:get).and_return ISSUES_YAML
       issues = @api.list
       issues.should be_an_instance_of(Array)
-      issues.each { |issue| issue.should be_an_instance_of(Issue) }
+      issues.each { |issue| issue.should be_an_instance_of(GHI::Issue) }
     end
 
     it "should list closed" do
@@ -132,7 +130,7 @@ describe GHI::API do
     it "should show" do
       @api.should_receive(:url).with(:show, 1).and_return "u"
       Net::HTTP.stub!(:get).and_return ISSUE_YAML
-      @api.show(1).should be_an_instance_of(Issue)
+      @api.show(1).should be_an_instance_of(GHI::Issue)
     end
 
     it "should open" do
@@ -140,7 +138,7 @@ describe GHI::API do
       response = mock(Net::HTTPRequest)
       response.stub!(:body).and_return ISSUE_YAML
       Net::HTTP.stub!(:post_form).and_return response
-      @api.open("Title", "Body").should be_an_instance_of(Issue)
+      @api.open("Title", "Body").should be_an_instance_of(GHI::Issue)
     end
 
     it "should edit" do
@@ -148,7 +146,7 @@ describe GHI::API do
       response = mock(Net::HTTPRequest)
       response.stub!(:body).and_return ISSUE_YAML
       Net::HTTP.stub!(:post_form).and_return response
-      @api.edit(1, "Title", "Body").should be_an_instance_of(Issue)
+      @api.edit(1, "Title", "Body").should be_an_instance_of(GHI::Issue)
     end
 
     it "should close" do
@@ -156,7 +154,7 @@ describe GHI::API do
       response = mock(Net::HTTPRequest)
       response.stub!(:body).and_return ISSUE_YAML
       Net::HTTP.stub!(:post_form).and_return response
-      @api.close(1).should be_an_instance_of(Issue)
+      @api.close(1).should be_an_instance_of(GHI::Issue)
     end
 
     it "should reopen" do
@@ -164,7 +162,7 @@ describe GHI::API do
       response = mock(Net::HTTPRequest)
       response.stub!(:body).and_return ISSUE_YAML
       Net::HTTP.stub!(:post_form).and_return response
-      @api.reopen(1).should be_an_instance_of(Issue)
+      @api.reopen(1).should be_an_instance_of(GHI::Issue)
     end
 
     it "should add labels" do

data/spec/ghi/cli_spec.rb

@@ -1,7 +1,241 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "ghi"
+require "ghi/api"
 require "ghi/cli"
-include GHI
 
-describe GHI::CLI do
+describe GHI::CLI::Executable do
+  before :each do
+    @cli = GHI::CLI::Executable.new
+    @cli.stub!(:api).and_return(mock(GHI::API))
+  end
+
+  describe "parsing" do
+    describe "with well-formed arguments" do
+      before :each do
+        @user, @repo = "localuser", "ghi"
+        @action = @state = @number = @term =
+          @title = @body = @tag = @comment = nil
+      end
+
+      after :each do
+        @cli.stub!(:`).and_return "stub:localuser/ghi.git"
+        @cli.should_receive(@action)
+        @cli.parse! @args
+        @cli.action.should == @action
+        @cli.state.should  == @state
+        @cli.number.should == @number
+        @cli.search_term.should == @term
+        @cli.title.should == @title
+        @cli.body.should == @body
+        @cli.user.should == @user
+        @cli.repo.should == @repo
+        @cli.tag.should == @tag
+        if @commenting
+          @cli.should be_commenting
+        else
+          @cli.should_not be_commenting
+        end
+      end
+
+      it "should parse -l as list open" do
+        @args = ["-l"]
+        @action, @state = :list, :open
+      end
+
+      it "should parse -lo as list open" do
+        @args = ["-lo"]
+        @action, @state = :list, :open
+      end
+
+      it "should parse -lc as list closed" do
+        @args = ["-lc"]
+        @action, @state = :list, :closed
+      end
+
+      it "should parse -l2 as show issue 2" do
+        @args = ["-l2"]
+        @action, @number = :show, 2
+      end
+
+      it "should parse -l 'term' as search open for 'term'" do
+        @args = ["-l", "term"]
+        @action, @state, @term = :search, :open, "term"
+      end
+
+      it "should parse -o as open new issue" do
+        @args = ["-o"]
+        @action = :open
+      end
+
+      it "should parse -o 'New Issue' as open issue with title 'New Issue'" do
+        @args = ["-o", "New Issue"]
+        @action, @title = :open, "New Issue"
+      end
+
+      it "should parse -om 'New Issue' as open issue with'New Issue'" do
+        @args = ["-om", "New Issue"]
+        @action, @title = :open, "New Issue"
+      end
+
+      it "should parse -o 'New Issue' -m as open 'New Issue' in $EDITOR" do
+        @args = ["-o", "New Issue", "-m"]
+        @action, @title, @commenting = :open, "New Issue", true
+      end
+
+      it "should parse -o 'Issue' -m 'Body' as open 'Issue' with 'Body'" do
+        @args = ["-o", "Issue", "-m", "Body"]
+        @action, @title, @body = :open, "Issue", "Body"
+      end
+
+      it "should parse -o2 as reopen issue 2" do
+        @args = ["-o2"]
+        @action, @number = :reopen, 2
+      end
+
+      it "should parse -o2 -m as reopen issue 2 with a comment" do
+        @args = ["-o2", "-m"]
+        @action, @number, @commenting = :reopen, 2, true
+      end
+
+      it "should parse -o2 -m 'Comment' as reopen issue 2" do
+        @args = ["-o2", "-m", "Comment"]
+        @action, @number, @body = :reopen, 2, "Comment"
+      end
+
+      it "should parse -ol as list open" do
+        @args = ["-ol"]
+        @action, @state = :list, :open
+      end
+
+      it "should parse -ou as return open issues url" do
+        @args = ["-ou"]
+        @action = :url # Should state be :open?
+      end
+
+      it "should parse -cl as list closed" do
+        @args = ["-cl"]
+        @action, @state = :list, :closed
+      end
+
+      it "should parse -c2 as close issue 2" do
+        @args = ["-c2"]
+        @action, @number = :close, 2
+      end
+
+      it "should parse -c2 -m as close issue 2 with a comment" do
+        @args = ["-c2", "-m"]
+        @action, @number, @commenting = :close, 2, true
+      end
+
+      it "should parse -c2 -m 'Fixed' as close issue 2 with 'Fixed'" do
+        @args = ["-c2", "-m", "Fixed"]
+        @action, @number, @body = :close, 2, "Fixed"
+      end
+
+      it "should parse -m2 -c as close issue 2 with a comment" do
+        @args = ["-m2", "-c"]
+        @action, @number, @commenting = :close, 2, true
+      end
+
+      it "should parse -cu as return closed issues url" do
+        @args = ["-cu"]
+        @action, @state = :url, :closed
+      end
+
+      it "should parse -e2 as edit issue 2" do
+        @args = ["-e2"]
+        @action, @number = :edit, 2
+      end
+
+      it "should parse -rlocalrepo as localuser/localrepo" do
+        GHI.stub!(:login).and_return "localuser"
+        @args = ["-rlocalrepo", "-l"]
+        @action, @state, @user, @repo = :list, :open, "localuser", "localrepo"
+      end
+
+      it "should parse -rremoteuser/remoterepo as remoteuser/remoterepo" do
+        @args = ["-rremoteuser/remoterepo", "-l"]
+        @action, @state, @user, @repo = :list, :open, "remoteuser", "remoterepo"
+      end
+
+      it "should parse -t2 'tag' as label issue 2 with 'tag'" do
+        @args = ["-t2", "tag"]
+        @action, @number, @tag = :label, 2, "tag"
+      end
+
+      it "should parse -d2 'tag' as remove label 'tag' from issue 2" do
+        @args = ["-d2", "tag"]
+        @action, @number, @tag = :unlabel, 2, "tag"
+      end
+
+      it "should parse -m2 as comment on issue 2" do
+        @args = ["-m2"]
+        @action, @number, @commenting = :comment, 2, true
+      end
+
+      it "should parse -m2 'Comment' as comment 'Comment' on issue 2" do
+        @args = ["-m2", "Comment"]
+        @action, @number, @body = :comment, 2, "Comment"
+      end
+
+      it "should parse -u as return open issues url" do
+        @args = ["-u"]
+        @action = :url # Should state be :open?
+      end
+
+      it "should parse -uo as return open issues url" do
+        @args = ["-uo"]
+        @action = :url # Should state be :open?
+      end
+
+      it "should parse -uc as return open issues url" do
+        @args = ["-uc"]
+        @action, @state = :url, :closed
+      end
+
+      it "should parse -u2 as return issue 2 url" do
+        @args = ["-u2"]
+        @action, @number = :url, 2
+      end
+
+      it "should parse -uu as return unread issues url" do
+        @args = ["-uu"]
+        @action, @state = :url, :unread
+      end
+    end
+
+    describe "with malformed arguments" do
+      before :each do
+        @cli.should_receive :warn
+        @cli.should_receive(:exit).with 1
+      end
+
+      it "should exit with -e" do
+        @cli.should_receive :puts
+        @cli.parse! ["-e"]
+      end
+
+      it "should exit with -e 'invalid'" do
+        @cli.should_receive :puts
+        @cli.parse! ["-e", "invalid"]
+      end
+
+      it "should exit with -c as list closed" do
+        @cli.parse! ["-c"]
+      end
+
+      it "should exit with -r" do
+        @cli.should_receive :puts
+        @cli.parse! ["-r"]
+      end
+
+      it "should exit with -t" do
+        @cli.should_receive :puts
+        @cli.parse! ["-t"]
+      end
+
+      it "should exit with -t2" do
+        @cli.parse! ["-t2"]
+      end
+    end
+  end
 end

data/spec/ghi/issue_spec.rb

@@ -1,7 +1,26 @@
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "ghi"
 require "ghi/issue"
-include GHI
 
 describe GHI::Issue do
+  before :each do
+    @now = Time.now
+    @issue = GHI::Issue.new "number"     => 1,
+                            "state"      => "open",
+                            "title"      => "new issue",
+                            "user"       => "schacon",
+                            "votes"      => 0,
+                            "created_at" => @now,
+                            "updated_at" => @now,
+                            "body"       => "my sweet, sweet issue"
+  end
+
+  it "should read all keys" do
+    @issue.number.should == 1
+    @issue.state.should == "open"
+    @issue.title.should == "new issue"
+    @issue.user.should == "schacon"
+    @issue.votes.should == 0
+    @issue.created_at.should == @now
+    @issue.updated_at.should == @now
+  end
 end

data/spec/ghi_spec.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "ghi"
 
 LOGGED_OUT_YAML = <<-YAML
@@ -85,7 +84,6 @@ describe GHI do
     GHI.should_receive(:gets).and_return "invalid\n", "#{token}\n"
     Net::HTTP.should_receive(:get).and_return LOGGED_OUT_YAML, LOGGED_IN_YAML
     GHI.should_receive(:warn).once
-    # FIXME: Passes on its own...but failing for `spec spec`.
     GHI.should_receive(:`).with("git config --global github.token #{token}").
       and_return "\n"
     GHI.token.should == token

metadata

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