chef-zero 1.3 → 1.4.0.alpha

data/Rakefile

@@ -1,7 +1,10 @@
 require 'bundler'
-require 'bundler/gem_tasks'
+require 'bundler/gem_helper'
 
-require 'chef_zero/version'
+# Get build, install and release tasks for each gem flavor
+%w(chef-zero chef-zero-x86-mingw32).each do |gem_name|
+  Bundler::GemHelper.install_tasks :name => gem_name
+end
 
 task :spec do
   sh 'ruby spec/run.rb'

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

@@ -26,11 +26,12 @@ module ChefZero
             left.matches_doc?(doc)
           when ':'
             if left.respond_to?(:literal_string) && left.literal_string
-              values = doc[left.literal_string]
+              value = doc[left.literal_string]
+              right.matches_values?([value])
             else
               values = doc.matching_values { |key| left.matches_values?([key]) }
+              right.matches_values?(values)
             end
-            right.matches_values?(values)
           end
         end
 

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

@@ -14,7 +14,8 @@ module ChefZero
         attr_reader :regexp
 
         def matches_doc?(doc)
-          matches_values?(doc[DEFAULT_FIELD])
+          value = doc[DEFAULT_FIELD]
+          return value ? matches_values?([value]) : false
         end
         def matches_values?(values)
           values.any? { |value| !@regexp.match(value).nil? }

data/lib/chef_zero/solr/solr_doc.rb

@@ -9,22 +9,31 @@ module ChefZero
       end
 
       def [](key)
-        matching_values { |match_key| match_key == key }
+        values = matching_values { |match_key| match_key == key }
+        values[0]
       end
 
       def matching_values(&block)
-        result = []
+        result = {}
         key_values(nil, @json) do |key, value|
           if block.call(key)
-            result << value.to_s
+            if result.has_key?(key)
+              result[key] << value.to_s
+            else
+              result[key] = value.to_s.clone
+            end
           end
         end
         # Handle manufactured value(s)
         if block.call('X_CHEF_id_CHEF_X')
-          result << @id.to_s
+          if result.has_key?('X_CHEF_id_CHEF_X')
+            result['X_CHEF_id_CHEF_X'] << @id.to_s
+          else
+            result['X_CHEF_id_CHEF_X'] = @id.to_s.clone
+          end
         end
 
-        result.uniq
+        result.values
       end
 
       private

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.3'
+  VERSION = '1.4.0.alpha'
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: '1.3'
-  prerelease: 
+  version: 1.4.0.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
@@ -158,8 +158,7 @@ files:
 - spec/run.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
-- !binary |-
-  YmluL2NoZWYtemVybw==
+- bin/chef-zero
 homepage: http://www.opscode.com
 licenses: []
 post_install_message: 
@@ -175,9 +174,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23