hammer_cli_foreman 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d87fa149fc1614b767ea22dbb7035c5ce7885b8d
-  data.tar.gz: 95e857975d4178e6e75da2b50643f52b05ab3723
+  metadata.gz: 8c0241ac81129df8860ec4157f08d6aae24d0bd3
+  data.tar.gz: ae9dcd30957ce18bbbdfe7b94129f1b53db08ea7
 SHA512:
-  metadata.gz: ebb86bc0b6cf8dfde731271567c1c6592fa4d37b59338e26e367bbb62b8ee60f091b2ba6fb1880721c4a5b0d3ce7382af210fe82ba57b94dc24ee2da4f13c6ff
-  data.tar.gz: 3249b9157df0f2f25417f62fb3268618edfbfdf4be50178675e70a16945f89dc255ffb8a4e4df144666a445eb74c8b1806379c8f3e2b1ffa67767f23a61bd3e3
+  metadata.gz: 446b99ddc24f96b787a5fa578f5333daee11c7697b20d3cb1df6f167fb65200620fffbb9f9e2e2fc14c64fcc63ca120492ce8f3bdc8fa41808809e3f0b35d937
+  data.tar.gz: ebd443959657a426311487215bbf125407a94e26bd2a28239656bc676ccc6ba8e350b1cfb5563f8eb52708025bfe57670c82b928cb3ef3808f22bdbc8653e3dc

data/doc/release_notes.md

@@ -1,5 +1,9 @@
 Release notes
 =============
+### 0.12.1 (2018-03-05)
+* temporary fix for override values ([#22751](http://projects.theforeman.org/issues/22751))
+* raise error when wrong number of ids is resolved ([#22718](http://projects.theforeman.org/issues/22718))
+* Puppetrun command is moved from hosts to puppet hosts ([#22658](http://projects.theforeman.org/issues/22658))
 
 ### 0.12.0 (2018-02-19)
 * Do not resolve already resolved id params ([#22517](http://projects.theforeman.org/issues/22517))

data/lib/hammer_cli_foreman/host.rb

@@ -168,6 +168,7 @@ module HammerCLIForeman
 
     class PuppetRunCommand < HammerCLIForeman::SingleResourceCommand
       command_name "puppetrun"
+      resource :puppet_hosts
       action :puppetrun
 
       def print_data(records)

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -172,7 +172,7 @@ module HammerCLIForeman
     def find_resources(resource_name, options)
       resource = @api.resource(resource_name)
       results = resolved_call(resource_name, :index, options, :multi)
-      raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource)
+      raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource, :multi)
       results
     end
 
@@ -184,7 +184,7 @@ module HammerCLIForeman
         ids
       elsif !options_empty?(resource, options)
         results = resolved_call(resource_name, :index, options, :multi).first.values.flatten
-        raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource)
+        raise ResolverError.new(_("one of %s not found.") % resource.name, resource) if results.count < expected_record_count(options, resource, :multi)
         results
       else
         []
@@ -266,10 +266,11 @@ module HammerCLIForeman
       search_options
     end
 
-    def expected_record_count(options, resource)
+    # @param mode [Symbol] mode in which ids are searched :single, :multi, nil for old beahvior
+    def expected_record_count(options, resource, mode = nil)
       searchables(resource).each do |s|
-        value = options[HammerCLI.option_accessor_name(s.name.to_s)]
-        values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)]
+        value = options[HammerCLI.option_accessor_name(s.name.to_s)] unless mode == :multi
+        values = options[HammerCLI.option_accessor_name(s.plural_name.to_s)] unless mode == :single
         if value
           return 1
         elsif values

data/lib/hammer_cli_foreman/smart_class_parameter.rb

@@ -105,6 +105,8 @@ module HammerCLIForeman
       success_message _("Parameter updated.")
       failure_message _("Could not update the parameter")
 
+      option '--default-value', 'VALUE', _('Value to use when there is no match')
+
       build_options do |options|
         options.expand.including(:puppetclasses)
         options.without(:parameter_type, :validator_type, :override, :required, :override_value_order)
@@ -140,6 +142,8 @@ module HammerCLIForeman
       resource :override_values
       command_name 'add-matcher'
 
+      option '--value', 'VALUE', _('Override value, required if omit is false')
+
       success_message _("Override value created.")
       failure_message _("Could not create the override value")
 

data/lib/hammer_cli_foreman/smart_variable.rb

@@ -10,6 +10,7 @@ module HammerCLIForeman
                   :format => HammerCLI::Options::Normalizers::Enum.new(['regexp', 'list', ''])
       base.option "--override-value-order", "OVERRIDE_VALUE_ORDER", _("The order in which values are resolved"),
                   :format => HammerCLI::Options::Normalizers::List.new
+      base.option '--default-value', 'VALUE', _('Value to use when there is no match')
 
       base.build_options :without => [:variable_type, :validator_type, :override_value_order]
     end
@@ -129,6 +130,8 @@ module HammerCLIForeman
       resource :override_values
       command_name 'add-matcher'
 
+      option '--value', 'VALUE', _('Override value, required if omit is false')
+
       success_message _("Override value created.")
       failure_message _("Could not create the override value")
 

data/lib/hammer_cli_foreman/testing/api_expectations.rb

@@ -33,7 +33,7 @@ module HammerCLIForeman
 
         protected
         def assert_params(params)
-          params == deep_merge_hash(params, @expected_params)
+          stringify_keys(params) == deep_merge_hash(stringify_keys(params), stringify_keys(@expected_params))
         end
 
         def deep_merge_hash(h, other_h)
@@ -46,6 +46,15 @@ module HammerCLIForeman
             end
           end
         end
+
+        def stringify_keys(hash)
+          hash.inject({}) do |stringified, (key, value)|
+            if value.is_a?(Hash)
+              value = stringify_keys(value)
+            end
+            stringified.update(key.to_s => value)
+          end
+        end
       end
 
       module ExpectationExtensions

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.12.0'
+    @version ||= Gem::Version.new '0.12.1'
   end
 end

data/test/functional/smart_class_parameter_test.rb

@@ -32,38 +32,52 @@ describe 'sc-params add-matcher' do
     '--match', match
   ] }
 
+  def api_expects_parameter_search(puppet_class, parameter)
+    api_expects(:puppetclasses, :index, 'Find puppet class') do |par|
+      par[:search] == %Q(name = "#{puppet_class['name']}")
+    end.returns(index_response('motd' => [puppet_class]))
+
+    api_expects(:smart_class_parameters, :index, 'Find smart parameter') do |par|
+      par[:search] == %Q(key = "#{parameter['name']}") &&
+        par[:puppetclass_id] == puppet_class['id']
+    end.returns(index_response([parameter]))
+  end
+
   it 'allows to set value' do
     params = ['--value', override_value]
     expected_result = success_result("Override value created.\n")
 
-    prepare_api_expectations = proc do
-      expectations = []
-      expectations << api_expects(:puppetclasses, :index, 'Find puppet class') do |par|
-        par[:search] == %Q(name = "#{puppet_class['name']}")
-      end.returns(index_response('motd' => [puppet_class]))
-
-      expectations << api_expects(:smart_class_parameters, :index, 'Find smart parameter') do |par|
-        par[:search] == %Q(key = "#{parameter['name']}") &&
-          par[:puppetclass_id] == puppet_class['id']
-      end.returns(index_response([parameter]))
-
-      expectations << api_expects(:override_values, :create, 'Create override value') do |par|
-        val = par['override_value']
-        par['smart_class_parameter_id'] == parameter['id'] &&
-          val['match'] == match &&
-          val['value'] == override_value
-      end
-    end
-
-    expectations = prepare_api_expectations.call()
+    api_expects_parameter_search(puppet_class, parameter)
+
+    api_expects(:override_values, :create, 'Create override value').with_params(
+      :smart_class_parameter_id => parameter['id'],
+      :override_value => {
+        :match => match,
+        :value => override_value
+      }
+    )
+
     result = run_cmd(cmd + base + params)
     assert_cmd(expected_result, result)
-    assert expectations.all?(&:verified?)
+  end
 
-    expectations = prepare_api_expectations.call()
-    result = run_cmd(cmd + base + params + ['--use-puppet-default', false])
+  it 'allows to set value with disabled puppet default' do
+    params = ['--value', override_value, '--use-puppet-default', false]
+    expected_result = success_result("Override value created.\n")
+
+    api_expects_parameter_search(puppet_class, parameter)
+
+    api_expects(:override_values, :create, 'Create override value').with_params(
+      :smart_class_parameter_id => parameter['id'],
+      :override_value => {
+        :match => match,
+        :value => override_value,
+        :use_puppet_default => false
+      }
+    )
+
+    result = run_cmd(cmd + base + params)
     assert_cmd(expected_result, result)
-    assert expectations.all?(&:verified?)
   end
 
   it 'does not allow to use puppet default and value at the same time' do

data/test/unit/id_resolver_test.rb

@@ -253,6 +253,14 @@ describe HammerCLIForeman::IdResolver do
         assert_equal [john_id, jane_id], resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"]})
       end
 
+      it "raises exception when wrong number of resources is found even with conflicting options" do
+        ResourceMocks.mock_action_call(:users, :index, [john])
+
+        assert_raises HammerCLIForeman::ResolverError do
+          resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"], "option_name" => "group1"})
+        end
+      end
+
       it "raises exception when wrong number of resources is found" do
         ResourceMocks.mock_action_call(:users, :index, [john])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli