ghi 0.2.5 → 0.3.0

data/README.rdoc

@@ -91,8 +91,36 @@ Always favor SSL by setting it:
 
 === CONTRIBUTE?
 
+Running the tests should be as simple as a `bundle` and
+`bundle exec spec spec`.
+
 ghi is not under currently under the control of any gem packaging system. To
 build, use RubyGems:
 
   % gem build ghi.gemspec
   % sudo gem install ghi*.gem
+
+
+== LICENSE
+
+(The MIT License)
+
+(c) 2009-* Stephen Celis, stephen@stephencelis.com.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/ghi.rb

@@ -1,21 +1,19 @@
 require "net/http"
 require "yaml"
+YAML::ENGINE.yamler = "syck" if YAML.const_defined? :ENGINE
 
 module GHI
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 
   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`
+        warn "Please configure your GitHub username."
+        puts
+        puts "E.g., git config --global github.user [your username]"
+        abort
       end
       @login
     end
@@ -24,13 +22,14 @@ module GHI
       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`
+        warn "Please configure your GitHub token."
+        puts
+        puts "E.g., git config --global github.user [your token]"
+        puts
+        puts "Find your token here: https://github.com/account/admin"
+        abort
+      elsif @token.sub!(/^!/, '')
+        @token = `#@token`
       end
       @token
     end

data/lib/ghi/api.rb

@@ -1,19 +1,22 @@
-require "net/http"
+require "net/https"
 require "yaml"
 require "cgi"
 
 class GHI::API
-  class InvalidRequest < StandardError
+  class GHIError < StandardError
   end
 
-  class InvalidConnection < StandardError
+  class InvalidRequest < GHIError
   end
 
-  class ResponseError < StandardError
+  class InvalidConnection < GHIError
   end
 
-  API_HOST  = "github.com"
-  API_PATH  = "/api/v2/yaml/issues/:action/:user/:repo"
+  class ResponseError < GHIError
+  end
+
+  API_HOST = "github.com"
+  API_PATH = "/api/v2/yaml/issues/:action/:user/:repo"
 
   attr_reader :user, :repo
 
@@ -34,11 +37,21 @@ class GHI::API
     GHI::Issue.new get(:show, number)["issue"]
   end
 
+  def comments(number)
+    get(:comments, number)["comments"]
+  end
+
   def open(title, body)
+    if title.empty? && body.empty?
+      raise GHIError, "Aborting request due to empty issue."
+    end
     GHI::Issue.new post(:open, "title" => title, "body" => body)["issue"]
   end
 
   def edit(number, title, body)
+    if title.empty? && body.empty?
+      raise GHIError, "Aborting request due to empty issue."
+    end
     res = post :edit, number, "title" => title, "body" => body
     GHI::Issue.new res["issue"]
   end
@@ -60,6 +73,9 @@ class GHI::API
   end
 
   def comment(number, comment)
+    if comment.empty?
+      raise GHIError, "Aborting request due to empty comment."
+    end
     post(:comment, number, "comment" => comment)["comment"]
   end
 
@@ -79,7 +95,7 @@ class GHI::API
       res = YAML.load http.request(req).body
     end
 
-    raise ResponseError, errors(res) if res["error"]
+    raise ResponseError, errors(res) if res["error"] || res[:error]
     res
   rescue ArgumentError, URI::InvalidURIError
     raise ResponseError, "GitHub hiccuped on your request"
@@ -99,7 +115,7 @@ class GHI::API
       res = YAML.load http.request(req).body
     end
 
-    raise ResponseError, errors(res) if res["error"]
+    raise ResponseError, errors(res) if res["error"] || res[:error]
     res
   rescue ArgumentError, URI::InvalidURIError
     raise ResponseError, "GitHub hiccuped on your request"
@@ -108,6 +124,7 @@ class GHI::API
   end
 
   def errors(response)
+    return response[:error] if response.key? :error
     [*response["error"]].map { |e| e["error"] } * ", "
   end
 

data/lib/ghi/cli.rb

@@ -90,12 +90,16 @@ module GHI::CLI #:nodoc:
         if verbosity
           issues.map { |i| ["=" * 79] + show_format(i) }
         else
