Attachment 153548 Details for Bug 198055 – update to 0.6.4

[patch] update to 0.6.4

rubygem-clamp-0.6.4.diff (text/plain), 3.58 KB, created by Michael Moll on 2015-02-26 16:21:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Moll

Created: 2015-02-26 16:21:23 UTC

Size: 3.58 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 380016)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	clamp
>-PORTVERSION=	0.6.3
>-PORTREVISION=	1
>+PORTVERSION=	0.6.4
> CATEGORIES=	devel ruby
> MASTER_SITES=	RG
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 380016)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (rubygem/clamp-0.6.3.gem) = 6e5feb738879f3ec8e74ac1d9a6339c316a65fdc054ef587851b0397ced1bab8
>-SIZE (rubygem/clamp-0.6.3.gem) = 24064
>+SHA256 (rubygem/clamp-0.6.4.gem) = e806278bee5df0aeaa7f15c55405a4d39ffe6182a1292c21462e1b771b60e138
>+SIZE (rubygem/clamp-0.6.4.gem) = 24576
>Index: files/patch-i18n
>===================================================================
>--- files/patch-i18n	(revision 380016)
>+++ files/patch-i18n	(working copy)
>@@ -1,7 +1,7 @@
>-diff --git a/clamp-0.6.3.gemspec b/clamp-0.6.3.gemspec
>+diff --git a/clamp-0.6.4.gemspec b/clamp-0.6.4.gemspec
> index 8f51cc3..acab485 100644
>---- clamp-0.6.3.gemspec
>-+++ clamp-0.6.3.gemspec
>+--- clamp-0.6.4.gemspec
>++++ clamp-0.6.4.gemspec
> @@ -43,6 +43,7 @@
>  - lib/clamp/command.rb
>  - lib/clamp/errors.rb
>@@ -15,7 +15,7 @@
> index 8f51cc3..acab485 100644
> --- lib/clamp/attribute/instance.rb
> +++ lib/clamp/attribute/instance.rb
>-@@ -72,7 +72,7 @@ def default_from_environment
>+@@ -69,7 +69,7 @@ def default_from_environment
>          begin
>            take(value)
>          rescue ArgumentError => e
>@@ -46,9 +46,31 @@
> index e09731a..1e57530 100644
> --- lib/clamp/help.rb
> +++ lib/clamp/help.rb
>-@@ -61,7 +61,7 @@ def string
>+@@ -1,4 +1,5 @@
>+ require 'stringio'
>++require 'clamp/messages'
>+ 
>+ module Clamp
>+ 
>+@@ -41,12 +42,12 @@ def help(invocation_path, builder = Builder.new)
>+       help.add_usage(invocation_path, usage_descriptions)
>+       help.add_description(description)
>+       if has_parameters?
>+-        help.add_list("Parameters", parameters)
>++        help.add_list(Clamp.message(:parameters_heading), parameters)
>        end
>+       if has_subcommands?
>+-        help.add_list("Subcommands", recognised_subcommands)
>++        help.add_list(Clamp.message(:subcommands_heading), recognised_subcommands)
>+       end
>+-      help.add_list("Options", recognised_options)
>++      help.add_list(Clamp.message(:options_heading), recognised_options)
>+       help.string
>+     end
>  
>+@@ -61,7 +62,7 @@ def string
>+       end
>+ 
>        def add_usage(invocation_path, usage_descriptions)
> -        puts "Usage:"
> +        puts usage_heading
>@@ -55,7 +77,7 @@
>          usage_descriptions.each do |usage|
>            puts "    #{invocation_path} #{usage}".rstrip
>          end
>-@@ -87,6 +87,12 @@ def add_list(heading, items)
>+@@ -87,6 +88,12 @@ def add_list(heading, items)
>          end
>        end
>  
>@@ -62,7 +84,7 @@
> +      protected
> +
> +      def usage_heading
>-+        "Usage:"
>++        Clamp.message(:usage_heading) + ":"
> +      end
> +
>        private
>@@ -73,7 +95,7 @@
> index 0000000..61cce94
> --- /dev/null
> +++ lib/clamp/messages.rb
>-@@ -0,0 +1,39 @@
>+@@ -0,0 +1,43 @@
> +module Clamp
> +
> +  def self.messages=(messages)
>@@ -96,7 +118,11 @@
> +      :env_argument_error => "$%<env>s: %<message>s",
> +      :unrecognised_option => "Unrecognised option '%<switch>s'",
> +      :no_such_subcommand => "No such sub-command '%<name>s'",
>-+      :no_value_provided => "no value provided"
>++      :no_value_provided => "no value provided",
>++      :usage_heading => "Usage",
>++      :parameters_heading => "Parameters",
>++      :subcommands_heading => "Subcommands",
>++      :options_heading => "Options"
> +    }
> +  end
> +

Actions: View | Diff

Attachments on bug 198055: 153548 | 153549