chef-zero 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdca57f2c1f1b6b83c281e4b47b8ddd84fca03eb
-  data.tar.gz: cfb147366f9d3a05f26855fcb6e33335f484c4e0
+  metadata.gz: d3b24181f44a02acb72212f6b506ba88c611aecc
+  data.tar.gz: d28e1d99c8803fedf8f1ba9ece631f2ae7829195
 SHA512:
-  metadata.gz: 12c4155f7402cdda0364fbb0b09e52249419f50eadd70536089168e05379579e0ab5f40384c4a917ee9b53c10efcad49f1035b36263e05202dcc341e7ae23d40
-  data.tar.gz: 2ea8061572057a986dc50064a4e81cbcd673e1a7042028f7eda72650a97d6f5d2807f1e85cb3055a4a85af5a0f30123e7c2da3f5d87a54c234bb1d854f5e03b5
+  metadata.gz: ccd7ed569ad1958ccaee60cf4acdff8d9ce87b146a6dd5a12f9b9df294122a1e86c183f5501405d92b73d5221d9bcbf0411987b08c8d18e16e4ed67aa9094e48
+  data.tar.gz: '00997addd10b1aa6a98d8fca3a3aa084a2926135dc4894014dc0e1a06e403a4030271bd6ca569753b8120124da91056396123ce8f93d63efdf2bae287e7a9ab5'

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -29,18 +29,16 @@ module ChefZero
 
       def self.metadata_from(directory, name, version, recipe_names)
         metadata = PretendCookbookMetadata.new(PretendCookbook.new(name, recipe_names))
-        # If both .rb and .json exist, read .rb
-        # TODO if recipes has 3 recipes in it, and the Ruby/JSON has only one, should
-        # the resulting recipe list have 1, or 3-4 recipes in it?
-        if has_child(directory, "metadata.rb")
+        # If both .rb and .json exist, read .json
+        if has_child(directory, "metadata.json")
+          metadata.from_json(read_file(directory, "metadata.json"))
+        elsif has_child(directory, "metadata.rb")
           begin
             file = filename(directory, "metadata.rb") || "(#{name}/metadata.rb)"
             metadata.instance_eval(read_file(directory, "metadata.rb"), file)
           rescue
             ChefZero::Log.error("Error loading cookbook #{name}: #{$!}\n  #{$!.backtrace.join("\n  ")}")
           end
-        elsif has_child(directory, "metadata.json")
-          metadata.from_json(read_file(directory, "metadata.json"))
         end
         result = {}
         metadata.to_hash.each_pair do |key, value|

data/lib/chef_zero/solr/query/unary_operator.rb

@@ -16,7 +16,7 @@ module ChefZero
 
         def matches_doc?(doc)
           case @operator
-          when "-", "NOT"
+          when "-", "NOT", "!"
             !operand.matches_doc?(doc)
           when "+"
             # TODO This operator uses relevance to eliminate other, unrelated
@@ -27,7 +27,7 @@ module ChefZero
 
         def matches_values?(values)
           case @operator
-          when "-", "NOT"
+          when "-", "NOT", "!"
             !operand.matches_values?(values)
           when "+"
             # TODO This operator uses relevance to eliminate other, unrelated

data/lib/chef_zero/solr/solr_parser.rb

@@ -180,7 +180,7 @@ module ChefZero
       end
 
       def unary_operator?(token)
-        [ "NOT", "+", "-" ].include?(token)
+        [ "NOT", "+", "-", "!" ].include?(token)
       end
 
       def binary_operator?(token)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "5.1.1"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing