Improved arg parsing for gitlab readline shell. Other small fixes/imp…

…rovements on regexes.
NARKOZ · Jul 29, 2014 · 916e8a7 · 916e8a7
1 parent f8f3715
commit 916e8a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/gitlab/client/repositories.rb b/lib/gitlab/client/repositories.rb
@@ -19,7 +19,7 @@ def tags(project, options={})
     # Creates a new project repository tag.
     #
     # @example
-    #   Gitlab.create_tag(42,'new_tag','master'))
+    #   Gitlab.create_tag(42,'new_tag','master')
     #
     # @param  [Integer] project The ID of a project.
     # @param  [String]  tag_name The name of the new tag.

diff --git a/lib/gitlab/help.rb b/lib/gitlab/help.rb
@@ -20,10 +20,10 @@ def self.get_help(methods,cmd=nil)
             ri_output = `#{ri_cmd} -T #{namespace} 2>&1`.chomp
 
             if $? == 0
-              ri_output.gsub!(/#{cmd}\((.*)\)/, cmd+' \1')
+              ri_output.gsub!(/#{cmd}\((.*?)\)/, cmd+' \1')
               ri_output.gsub!(/Gitlab\./, 'gitlab> ')
               ri_output.gsub!(/Gitlab\..+$/, '')
-              ri_output.gsub!(/\,/, '')
+              ri_output.gsub!(/\,\s?/, ' ')
               help = ri_output
             else
               help = "Ri docs not found for #{namespace}, please install the docs to use 'help'"

diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
@@ -20,7 +20,7 @@ def self.start
       next if buf.nil? || buf.empty?
       break if buf == 'exit'
 
-      buf = buf.split.map(&:chomp)
+      buf = buf.scan(/["][^"]+["]|\S+/).map { |word| word.gsub(/^['"]|['"]$/,'') }
       cmd = buf.shift
       args = buf.count > 0 ? buf : []