[PATCH aeolus-cli] BZ#772274 Fixed --help Option

[Martyn Taylor]

From: Martyn Taylor

---
 lib/aeolus_cli/command/config_parser.rb |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/aeolus_cli/command/config_parser.rb b/lib/aeolus_cli/command/config_parser.rb
index ff1172d..e74401d 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -36,7 +36,7 @@ module Aeolus
         # File.expand_path("~")
         if COMMANDS.include?(@command)
           opts = self.send((@command + "Options").to_sym)
-          if @args.include?('-h')
+          if @args.include?('-h') || @args.include?('--help')
             puts opts
           else
             parse(opts)
@@ -166,7 +166,7 @@ module Aeolus
           opts.on('-A', '--account NAME,NAME', Array, 'name of specific provider account to use for push') do |name|
             @options[:account] = name
           end
-          opts.on( '-h', '--help', 'Get usage information for this command')
+

opts.separator ""
           opts.separator "Examples:"
@@ -301,7 +301,6 @@ module Aeolus
         status_command = StatusCommand.new(@options)
         status_command.run
       end
-
     end
   end
 end
\ No newline at end of file

[Francesco Vollero]

Ack'd

On Tue, Jan 10, 2012 at 11:08:39AM +0000, [e-mail] wrote:
> From: Martyn Taylor
>
> lib/aeolus_cli/command/config_parser.rb |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/lib/aeolus_cli/command/config_parser.rb b/lib/aeolus_cli/command/config_parser.rb
> index ff1172d..e74401d 100644
> --- a/lib/aeolus_cli/command/config_parser.rb
> +++ b/lib/aeolus_cli/command/config_parser.rb
> @@ -36,7 +36,7 @@ module Aeolus
>          # File.expand_path("~")
>          if COMMANDS.include?(@command)
>            opts = self.send((@command + "Options").to_sym)
>      if @args.include?('-h')
>      if @args.include?('-h') || @args.include?('--help')
>        puts opts
>      else
>        parse(opts)
>
> @@ -166,7 +166,7 @@ module Aeolus
>            opts.on('-A', '--account NAME,NAME', Array, 'name of specific provider account to use for push') do |name|
>              @options[:account] = name
>            end
>      opts.on( '-h', '--help', 'Get usage information for this command')
>      opts.separator ""
>      opts.separator "Examples:"
>
> @@ -301,7 +301,6 @@ module Aeolus
>          status_command = StatusCommand.new(@options)
>          status_command.run
>        end
> end
>  end
>
> end
> \ No newline at end of file
> -- 
> 1.7.6.4