chef-zero 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f291a4a186e5685eb19dec4304d71bd06c7fc7da
-  data.tar.gz: bb94f240005505442e01f81c43c21fe30ce663e6
+  metadata.gz: 322a85c869fafa6c722e5b54697fc5daa9aa669e
+  data.tar.gz: 4b436b5ea2f219f7b17988d4832a2aa9f72bf64d
 SHA512:
-  metadata.gz: 04e07c10506e832d398d02139eae21f250cf730297629bee478c0b0b65bb2292ff3ad7bef1933ae7033a8334e7a7091cebdc92da290e5aa3741613d0e088c300
-  data.tar.gz: b8ff8228beb4c2845020f929ff612f70165902cf6ed8d0b2557b8282a6c98ad9310b764ba7621e426d58db7b7936839f4228bfe5e4218af3d5d2442a1522e49c
+  metadata.gz: 89a0555f5a959b8593d27f07783ba18e297e6f7f76ae9915775abdcb82adc2e159a4bc10968797aebc25a1dc4ebadf9c3179248bf90cc732a701608c624bda83
+  data.tar.gz: cd000b0a319f0ac6cab623f93fd306678ea1dbd7aa5f41e3b3f44f711a738cde5616c5d178afa00449cd13a0f6498c7374535b6e19453222dd59ff225334bcee

data/lib/chef_zero/rest_base.rb

@@ -123,7 +123,7 @@ module ChefZero
     def build_uri(base_uri, rest_path)
       if server.options[:single_org]
         # Strip off /organizations/chef if we are in single org mode
-        if rest_path[0..1] != [ 'organizations', 'chef' ]
+        if rest_path[0..1] != [ 'organizations', server.options[:single_org] ]
           raise "Unexpected URL #{rest_path[0..1]} passed to build_uri in single org mode"
         end
         "#{base_uri}/#{rest_path[2..-1].join('/')}"

data/lib/chef_zero/server.rb

@@ -386,35 +386,42 @@ module ChefZero
       router.not_found = NotFoundEndpoint.new
 
       if options[:single_org]
-        rest_base_prefix = [ 'organizations', 'chef' ]
+        rest_base_prefix = [ 'organizations', options[:single_org] ]
       else
         rest_base_prefix = []
       end
       return proc do |env|
-        request = RestRequest.new(env, rest_base_prefix)
-        if @on_request_proc
-          @on_request_proc.call(request)
-        end
-        response = nil
-        if @request_handler
-          response = @request_handler.call(request)
-        end
-        unless response
-          response = router.call(request)
-        end
-        if @on_response_proc
-          @on_response_proc.call(request, response)
-        end
+        begin
+          request = RestRequest.new(env, rest_base_prefix)
+          if @on_request_proc
+            @on_request_proc.call(request)
+          end
+          response = nil
+          if @request_handler
+            response = @request_handler.call(request)
+          end
+          unless response
+            response = router.call(request)
+          end
+          if @on_response_proc
+            @on_response_proc.call(request, response)
+          end
 
-        # Insert Server header
-        response[1]['Server'] = 'chef-zero'
+          # Insert Server header
+          response[1]['Server'] = 'chef-zero'
 
-        # Puma expects the response to be an array (chunked responses). Since
-        # we are statically generating data, we won't ever have said chunked
-        # response, so fake it.
-        response[-1] = Array(response[-1])
+          # Puma expects the response to be an array (chunked responses). Since
+          # we are statically generating data, we won't ever have said chunked
+          # response, so fake it.
+          response[-1] = Array(response[-1])
 
-        response
+          response
+        rescue
+          if options[:log_level] == :debug
+            STDERR.puts "Request Error: #{$!}"
+            STDERR.puts $!.backtrace.join("\n")
+          end
+        end
       end
     end
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end

data/spec/run.rb

@@ -7,7 +7,7 @@ require 'rspec/core'
 
 tmpdir = nil
 
-def start_server(chef_repo_path)
+def start_local_server(chef_repo_path)
   Dir.mkdir(chef_repo_path) if !File.exists?(chef_repo_path)
 
   # 11.6 and below had a bug where it couldn't create the repo children automatically
@@ -43,10 +43,15 @@ begin
     chef_repo_path = "#{tmpdir}/repo"
 
     # Capture setup data into master_chef_repo_path
-    server = start_server(chef_repo_path)
+    server = start_local_server(chef_repo_path)
+
+  elsif ENV['SINGLE_ORG']
+    server = ChefZero::Server.new(:port => 8889, :single_org => 'singleorg')
+    server.start_background
 
   else
-    server = ChefZero::Server.new(:port => 8889)
+    server = ChefZero::Server.new(:port => 8889, :single_org => false)
+    server.data_store.create_dir([ 'organizations' ], 'pedant')
     server.start_background
   end
 

data/spec/support/pedant.rb

@@ -21,7 +21,11 @@
 ################################################################################
 # You MUST specify the address of the server the API requests will be
 # sent to.  Only specify protocol, hostname, and port.
-chef_server 'http://127.0.0.1:8889'
+if ENV['SINGLE_ORG']
+  chef_server 'http://127.0.0.1:8889'
+else
+  chef_server 'http://127.0.0.1:8889/organizations/pedant'
+end
 
 # If you are doing development testing, you can specify the address of
 # the Solr server.  The presence of this parameter will enable tests

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log