mcollective-client 2.8.9 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b38bbfce7f0aba03c8178a28501d99894e3d2f
-  data.tar.gz: 657509db5b28a31967dfd16fc333da90c12eb605
+  metadata.gz: 65208c5aeb53a535cdcbf8d633f4bcb538c70f59
+  data.tar.gz: a7b6501a7b73dae8201d34e3d64275b5a184d369
 SHA512:
-  metadata.gz: f70b87a2142b39da0f78d9096b75f6a4177cefcc26cd15a42779973dcf6823a78ce7aa035431938c1bb93711ce0430f4eda062e771bb438e790f5c3b32d54e3b
-  data.tar.gz: 671f207d9cddb69f948499413c2867719a919252cf054af3fcb65e91b741fee6de75498be1900a49fc453cd2ef294da0ef34365a2c86eb554973c051efde5813
+  metadata.gz: 4473732cda0184dee2c04226516018fb28c41427d1bbd65426eb3ceea26c3337f9a7ad3799cc15d8f3eb335fab2e98f06b7ac6d9393e2aebf875ef5ad7569636
+  data.tar.gz: 6de6f9e59d3c284dcc3543a96843257a5230e1eace03ca21e87ea246f1540c86abe8bc7e6ebe97fb98675c5c15671bc07ca1fb61895029c7783a9f82881d9cea

data/lib/mcollective.rb

@@ -59,7 +59,7 @@ module MCollective
 
   MCollective::Vendor.load_vendored
 
-  VERSION="2.8.9"
+  VERSION="2.9.0"
 
   def self.version
     VERSION

data/lib/mcollective/connector/activemq.rb

@@ -224,15 +224,43 @@ module MCollective
 
           pools = Integer(get_option("activemq.pool.size"))
           hosts = []
+          middleware_user = ''
+          middleware_password = ''
+          prompt_for_username = get_bool_option("activemq.prompt_user", "false")
+          prompt_for_password = get_bool_option("activemq.prompt_password", "false")
+          
+          if prompt_for_username
+            Log.debug("No previous user exists and activemq.prompt-user is set to true")
+            print "Please enter user to connect to middleware: "
+            middleware_user = STDIN.gets.chomp
+          end
+
+          if prompt_for_password
+            Log.debug("No previous password exists and activemq.prompt-password is set to true")
+            middleware_password = MCollective::Util.get_hidden_input("Please enter password: ")
+            print "\n"
+          end
 
           1.upto(pools) do |poolnum|
             host = {}
 
             host[:host] = get_option("activemq.pool.#{poolnum}.host")
             host[:port] = get_option("activemq.pool.#{poolnum}.port", 61613).to_i
-            host[:login] = get_env_or_option("STOMP_USER", "activemq.pool.#{poolnum}.user", '')
-            host[:passcode] = get_env_or_option("STOMP_PASSWORD", "activemq.pool.#{poolnum}.password", '')
             host[:ssl] = get_bool_option("activemq.pool.#{poolnum}.ssl", "false")
+            
+            # read user from config file
+            host[:login] = get_env_or_option("STOMP_USER", "activemq.pool.#{poolnum}.user", middleware_user)
+            if prompt_for_username and host[:login] != middleware_user
+                Log.info("Using #{host[:login]} from config file to connect to #{host[:host]}. "+
+                        "plugin.activemq.prompt_user should be set to false to remove the prompt.")
+            end
+            
+            # read user from config file
+            host[:passcode] = get_env_or_option("STOMP_PASSWORD", "activemq.pool.#{poolnum}.password", middleware_password)
+            if prompt_for_password and host[:passcode] != middleware_password
+                Log.info("Using password from config file to connect to #{host[:host]}. "+
+                        "plugin.activemq.prompt_password should be set to false to remove the prompt.")
+            end
 
             # if ssl is enabled set :ssl to the hash of parameters
             if host[:ssl]

data/lib/mcollective/connector/rabbitmq.rb

@@ -118,16 +118,43 @@ module MCollective
 
           pools = Integer(get_option("rabbitmq.pool.size"))
           hosts = []
+          middleware_user = ''
+          middleware_password = ''
+          prompt_for_username = get_bool_option("rabbitmq.prompt_user", "false")
+          prompt_for_password = get_bool_option("rabbitmq.prompt_password", "false")
+          if prompt_for_username
+            Log.debug("No previous user exists and rabbitmq.prompt-user is set to true")
+            print "Please enter user to connect to middleware: "
+            middleware_user = STDIN.gets.chomp
+          end
 
+          if prompt_for_password
+            Log.debug("No previous password exists and rabbitmq.prompt-password is set to true")
+            middleware_password = MCollective::Util.get_hidden_input("Please enter password: ")
+            print "\n"
+          end
+          
           1.upto(pools) do |poolnum|
             host = {}
 
             host[:host] = get_option("rabbitmq.pool.#{poolnum}.host")
             host[:port] = get_option("rabbitmq.pool.#{poolnum}.port", 61613).to_i
-            host[:login] = get_env_or_option("STOMP_USER", "rabbitmq.pool.#{poolnum}.user", '')
-            host[:passcode] = get_env_or_option("STOMP_PASSWORD", "rabbitmq.pool.#{poolnum}.password", '')
             host[:ssl] = get_bool_option("rabbitmq.pool.#{poolnum}.ssl", "false")
-
+            
+            # read user from config file
+            host[:login] = get_env_or_option("STOMP_USER", "rabbitmq.pool.#{poolnum}.user", middleware_user)
+            if prompt_for_username and host[:login] != middleware_user
+              Log.info("Using #{host[:login]} from config file to connect to #{host[:host]}. "+
+                        "plugin.rabbitmq.prompt_user should be set to false to remove the prompt.")
+            end
+            
+            # read password from config file
+            host[:passcode] = get_env_or_option("STOMP_PASSWORD", "rabbitmq.pool.#{poolnum}.password", middleware_password)
+            if prompt_for_password and host[:passcode] != middleware_password
+                Log.info("Using password from config file to connect to #{host[:host]}. "+
+                        "plugin.rabbitmq.prompt_password should be set to false to remove the prompt.")
+            end
+           
             # if ssl is enabled set :ssl to the hash of parameters
             if host[:ssl]
               host[:ssl] = ssl_parameters(poolnum, get_bool_option("rabbitmq.pool.#{poolnum}.ssl.fallback", "false"))

data/lib/mcollective/pluginpackager/debpackage_packager.rb

@@ -91,11 +91,11 @@ module MCollective
         dependencies = []
         PluginPackager.filter_dependencies('debian', data[:dependencies]).each do |dep|
           if dep[:version] && dep[:revision]
-            dependencies << "#{dep[:name]} (>=#{dep[:version]}-#{dep[:revision]})"
+            dependencies << "#{dep[:name]} (>=#{dep[:version]}-#{dep[:revision]}) | puppet-agent"
           elsif dep[:version]
-            dependencies << "#{dep[:name]} (>=#{dep[:version]})"
+            dependencies << "#{dep[:name]} (>=#{dep[:version]}) | puppet-agent"
           else
-            dependencies << dep[:name]
+            dependencies << "#{dep[:name]} | puppet-agent"
           end
         end
 

data/lib/mcollective/util.rb

@@ -520,5 +520,60 @@ module MCollective
       number = (max_size/field_size).to_i
       (number == 0) ? 1 : number
     end
+    
+    def self.get_hidden_input_on_windows()
+      require 'Win32API'
+      # Hook into getch from crtdll. Keep reading all keys till return
+      # or newline is hit.
+      # If key is backspace or delete, then delete the character and update
+      # the buffer.
+      input = ''
+      while char = Win32API.new("crtdll", "_getch", [ ], "I").Call do
+        break if char == 10 || char == 13 # return or newline
+        if char == 127 || char == 8 # backspace and delete
+          if input.length > 0
+            input.slice!(-1, 1)
+          end
+        else
+          input << char.chr
+        end
+      end
+      char = ''
+      input
+    end
+
+    def self.get_hidden_input_on_unix()
+      unless $stdin.tty?
+        raise 'Could not hook to stdin to hide input. If using SSH, try using -t flag while connecting to server.'
+      end
+      unless system 'stty -echo -icanon'
+        raise 'Could not hide input using stty command.'
+      end
+      input = $stdin.gets
+      ensure
+        unless system 'stty echo icanon'
+          raise 'Could not enable echoing of input. Try executing `stty echo icanon` to debug.'
+        end
+      input
+    end
+
+    def self.get_hidden_input(message='Please enter data: ')
+      unless message.nil?
+        print message
+      end
+      if versioncmp(ruby_version, '1.9.3') >= 0
+        require 'io/console'
+        input = $stdin.noecho(&:gets)
+      else
+        # Use hacks to get hidden input on Ruby <1.9.3
+        if self.windows?
+          input = self.get_hidden_input_on_windows()
+        else
+          input = self.get_hidden_input_on_unix()
+        end
+      end
+      input.chomp! if input
+      input
+    end
   end
 end

data/spec/unit/mcollective/connector/activemq_spec.rb

@@ -113,6 +113,8 @@ module MCollective
           Activemq.any_instance.stubs(:get_option).with("activemq.max_hbrlck_fails", 0).returns(0)
           Activemq.any_instance.stubs(:get_option).with("activemq.max_hbread_fails", 2).returns(2)
           Activemq.any_instance.stubs(:get_bool_option).with("activemq.base64", 'false').returns(false)
+          Activemq.any_instance.stubs(:get_bool_option).with("activemq.prompt_user", 'false').returns(false)
+          Activemq.any_instance.stubs(:get_bool_option).with("activemq.prompt_password", 'false').returns(false)
           Activemq.any_instance.stubs(:get_option).with("activemq.priority", 0).returns(0)
           Activemq.any_instance.stubs(:get_option).with("activemq.pool.size").returns(2)
           Activemq.any_instance.stubs(:get_option).with("activemq.pool.1.host").returns("host1")

data/spec/unit/mcollective/connector/rabbitmq_spec.rb

@@ -114,6 +114,8 @@ module MCollective
           Rabbitmq.any_instance.stubs(:get_option).with("rabbitmq.max_hbrlck_fails", 0).returns(0)
           Rabbitmq.any_instance.stubs(:get_option).with("rabbitmq.max_hbread_fails", 2).returns(2)
           Rabbitmq.any_instance.stubs(:get_bool_option).with("rabbitmq.base64", 'false').returns(false)
+          Rabbitmq.any_instance.stubs(:get_bool_option).with("rabbitmq.prompt_user", 'false').returns(false)
+          Rabbitmq.any_instance.stubs(:get_bool_option).with("rabbitmq.prompt_password", 'false').returns(false)
           Rabbitmq.any_instance.stubs(:get_option).with("rabbitmq.pool.size").returns(2)
           Rabbitmq.any_instance.stubs(:get_option).with("rabbitmq.pool.1.host").returns("host1")
           Rabbitmq.any_instance.stubs(:get_option).with("rabbitmq.pool.1.port", 61613).returns(6163)

data/spec/unit/mcollective/packagers/debpackage_packager_spec.rb

@@ -132,7 +132,7 @@ module MCollective
         it 'should create the correct dependency string' do
           PluginPackager.expects(:filter_dependencies).with('debian', data[:dependencies]).returns(data[:dependencies])
           result = packager.send(:build_dependency_string, data)
-          result.should == 'dep1, dep2 (>=1.1), dep3 (>=1.1-2), mcollective-rspec-common (= ${binary:Version})'
+          result.should == 'dep1 | puppet-agent, dep2 (>=1.1) | puppet-agent, dep3 (>=1.1-2) | puppet-agent, mcollective-rspec-common (= ${binary:Version})'
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.8.9
+  version: 2.9.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu