hammer_cli 3.1.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b85ac5a195550a8e7a09c1f9be837e8ff6fb20a2beec7d17be3a74ff1b18a6d4
-  data.tar.gz: f07cb34217d8c07e9d93884ad49142a3a9e28121bc0127d69eab9db0052b00e1
+  metadata.gz: 19ccf9a99763e1aabeaafef875ee962c17dea4247848c2c72f55f02ee49c0556
+  data.tar.gz: 8ed4b36598e80f4ab0a4546aa28914860bfc847ef303b58180df33da1450428f
 SHA512:
-  metadata.gz: d680f551580f46e4b108e8350b62da4fc724405a02181d25a67627cca1d674e5b8ddef9badd1a3f8dc67990f567f035c1351b73d5e4e92aa510f532f750fdc16
-  data.tar.gz: f4515582c5297748b00a81c41ec2d39e7757e58dfc41cf77cd57c5b0044fd733594cc8bf62fbe44ac252bc3d65a06ef48a7916ad9f32a39a040d6a3ad395f078
+  metadata.gz: 378a341cfe23d45752298fcf586772b60e838b5602ee4e89d4eb97c4c92e059c14742d37faa3ba81dfe6d97f8553d1df6afeb328b2c8acda81a01751b6180d58
+  data.tar.gz: bcb5ede4af035343c4fae584d48b761d8c948104091835a49b875d0f6f105e422adae4f127d602ef5ba1760aeb4f4a24568cd3a4a16d30ec27d7646c7f8fed4e

data/doc/release_notes.md

@@ -1,7 +1,17 @@
 Release notes
 =============
-### 3.1.1 (2022-02-01)
+### 3.4.0 (2022-08-09)
+* Bump to 3.4.0-develop
+
+### 3.3.0 (2022-05-10)
+* Fix hammer shell with pipe as stdin ([PR #360](https://github.com/theforeman/hammer-cli/pull/360)), [#34724](http://projects.theforeman.org/issues/34724)
+* Bump to 3.3.0-develop
+
+### 3.2.0 (2022-02-10)
 * Fix fr translation ([PR #358](https://github.com/theforeman/hammer-cli/pull/358)), [#34204](http://projects.theforeman.org/issues/34204)
+* Add missing_args_error_result test helper ([PR #357](https://github.com/theforeman/hammer-cli/pull/357))
+* Allow explicit strings in key=value options ([PR #356](https://github.com/theforeman/hammer-cli/pull/356)), [#34079](http://projects.theforeman.org/issues/34079)
+* Bump to 3.2.0-develop
 
 ### 3.1.0 (2021-11-10)
 * Remove a space in hammer's shebang, [#33810](http://projects.theforeman.org/issues/33810)

data/lib/hammer_cli/options/normalizers.rb

@@ -104,15 +104,13 @@ module HammerCLI
 
         def strip_value(value)
           if value.is_a? Array
-            value.map do |item|
-              strip_chars(item.strip, '"\'')
-            end
+            value.map(&:strip)
           elsif value.is_a? Hash
             value.map do |key, val|
-              [strip_chars(key.strip, '"\''), strip_chars(val.strip, '"\'')]
+              [strip_chars(key.strip, '"\''), val.strip]
             end.to_h
           else
-            strip_chars(value.strip, '"\'')
+            value.strip
           end
         end
 

data/lib/hammer_cli/shell.rb

@@ -86,7 +86,7 @@ module HammerCLI
       Readline.completer_word_break_characters = ' ='
       Readline.completion_proc = complete_proc
 
-      stty_save = `stty -g`.chomp
+      stty_save = `stty -g`.chomp if $stdin.tty?
 
       history = ShellHistory.new(Settings.get(:ui, :history_file) || DEFAULT_HISTORY_FILE)
 
@@ -102,7 +102,8 @@ module HammerCLI
       rescue Interrupt; end
 
       puts
-      system('stty', stty_save) # Restore
+      # Restore
+      system('stty', stty_save) if $stdin.tty?
       HammerCLI::EX_OK
     end
 

data/lib/hammer_cli/testing/command_assertions.rb

@@ -94,6 +94,20 @@ module HammerCLI
         end
       end
 
+      def missing_args_error(command, opts, heading = nil)
+        opts = Array(opts).map { |o| "'#{o}'" }.join(', ')
+        message = "  Missing arguments for #{opts}."
+        if heading.nil?
+          ["Could not #{command[-1]} the #{command[-2]}:",
+           message,
+           ''].join("\n")
+        else
+          ["#{heading}:",
+           message,
+           ''].join("\n")
+        end
+      end
+
       def usage_error_result(command, message, heading=nil)
         expected_result = CommandExpectation.new
         expected_result.expected_err = usage_error(command, message, heading)
@@ -115,6 +129,13 @@ module HammerCLI
         expected_result
       end
 
+      def missing_args_error_result(command, opts, heading = nil)
+        expected_result = CommandExpectation.new
+        expected_result.expected_err = missing_args_error(command, opts, heading)
+        expected_result.expected_exit_code = HammerCLI::EX_USAGE
+        expected_result
+      end
+
       def success_result(message)
         CommandExpectation.new(message)
       end

data/lib/hammer_cli/version.rb

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

data/test/unit/options/normalizers_test.rb

@@ -177,16 +177,20 @@ describe HammerCLI::Options::Normalizers do
         formatter.format("a= 1 , b = 2 ,c =3").must_equal({'a' => '1', 'b' => '2', 'c' => '3'})
       end
 
-      it "should parse a comma separated string with spaces using single quotes" do
-        formatter.format("a= ' 1 ' , b =' 2',c ='3'").must_equal({'a' => ' 1 ', 'b' => ' 2', 'c' => '3'})
+      it 'should parse a comma separated string with spaces using single quotes' do
+        formatter.format("a= ' 1 ' , b =' 2',c ='3'").must_equal({ 'a' => "' 1 '", 'b' => "' 2'", 'c' => "'3'" })
       end
 
-      it "should parse a comma separated string with spaces using double quotes" do
-        formatter.format("a= \" 1 \" , b =\" 2\",c =\"3\"").must_equal({'a' => ' 1 ', 'b' => ' 2', 'c' => '3'})
+      it 'should parse a comma separated string with spaces using double quotes' do
+        formatter.format('a= " 1 " , b =" 2",c ="3"').must_equal({ 'a' => '" 1 "', 'b' => '" 2"', 'c' => '"3"' })
       end
 
-      it "should deal with equal sign in value" do
-        formatter.format("a=1,b='2=2',c=3").must_equal({'a' => '1', 'b' => '2=2', 'c' => '3'})
+      it 'should deal with equal sign in string value' do
+        formatter.format("a=1,b='2=2',c=3").must_equal({ 'a' => '1', 'b' => "'2=2'", 'c' => '3' })
+      end
+
+      it 'should deal with equal sign in value' do
+        formatter.format('a=1,b=2=2,c=3').must_equal({ 'a' => '1', 'b' => '2=2', 'c' => '3' })
       end
 
       it "should parse arrays" do
@@ -197,12 +201,20 @@ describe HammerCLI::Options::Normalizers do
         formatter.format("a=1,b=[1, 2, 3],c=3").must_equal({'a' => '1', 'b' => ['1', '2', '3'], 'c' => '3'})
       end
 
-      it "should parse arrays with spaces using by single quotes" do
-        formatter.format("a=1,b=['1 1', ' 2 ', ' 3 3'],c=3").must_equal({'a' => '1', 'b' => ['1 1', ' 2 ', ' 3 3'], 'c' => '3'})
+      it 'should parse arrays with spaces using by single quotes' do
+        formatter.format("a=1,b=['1 1', ' 2 ', ' 3 3'],c=3").must_equal(
+          { 'a' => '1', 'b' => ["'1 1'", "' 2 '", "' 3 3'"], 'c' => '3' }
+        )
+      end
+
+      it 'should parse arrays with spaces using by double quotes' do
+        formatter.format('a=1,b=["1 1", " 2 ", " 3 3"],c=3').must_equal(
+          { 'a' => '1', 'b' => ['"1 1"', '" 2 "', '" 3 3"'], 'c' => '3' }
+        )
       end
 
-      it "should parse arrays with spaces using by double quotes" do
-        formatter.format("a=1,b=[\"1 1\", \" 2 \", \" 3 3\"],c=3").must_equal({'a' => '1', 'b' => ['1 1', ' 2 ', ' 3 3'], 'c' => '3'})
+      it 'should parse arrays with spaces' do
+        formatter.format('a=1,b=[1 1,  2 ,  3 3],c=3').must_equal({ 'a' => '1', 'b' => ['1 1', '2', '3 3'], 'c' => '3' })
       end
 
       it "should parse array with one item" do
@@ -226,6 +238,10 @@ describe HammerCLI::Options::Normalizers do
       it "should parse a comma separated string 2" do
         proc { formatter.format("a=1,b,c=3") }.must_raise ArgumentError
       end
+
+      it 'should parse explicit strings' do
+        formatter.format('name="*"').must_equal({ 'name' => '"*"' })
+      end
     end
 
     describe 'json format' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Martin Bačovský
 - Tomáš Strachota
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -135,17 +135,17 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.0
 description: 'Hammer cli provides universal extendable CLI interface for ruby apps
 
-'
+  '
 email: mbacovsk@redhat.com
 executables:
 - hammer
@@ -174,8 +174,8 @@ extra_rdoc_files:
 - doc/output.md
 - doc/review_checklist.md
 - config/cli.modules.d/module_config_template.yml
-- config/cli_config.template.yml
 - config/hammer.completion
+- config/cli_config.template.yml
 - README.md
 files:
 - LICENSE
@@ -379,7 +379,7 @@ homepage: https://github.com/theforeman/hammer-cli
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -395,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Universal command-line interface
 test_files:
@@ -414,8 +414,8 @@ test_files:
 - test/unit/connection_test.rb
 - test/unit/csv_parser_test.rb
 - test/unit/defaults_test.rb
-- test/unit/fixtures/apipie/architectures.json
 - test/unit/fixtures/apipie/documented.json
+- test/unit/fixtures/apipie/architectures.json
 - test/unit/fixtures/certs/ca_cert.pem
 - test/unit/fixtures/certs/non_ca_cert.pem
 - test/unit/fixtures/defaults/defaults.yml