mcollective-client 2.11.0 → 2.11.1

data/lib/mcollective.rb

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

data/lib/mcollective/data/result.rb

@@ -23,7 +23,8 @@ module MCollective
       end
 
       def []=(key, val)
-        raise "Can only store String, Integer, Float or Boolean data but got #{val.class} for key #{key}" unless [String, Fixnum, Bignum, Float, TrueClass, FalseClass].include?(val.class)
+        # checks using the string representation of the class name to avoid deprecations on Bignum and Fixnum
+        raise "Can only store String, Integer, Float or Boolean data but got #{val.class} for key #{key}" unless ["String", "Integer", "Bignum", "Fixnum", "Float", "TrueClass", "FalseClass"].include?(val.class.to_s)
 
         @data[key.to_sym] = val
       end

data/lib/mcollective/discovery.rb

@@ -125,7 +125,7 @@ module MCollective
     end
 
     def discover(filter, timeout, limit)
-      raise "Limit has to be an integer" unless limit.is_a?(Fixnum)
+      raise "Limit has to be an integer" unless limit.is_a?(Integer)
 
       force_discovery_method_by_filter(filter)
 

data/lib/mcollective/facts/base.rb

@@ -8,6 +8,7 @@ module MCollective
     #   "bar" => "baz"}
     class Base
       def initialize
+        @mutex = Mutex.new
         @facts = {}
         @last_good_facts = {}
         @last_facts_load = 0
@@ -24,7 +25,7 @@ module MCollective
 
         cache_time = config.fact_cache_time || 300
 
-        Thread.exclusive do
+        @mutex.synchronize do
           begin
             if (Time.now.to_i - @last_facts_load > cache_time.to_i ) || force_reload?
               Log.debug("Resetting facter cache, now: #{Time.now.to_i} last-known-good: #{@last_facts_load}")

data/lib/mcollective/rpc/client.rb

@@ -566,7 +566,7 @@ module MCollective
           # limit method then pass in the limit thus minimizing the amount
           # of work we do in the discover phase and speeding it up significantly
           filter = @filter.merge({'collective' => @collective})
-          if @limit_method == :first and @limit_targets.is_a?(Fixnum)
+          if @limit_method == :first and @limit_targets.is_a?(Integer)
             @discovered_agents = @client.discover(filter, discovery_timeout, @limit_targets)
           else
             @discovered_agents = @client.discover(filter, discovery_timeout)

data/lib/mcollective/shell.rb

@@ -61,7 +61,7 @@ module MCollective
             end
 
           when "timeout"
-            raise "timeout should be a positive integer or the symbol :on_thread_exit symbol" unless val.eql?(:on_thread_exit) || ( val.is_a?(Fixnum) && val>0 )
+            raise "timeout should be a positive integer or the symbol :on_thread_exit symbol" unless val.eql?(:on_thread_exit) || ( val.is_a?(Integer) && val>0 )
             @timeout = val
         end
       end
@@ -85,7 +85,7 @@ module MCollective
       # guard thread reaping the pid on completion.
       @status = systemu(@command, opts) do |cid|
         begin
-          if timeout.is_a?(Fixnum)
+          if timeout.is_a?(Integer)
             # wait for the specified timeout
             sleep timeout
           else

data/lib/mcollective/ssl.rb

@@ -142,7 +142,7 @@ module MCollective
 
     # encrypts a string, returns a hash of key, iv and data
     def aes_encrypt(plain_string)
-      cipher = OpenSSL::Cipher::Cipher.new(ssl_cipher)
+      cipher = OpenSSL::Cipher.new(ssl_cipher)
       cipher.encrypt
 
       key = cipher.random_key
@@ -156,7 +156,7 @@ module MCollective
 
     # decrypts a string given key, iv and data
     def aes_decrypt(key, crypt_string)
-      cipher = OpenSSL::Cipher::Cipher.new(ssl_cipher)
+      cipher = OpenSSL::Cipher.new(ssl_cipher)
 
       cipher.decrypt
       cipher.key = key

data/lib/mcollective/validator/typecheck_validator.rb

@@ -10,7 +10,7 @@ module MCollective
           when Class
             validator.is_a?(validation_type)
           when :integer
-            validator.is_a?(Fixnum)
+            validator.is_a?(Integer)
           when :float
             validator.is_a?(Float)
           when :number

data/spec/unit/mcollective/ddl_spec.rb

@@ -49,7 +49,7 @@ module MCollective
     describe "#string_to_number" do
       it "should turn valid strings into numbers" do
         ["1", "0", "9999"].each do |i|
-          DDL.string_to_number(i).class.should == Fixnum
+          expect(DDL.string_to_number(i)).to be_a(Integer)
         end
 
         ["1.1", "0.0", "9999.99"].each do |i|

data/spec/unit/mcollective/ssl_spec.rb

@@ -168,9 +168,11 @@ module MCollective
         data = @ssl.base64_decode("FkH6qLvKTn7a+uNPe8ciHA==")
 
         # the default aes-256-cbc should fail here, the key above is 128 bit
-        # the exception classes changed mid-1.9.2 :(
+        # the exception classes changed mid-1.9.2 and again later in 2.4 :(
         if OpenSSL.constants.include?("CipherError")
           expect { @ssl.aes_decrypt(key, data) }.to raise_error(OpenSSL::CipherError)
+        elsif RUBY_VERSION =~ /^2\.4/
+          expect { @ssl.aes_decrypt(key, data) }.to raise_error(ArgumentError)
         else
           expect { @ssl.aes_decrypt(key, data) }.to raise_error(OpenSSL::Cipher::CipherError)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu