hammer_cli_foreman 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2caf9087105bdd00ac37c6968833a5ad163710f2
-  data.tar.gz: '00296238bf77e4bcf9d11a080e589176ebae6df2'
+  metadata.gz: 299ecfde2e76d65fc4c7f1d5bdac72f5d51143b0
+  data.tar.gz: 9b103faecf764289ef13d92c5eed3b2d2080cca6
 SHA512:
-  metadata.gz: d97d63f32e7677044e2a8585bb626c1364173671ea20c5c1293418649878902ed2156ff283afcba688a3b16e4218f54cec420fd143335aaec5f6d6e45ea781fe
-  data.tar.gz: ff428a43ca9f2b51ff59e5fef8863d78baba307c07ed8ca5fa87ac9f212ffa3a4114c589ca2b2c6664d6cdf325c77f5598f0bb6f18cfd50d076ab3866301de2e
+  metadata.gz: 0e1c8af02919b59b4650ab43a2435af314b9c52371eb4c258015e2e06a61a0e3786d30a49fc54ca7e9b0738160c8a3f94d05b43d7077c84b76dd3d129bf57c49
+  data.tar.gz: 942d83cbaf1b5d836ac3fc1cdfb8f6a37b52ea8695d8dbc49dfacbf86725c148e3c4b48b308f98bc1940901cd7dc7c68414091bc0141f857bd977d36fd7d78a4

data/doc/release_notes.md

@@ -1,5 +1,9 @@
 Release notes
 =============
+### 0.13.2 (2018-08-15)
+* Stop overriding apipie help for host flags ([#24490](http://projects.theforeman.org/issues/24490))
+* Hammer asks for user password though -p option provided ([#23996](http://projects.theforeman.org/issues/23996))
+
 ### 0.13.1 (2018-07-18)
 * removed redundant info about OS from hostgroup ([#23722](http://projects.theforeman.org/issues/23722))
 

data/lib/hammer_cli_foreman/api/interactive_basic_auth.rb

@@ -30,6 +30,10 @@ module HammerCLIForeman
         @user ||= ask && get_user
       end
 
+      def password(ask=nil)
+        @password ||= ask && get_password
+      end
+
       def set_credentials(user, password)
         @user = user
         @password = password

data/lib/hammer_cli_foreman/api/session_authenticator_wrapper.rb

@@ -82,6 +82,10 @@ module HammerCLIForeman
         @authenticator.user(ask) if @authenticator.respond_to?(:user)
       end
 
+      def password(ask=nil)
+        @authenticator.password(ask) if @authenticator.respond_to?(:password)
+      end
+
       def set_credentials(*args)
         @authenticator.set_credentials(*args) if @authenticator.respond_to?(:set_credentials)
       end

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -25,12 +25,6 @@ module HammerCLIForeman
         bme_options = {}
         bme_options[:default] = 'true' if base.action.to_sym == :create
 
-        bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
-        base.option "--managed", "MANAGED", " ", bme_options
-        bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
-        base.option "--build", "BUILD", " ", bme_options
-        bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
-        base.option "--enabled", "ENABLED", " ",  bme_options
         bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
         base.option "--overwrite", "OVERWRITE", " ",  bme_options
 
@@ -71,9 +65,11 @@ module HammerCLIForeman
         puppetclass_ids = option_puppetclass_ids || puppet_class_ids(option_puppet_classes)
         params['host']['puppetclass_ids'] = puppetclass_ids unless puppetclass_ids.nil?
 
-        params['host']['build'] = option_build unless option_build.nil?
-        params['host']['managed'] = option_managed unless option_managed.nil?
-        params['host']['enabled'] = option_enabled unless option_enabled.nil?
+        if action == :create
+          params['host']['build'] = true if option_build.nil?
+          params['host']['managed'] = true if option_managed.nil?
+          params['host']['enabled'] = true if option_enabled.nil?
+        end
         params['host']['overwrite'] = option_overwrite unless option_overwrite.nil?
 
         params['host']['host_parameters_attributes'] = parameter_attributes

data/lib/hammer_cli_foreman/option_sources/user_params.rb

@@ -13,7 +13,10 @@ module HammerCLIForeman
 
         if @command.action == :update
           if result[option_name(:password)] || result[option_name(:ask_password)]
+
             if current_logged_user["id"].to_s == result[option_name(:id)].to_s
+              curr_passwd = HammerCLIForeman.foreman_api_connection.authenticator.password(true)
+              result[option_name(:current_password)] = curr_passwd unless curr_passwd.nil?
               unless result[option_name(:current_password)]
                 result[option_name(:current_password)] = ask_password(:current)
               end

data/lib/hammer_cli_foreman/version.rb

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

data/test/unit/api/interactive_basic_auth_test.rb

@@ -66,6 +66,20 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
     end
   end
 
+  describe '#password' do
+    it "returns nil when password wasn't provided" do
+      auth = HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, nil)
+
+      assert_nil auth.password
+    end
+
+    it "returns the password" do
+      auth = HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, 'testpswd')
+
+      assert_equal 'testpswd', auth.password
+    end
+  end
+
   describe '#error' do
     let(:auth) { HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, nil) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli