chef 0.10.0.beta.1 → 0.10.0.beta.2

data/lib/chef/knife.rb

@@ -413,7 +413,10 @@ class Chef
     end
 
     def rest
-      @rest ||= Chef::REST.new(Chef::Config[:chef_server_url])
+      @rest ||= begin
+        require 'chef/rest'
+        Chef::REST.new(Chef::Config[:chef_server_url])
+      end
     end
 
   end

data/lib/chef/solr_query/lucene.treetop

@@ -27,7 +27,7 @@ grammar Lucene
   end
 
   rule term
-    keyword valid_letter+ <Term> / !keyword valid_letter+ <Term> 
+    keyword valid_letter+ <Term> / !keyword !"?" valid_letter <Term>
   end
 
   rule field
@@ -45,7 +45,7 @@ grammar Lucene
   end
 
   rule range_value
-    valid_letter+ <RangeValue>
+    valid_letter+ <RangeValue> / "*" <RangeValue>
   end
 
   rule group
@@ -102,8 +102,6 @@ grammar Lucene
 
   rule prohibited_op
     !valid_letter prohibited_operator (field/field_range/term/string) <UnaryOp>
-    /
-    prohibited_operator (field/field_range/term/string) <UnaryOp>
   end
 
   rule prohibited_operator
@@ -115,7 +113,7 @@ grammar Lucene
   end
 
   rule fuzzy_op
-    (term/string) '~' fuzzy_param? <FuzzyOp>
+    (term/string) '~' fuzzy_param? (space / !valid_letter) <FuzzyOp>
   end
 
   rule fuzzy_param
@@ -123,7 +121,6 @@ grammar Lucene
   end
 
   rule string
-    #'"' (!'"' . / '\"')* '"' <Phrase>
     '"' term (space term)* '"' <Phrase>
   end
 
@@ -132,11 +129,19 @@ grammar Lucene
   end
 
   rule valid_letter
-    [a-zA-Z0-9*_+.-] / '\\' special_char
+    start_letter+ ([a-zA-Z0-9*?_.-] / '\\' special_char)*
+  end
+
+  rule start_letter
+    [a-zA-Z0-9._*] / '\\' special_char
+  end
+
+  rule end_letter
+    [a-zA-Z0-9*?_.] / '\\' special_char
   end
 
   rule special_char
-    [!(){}\[\]^"~*?:\\]
+    [-+&|!(){}\[\]^"~*?:\\]
   end
 
   rule space

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '0.10.0.beta.1'
+  VERSION = '0.10.0.beta.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

metadata

@@ -2,7 +2,7 @@
 name: chef
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.10.0.beta.1
+  version: 0.10.0.beta.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 -07:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency