ghi 0.2.4 → 0.2.5

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.2.5
+
+* 1 enhancement
+
+  * Support for SSL with the "--ssl" flag (and "github.ssl" configuration).
+
+
 === 0.2.4
 
 * 1 enhancement

data/README.rdoc

@@ -19,6 +19,7 @@ Go:
       -l, --list [state|term|number]
           --search, --show
       -v, --verbose
+          --ssl
       -o, --open [title|number]
           --reopen
       -c, --closed, --close [number]
@@ -76,11 +77,16 @@ ghi uses ANSI colors if you use them in git.
 
 ghi looks for a <tt>$GHI_PAGER</tt> variable for paging.
 
+Always favor SSL by setting it:
+
+  git config --global github.ssl true
+
 
 == CONTRIBUTORS
 
 * Jamie Macey (http://blog.tracefunc.com)
 * Hiroshi Nakamura (http://github.com/nahi)
+* David J. Hamilton
 
 
 === CONTRIBUTE?

data/lib/ghi/api.rb

@@ -1,5 +1,6 @@
 require "net/http"
 require "yaml"
+require "cgi"
 
 class GHI::API
   class InvalidRequest < StandardError
@@ -11,13 +12,14 @@ class GHI::API
   class ResponseError < StandardError
   end
 
-  API_URL = "http://github.com/api/v2/yaml/issues/:action/:user/:repo"
+  API_HOST  = "github.com"
+  API_PATH  = "/api/v2/yaml/issues/:action/:user/:repo"
 
   attr_reader :user, :repo
 
-  def initialize(user, repo)
+  def initialize(user, repo, use_ssl = false)
     raise InvalidConnection if user.nil? || repo.nil?
-    @user, @repo = user, repo
+    @user, @repo, @use_ssl = user, repo, use_ssl
   end
 
   def search(term, state = :open)
@@ -64,7 +66,19 @@ class GHI::API
   private
 
   def get(*args)
-    res = YAML.load Net::HTTP.get(URI.parse(url(*args) + auth(true)))
+    res = nil
+    http = Net::HTTP.new(API_HOST, @use_ssl ? 443 : 80)
+    http.use_ssl = true if @use_ssl
+    http.start do
+      if @use_ssl
+        req = Net::HTTP::Post.new path(*args)
+        req.set_form_data auth
+      else
+        req = Net::HTTP::Get.new(path(*args) + auth(true))
+      end
+      res = YAML.load http.request(req).body
+    end
+
     raise ResponseError, errors(res) if res["error"]
     res
   rescue ArgumentError, URI::InvalidURIError
@@ -75,8 +89,16 @@ class GHI::API
 
   def post(*args)
     params = args.last.is_a?(Hash) ? args.pop : {}
-    params.update auth
-    res = YAML.load Net::HTTP.post_form(URI.parse(url(*args)), params).body
+
+    res = nil
+    http = Net::HTTP.new(API_HOST, @use_ssl ? 443 : 80)
+    http.use_ssl = true if @use_ssl
+    http.start do
+      req = Net::HTTP::Post.new path(*args)
+      req.set_form_data params.merge(auth)
+      res = YAML.load http.request(req).body
+    end
+
     raise ResponseError, errors(res) if res["error"]
     res
   rescue ArgumentError, URI::InvalidURIError
@@ -97,10 +119,10 @@ class GHI::API
     end
   end
 
-  def url(action, *args)
-    @url ||= API_URL.sub(":user", user).sub(":repo", repo)
-    uri  = @url.sub ":action", action.to_s
-    uri += "/#{args.join("/")}" unless args.empty?
-    uri
+  def path(action, *args)
+    @path ||= API_PATH.sub(":user", user).sub(":repo", repo)
+    path  = @path.sub ":action", action.to_s
+    path << "/#{args.join("/")}" unless args.empty?
+    path
   end
 end

data/lib/ghi/cli.rb

@@ -207,7 +207,8 @@ module GHI::CLI #:nodoc:
     include FileHelper, FormattingHelper
 
     attr_reader :message, :local_user, :local_repo, :user, :repo, :api,
-      :action, :search_term, :number, :title, :body, :tag, :args, :verbosity
+      :action, :search_term, :number, :title, :body, :tag, :args, :verbosity,
+      :use_ssl
 
     def parse!(*argv)
       @args, @argv = argv, argv.dup
@@ -241,7 +242,7 @@ module GHI::CLI #:nodoc:
     end
 
     def run!
-      @api = GHI::API.new user, repo
+      @api = GHI::API.new user, repo, use_ssl
 
       case action
         when :search        then search
@@ -313,6 +314,10 @@ module GHI::CLI #:nodoc:
           end
         end
 
+        opts.on("--ssl") do |ssl|
+          @use_ssl = true
+        end
+
         opts.on("-o", "--open", "--reopen [title|number]") do |v|
           @action = :open
           case v
@@ -607,6 +612,9 @@ module GHI::CLI #:nodoc:
         @action = :url
         @number ||= arguments.shift[/\d+/].to_i
       end
+
+      @use_ssl ||= `git config github.ssl`.chomp == 'true'
+
       if @action
         @args = @argv.dup
         args.delete_if { |arg| arg == command }

data/spec/ghi/api_spec.rb

@@ -65,132 +65,154 @@ describe GHI::API do
       @api = API.new "stephencelis", "ghi"
       GHI.stub!(:login).and_return "stephencelis"
       GHI.stub!(:token).and_return "token"
+
+      @http = mock(Net::HTTP)
+      @http.stub(:start) { |l| l.call }
     end
 
     it "should substitute url tokens" do
-      @api.send(:url, :open).should ==
-        "http://github.com/api/v2/yaml/issues/open/stephencelis/ghi"
-      @api.send(:url, :show, 1).should ==
-        "http://github.com/api/v2/yaml/issues/show/stephencelis/ghi/1"
-      @api.send(:url, :search, :open, "me").should ==
-        "http://github.com/api/v2/yaml/issues/search/stephencelis/ghi/open/me"
-      @api.send(:url, "label/add", "me").should ==
-        "http://github.com/api/v2/yaml/issues/label/add/stephencelis/ghi/me"
+      @api.send(:path, :open).should ==
+        "/api/v2/yaml/issues/open/stephencelis/ghi"
+      @api.send(:path, :show, 1).should ==
+        "/api/v2/yaml/issues/show/stephencelis/ghi/1"
+      @api.send(:path, :search, :open, "me").should ==
+        "/api/v2/yaml/issues/search/stephencelis/ghi/open/me"
+      @api.send(:path, "label/add", "me").should ==
+        "/api/v2/yaml/issues/label/add/stephencelis/ghi/me"
     end
 
     it "should process gets" do
-      url   = "http://github.com/api/v2/yaml/issues/open/stephencelis/ghi"
+      path  = "/api/v2/yaml/issues/open/stephencelis/ghi"
       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
+      @api.stub!(:path).and_return path
+      req = mock(Net::HTTPRequest)
+      res = mock(Net::HTTPResponse)
+      Net::HTTP.should_receive(:new).once.and_return @http
+      Net::HTTP::Get.should_receive(:new).once.with(path + query).
+        and_return req
+      @http.should_receive(:request).once.with(req).and_return res
+      res.should_receive(:body).once.and_return ISSUES_YAML
       @api.list
     end
 
     it "should process posts" do
-      url   = "http://github.com/api/v2/yaml/issues/open/stephencelis/ghi"
+      path  = "/api/v2/yaml/issues/open/stephencelis/ghi"
       query = { "login" => "stephencelis",
                 "token" => "token",
                 "title" => "Title",
                 "body"  => "Body" }
-      @api.stub!(:url).and_return url
-      r = mock(Net::HTTPRequest)
-      r.should_receive(:body).once.and_return ISSUE_YAML
-      URI.should_receive(:parse).once.with(url).and_return "u"
-      Net::HTTP.should_receive(:post_form).once.with("u", query).and_return r
+      @api.stub!(:path).and_return path
+      req = mock(Net::HTTPRequest)
+      res = mock(Net::HTTPResponse)
+      Net::HTTP.should_receive(:new).once.and_return @http
+      Net::HTTP::Post.should_receive(:new).once.with(path).and_return req
+      req.should_receive(:set_form_data).once
+      @http.should_receive(:request).once.with(req).and_return res
+      res.should_receive(:body).once.and_return ISSUE_YAML
       @api.open "Title", "Body"
     end
 
+    def expect_get_response(body)
+      req = mock(Net::HTTPRequest)
+      res = mock(Net::HTTPResponse)
+      Net::HTTP.should_receive(:new).once.and_return @http
+      Net::HTTP::Get.should_receive(:new).once.and_return req
+      @http.should_receive(:request).once.with(req).and_return res
+      res.should_receive(:body).once.and_return body
+    end
+
+    def expect_post_response(body)
+      req = mock(Net::HTTPRequest)
+      res = mock(Net::HTTPResponse)
+      Net::HTTP.should_receive(:new).once.and_return @http
+      Net::HTTP::Post.should_receive(:new).once.and_return req
+      req.should_receive(:set_form_data).once
+      @http.should_receive(:request).once.with(req).and_return res
+      res.should_receive(:body).once.and_return body
+    end
+
     it "should search open by default" do
-      @api.should_receive(:url).with(:search, :open, "me").and_return "u"
-      Net::HTTP.stub!(:get).and_return ISSUES_YAML
+      @api.should_receive(:path).with(:search, :open, "me").and_return "u"
+      expect_get_response ISSUES_YAML
       issues = @api.search "me"
       issues.should be_an_instance_of(Array)
       issues.each { |issue| issue.should be_an_instance_of(Issue) }
     end
 
     it "should search closed" do
-      @api.should_receive(:url).with(:search, :closed, "me").and_return "u"
-      Net::HTTP.stub!(:get).and_return ISSUES_YAML
+      @api.should_receive(:path).with(:search, :closed, "me").and_return "u"
+      expect_get_response ISSUES_YAML
       @api.search "me", :closed
     end
 
     it "should list open by default" do
-      @api.should_receive(:url).with(:list, :open).and_return "u"
-      Net::HTTP.stub!(:get).and_return ISSUES_YAML
+      @api.should_receive(:path).with(:list, :open).and_return "u"
+      expect_get_response ISSUES_YAML
       issues = @api.list
       issues.should be_an_instance_of(Array)
       issues.each { |issue| issue.should be_an_instance_of(Issue) }
     end
 
     it "should list closed" do
-      @api.should_receive(:url).with(:list, :closed).and_return "u"
-      Net::HTTP.stub!(:get).and_return ISSUES_YAML
+      @api.should_receive(:path).with(:list, :closed).and_return "u"
+      expect_get_response ISSUES_YAML
       @api.list :closed
     end
 
     it "should show" do
-      @api.should_receive(:url).with(:show, 1).and_return "u"
-      Net::HTTP.stub!(:get).and_return ISSUE_YAML
+      @api.should_receive(:path).with(:show, 1).and_return "u"
+      expect_get_response ISSUE_YAML
       @api.show(1).should be_an_instance_of(Issue)
     end
 
     it "should open" do
-      @api.should_receive(:url).with(:open).and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return ISSUE_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with(:open).and_return "u"
+      expect_post_response ISSUE_YAML
       @api.open("Title", "Body").should be_an_instance_of(Issue)
     end
 
     it "should edit" do
-      @api.should_receive(:url).with(:edit, 1).and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return ISSUE_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with(:edit, 1).and_return "u"
+      expect_post_response ISSUE_YAML
       @api.edit(1, "Title", "Body").should be_an_instance_of(Issue)
     end
 
     it "should close" do
-      @api.should_receive(:url).with(:close, 1).and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return ISSUE_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with(:close, 1).and_return "u"
+      expect_post_response ISSUE_YAML
       @api.close(1).should be_an_instance_of(Issue)
     end
 
     it "should reopen" do
-      @api.should_receive(:url).with(:reopen, 1).and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return ISSUE_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with(:reopen, 1).and_return "u"
+      expect_post_response ISSUE_YAML
       @api.reopen(1).should be_an_instance_of(Issue)
     end
 
     it "should add labels" do
-      @api.should_receive(:url).with("label/add", 1, "l").and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return LABELS_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with("label/add", 1, "l").and_return "u"
+      expect_post_response LABELS_YAML
       @api.add_label(1, "l").should be_an_instance_of(Array)
     end
 
     it "should remove labels" do
-      @api.should_receive(:url).with("label/remove", 1, "l").and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return LABELS_YAML
-      Net::HTTP.stub!(:post_form).and_return response
+      @api.should_receive(:path).with("label/remove", 1, "l").and_return "u"
+      expect_post_response LABELS_YAML
       @api.remove_label(1, "l").should be_an_instance_of(Array)
     end
 
-    it "should comment" do
-      @api.should_receive(:url).with(:comment, 1).and_return "u"
-      URI.stub!(:parse).and_return "u"
-      response = mock(Net::HTTPRequest)
-      response.stub!(:body).and_return COMMENT_YAML
-      Net::HTTP.should_receive(:post_form).with("u",
-        hash_including("comment" => "Comment")).and_return response
-      @api.comment(1, "Comment").should be_an_instance_of(Hash)
+    it "should comment, and escape values" do
+      @api.should_receive(:path).with(:comment, 1).and_return "u"
+
+      req = mock(Net::HTTPRequest)
+      res = mock(Net::HTTPResponse)
+      Net::HTTP.should_receive(:new).once.and_return @http
+      Net::HTTP::Post.should_receive(:new).once.and_return req
+      req.should_receive(:set_form_data).once
+      @http.should_receive(:request).once.with(req).and_return res
+      res.should_receive(:body).once.and_return COMMENT_YAML
+
+      @api.comment(1, "Comment&so").should be_an_instance_of(Hash)
     end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ghi
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 -06:00
+date: 2010-07-28 00:00:00 -05:00
 default_executable: ghi
 dependencies: []
 
@@ -48,21 +53,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ghi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: GitHub Issues on the command line