@@ -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) bin/ghi @@ -4,50 +4,52 @@ require "yaml" module GHI VERSION = "0.1.5" - 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 lib/ghi.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 lib/ghi/cli.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" spec/ghi_spec.rb 89b9593afddaf3755b4f6c99ca10c68fd1d49067 Stephen Celis stephen@stephencelis.com http://github.com/stephencelis/ghi/commit/db0d4a90861f49f2decfc7cb4af6d91924017454 db0d4a90861f49f2decfc7cb4af6d91924017454 2009-08-05T16:23:17-07:00 2009-08-05T16:23:17-07:00 Cleanup. 5240185a870c221a06bc6eb990bf3db6fcb2d078 Stephen Celis stephen@stephencelis.com