chef-zero 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbe4fdeea51156a8ca4c962db7d52502377726f
-  data.tar.gz: c62f0e6611983ea46a3c65f4c8afd608fa44da48
+  metadata.gz: 0ba30ee9950ff65e5d772c7e2092063f4916067a
+  data.tar.gz: 2361f6ad62e82e24969f4a70fbf475b9be6ae873
 SHA512:
-  metadata.gz: 1f29a803c8a6692e7a9a868d76d9391776812fbb31fc2ff0d0779918b61c9108f7be26f3fecae2b636e9c6da61d906baa55b4654fefdb28f52544a4db6cd7084
-  data.tar.gz: 84d70a227925b452a248c3d2c76456957c89bbdebf7483753a5671e96aebf1a0be24862d5fe5faf16420fb98edc8fd76b29d92af11838215ef79ce1da7ab4025
+  metadata.gz: 68d6b4736a6eeb9ba697baf1296eb5cf9f456f0ed292bb7b6cc21e23288ea9f99a40d9548091f1a96a892f998dcdb351b3910c150dd5adbf71d58a8f0bf80e09
+  data.tar.gz: 72e592a0a6b2f4eda33b02f5b8d08080ec536c9d80aac5992d826804614390d6d498399b05d4a55381becde2124c3ef9e12dd1f043c4458ab33c378b2bbe5f60

data/lib/chef_zero/data_store/v1_to_v2_adapter.rb

@@ -38,7 +38,16 @@ module ChefZero
       def get(path, request=nil)
         raise DataNotFoundError.new(path) if skip_organizations?(path)
         fix_exceptions do
-          real_store.get(path[2..-1], request)
+          # Make it so build_uri will include /organizations/ORG inside the V1 data store
+          if request && request.rest_base_prefix.size == 0
+            old_base_uri = request.base_uri
+            request.base_uri = File.join(request.base_uri, 'organizations', single_org)
+          end
+          begin
+            real_store.get(path[2..-1], request)
+          ensure
+            request.base_uri = old_base_uri if request && request.rest_base_prefix.size == 0
+          end
         end
       end
 

data/lib/chef_zero/endpoints/file_store_file_endpoint.rb

@@ -3,7 +3,7 @@ require 'chef_zero/rest_base'
 module ChefZero
   module Endpoints
     # The minimum amount of S3 necessary to support cookbook upload/download
-    # /file_store/FILE
+    # /organizations/NAME/file_store/FILE
     class FileStoreFileEndpoint < RestBase
       def json_only
         false

data/lib/chef_zero/rest_request.rb

@@ -8,12 +8,16 @@ module ChefZero
     end
 
     attr_reader :env
-    attr_reader :rest_base_prefix
+    attr_accessor :rest_base_prefix
 
     def base_uri
       @base_uri ||= "#{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['SCRIPT_NAME']}"
     end
 
+    def base_uri=(value)
+      @base_uri = value
+    end
+
     def requestor
       @env['HTTP_X_OPS_USERID']
     end

data/lib/chef_zero/server.rb

@@ -300,8 +300,8 @@ module ChefZero
     #
     def stop(wait = 5)
       if @running
-        @server.shutdown
-        @thread.join(wait)
+        @server.shutdown if @server
+        @thread.join(wait) if @thread
       end
     rescue Timeout::Error
       if @thread

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log