ghi 0.2.2 → 0.2.3

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.2.3 / 2009-12-17
+
+* Minor enhancements
+
+  * Better follow git's editor and pager behavior.
+  * Accept -w and --web as alternatives to -u and --url (like git help).
+
+
 === 0.2.2 / 2009-11-30
 
 * 1 bugfix

data/lib/ghi.rb

@@ -2,7 +2,7 @@ require "net/http"
 require "yaml"
 
 module GHI
-  VERSION = "0.2"
+  VERSION = "0.2.3"
 
   class << self
     def login

data/lib/ghi/cli.rb

@@ -45,7 +45,8 @@ module GHI::CLI #:nodoc:
     private
 
     def editor
-      ENV["GHI_EDITOR"] || ENV["VISUAL"] || ENV["EDITOR"] || "vi"
+      ENV["GHI_EDITOR"] || ENV["GIT_EDITOR"] ||
+        `git config --get-all core.editor`.split.first || ENV["EDITOR"] || "vi"
     end
 
     def gitdir
@@ -190,8 +191,11 @@ module GHI::CLI #:nodoc:
 
     def pager
       return @pager if defined? @pager
-      pagers = [ENV["GHI_PAGER"], "less -EMRX", "pager", "more"].compact.uniq
-      pagers.each { |pager| return @pager = IO.popen(pager, "w") rescue nil }
+      pager = ENV["GHI_PAGER"] || ENV["GIT_PAGER"] ||
+        `git config --get-all core.pager`.split.first || ENV["PAGER"] ||
+        "less -EMRX"
+
+      @pager = IO.popen(pager, "w")
     end
 
     def windows?
@@ -292,7 +296,7 @@ module GHI::CLI #:nodoc:
             @number = v.to_i
           when /^c(?:losed)?$/
             @state = :closed
-          when /^u$/
+          when /^[uw]$/
             @action = :url
           when /^v$/
             @verbosity = true
@@ -319,7 +323,7 @@ module GHI::CLI #:nodoc:
             @action = :list
           when /^m$/
             @title = args * " "
-          when /^u$/
+          when /^[uw]$/
             @action = :url
           else
             @title = v
@@ -334,7 +338,7 @@ module GHI::CLI #:nodoc:
           when /^l$/
             @action = :list
             @state = :closed
-          when /^u$/
+          when /^[uw]$/
             @action = :url
             @state = :closed
           when nil
@@ -405,7 +409,7 @@ module GHI::CLI #:nodoc:
           end
         end
 
-        opts.on("-u", "--url [state|number]") do |v|
+        opts.on("-u", "-w", "--url", "--web [state|number]") do |v|
           @action = :url
           case v
           when /^\d+$/
@@ -593,6 +597,9 @@ module GHI::CLI #:nodoc:
       when %r{^([^/]+)/([^/]+)$}
         @action = :list
         @user, @repo = $1, $2
+      when "url", "web"
+        @action = :url
+        @number ||= arguments.shift[/\d+/].to_i
       end
       if @action
         @args = @argv.dup

data/spec/ghi/api_spec.rb

@@ -1,6 +1,8 @@
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
 require "ghi"
 require "ghi/api"
 require "ghi/issue"
+include GHI
 
 ISSUES_YAML = <<-YAML
 ---
@@ -52,15 +54,15 @@ YAML
 
 describe GHI::API do
   it "should require user and repo" do
-    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)
+    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)
   end
 
   describe "requests" do
-    before :all do
-      @api = GHI::API.new "stephencelis", "ghi"
+    before :each do
+      @api = API.new "stephencelis", "ghi"
       GHI.stub!(:login).and_return "stephencelis"
       GHI.stub!(:token).and_return "token"
     end
@@ -78,7 +80,7 @@ describe GHI::API do
 
     it "should process gets" do
       url   = "http://github.com/api/v2/yaml/issues/open/stephencelis/ghi"
-      query = "?login=stephencelis&token=d1cd249db48d51c9847cbf2b291f5ae9"
+      query = "?login=stephencelis&token=token"
       @api.stub!(:url).and_return url
       URI.should_receive(:parse).once.with(url + query).and_return("mock")
       Net::HTTP.should_receive(:get).once.with("mock").and_return ISSUES_YAML
@@ -88,7 +90,7 @@ describe GHI::API do
     it "should process posts" do
       url   = "http://github.com/api/v2/yaml/issues/open/stephencelis/ghi"
       query = { "login" => "stephencelis",
-                "token" => "d1cd249db48d51c9847cbf2b291f5ae9",
+                "token" => "token",
                 "title" => "Title",
                 "body"  => "Body" }
       @api.stub!(:url).and_return url
@@ -104,7 +106,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(GHI::Issue) }
+      issues.each { |issue| issue.should be_an_instance_of(Issue) }
     end
 
     it "should search closed" do
@@ -118,7 +120,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(GHI::Issue) }
+      issues.each { |issue| issue.should be_an_instance_of(Issue) }
     end
 
     it "should list closed" do
@@ -130,7 +132,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(GHI::Issue)
+      @api.show(1).should be_an_instance_of(Issue)
     end
 
     it "should open" do
@@ -138,7 +140,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(GHI::Issue)
+      @api.open("Title", "Body").should be_an_instance_of(Issue)
     end
 
     it "should edit" do
@@ -146,7 +148,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(GHI::Issue)
+      @api.edit(1, "Title", "Body").should be_an_instance_of(Issue)
     end
 
     it "should close" do
@@ -154,7 +156,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(GHI::Issue)
+      @api.close(1).should be_an_instance_of(Issue)
     end
 
     it "should reopen" do
@@ -162,7 +164,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(GHI::Issue)
+      @api.reopen(1).should be_an_instance_of(Issue)
     end
 
     it "should add labels" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghi
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -06:00
+date: 2009-12-07 00:00:00 -06:00
 default_executable: ghi
 dependencies: []