hammer_cli 0.1.0 → 0.1.1

data/lib/hammer_cli/apipie/options.rb

@@ -2,10 +2,6 @@
 module HammerCLI::Apipie
   module Options
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
     def all_method_options
       method_options_for_params(resource.action(action).params, true)
     end
@@ -23,6 +19,7 @@ module HammerCLI::Apipie
           opts[p.name] = get_option_value(p.name)
         end
       end
+
       opts.reject! {|key, value| value.nil? } unless include_nil
       opts
     end
@@ -35,62 +32,5 @@ module HammerCLI::Apipie
       end
     end
 
-    module ClassMethods
-
-      def apipie_options(options={})
-        setup_identifier_options
-        if resource_defined?
-          filter = options[:without] || []
-          filter = Array(filter)
-          filter += declared_identifiers.keys
-
-          options_for_params(resource.action(action).params, filter)
-        end
-      end
-
-      protected
-
-      def options_for_params(params, filter)
-        params.each do |p|
-          next if filter.include?(p.name) || filter.include?(p.name.to_sym)
-          if p.expected_type == :hash
-            options_for_params(p.params, filter)
-          else
-            create_option p
-          end
-        end
-      end
-
-      def create_option(param)
-        option(
-          option_switches(param),
-          option_type(param),
-          option_desc(param),
-          option_opts(param)
-        )
-      end
-
-      def option_switches(param)
-        '--' + param.name.gsub('_', '-')
-      end
-
-      def option_type(param)
-        param.name.upcase.gsub('-', '_')
-      end
-
-      def option_desc(param)
-        param.description || " "
-      end
-
-      def option_opts(param)
-        opts = {}
-        opts[:required] = true if param.required?
-        # FIXME: There is a bug in apipie, it does not produce correct expected type for Arrays
-        # When it's fixed, we should test param["expected_type"] == "array"
-        opts[:format] = HammerCLI::Options::Normalizers::List.new if param.validator.include? "Array"
-        return opts
-      end
-
-    end
   end
 end

data/lib/hammer_cli/clamp.rb

@@ -0,0 +1,15 @@
+require 'clamp'
+
+if Clamp.respond_to?(:messages=)
+  Clamp.messages = {
+    :too_many_arguments =>       _("too many arguments"),
+    :option_required =>          _("option '%<option>s' is required"),
+    :option_or_env_required =>   _("option '%<option>s' (or env %<env>s) is required"),
+    :option_argument_error =>    _("option '%<switch>s': %<message>s"),
+    :parameter_argument_error => _("parameter '%<param>s': %<message>s"),
+    :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")
+  }
+end

data/lib/hammer_cli/i18n.rb

@@ -37,6 +37,10 @@ module HammerCLI
         :mo
       end
 
+      def available?
+        File.exist?(locale_dir)
+      end
+
       attr_reader :locale_dir, :domain_name
     end
 
@@ -76,12 +80,20 @@ module HammerCLI
       @domains
     end
 
+
     def self.add_domain(domain)
-      domains << domain
-      FastGettext.add_text_domain(domain.domain_name, :path => domain.locale_dir, :type => domain.type, :report_warning => false)
+      if domain.available?
+        domains << domain
+        FastGettext.add_text_domain(domain.domain_name, :path => domain.locale_dir, :type => domain.type, :report_warning => false)
+      end
     end
 
 
+    def self.clear
+      FastGettext.translation_repositories.clear
+      domains.clear
+    end
+
     Encoding.default_external='UTF-8' if defined? Encoding
     FastGettext.locale = locale
 

data/lib/hammer_cli/logger.rb

@@ -36,7 +36,7 @@ module HammerCLI
                                                           :layout   => NOCOLOR_LAYOUT,
                                                           :truncate => false,
                                                           :keep     => 5,
-                                                          :size     => HammerCLI::Settings.get(:log_size) || 1024*1024) # 1MB
+                                                          :size     => (HammerCLI::Settings.get(:log_size) || 1)*1024*1024) # 1MB
       # set owner and group (it's ignored if attribute is nil)
       FileUtils.chown HammerCLI::Settings.get(:log_owner), HammerCLI::Settings.get(:log_group), filename
     rescue ArgumentError => e

data/lib/hammer_cli/option_builder.rb

@@ -0,0 +1,43 @@
+
+module HammerCLI
+
+  class AbstractOptionBuilder
+
+    def build(builder_params={})
+    end
+
+    protected
+
+    def option(*args)
+      HammerCLI::Options::OptionDefinition.new(*args)
+    end
+
+    def optionamize(name_candidate)
+      name_candidate.gsub('_', '-')
+    end
+
+  end
+
+
+  class OptionBuilderContainer < AbstractOptionBuilder
+
+    def build(builder_params={})
+      options = []
+      builders.each do |b|
+        options += b.build(builder_params)
+      end
+      options
+    end
+
+    def builders
+      @builders ||= []
+      @builders
+    end
+
+    def builders=(builders)
+      @builders=builders
+    end
+
+  end
+
+end

data/lib/hammer_cli/options/option_definition.rb

@@ -21,6 +21,12 @@ module HammerCLI
       attr_accessor :value_formatter
       attr_accessor :context_target
 
+      def initialize(switches, type, description, options = {})
+        self.value_formatter = options.delete(:format)
+        self.context_target = options.delete(:context_target)
+        super
+      end
+
       def complete(value)
         if value_formatter.nil?
           []

data/lib/hammer_cli/output/adapter/abstract.rb

@@ -45,9 +45,9 @@ module HammerCLI::Output::Adapter
       path = field.path
 
       path.inject(record) do |record, path_key|
-        if record.has_key? path_key.to_sym
+        if record && record.kind_of?(Hash) && record.has_key?(path_key.to_sym)
           record[path_key.to_sym]
-        elsif record.has_key? path_key.to_s
+        elsif record && record.kind_of?(Hash) && record.has_key?(path_key.to_s)
           record[path_key.to_s]
         else
           return nil

data/lib/hammer_cli/output/adapter/base.rb

@@ -52,7 +52,6 @@ module HammerCLI::Output::Adapter
     end
 
     def render_field(field, data, label_width)
-
       if field.is_a? Fields::ContainerField
         output = ""
 
@@ -61,7 +60,9 @@ module HammerCLI::Output::Adapter
         data.each do |d|
           idx += 1
           fields_output = render_fields(field.fields, d).indent_with(GROUP_INDENT)
-          fields_output = fields_output.sub(/^[ ]{4}/, " %-3s" % "#{idx})") if field.is_a? Fields::Collection
+          if field.is_a?(Fields::Collection) && field.parameters[:numbered]
+            fields_output = fields_output.sub(/^[ ]{4}/, " %-3s" % "#{idx})")
+          end
 
           output += fields_output
           output += "\n"
@@ -84,7 +85,9 @@ module HammerCLI::Output::Adapter
 
     def render_value(field, data)
       formatter = @formatters.formatter_for_type(field.class)
-      data = formatter.format(data) if formatter
+      parameters = field.parameters
+      parameters[:context] = @context
+      data = formatter.format(data, field.parameters) if formatter
       data.to_s
     end
 

data/lib/hammer_cli/output/adapter/table.rb

@@ -2,6 +2,23 @@ require 'table_print'
 
 module HammerCLI::Output::Adapter
 
+  class WrapperFormatter
+
+    def initialize(formatter, params)
+      @formatter = formatter
+      @params = params
+    end
+
+    def format(value)
+      if @formatter
+        @formatter.format(value, @params)
+      else
+        value
+      end
+    end
+
+  end
+
   class Table < Abstract
 
     MAX_COLUMN_WIDTH = 80
@@ -21,14 +38,14 @@ module HammerCLI::Output::Adapter
       rows = collection.collect do |d|
         row = {}
         fields.each do |f|
-          row[label_for(f)] = data_for_field(f, d) || ""
+          row[label_for(f)] = WrapperFormatter.new(
+            @formatters.formatter_for_type(f.class), f.parameters).format(data_for_field(f, d) || "")
         end
         row
       end
 
       options = fields.collect do |f|
         { label_for(f) => {
-            :formatters => Array(@formatters.formatter_for_type(f.class)),
             :width => max_width_for(f)
           }
         }

data/lib/hammer_cli/output/definition.rb

@@ -12,6 +12,10 @@ module HammerCLI::Output
       @fields += fields
     end
 
+    def empty?
+      @fields.empty?
+    end
+
   end
 
 end

data/lib/hammer_cli/output/fields.rb

@@ -84,6 +84,15 @@ module Fields
   end
 
   class Collection < ContainerField
+
+    def initialize(options={}, &block)
+      options[:numbered] = true if options[:numbered].nil?
+      super(options, &block)
+    end
+
+  end
+
+  class Boolean < Field
   end
 
 end

data/lib/hammer_cli/output/formatters.rb

@@ -43,7 +43,7 @@ module HammerCLI::Output
         tags & other_tags == tags
       end
 
-      def format(data)
+      def format(data, field_params={})
         data
       end
     end
@@ -58,8 +58,8 @@ module HammerCLI::Output
         @formatters += formatters
       end
 
-      def format(data)
-        @formatters.inject(data) { |d,f| f.format(d) }
+      def format(data, field_params={})
+        @formatters.inject(data) { |d,f| f.format(d, field_params) }
       end
 
     end
@@ -73,7 +73,7 @@ module HammerCLI::Output
         [:screen, :flat]
       end
 
-      def format(data)
+      def format(data, field_params={})
         c = HighLine.color(data.to_s, @color)
       end
     end
@@ -84,7 +84,7 @@ module HammerCLI::Output
         [:flat]
       end
 
-      def format(string_date)
+      def format(string_date, field_params={})
         t = DateTime.parse(string_date.to_s)
         t.strftime("%Y/%m/%d %H:%M:%S")
       rescue ArgumentError
@@ -98,7 +98,7 @@ module HammerCLI::Output
         [:flat]
       end
 
-      def format(list)
+      def format(list, field_params={})
         if list.is_a? Array
           list.join(", ")
         elsif list
@@ -115,7 +115,7 @@ module HammerCLI::Output
         [:screen, :flat]
       end
 
-      def format(params)
+      def format(params, field_params={})
         if params.is_a? Hash
           name = params[:name] || params["name"]
           value = params[:value] || params["value"]
@@ -138,16 +138,28 @@ module HammerCLI::Output
         [:screen]
       end
 
-      def format(text)
+      def format(text, field_params={})
         text = text.to_s.indent_with(INDENT) if @indent
         "\n#{text}"
       end
     end
 
+    class BooleanFormatter < FieldFormatter
+
+      def tags
+        [:flat, :screen]
+      end
+
+      def format(value, field_params={})
+        !value || value == "" ? _("no") : _("yes")
+      end
+    end
+
     HammerCLI::Output::Output.register_formatter(DateFormatter.new, :Date)
     HammerCLI::Output::Output.register_formatter(ListFormatter.new, :List)
     HammerCLI::Output::Output.register_formatter(KeyValueFormatter.new, :KeyValue)
     HammerCLI::Output::Output.register_formatter(LongTextFormatter.new, :LongText)
+    HammerCLI::Output::Output.register_formatter(BooleanFormatter.new, :Boolean)
 
   end
 end

data/lib/hammer_cli/utils.rb

@@ -9,7 +9,7 @@ class String
         params[name.to_s] || params[name.to_sym]
       end
 
-      self.gsub(/%[<{]([^>}]*)[>}]/, '%') % array_params
+      self.gsub(/%[<]([^>]*)[>]/, '%').gsub(/%[{]([^}]*)[}]/, '%s') % array_params
     else
       self % params
     end

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new '0.1.0'
+    @version ||= Gem::Version.new '0.1.1'
   end
 end

data/locale/hammer-cli.pot

@@ -6,20 +6,44 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.0.18\n"
+"Project-Id-Version: hammer-cli 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-05 20:36+0000\n"
+"POT-Creation-Date: 2014-05-09 16:07-0400\n"
 "PO-Revision-Date: 2014-03-04 16:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: lib/hammer_cli/modules.rb:31
-msgid "Warning: An error occured while loading module %s"
+#: lib/hammer_cli/validator.rb:41
+msgid "Unknown option name '%s'"
+msgstr ""
+
+#: lib/hammer_cli/validator.rb:62
+msgid "You can't set all options %s at one time"
+msgstr ""
+
+#: lib/hammer_cli/validator.rb:63
+msgid "Options %s are required"
+msgstr ""
+
+#: lib/hammer_cli/validator.rb:79
+msgid "You can't set any of options %s"
+msgstr ""
+
+#: lib/hammer_cli/validator.rb:80
+msgid "At least one of options %s is required"
+msgstr ""
+
+#: lib/hammer_cli/output/formatters.rb:154
+msgid "no"
+msgstr ""
+
+#: lib/hammer_cli/output/formatters.rb:154
+msgid "yes"
 msgstr ""
 
 #: lib/hammer_cli/output/adapter/csv.rb:47
@@ -34,116 +58,118 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: lib/hammer_cli/shell.rb:10
-msgid "Print help for commands"
-msgstr ""
-
-#: lib/hammer_cli/shell.rb:22
-msgid "Exit interactive shell"
+#: lib/hammer_cli/exception_handler.rb:60
+msgid "Error: %s"
 msgstr ""
 
-#: lib/hammer_cli/shell.rb:116
-msgid "Welcome to the hammer interactive shell"
+#: lib/hammer_cli/exception_handler.rb:66
+msgid "Error: %{message}\\n\\nSee: '%{path} --help'"
 msgstr ""
 
-#: lib/hammer_cli/shell.rb:117
-msgid "Type 'help' for usage information"
+#: lib/hammer_cli/exception_handler.rb:83
+msgid "Invalid username or password"
 msgstr ""
 
-#: lib/hammer_cli/shell.rb:133
-msgid "Interactive shell"
+#: lib/hammer_cli/exception_handler.rb:90
+msgid ""
+"Could not load API description from the server\\n  - is your server down?\\n"
+"\\\\n          \"  - was \\\"#{rake_command}\\\" run on the server when "
+"using apipie cache? (typical production settings))\\n\""
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:26
-msgid "Comma-separated list of key=value."
+#: lib/hammer_cli/logger.rb:28
+msgid "No permissions to create log dir %s"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:35
-msgid "value must be defined as a comma-separated list of key=value"
+#: lib/hammer_cli/logger.rb:43
+msgid "File %s not writeable, won't log anything to the file!"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:46
-msgid "Comma separated list of values."
+#: lib/hammer_cli/modules.rb:10
+msgid ""
+"Legacy configuration of modules detected. Check section about configuration "
+"in user manual"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:58
-msgid "One of true/false, yes/no, 1/0."
+#: lib/hammer_cli/modules.rb:42
+msgid "Warning: An error occured while loading module %s"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:68
-msgid "value must be one of true/false, yes/no, 1/0"
+#: lib/hammer_cli/shell.rb:10
+msgid "Print help for commands"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:107
-msgid "Unable to parse JSON input"
+#: lib/hammer_cli/shell.rb:22
+msgid "Exit interactive shell"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:120
-msgid "One of %s"
+#: lib/hammer_cli/shell.rb:120
+msgid "Welcome to the hammer interactive shell"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:127
-msgid "value must be one of '%s'"
+#: lib/hammer_cli/shell.rb:121
+msgid "Type 'help' for usage information"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:146
-msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
+#: lib/hammer_cli/shell.rb:122
+msgid ""
+"Command completion is disabled on ruby < 1.9 due to compatibility problems."
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:153
-msgid "'%s' is not a valid date"
+#: lib/hammer_cli/shell.rb:138
+msgid "Interactive shell"
 msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:62
+#: lib/hammer_cli/options/option_definition.rb:68
 msgid "Can be specified multiple times. "
 msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:63
+#: lib/hammer_cli/options/option_definition.rb:69
 msgid "Default: "
 msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:63
+#: lib/hammer_cli/options/option_definition.rb:69
 msgid ", or "
 msgstr ""
 
-#: lib/hammer_cli/apipie/command.rb:68
-msgid "resource id"
+#: lib/hammer_cli/options/normalizers.rb:26
+msgid "Comma-separated list of key=value."
 msgstr ""
 
-#: lib/hammer_cli/apipie/command.rb:69
-msgid "resource name"
+#: lib/hammer_cli/options/normalizers.rb:35
+msgid "value must be defined as a comma-separated list of key=value"
 msgstr ""
 
-#: lib/hammer_cli/apipie/command.rb:70
-msgid "resource label"
+#: lib/hammer_cli/options/normalizers.rb:46
+msgid "Comma separated list of values."
 msgstr ""
 
-#: lib/hammer_cli/apipie/command.rb:94
-msgid "%{resource} with %{option} '%{value}' not found"
+#: lib/hammer_cli/options/normalizers.rb:58
+msgid "One of true/false, yes/no, 1/0."
 msgstr ""
 
-#: lib/hammer_cli/apipie/command.rb:95
-msgid "%{resource} with %{option} '%{value}' found more than once"
+#: lib/hammer_cli/options/normalizers.rb:68
+msgid "value must be one of true/false, yes/no, 1/0"
 msgstr ""
 
-#: lib/hammer_cli/validator.rb:41
-msgid "Unknown option name '%s'"
+#: lib/hammer_cli/options/normalizers.rb:107
+msgid "Unable to parse JSON input"
 msgstr ""
 
-#: lib/hammer_cli/validator.rb:62
-msgid "You can't set all options %s at one time"
+#: lib/hammer_cli/options/normalizers.rb:120
+msgid "One of %s"
 msgstr ""
 
-#: lib/hammer_cli/validator.rb:63
-msgid "Options %s are required"
+#: lib/hammer_cli/options/normalizers.rb:127
+msgid "value must be one of '%s'"
 msgstr ""
 
-#: lib/hammer_cli/validator.rb:79
-msgid "You can't set any of options %s"
+#: lib/hammer_cli/options/normalizers.rb:146
+msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
 msgstr ""
 
-#: lib/hammer_cli/validator.rb:80
-msgid "At least one of options %s is required"
+#: lib/hammer_cli/options/normalizers.rb:153
+msgid "'%s' is not a valid date"
 msgstr ""
 
 #: lib/hammer_cli/main.rb:7
@@ -151,53 +177,51 @@ msgid "be verbose"
 msgstr ""
 
 #: lib/hammer_cli/main.rb:8
+msgid "show debugging output "
+msgstr ""
+
+#: lib/hammer_cli/main.rb:9
 msgid "path to custom config file"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:10
+#: lib/hammer_cli/main.rb:11
 msgid "username to access the remote system"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:12
+#: lib/hammer_cli/main.rb:13
 msgid "password to access the remote system"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:15
+#: lib/hammer_cli/main.rb:16
 msgid "show version"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:24
+#: lib/hammer_cli/main.rb:25
 msgid "Show ids of associated resources"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:26
+#: lib/hammer_cli/main.rb:27
 msgid "Explicitly turn interactive mode on/off"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:30
+#: lib/hammer_cli/main.rb:31
 msgid "Output as CSV (same as --output=csv)"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:31
+#: lib/hammer_cli/main.rb:32
 msgid "Set output format. One of [%s]"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:34
+#: lib/hammer_cli/main.rb:35
 msgid "Character to separate the values"
 msgstr ""
 
-#: lib/hammer_cli/main.rb:38
+#: lib/hammer_cli/main.rb:39
 msgid "Get list of possible endings"
 msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:59
-msgid "Error: %s"
-msgstr ""
-
-#: lib/hammer_cli/exception_handler.rb:65
-msgid "Error: %s\\n\\nSee: '%s --help'"
-msgstr ""
-
-#: lib/hammer_cli/exception_handler.rb:82
-msgid "Invalid username or password"
+#: lib/hammer_cli/settings.rb:28
+msgid ""
+"Warning: location hammer.modules.d is deprecated, move your module "
+"configurations to cli.modules.d"
 msgstr ""