mcollective-client 2.8.8 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb16d0f4c651d8d8bda6c9a0643a908afea9ddcc
-  data.tar.gz: 36de6a62d72f40972804cd820052d1bd5c7fc599
+  metadata.gz: 67b38bbfce7f0aba03c8178a28501d99894e3d2f
+  data.tar.gz: 657509db5b28a31967dfd16fc333da90c12eb605
 SHA512:
-  metadata.gz: 992c3957cea99c1d5a64ee774a40bdf87806104a30c87616e4b2864c7f5c92da476400d1679b867ca4d9d054975d1e055e5d930d736d2a3226890b67cf5db906
-  data.tar.gz: 591c2e50265b70db08c0ef894a86097ed2f6f7a0d029e0789be0724b38510ebb12e223d1aeab09bd5954158f6a6dd1b7b146d1214b2f08e4c4651fe1e11cd658
+  metadata.gz: f70b87a2142b39da0f78d9096b75f6a4177cefcc26cd15a42779973dcf6823a78ce7aa035431938c1bb93711ce0430f4eda062e771bb438e790f5c3b32d54e3b
+  data.tar.gz: 671f207d9cddb69f948499413c2867719a919252cf054af3fcb65e91b741fee6de75498be1900a49fc453cd2ef294da0ef34365a2c86eb554973c051efde5813

data/lib/mcollective.rb

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

data/lib/mcollective/matcher.rb

@@ -157,11 +157,6 @@ module MCollective
         return false
       end
 
-      # Escape strings for evaluation
-      if (l_compare.is_a?(String)  && !(function_hash["operator"] =~ /=~|!=~/))
-        r_compare = "\"#{r_compare}\""
-      end
-
       # Do a regex comparison if right compare string is a regex
       if operator=~ /(=~|!=~)/
         # Fail if left compare value isn't a string
@@ -177,10 +172,40 @@ module MCollective
             return !!result
           end
         end
-        # Otherwise evaluate the logical comparison
+        # Otherwise do a normal comparison while taking the type into account
       else
-        l_compare = "\"#{l_compare}\"" if l_compare.is_a?(String)
-        result = eval("#{l_compare} #{operator} #{r_compare}")
+        if l_compare.is_a? String
+          r_compare = r_compare.to_s
+        elsif r_compare.is_a? String
+          if l_compare.is_a? Numeric
+            r_compare = r_compare.strip
+            begin
+              r_compare = Integer(r_compare)
+            rescue ArgumentError
+              begin
+                r_compare = Float(r_compare)
+              rescue ArgumentError
+                raise ArgumentError, "invalid numeric value: #{r_compare}"
+              end
+            end
+          elsif l_compare.is_a? TrueClass or l_compare.is_a? FalseClass
+            r_compare = r_compare.strip
+            if r_compare == true.to_s
+              r_compare = true
+            elsif r_compare == false.to_s
+              r_compare = false
+            else
+              raise ArgumentError, "invalid boolean value: #{r_compare}"
+            end
+          end
+        end
+        operator = operator.strip
+        if operator =~ /(?:(!=|<=|>=|<|>)|==?)/
+          operator = $1 ? $1.to_sym : :==
+        else
+          raise ArgumentError, "invalid operator: #{operator}"
+        end
+        result = l_compare.send(operator, r_compare)
         return result
       end
     end

data/lib/mcollective/matcher/scanner.rb

@@ -65,7 +65,6 @@ module MCollective
         current_token_value = ""
         j = @token_index
         escaped = false
-        escaped_with = ""
 
         begin
           if (@arguments[j] == "/")
@@ -117,47 +116,46 @@ module MCollective
                 break
               end
 
-              if @arguments[j+1] == "("
+              if @arguments[j] == "("
                 func = true
-                be_greedy = true
-              end
-
-              if @arguments[j+1] == '"' || @arguments[j+1] == "'"
-                func = false
-                be_greedy = true
-                escaped = true
-                escaped_with = @arguments[j+1]
-              end
 
-              current_token_value << @arguments[j]
+                current_token_value << @arguments[j]
+                j += 1
 
-              if be_greedy
-                if func
-                  while !(j+1 >= @arguments.size) && @arguments[j] != ')'
+                while j < @arguments.size
+                  current_token_value << @arguments[j]
+                  if @arguments[j] == ')'
                     j += 1
-                    current_token_value << @arguments[j]
+                    break
                   end
-                else
-                  j += 2 # step over first "
-                  @white_spaces += 1
-                  # identified "..."
-                  while !(j+1 >= @arguments.size) && @arguments[j] != escaped_with
-                    if  @arguments[j] == '\\'
-                      # eat the escape char but don't add it to the token, or we
-                      # end up with \\\"
-                      @white_spaces += 1
-                      j += 1
-                      escaped = true
+                  j += 1
+                end
+              elsif @arguments[j] == '"' || @arguments[j] == "'"
+                escaped = true
+                escaped_with = @arguments[j]
+
+                j += 1 # step over first " or '
+                @white_spaces += 1
+                # identified "..." or '...'
+                while j < @arguments.size
+                  if  @arguments[j] == '\\'
+                    # eat the escape char but don't add it to the token, or we
+                    # end up with \\\"
+                    j += 1
+                    @white_spaces += 1
+                    unless j < @arguments.size
+                      break
                     end
-                    current_token_value << @arguments[j]
+                  elsif @arguments[j] == escaped_with
                     j += 1
+                    @white_spaces += 1
+                    break
                   end
-                  @white_spaces += 1
+                  current_token_value << @arguments[j]
+                  j += 1
                 end
-
-                j += 1
-                be_greedy = false
               else
+                current_token_value << @arguments[j]
                 j += 1
               end
 

data/lib/mcollective/ssl.rb

@@ -218,7 +218,7 @@ module MCollective
     def self.uuid(string=nil)
       string ||= OpenSSL::Random.random_bytes(16).unpack('H*').shift
 
-      uuid_name_space_dns = "\x6b\xa7\xb8\x10\x9d\xad\x11\xd1\x80\xb4\x00\xc0\x4f\xd4\x30\xc8"
+      uuid_name_space_dns = [0x6b, 0xa7, 0xb8, 0x10, 0x9d, 0xad, 0x11, 0xd1, 0x80, 0xb4, 0x00, 0xc0, 0x4f, 0xd4, 0x30, 0xc8].map {|b| b.chr}.join
 
       sha1 = Digest::SHA1.new
       sha1.update(uuid_name_space_dns)

data/spec/unit/mcollective/matcher/parser_spec.rb

@@ -105,8 +105,8 @@ module MCollective
         end
 
         it "should parse complex fstatements and statements with operators seperated by whitespaces" do
-          parser = Parser.new("foo('bar').value = 1 and foo=bar or foo  = bar")
-          parser.execution_stack.should == [{"fstatement"=>"foo('bar').value=1"}, {"and"=>"and"}, {"statement"=>"foo=bar"}, {"or"=>"or"}, {"statement"=>"foo=bar"}]
+          parser = Parser.new(%q(foo('bar').value = 1 and foo=bar or foo  = bar and baz("abc") = "xyz"))
+          parser.execution_stack.should == [{"fstatement"=>"foo('bar').value=1"}, {"and"=>"and"}, {"statement"=>"foo=bar"}, {"or"=>"or"}, {"statement"=>"foo=bar"}, {"and"=>"and"}, {"fstatement"=>'baz("abc")=xyz'}]
         end
 
         it "should parse statements where classes are mixed with fact comparisons and fstatements" do

data/spec/unit/mcollective/matcher_spec.rb

@@ -262,6 +262,22 @@ module MCollective
           result.should == true
        end
 
+        it "should handle integer literals" do
+          Matcher.expects(:execute_function).returns(10)
+          @function_hash["r_compare"] = "0xa"
+          @function_hash["operator"] = "="
+          result = Matcher.eval_compound_fstatement(@function_hash)
+          result.should == true
+        end
+
+        it "should handle float literals" do
+          Matcher.expects(:execute_function).returns(50)
+          @function_hash["r_compare"] = "0.5e2"
+          @function_hash["operator"] = "="
+          result = Matcher.eval_compound_fstatement(@function_hash)
+          result.should == true
+        end
+
        it "should return true if we do a false=false comparison" do
           Matcher.expects(:execute_function).returns(false)
           @function_hash["r_compare"] = false

metadata

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