stephencelis-ghi 0.1.5 → 0.1.6

data/History.rdoc

@@ -1,4 +1,16 @@
-=== 0.1.5 / 2009-05-15
+=== 0.1.6 / 2009-08-05
+
+* 1 minor enhancement
+
+  * Support for non-"origin" remotes.
+
+
+* 1 bugfix
+
+  * Graceful offline error.
+
+
+=== 0.1.5 / 2009-07-08
 
 * 2 bugfixes
 

data/bin/ghi

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+$: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
 require "ghi/cli"
 $stdout.sync = true
 GHI::CLI::Executable.new.parse!(ARGV)

data/lib/ghi/api.rb

@@ -69,6 +69,8 @@ class GHI::API
     res
   rescue ArgumentError, URI::InvalidURIError
     raise ResponseError, "GitHub hiccuped on your request"
+  rescue SocketError
+    raise ResponseError, "couldn't find the internet"
   end
 
   def post(*args)
@@ -79,6 +81,8 @@ class GHI::API
     res
   rescue ArgumentError, URI::InvalidURIError
     raise ResponseError, "GitHub hiccuped on your request"
+  rescue SocketError
+    raise ResponseError, "couldn't find the internet"
   end
 
   def errors(response)

data/lib/ghi/cli.rb

@@ -18,7 +18,7 @@ module GHI::CLI #:nodoc:
 
     def gets_from_editor(issue)
       if windows?
-        warn "Please supply the message by using the -m option"
+        warn "Please supply the message with the -m option"
         exit 1
       end
 
@@ -195,7 +195,7 @@ module GHI::CLI #:nodoc:
     end
 
     def windows?
-      RUBY_PLATFORM.include?("mswin")
+      RUBY_PLATFORM.include? "mswin"
     end
   end
 
@@ -208,8 +208,9 @@ module GHI::CLI #:nodoc:
     def parse!(*argv)
       @args, @argv = argv, argv.dup
 
+      remotes = `git config --get-regexp remote\..+\.url`.split /\n/
       repo_expression = %r{([^:/]+)/([^/\.\s]+)(?:\.git)?$}
-      `git config --get remote.origin.url`.match repo_expression
+      remotes.find { |r| r.include? "github.com" }.match repo_expression
       @user, @repo = $1, $2
 
       option_parser.parse!(*args)

data/lib/ghi.rb

@@ -2,52 +2,54 @@ require "net/http"
 require "yaml"
 
 module GHI
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
-  def self.login
-    return @login if defined? @login
-    @login = `git config --get github.user`.chomp
-    if @login.empty?
-      begin
-        print "Please enter your GitHub username: "
-        @login = gets.chomp
-        valid = user? @login
-        warn "invalid username" unless valid
-      end until valid
-      `git config --global github.user #@login`
+  class << self
+    def login
+      return @login if defined? @login
+      @login = `git config --get github.user`.chomp
+      if @login.empty?
+        begin
+          print "Please enter your GitHub username: "
+          @login = gets.chomp
+          valid = user? @login
+          warn "invalid username" unless valid
+        end until valid
+        `git config --global github.user #@login`
+      end
+      @login
     end
-    @login
-  end
 
-  def self.token
-    return @token if defined? @token
-    @token = `git config --get github.token`.chomp
-    if @token.empty?
-      begin
-        print "GitHub token (https://github.com/account): "
-        @token = gets.chomp
-        valid = token? @token
-        warn "invalid token for #{GHI.login}" unless valid
-      end until valid
-      `git config --global github.token #@token`
+    def token
+      return @token if defined? @token
+      @token = `git config --get github.token`.chomp
+      if @token.empty?
+        begin
+          print "GitHub token (https://github.com/account): "
+          @token = gets.chomp
+          valid = token? @token
+          warn "invalid token for #{login}" unless valid
+        end until valid
+        `git config --global github.token #@token`
+      end
+      @token
     end
-    @token
-  end
 
-  private
+    private
 
-  def self.user?(username)
-    url = "http://github.com/api/v2/yaml/user/show/#{username}"
-    !YAML.load(Net::HTTP.get(URI.parse(url)))["user"].nil?
-  rescue ArgumentError, URI::InvalidURIError
-    false
-  end
+    def user?(username)
+      url = "http://github.com/api/v2/yaml/user/show/#{username}"
+      !YAML.load(Net::HTTP.get(URI.parse(url)))["user"].nil?
+    rescue ArgumentError, URI::InvalidURIError
+      false
+    end
 
-  def self.token?(token)
-    url  = "http://github.com/api/v2/yaml/user/show/#{GHI.login}"
-    url += "?login=#{GHI.login}&token=#{token}"
-    !YAML.load(Net::HTTP.get(URI.parse(url)))["user"]["plan"].nil?
-  rescue ArgumentError, NoMethodError, URI::InvalidURIError
-    false
+    def token?(token)
+      url  = "http://github.com/api/v2/yaml/user/show/#{login}"
+      url += "?login=#{login}&token=#{token}"
+      !YAML.load(Net::HTTP.get(URI.parse(url)))["user"]["plan"].nil?
+    rescue ArgumentError, NoMethodError, URI::InvalidURIError
+      false
+    end
   end
 end

data/spec/ghi/cli_spec.rb

@@ -19,7 +19,7 @@ describe GHI::CLI::Executable do
       end
 
       after :each do
-        @cli.stub!(:`).and_return "stub:localuser/ghi.git"
+        @cli.stub!(:`).and_return "stub@github.com:localuser/ghi.git"
         @cli.should_receive(@action)
         @cli.parse! @args
         @cli.action.should == @action

data/spec/ghi_spec.rb

@@ -2,7 +2,7 @@ require "ghi"
 
 LOGGED_OUT_YAML = <<-YAML
 ---
-user: 
+user:
   id: 23
   login: defunkt
   name: Kristopher Walken Wanstrath
@@ -18,7 +18,7 @@ YAML
 
 LOGGED_IN_YAML = <<-YAML
 ---
-user: 
+user:
   id: 23
   login: defunkt
   name: Kristopher Walken Wanstrath
@@ -35,7 +35,7 @@ user:
   disk_usage: 50384
   owned_private_repo_count: 1
   private_gist_count: 0
-  plan: 
+  plan:
     name: mega
     collaborators: 60
     space: 20971520
@@ -54,7 +54,7 @@ describe GHI do
     GHI.should_receive(:`).once.and_return "stephencelis\n"
     GHI.login.should == "stephencelis"
   end
-  
+
   it "should return token" do
     GHI.should_receive(:`).once.and_return "da39a3ee5e6b4b0d3255bfef95601890\n"
     GHI.token.should == "da39a3ee5e6b4b0d3255bfef95601890"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stephencelis-ghi
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Stephen Celis
@@ -39,6 +39,7 @@ files:
 - spec/ghi_spec.rb
 has_rdoc: true
 homepage: http://github.com/stephencelis/ghi
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ghi
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: GitHub Issues on the command line