-          issues.map { |i| "  #{i.number.to_s.rjust 3}: #{truncate(i.title, 72)}" }
+          issues.map { |i| "  #{i.number.to_s.rjust 3}: #{truncate(i.title, 72)} #{label_format(i.labels)}" }
         end
       else
         "none"
       end
     end
+    
+    def label_format(labels)
+      labels and labels.map {|l| "[#{l}]"}.join(' ')
+    end
 
     def edit_format(issue)
       l = []
@@ -122,6 +126,7 @@ module GHI::CLI #:nodoc:
       l << "      number:  #{issue.number}"                    if issue.number
       l << "       state:  #{issue.state}"                     if issue.state
       l << "       title:  #{indent(issue.title, 15, 0).join}" if issue.title
+      l << "      labels:  #{label_format(issue.labels)}"      unless issue.labels.nil? || issue.labels.empty?
       l << "        user:  #{issue.user || GHI.login}"
       l << "       votes:  #{issue.votes}"                     if issue.votes
       l << "  created at:  #{issue.created_at}"                if issue.created_at
@@ -129,6 +134,19 @@ module GHI::CLI #:nodoc:
       return l unless verbose
       l << ""
       l += indent(issue.body)[0..-2]
+
+      comments = api.comments(issue.number)
+      unless comments.empty?
+        l << "=" * 79
+        comments.each do |c|
+          l << "#{c["user"]} commented:"
+          l << ""
+          l += indent(c["body"])
+          l << "-" * 79
+        end
+      end
+
+      l
     end
 
     def action_format(value = nil)
@@ -143,6 +161,7 @@ module GHI::CLI #:nodoc:
     end
 
     def indent(string, level = 4, first = level)
+      string = string.gsub(/\n{3,}/, "\n\n")
       lines = string.scan(/.{0,#{79 - level}}(?:\s|\Z)/).map { |line|
         " " * level + line
       }
@@ -214,7 +233,7 @@ module GHI::CLI #:nodoc:
       @args, @argv = argv, argv.dup
 
       remotes = `git config --get-regexp remote\..+\.url`.split /\n/
-      repo_expression = %r{([^:/]+)/([^/\s]+)(?:\.git)$}
+      repo_expression = %r{([^:/]+)/([^/\s]+?)(?:\.git)?$}
       if remote = remotes.find { |r| r.include? "github.com" }
         remote.match repo_expression
         @user, @repo = $1, $2
@@ -271,6 +290,9 @@ module GHI::CLI #:nodoc:
     rescue GHI::API::ResponseError => e
       warn "#{File.basename $0}: #{e.message} (#{user}/#{repo})"
       exit 1
+    rescue GHI::API::GHIError => e
+      warn e.message
+      exit 1
     end
 
     def commenting?
@@ -504,7 +526,7 @@ module GHI::CLI #:nodoc:
         comment = api.comment number, new_body
       end
       puts action_format(issue.title)
-      puts "(comment #{comment["status"]})" if comment
+      puts "(commented)" if comment
     end
 
     def reopen
@@ -514,7 +536,7 @@ module GHI::CLI #:nodoc:
         comment = api.comment number, new_body
       end
       puts action_format(issue.title)
-      puts "(comment #{comment["status"]})" if comment
+      puts "(commented)" if comment
     end
 
     def prepare_label
@@ -545,15 +567,15 @@ module GHI::CLI #:nodoc:
       @body ||= gets_from_editor api.show(number)
       comment = api.comment(number, body)
       delete_message
-      puts "(comment #{comment["status"]})"
+      puts "(comment})"
     end
 
     def url
-      url = "http://github.com/#{user}/#{repo}/issues"
+      url = "https://github.com/#{user}/#{repo}/issues"
       if number.nil?
         url << "/#{state}" unless state == :open
       else
-        url << "#issue/#{number}"
+        url << "/#{number}"
       end
       defined?(Launchy) ? Launchy.open(url) : puts(url)
     end
@@ -581,7 +603,13 @@ module GHI::CLI #:nodoc:
         @action = :show
         @number ||= ($1 || arguments.shift[/\d+/]).to_i
       when "open"
-        @action = :open
+        if arguments.first =~ /^\d+$/
+          @action = :reopen
+          @number ||= arguments.shift[/\d+/].to_i
+        else
+          @action = :open
+          @title = arguments.join(' ')
+        end
       when "edit"
         @action = :edit
         @number ||= arguments.shift[/\d+/].to_i

data/lib/ghi/issue.rb

@@ -1,6 +1,6 @@
 class GHI::Issue
   attr_reader :number, :title, :body, :votes, :state, :user, :created_at,
-    :updated_at
+    :updated_at, :labels
 
   def initialize(options = {})
     @number     = options["number"]
@@ -11,6 +11,7 @@ class GHI::Issue
     @user       = options["user"]
     @created_at = options["created_at"]
     @updated_at = options["updated_at"]
+    @labels     = options["labels"]
   end
 
   #-

data/spec/ghi_spec.rb

@@ -59,33 +59,4 @@ describe GHI do
     GHI.should_receive(:`).once.and_return "da39a3ee5e6b4b0d3255bfef95601890\n"
     GHI.token.should == "da39a3ee5e6b4b0d3255bfef95601890"
   end
-
-  it "should approve login input" do
-    GHI.instance_eval { instance_variable_defined?(:@login).should == false }
-    GHI.should_receive(:`).with("git config --get github.user").
-      and_return "\n"
-    GHI.should_receive(:print).twice
-    GHI.should_receive(:gets).twice.and_return "defunct\n", "defunkt\n"
-    Net::HTTP.should_receive(:get).and_return "500: invalid: response",
-      LOGGED_OUT_YAML
-    GHI.should_receive(:warn).once
-    GHI.should_receive(:`).with("git config --global github.user defunkt").
-      and_return "\n"
-    GHI.login.should == "defunkt"
-  end
-
-  it "should approve token input" do
-    GHI.instance_eval { instance_variable_defined?(:@token).should == false }
-    GHI.stub!(:login).and_return "defunkt"
-    GHI.should_receive(:`).with("git config --get github.token").
-      and_return "\n"
-    GHI.should_receive(:print).twice
-    token = "da39a3ee5e6b4b0d3255bfef95601890"
-    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
-    GHI.should_receive(:`).with("git config --global github.token #{token}").
-      and_return "\n"
-    GHI.token.should == token
-  end
 end

metadata

@@ -1,38 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ghi
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 5
-  version: 0.2.5
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-28 00:00:00 -05:00
-default_executable: ghi
-dependencies: []
-
+date: 2012-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70226629529100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: *70226629529100
 description: GitHub Issues on the command line. Use your `$EDITOR`, not your browser.
-email: 
-- stephen@stephencelis.com
-executables: 
+email: stephen@stephencelis.com
+executables:
 - ghi
 extensions: []
-
-extra_rdoc_files: 
-- History.rdoc
-- Manifest.txt
-- README.rdoc
-files: 
-- History.rdoc
-- Manifest.txt
+extra_rdoc_files:
 - README.rdoc
+files:
 - bin/ghi
 - lib/ghi/api.rb
 - lib/ghi/cli.rb
@@ -42,38 +39,32 @@ files:
 - spec/ghi/cli_spec.rb
 - spec/ghi/issue_spec.rb
 - spec/ghi_spec.rb
-has_rdoc: true
+- README.rdoc
 homepage: http://github.com/stephencelis/ghi
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ghi
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: GitHub Issues on the command line
+summary: GitHub Issues command line interface
 test_files: []
-
+has_rdoc: true

data/History.rdoc

@@ -1,221 +0,0 @@
-=== 0.2.5
-
-* 1 enhancement
-
-  * Support for SSL with the "--ssl" flag (and "github.ssl" configuration).
-
-
-=== 0.2.4
-
-* 1 enhancement
-
-  * Detect remotes and prefer them with the "-r" flag.
-
-
-* 1 bugfix
-
-  * Fix formatting for Ruby 1.9.1.
-
-
-=== 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
-
-  * Fixed Net::HTTP posts in Ruby 1.9 (params must be stringified keys).
-
-
-=== 0.2.1 / 2009-11-29
-
-* 1 bugfix
-
-  * ANSI format by word break.
-
-
-=== 0.2.0 / 2009-11-03
-
-* Major-minor release!
-
-  * Cleanup! (Better help, warnings and errors.)
-
-
-=== 0.1.7 / 2009-08-26
-
-* 2 bugfixes
-
-  * Allow dots in repo names.
-  * Fix bug preventing invocation from non-GitHub repo directories.
-
-
-=== 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
-
-  * Long titles should wrap in show/verbose issue view.
-  * If a non-OptionParser argument fails early, re-parse when valid.
-
-
-=== 0.1.4 / 2009-05-15
-
-* 1 minor enhancement
-
-  * Minor Windows support.
-
-
-=== 0.1.3 / 2009-05-08
-
-* 1 minor enhancement
-
-  * Fix bug where `more' was being passed `less' options.
-  * Fix scoping of commands so `ghi user/repo` can run outside of a repo
-    directory.
-
-
-=== 0.1.2 / 2009-05-07
-
-* 1 major enhancement
-
-  * Better fallbacks. Enter `ghi open`, `ghi list closed`, `ghi search term`,
-    `ghi show 2`, `ghi user/repo`, etc., it will try to work. Fallbacks do not
-    accept options, though.
-
-
-=== 0.1.1 / 2009-05-01
-
-* 3 major enhancements
-
-  * Use `more' (or $GHI_PAGER) to accommodate lengthy output.
-  * Default to "-l" if Dir.pwd is a git repo.
-  * Accept numbered args/flags to shortcut "show" (e.g., "ghi -2", "ghi 2")
-
-
-* 1 minor enhancement
-
-  * Update --url flag to GitHub's new convention.
-
-
-=== 0.1.0 / 2009-04-27
-
-* 2 major enhancements
-
-  * Use tempfiles when we should, the gitdir otherwise.
-  * Now a minor!
-
-
-* 2 minor enhancement
-
-  * Small ANSI tweaks.
-  * Truncation fix.
-
-
-=== 0.0.9 / 2009-04-27
-
-* 1 major enhancement
-
-  * ANSI colors (honors your .gitconfig).
-
-
-* 1 minor enhancement
-
-  * Bugfixes.
-
-
-=== 0.0.8 / 2009-04-26
-
-* 1 major enhancement
-
-  * Flag to return issues URLs.
-
-
-* 1 minor enhancement
-
-  * Preliminary specs for top-level module and API class.
-
-
-=== 0.0.7 / 2009-04-25
-
-* 1 major enhancement
-
-  * Labels! Label and un-label at your whim.
-
-
-* 1 minor enhancement
-
-  * Tail arguments are sometimes parsed. E.g., ghi -om "Issue message parsed".
-
-
-=== 0.0.6 / 2009-04-25
-
-* 2 minor enhancements
-
-  * Accept comments as arguments in more places.
-  * Update error message to accommodate both issues and comments.
-
-
-=== 0.0.5 / 2009-04-25
-
-* 3 major enhancements
-
-  * Flag to claim/label issues with your GitHub username (thanks, Jamie).
-  * Flag for commenting on issues.
-  * Prompt for GitHub login and token if absent from gitconfig.
-
-
-* 1 minor enhancement
-
-  * Opening issues with a title bypasses your $EDITOR.
-
-
-=== 0.0.4 / 2009-04-24
-
-* 1 major enhancement
-
-  * Cache messages created in $EDITOR.
-
-
-* 2 minor enhancements
-
-  * Refactoring and cleanup.
-  * Change editing messages.
-
-
-=== 0.0.3 / 2009-04-23
-
-* 2 minor enhancements
-
-  * Typo corrected.
-  * README updated.
-
-
-=== 0.0.2 / 2009-04-22
-
-* 1 major enhancement
-
-  * Add --search flag.
-  * Add --repo flag.
-
-
-=== 0.0.1 / 2009-04-21
-
-* 1 major enhancement
-
-  * Birthday!

data/Manifest.txt

@@ -1,14 +0,0 @@
-History.rdoc
-Manifest.txt
-MIT-LICENSE
-Rakefile
-README.rdoc
-bin/ghi
-lib/ghi/api.rb
-lib/ghi/cli.rb
-lib/ghi/issue.rb
-lib/ghi.rb
-spec/ghi/api_spec.rb
-spec/ghi/cli_spec.rb
-spec/ghi/issue_spec.rb
-spec/ghi_spec.rb