puppetdb_query 0.0.42 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319a2cce7db9ed74178688346751d952b68f321b
-  data.tar.gz: b79abeb8a5172e5d423bf9cf7bad9b074e3a4d7c
+  metadata.gz: 9357a22b2ac46f39cfc098965ebb11c89880cc4f
+  data.tar.gz: 209a291011f8f606f6234848e5dba9dc5bd5b955
 SHA512:
-  metadata.gz: 5d0ba428695f97b6336c8a2c6874a1167079bef5dadff94f946a6c15f417423a98eeeec42bbf0733d8cd2eaa503d7e76573ff3796e0a02729f185992aeba2186
-  data.tar.gz: f1032befc0bc8579ea381cf49dc2a83cdb61ce4192acf301fefbc4ecf3596437fff26df451d9a9c13f210152da98f661959980c289e5db4feddfe9e7ec73828a
+  metadata.gz: ed6cb32cab631aa429555e996475353551c811c61294f65b52a16f621e187a6196ab2523287690670607054a3cb11725faad993668f0ab2a367025f59ac4707f
+  data.tar.gz: a5f4650072a8ec5b1112933651d79bd63e6dd4078f36ae88a1f8d42c92437fdac63c5adead618508948b265b780ddbb7acc10ef8be10c328b0a6c916cc83acc8

data/lib/puppetdb_query/to_mongo.rb

@@ -48,9 +48,9 @@ module PuppetDBQuery
         # see https://jira.mongodb.org/browse/SERVER-10708
         { :$nor => terms }
       when :_equal
-        { term.args[0] => (term.args[1] != :null ? term.args[1].to_s : :null) }
+        { term.args[0] => stringify(term.args[1]) }
       when :_not_equal
-        { term.args[0] => { :$ne => (term.args[1] != :null ? term.args[1].to_s : :null) } }
+        { term.args[0] => { :$ne => stringify(term.args[1]) } }
       when :_match
         { term.args[0] => { :$regex => term.args[1].to_s } }
       when :_in
@@ -69,5 +69,11 @@ module PuppetDBQuery
     end
     # rubocop:enable Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity,Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
+
+    def stringify(value)
+      return value if value == :null
+      return value.to_s if value.is_a?(Symbol)
+      value
+    end
   end
 end

data/lib/puppetdb_query/tokenizer.rb

@@ -159,6 +159,8 @@ module PuppetDBQuery
       end
       s = STRING_TO_TOKEN[r]
       s = r.to_sym unless s
+      s = true if s == :true
+      s = false if s == :false
       logger.debug "  resulting symbol: #{s}"
       s
     end

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.42".freeze
+  VERSION = "0.1.1".freeze
 end

data/spec/puppetdb_query/parser_spec.rb

@@ -9,7 +9,7 @@ describe PuppetDBQuery::Parser do
       [PuppetDBQuery::Term.new(PuppetDBQuery::Parser::EQUAL).add(:hostname, "puppetdb-mike-217922")]
     ],
     [ 'disable_puppet = true',
-      [PuppetDBQuery::Term.new(PuppetDBQuery::Parser::EQUAL).add(:disable_puppet, :true)]
+      [PuppetDBQuery::Term.new(PuppetDBQuery::Parser::EQUAL).add(:disable_puppet, true)]
     ],
     [ 'fqdn~"app-dev" and group=develop and vertical~tracking and cluster_color~BLUE',
       [PuppetDBQuery::Term.new(PuppetDBQuery::Parser::AND)

data/spec/puppetdb_query/to_mongo_spec.rb

@@ -8,7 +8,7 @@ describe PuppetDBQuery::ToMongo do
       { hostname: "puppetdb-mike-217922" }
     ],
     [ 'disable_puppet = true',
-      { disable_puppet: "true" }
+      { disable_puppet: true }
     ],
     [ 'fqdn~"app-dev" and group=develop and vertical~tracking and cluster_color~BLUE',
       { :$and => [
@@ -27,7 +27,7 @@ describe PuppetDBQuery::ToMongo do
         ]
       }
     ],
-    [ '(group="develop-ci" or group=develop or group=mock) and operatingsystemmajrelease="6"',
+    [ '(group="develop-ci" or group=develop or group=mock) and operatingsystemmajrelease=6',
       { :$and => [
           { :$or => [
               { group: "develop-ci" },
@@ -35,7 +35,7 @@ describe PuppetDBQuery::ToMongo do
               { group: "mock" }
             ]
           },
-          { operatingsystemmajrelease: "6" }
+          { operatingsystemmajrelease: 6 }
         ]
       }
     ],
@@ -57,9 +57,9 @@ describe PuppetDBQuery::ToMongo do
       { :$and => [
           { server_type: { :$regex => "mesos-magr" } },
           { group: "ops-ci" },
-          { operatingsystemmajrelease: "7" },
-          { vmtest_vm: { :$ne => "true" } },
-          { disable_puppet: { :$ne => "true" } },
+          { operatingsystemmajrelease: 7 },
+          { vmtest_vm: { :$ne => true } },
+          { disable_puppet: { :$ne => true } },
           { puppet_artifact_version: { :$ne => "NO_VERSION_CHECK" } }
         ]
       }

data/spec/puppetdb_query/tokenizer_spec.rb

@@ -8,7 +8,7 @@ describe PuppetDBQuery::Tokenizer do
       [:hostname, :_equal, "puppetdb-mike-217922"]
     ],
     [ 'disable_puppet = true',
-      [:disable_puppet, :_equal, :true]
+      [:disable_puppet, :_equal, true]
     ],
     [ 'fqdn~"app-dev" and group=develop and vertical~tracking and cluster_color~BLUE',
       [:fqdn, :_match, "app-dev", :_and, :group, :_equal, :develop, :_and, :vertical, :_match,
@@ -29,8 +29,8 @@ describe PuppetDBQuery::Tokenizer do
     [ "server_type~'mesos-magr' and group='ops-ci' and operatingsystemmajrelease=7 and" \
       " vmtest_vm!=true and disable_puppet!=true and puppet_artifact_version!=NO_VERSION_CHECK",
       [:server_type, :_match, "mesos-magr", :_and, :group, :_equal, "ops-ci", :_and,
-       :operatingsystemmajrelease, :_equal, 7, :_and, :vmtest_vm, :_not_equal, :true, :_and,
-       :disable_puppet, :_not_equal, :true, :_and, :puppet_artifact_version, :_not_equal,
+       :operatingsystemmajrelease, :_equal, 7, :_and, :vmtest_vm, :_not_equal, true, :_and,
+       :disable_puppet, :_not_equal, true, :_and, :puppet_artifact_version, :_not_equal,
        :NO_VERSION_CHECK]
     ],
   ].freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.1.1
 platform: ruby
 authors:
 - Michael Meyling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec