hammer_cli 2.1.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e7d0cc6fea99d3276fb653e462448bddc6b8977e0e5ed9df2a1f257365bee84
-  data.tar.gz: 72123cef1ffaafb8979ff5e6bac55ca0fa9776e88800327ad41b48404a3a6284
+  metadata.gz: ef5d5eb556461a6873fe0b3b05bcc8a30aea17f88719b3c10c25106c73224884
+  data.tar.gz: 564721c9765ccd22b82fee81eea83be8b29da7ee0e415fd492deece64ca55b53
 SHA512:
-  metadata.gz: 1514dfe8e1059a70da7af58887e9763d604eaec59ec438af136b2a430338ba0c4c9222e4e86f275fb12135165dabb1f51281daaba5ba48924e32d206307bd94e
-  data.tar.gz: a17a67150e2bf0fb293f167d72cc5425e0fe0ebc9eb57c30144e5be952dbb45d8e370257408893727cfadcf3ce6d2607e098f90a1eb40955ff0dc98dc1ac39f1
+  metadata.gz: efde2a000ba9e27da2a466496232399da3861bb69705631ca9113ecc88920cc0af9ff344536c858fe4fbb77e60fe886582919885983d03b4235da70b0e80a6dd
+  data.tar.gz: a2673ec7bb6c5ed621c7a068e67962fec2c038f99b12abe1f0f19fa85fad3711598aaa3abf52e7896e72db938f74c7726b350e8bebcd5eaf04c6ef02806c96f5

data/bin/hammer-complete

@@ -5,9 +5,7 @@ require 'English'
 $LOAD_PATH.unshift(File.join(@project_root, 'lib'))
 HAMMER = ENV['HAMMER'] || File.join(@project_root, 'bin/hammer')
 
-require 'yaml'
-
-completion_cache_file = ENV['HAMMER_COMPLETION_CACHE'] || '~/.cache/hammer_completion.yml'
+completion_cache_file = ENV['HAMMER_COMPLETION_CACHE'] || '~/.cache/hammer_completion.json'
 completion_cache_file = File.expand_path(completion_cache_file)
 
 # build the cache if it does not exist

data/config/cli_config.template.yml

@@ -45,7 +45,7 @@
 #:log_pattern: '[%5l %d %c] %m'
 
 # Location of cache for bash completion
-:completion_cache_file: '~/.cache/hammer_completion.yml'
+:completion_cache_file: '~/.cache/hammer_completion.json'
 
 # SSL auth options
 #:ssl:

data/doc/installation.md

@@ -144,7 +144,7 @@ executable specified in `/etc/bash_completion.d/hammer`.
 
 Bash completion for hammer needs pre-built cache that holds description of
 all subcommands and its parameters. The cache is located by default in
-`~/.cache/hammer_completion.yml`. The location can be changed in hammer's
+`~/.cache/hammer_completion.json`. The location can be changed in hammer's
 config file. The cache can be built manually with
 `hammer prebuild-bash-completion` or is built automatically when completion is
 used and the cache is missing (this may cause slight delay). The cache expires

data/doc/installation_rpm.md

@@ -1,8 +1,8 @@
 ### Installation from RPMs
 
-#### Step 1: setup yum repositories
+#### Step 1: set up yum repositories
 
-For Foreman 1.3 stable the hammer packages are part of your installation repo and you can skip this step.
+For Foreman 1.3 stable, the hammer packages are part of your installation repo and you can skip this step.
 
 You can choose from stable or nightly repo. Nightly has more recent version of hammer packages, but it was subject to less testing so there is a higher risk of issues.
 Add the Foreman yum repository to your yum repo files. For Fedora installations replace 'el6' with 'f18' or 'f19' as appropriate.

data/doc/installation_source.md

@@ -8,6 +8,7 @@ Clone and install CLI core
 ```bash
 $ git clone https://github.com/theforeman/hammer-cli.git
 $ cd hammer-cli
+$ bundle install
 $ rake install
 $ cd ..
 ```
@@ -17,6 +18,7 @@ clone plugin with foreman commands
 ```bash
 $ git clone https://github.com/theforeman/hammer-cli-foreman.git
 $ cd hammer-cli-foreman
+$ bundle install
 $ rake install
 $ cd ..
 ```
@@ -25,7 +27,8 @@ and optionally other plugins.
 
 
 #### Step 2: enable and configure the plugins
-You'll have to copy configuration files to proper locations manually.
-Please check our [configuration instructions](installation.md#configuration)
+- Add the plugin as a gem to `Gemfile.local.rb`
+- Copy the configuration files to proper locations manually,
+please check our [configuration instructions](installation.md#configuration)
 and see how to proceed.
 

data/doc/release_notes.md

@@ -1,9 +1,23 @@
 Release notes
 =============
-### 2.1.1 (2020-05-29)
+### 2.4.0 (2021-02-01)
+* Expand path for bash completion file, [#30639](http://projects.theforeman.org/issues/30639)
+* Remove release notes written twice
+* Bump to 2.4.0-develop
+
+### 2.3.0 (2020-11-03)
+* Stop sending empty compute attrs param, [#30815](http://projects.theforeman.org/issues/30815)
+* Make fuzzy search work in hammer shell ([PR #335](https://github.com/theforeman/hammer-cli/pull/335)), [#30747](http://projects.theforeman.org/issues/30747)
+* Add details to installation from source doc ([PR #334](https://github.com/theforeman/hammer-cli/pull/334)), [#30666](http://projects.theforeman.org/issues/30666)
+* Bump to 2.3.0-develop
+* Bump to 2.2.0
+
+### 2.2.0 (2020-08-11)
+* Update installation_rpm.md ([PR #333](https://github.com/theforeman/hammer-cli/pull/333))
 * Clean gem_release.ipynb up
 * Replace awesome_print with amazing_print ([PR #330](https://github.com/theforeman/hammer-cli/pull/330)), [#29846](http://projects.theforeman.org/issues/29846)
 * Fix typo: s/filed/feild/ ([PR #331](https://github.com/theforeman/hammer-cli/pull/331))
+* Bump to 2.2.0-develop
 
 ### 2.1.0 (2020-05-14)
 * Hammer full-help returns correct output, [#29697](http://projects.theforeman.org/issues/29697)

data/lib/hammer_cli/apipie/options.rb

@@ -10,11 +10,11 @@ module HammerCLI::Apipie
       opts = {}
 
       params.each do |p|
-        if p.expected_type == :hash
+        if p.expected_type == :hash && !p.params.empty?
           opts[p.name] = method_options_for_params(p.params, options)
         else
           p_name = HammerCLI.option_accessor_name(p.name)
-          if options.has_key?(p_name)
+          if options.key?(p_name)
             opts[p.name] = options[p_name]
           elsif respond_to?(p_name, true)
             opt = send(p_name)

data/lib/hammer_cli/bash/prebuild_command.rb

@@ -3,10 +3,12 @@ module HammerCLI
     class PrebuildCompletionCommand < HammerCLI::AbstractCommand
       def execute
         map = HammerCLI::MainCommand.completion_map
-        cache_file = HammerCLI::Settings.get(:completion_cache_file)
+        cache_file = File.expand_path(
+          HammerCLI::Settings.get(:completion_cache_file)
+        )
         cache_dir = File.dirname(cache_file)
         FileUtils.mkdir_p(cache_dir) unless File.directory?(cache_dir)
-        File.write(File.expand_path(cache_file), map.to_json)
+        File.write(cache_file, map.to_json)
 
         HammerCLI::EX_OK
       end

data/lib/hammer_cli/help/builder.rb

@@ -61,25 +61,6 @@ module HammerCLI
         label = HighLine.color(label, :bold) if @richtext
         puts label
       end
-
-      private
-
-      def expand_invocation_path(path)
-        bits = path.split(' ')
-        parent_command = HammerCLI::MainCommand
-        new_path = (bits[1..-1] || []).each_with_object([]) do |bit, names|
-          subcommand = parent_command.find_subcommand(bit)
-          next if subcommand.nil?
-
-          names << if subcommand.names.size > 1
-                     "<#{subcommand.names.join('|')}>"
-                   else
-                     subcommand.names.first
-                   end
-          parent_command = subcommand.subcommand_class
-        end
-        new_path.unshift(bits.first).join(' ')
-      end
     end
   end
 end

data/lib/hammer_cli/settings.rb

@@ -67,7 +67,7 @@ module HammerCLI
     def self.default_settings
       {
         :use_defaults => true,
-        :completion_cache_file => '~/.cache/hammer_completion.yml'
+        :completion_cache_file => '~/.cache/hammer_completion.json'
       }
     end
 

data/lib/hammer_cli/utils.rb

@@ -121,7 +121,7 @@ module HammerCLI
     bits = path.split(' ')
     parent_command = HammerCLI::MainCommand
     new_path = (bits[1..-1] || []).each_with_object([]) do |bit, names|
-      subcommand = parent_command.find_subcommand(bit)
+      subcommand = parent_command.find_subcommand(bit, fuzzy: false)
       next if subcommand.nil?
 
       names << if subcommand.names.size > 1

data/lib/hammer_cli/version.rb

@@ -1,5 +1,5 @@
 module HammerCLI
   def self.version
-    @version ||= Gem::Version.new "2.1.1"
+    @version ||= Gem::Version.new "2.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Martin Bačovský
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -145,7 +145,7 @@ dependencies:
         version: 0.2.0
 description: 'Hammer cli provides universal extendable CLI interface for ruby apps
 
-'
+  '
 email: mbacovsk@redhat.com
 executables:
 - hammer
@@ -153,26 +153,26 @@ executables:
 extensions: []
 extra_rdoc_files:
 - doc/commands_extension.md
-- doc/commands_modification.md
-- doc/creating_apipie_commands.md
-- doc/creating_commands.md
+- doc/release_notes.md
 - doc/design.png
-- doc/design.uml
-- doc/developer_docs.md
-- doc/development_tips.md
-- doc/help_modification.md
-- doc/i18n.md
+- doc/commands_modification.md
 - doc/installation.md
+- doc/development_tips.md
+- doc/writing_a_plugin.md
+- doc/output.md
+- doc/developer_docs.md
 - doc/installation_deb.md
-- doc/installation_gem.md
+- doc/option_normalizers.md
 - doc/installation_rpm.md
+- doc/installation_gem.md
+- doc/help_modification.md
+- doc/creating_commands.md
 - doc/installation_source.md
 - doc/option_builders.md
-- doc/option_normalizers.md
-- doc/output.md
+- doc/i18n.md
 - doc/review_checklist.md
-- doc/writing_a_plugin.md
-- doc/release_notes.md
+- doc/creating_apipie_commands.md
+- doc/design.uml
 - config/cli.modules.d/module_config_template.yml
 - config/cli_config.template.yml
 - config/hammer.completion
@@ -394,75 +394,75 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Universal command-line interface
 test_files:
-- test/functional/defaults_test.rb
-- test/functional/help_test.rb
-- test/functional/nil_values_test.rb
-- test/functional/test_helper.rb
-- test/test_helper.rb
-- test/unit/abstract_test.rb
-- test/unit/apipie/api_connection_test.rb
+- test/unit/messages_test.rb
+- test/unit/exception_handler_test.rb
+- test/unit/modules_test.rb
+- test/unit/connection_test.rb
+- test/unit/completer_test.rb
+- test/unit/csv_parser_test.rb
+- test/unit/option_builder_test.rb
+- test/unit/test_helper.rb
+- test/unit/utils_test.rb
 - test/unit/apipie/command_test.rb
 - test/unit/apipie/option_builder_test.rb
-- test/unit/apipie/option_definition_test.rb
 - test/unit/apipie/test_helper.rb
-- test/unit/bash_test.rb
-- test/unit/ca_cert_manager_test.rb
+- test/unit/apipie/api_connection_test.rb
+- test/unit/apipie/option_definition_test.rb
 - test/unit/command_extensions_test.rb
-- test/unit/completer_test.rb
-- test/unit/connection_test.rb
-- test/unit/csv_parser_test.rb
+- test/unit/main_test.rb
+- test/unit/options/processor_list_test.rb
+- test/unit/options/option_family_test.rb
+- test/unit/options/validators/dsl_test.rb
+- test/unit/options/sources/command_line_test.rb
+- test/unit/options/sources/saved_defaults_test.rb
+- test/unit/options/matcher_test.rb
+- test/unit/options/option_collector_test.rb
+- test/unit/options/normalizers_test.rb
+- test/unit/options/option_definition_test.rb
+- test/unit/settings_test.rb
+- test/unit/history_test.rb
 - test/unit/defaults_test.rb
-- test/unit/exception_handler_test.rb
+- test/unit/logger_test.rb
+- test/unit/output/formatters_test.rb
+- test/unit/output/record_collection_test.rb
+- test/unit/output/dsl_test.rb
+- test/unit/output/definition_test.rb
+- test/unit/output/output_test.rb
+- test/unit/output/field_filter_test.rb
+- test/unit/output/fields_test.rb
+- test/unit/output/adapter/table_test.rb
+- test/unit/output/adapter/json_test.rb
+- test/unit/output/adapter/abstract_test.rb
+- test/unit/output/adapter/yaml_test.rb
+- test/unit/output/adapter/csv_test.rb
+- test/unit/output/adapter/base_test.rb
+- test/unit/abstract_test.rb
+- test/unit/i18n_test.rb
 - test/unit/fixtures/apipie/architectures.json
 - test/unit/fixtures/apipie/documented.json
-- test/unit/fixtures/certs/ca_cert.pem
-- test/unit/fixtures/certs/non_ca_cert.pem
-- test/unit/fixtures/defaults/defaults.yml
 - test/unit/fixtures/defaults/defaults_dashed.yml
-- test/unit/fixtures/json_input/invalid.json
+- test/unit/fixtures/defaults/defaults.yml
 - test/unit/fixtures/json_input/valid.json
-- test/unit/help/builder_test.rb
-- test/unit/help/definition/abstract_item_test.rb
-- test/unit/help/definition/list_test.rb
-- test/unit/help/definition/note_test.rb
+- test/unit/fixtures/json_input/invalid.json
+- test/unit/fixtures/certs/ca_cert.pem
+- test/unit/fixtures/certs/non_ca_cert.pem
+- test/unit/bash_test.rb
 - test/unit/help/definition/section_test.rb
+- test/unit/help/definition/list_test.rb
 - test/unit/help/definition/text_test.rb
+- test/unit/help/definition/abstract_item_test.rb
+- test/unit/help/definition/note_test.rb
 - test/unit/help/definition_test.rb
+- test/unit/help/builder_test.rb
 - test/unit/help/text_builder_test.rb
-- test/unit/history_test.rb
-- test/unit/i18n_test.rb
-- test/unit/logger_test.rb
-- test/unit/main_test.rb
-- test/unit/messages_test.rb
-- test/unit/modules_test.rb
-- test/unit/option_builder_test.rb
-- test/unit/options/matcher_test.rb
-- test/unit/options/normalizers_test.rb
-- test/unit/options/option_collector_test.rb
-- test/unit/options/option_definition_test.rb
-- test/unit/options/option_family_test.rb
-- test/unit/options/processor_list_test.rb
-- test/unit/options/sources/command_line_test.rb
-- test/unit/options/sources/saved_defaults_test.rb
-- test/unit/options/validators/dsl_test.rb
-- test/unit/output/adapter/abstract_test.rb
-- test/unit/output/adapter/base_test.rb
-- test/unit/output/adapter/csv_test.rb
-- test/unit/output/adapter/json_test.rb
-- test/unit/output/adapter/table_test.rb
-- test/unit/output/adapter/yaml_test.rb
-- test/unit/output/definition_test.rb
-- test/unit/output/dsl_test.rb
-- test/unit/output/field_filter_test.rb
-- test/unit/output/fields_test.rb
-- test/unit/output/formatters_test.rb
-- test/unit/output/output_test.rb
-- test/unit/output/record_collection_test.rb
-- test/unit/settings_test.rb
-- test/unit/test_helper.rb
-- test/unit/utils_test.rb
+- test/unit/ca_cert_manager_test.rb
+- test/functional/help_test.rb
+- test/functional/test_helper.rb
+- test/functional/nil_values_test.rb
+- test/functional/defaults_test.rb
+- test/test_helper.rb