chef-zero 1.6 → 1.6.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 41f3262d55e2da6c2b9bf3afb8107fca976797ee
+  data.tar.gz: a5f9e8d5b1bc005a98b7eaad746c380aceec1aa8
+SHA512:
+  metadata.gz: dc7ad95473bb9fc9fc726d13984f2dd5de6b6ec24640476a1faba8b5845cdccdbf11a61debe62545cff7e5fd9f8cb69acd2fae99a7a11637b2826cc99c5dac2a
+  data.tar.gz: 8dfe749deeec3bf6b52acd96c794beaf2d7d805cc5f8b7fb8c4a7ef74c2ef4af2b22d9907dca6790e7226cbb354dcb37931d2a507ea8cd75dbb2ec35544e3a14

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'chef_zero/endpoints/rest_object_endpoint'
 require 'chef_zero/rest_error_response'
 require 'chef_zero/data_normalizer'
+require 'chef_zero/data_store/data_not_found_error'
 
 module ChefZero
   module Endpoints
@@ -42,7 +43,7 @@ module ChefZero
         if existing_cookbook
           missing_checksums = get_checksums(existing_cookbook) - get_checksums(request.body)
           if missing_checksums.size > 0
-            hoover_unused_checksums(missing_checksums)
+            hoover_unused_checksums(missing_checksums, request)
           end
         end
 
@@ -58,10 +59,12 @@ module ChefZero
 
         response = super(request)
         cookbook_name = request.rest_path[1]
-        delete_data_dir(request, ['cookbooks', cookbook_name]) if list_data(request, ['cookbooks', cookbook_name]).size == 0
+        if exists_data_dir?(request, [ 'cookbooks', cookbook_name ]) && list_data(request, ['cookbooks', cookbook_name]).size == 0
+          delete_data_dir(request, ['cookbooks', cookbook_name])
+        end
 
         # Hoover deleted files, if they exist
-        hoover_unused_checksums(get_checksums(deleted_cookbook))
+        hoover_unused_checksums(get_checksums(deleted_cookbook), request)
         response
       end
 
@@ -81,16 +84,21 @@ module ChefZero
 
       private
 
-      def hoover_unused_checksums(deleted_checksums)
+      def hoover_unused_checksums(deleted_checksums, request)
         data_store.list(['cookbooks']).each do |cookbook_name|
           data_store.list(['cookbooks', cookbook_name]).each do |version|
-            cookbook = data_store.get(['cookbooks', cookbook_name, version])
+            cookbook = data_store.get(['cookbooks', cookbook_name, version], request)
             deleted_checksums = deleted_checksums - get_checksums(cookbook)
           end
         end
         deleted_checksums.each do |checksum|
           # There can be a race here if multiple cookbooks are uploading.
-          data_store.delete(['file_store', 'checksums', checksum])
+          # This deals with an exception on delete, but things can still get deleted
+          # that shouldn't be.
+          begin
+            data_store.delete(['file_store', 'checksums', checksum])
+          rescue ChefZero::DataStore::DataNotFoundError
+          end
         end
       end
 

data/lib/chef_zero/rest_base.rb

@@ -70,7 +70,7 @@ module ChefZero
     def delete_data_dir(request, rest_path, *options)
       rest_path ||= request.rest_path
       begin
-        data_store.delete_dir(rest_path)
+        data_store.delete_dir(rest_path, *options)
       rescue DataStore::DataNotFoundError
         raise RestErrorResponse.new(404, "Object not found: #{build_uri(request.base_uri, request.rest_path)}")
       end

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

@@ -10,24 +10,36 @@ module ChefZero
         end
 
         def to_s
-          "#{@from_inclusive ? '[' : '{'}#{@from} TO #{@to}#{@to_inclusive ? '[' : '{'}"
+          "#{@from_inclusive ? '[' : '{'}#{@from} TO #{@to}#{@to_inclusive ? ']' : '}'}"
         end
 
-        def matches?(key, value)
-          case @from <=> value
-          when -1
-            return false
-          when 0
-            return false if !@from_inclusive
+        def matches_values?(values)
+          values.any? do |value|
+            unless @from == '*'
+              case @from <=> value
+              when -1
+                return false
+              when 0
+                return false if !@from_inclusive
+              end
+            end
+            unless @to == '*'
+              case value <=> @to
+              when 1
+                return false
+              when 0
+                return false if !@to_inclusive
+              end
+            end
+            return true
           end
-          case @to <=> value
-          when 1
-            return false
-          when 0
-            return false if !@to_inclusive
-          end
-          return true
         end
+
+        def matches_doc?(doc)
+          matches_values?(doc[DEFAULT_FIELD])
+        end
+
+        DEFAULT_FIELD = "text"
       end
     end
   end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.6'
+  VERSION = '1.6.1'
 end

data/spec/search_spec.rb

@@ -0,0 +1,32 @@
+require 'chef_zero/solr/solr_parser'
+require 'chef_zero/solr/solr_doc'
+
+describe ChefZero::Solr::SolrParser do
+  let (:all_docs) do
+    docs = []
+    [{'foo' => 'a'},
+     {'foo' => 'd'}].each_with_index do |h, i|
+      docs.push ChefZero::Solr::SolrDoc.new(h, i)
+    end
+    docs
+  end
+
+  def search_for(query)
+    q = ChefZero::Solr::SolrParser.new(query).parse
+    all_docs.select {|doc| q.matches_doc?(doc) }
+  end
+
+  it "handles terms" do
+    search_for('foo:d').size.should eq(1)
+  end
+
+  it "handles ranges" do
+    search_for('foo:[a TO c]').size.should eq(1)
+  end
+
+  it "handles wildcard ranges" do
+    search_for('foo:[* TO c]').size.should eq(1)
+    search_for('foo:[c TO *]').size.should eq(1)
+    search_for('foo:[* TO *]').size.should eq(2)
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: '1.6'
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
@@ -78,49 +69,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
@@ -188,34 +173,33 @@ files:
 - lib/chef_zero/version.rb
 - lib/chef_zero.rb
 - spec/run.rb
+- spec/search_spec.rb
 - spec/support/pedant.rb
 - spec/support/stickywicket.pem
-- !binary |-
-  YmluL2NoZWYtemVybw==
+- bin/chef-zero
 homepage: http://www.opscode.com
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 test_files: []