stephencelis-ghi 0.1.4 → 0.1.5

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.1.5 / 2009-05-15
+
+* 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

data/lib/ghi/cli.rb

@@ -118,13 +118,13 @@ module GHI::CLI #:nodoc:
 
     def show_format(issue, verbose = true)
       l = []
-      l << "      number:  #{issue.number}"     if issue.number
-      l << "       state:  #{issue.state}"      if issue.state
-      l << "       title:  #{issue.title}"      if issue.title
+      l << "      number:  #{issue.number}"               if issue.number
+      l << "       state:  #{issue.state}"                if issue.state
+      l << "       title:  #{indent(issue.title, 15, 0)}" if issue.title
       l << "        user:  #{issue.user || GHI.login}"
-      l << "       votes:  #{issue.votes}"      if issue.votes
-      l << "  created at:  #{issue.created_at}" if issue.created_at
-      l << "  updated at:  #{issue.updated_at}" if issue.updated_at
+      l << "       votes:  #{issue.votes}"                if issue.votes
+      l << "  created at:  #{issue.created_at}"           if issue.created_at
+      l << "  updated at:  #{issue.updated_at}"           if issue.updated_at
       return l unless verbose
       l << ""
       l += indent(issue.body)[0..-2]
@@ -141,10 +141,12 @@ module GHI::CLI #:nodoc:
       result
     end
 
-    def indent(string, level = 4)
-      string.scan(/.{0,#{79 - level}}(?:\s|\Z)/).map { |line|
+    def indent(string, level = 4, first = level)
+      lines = string.scan(/.{0,#{79 - level}}(?:\s|\Z)/).map { |line|
         " " * level + line
       }
+      lines.first.sub!(/^\s+/) {} if first != level
+      lines
     end
 
     private
@@ -204,7 +206,7 @@ module GHI::CLI #:nodoc:
       :action, :search_term, :number, :title, :body, :tag, :args, :verbosity
 
     def parse!(*argv)
-      @args = argv
+      @args, @argv = argv, argv.dup
 
       repo_expression = %r{([^:/]+)/([^/\.\s]+)(?:\.git)?$}
       `git config --get remote.origin.url`.match repo_expression
@@ -555,7 +557,7 @@ module GHI::CLI #:nodoc:
         @search_term ||= arguments.shift
       when "show", /^-?(\d+)$/
         @action = :show
-        @number ||= ($1 || arguments.shift[/\d+/].to_i)
+        @number ||= ($1 || arguments.shift[/\d+/]).to_i
       when "open"
         @action = :open
       when "edit"
@@ -585,7 +587,12 @@ module GHI::CLI #:nodoc:
         @action = :list
         @user, @repo = $1, $2
       end
-      return true if @action
+      if @action
+        @args = @argv.dup
+        args.delete_if { |arg| arg == command }
+        option_parser.parse!(*args)
+        return true
+      end
       unless command.start_with? "-"
         warn "#{File.basename $0}: what do you mean, '#{command}'?"
       end

data/lib/ghi.rb

@@ -2,7 +2,7 @@ require "net/http"
 require "yaml"
 
 module GHI
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   def self.login
     return @login if defined? @login

data/spec/ghi/cli_spec.rb

@@ -159,6 +159,11 @@ describe GHI::CLI::Executable do
         @action, @state, @user, @repo = :list, :open, "remoteuser", "remoterepo"
       end
 
+      it "should parse -rremoteuser/remoterepo as a later argument" do
+        @args = ["-1", "-rremoteuser/remoterepo"]
+        @action, @number, @user, @repo = :show, 1, "remoteuser", "remoterepo"
+      end
+
       it "should parse -t2 'tag' as label issue 2 with 'tag'" do
         @args = ["-t2", "tag"]
         @action, @number, @tag = :label, 2, "tag"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stephencelis-ghi
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -07:00
+date: 2009-07-08 00:00:00 -07:00
 default_executable: ghi
 dependencies: []