chef-zero 14.0.12 → 14.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18556b1f6a192914d736e3477f8ae1813a92c9635c812a3fad3ea13936730fc2
-  data.tar.gz: 29565bf8101772bc167f881f85f61b53535e542b2eef15c87e9e27c7d95ee319
+  metadata.gz: 8f0e22b3dea494e8b561ec5f724f8854c0441f3b0695528f925737f4f9c9e768
+  data.tar.gz: d7e7e8b3d22f9d2ecea27799b04c40bc73c9765aabb353eac88442f7359da98b
 SHA512:
-  metadata.gz: e72fd5c1e0f749c4d5437a9e29daa60f6704eba864414dad242eb755f0c9466f9771de45d61670d82121a775cb0110e1e4872118391cc80ef419c280abb2d688
-  data.tar.gz: 14c97ab83e709f967fe5ca74537fbb1667672220810901c82d81f0d2b3150d92f55cdfaf39eb4a5a2eb852ff8f7b19adafbc49b0189e81587507abe7dd01dc69
+  metadata.gz: f3ba2f87dfa20516459d5a17bde60a0dc7925f1fe245700707c328fe9c99f8dcbe110cb6daaeed70c92dcc85bda18f63eb1b8868e27e50a284443078abbe6d4b
+  data.tar.gz: 405b1b2b070dd2b8c2d6537de6af2a029cd9cf05378b17e9ea10351b52b8230621acd3468ada349d2bafccccb4abbf448a62e62c9714f211f3af27df3f0dd785

data/bin/chef-zero

@@ -7,6 +7,7 @@ require "rubygems"
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
 require "chef_zero/log"
+require "chef_zero/dist"
 require "chef_zero/version"
 require "chef_zero/server"
 require "chef_zero/data_store/raw_file_store"
@@ -28,7 +29,7 @@ end
 options = {}
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: chef-zero [ARGS]"
+  opts.banner = "Usage: #{ChefZero::Dist::CLIENT} [ARGS]"
 
   opts.on("-H", "--host HOST", "Host to bind to (default: 127.0.0.1)") do |value|
     options[:host] ||= []
@@ -100,7 +101,7 @@ if options[:daemon]
     server.start(true)
   else
     if ENV["OS"] == "Windows_NT"
-      abort "Daemonization is not supported on Windows. Running 'start chef-zero' will fork the process."
+      abort "Daemonization is not supported on Windows. Running 'start #{ChefZero::Dist::CLIENT}' will fork the process."
     else
       abort "Process.daemon requires Ruby >= 1.9"
     end

data/lib/chef_zero/dist.rb

@@ -0,0 +1,9 @@
+module ChefZero
+  class Dist
+    # When referencing a product directly
+    PRODUCT = "Chef Zero".freeze
+
+    # The binary alias
+    CLIENT = "chef-zero".freeze
+  end
+end

data/lib/chef_zero/endpoints/controls_endpoint.rb

@@ -1,14 +1,15 @@
+require "chef_zero/dist"
 module ChefZero
   module Endpoints
     # /organizations/ORG/controls
     class ControlsEndpoint < RestBase
       # ours is not to wonder why; ours is but to make the pedant specs pass.
       def get(request)
-        error(410, "Server says 410, chef-zero says 410.")
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
       end
 
       def post(request)
-        error(410, "Server says 410, chef-zero says 410.")
+        error(410, "Server says 410, #{ChefZero::Dist::CLIENT} says 410.")
       end
     end
   end

data/lib/chef_zero/endpoints/version_endpoint.rb

@@ -1,11 +1,12 @@
 require "chef_zero/rest_base"
+require "chef_zero/dist"
 
 module ChefZero
   module Endpoints
     # /version
     class VersionEndpoint < RestBase
       def get(request)
-        text_response(200, "chef-zero #{ChefZero::VERSION}\n")
+        text_response(200, "#{ChefZero::Dist::CLIENT} #{ChefZero::VERSION}\n")
       end
     end
   end

data/lib/chef_zero/rspec.rb

@@ -42,7 +42,7 @@ module ChefZero
     extend RSpecClassMethods
 
     def when_the_chef_server(description, *tags, &block)
-      context "When the Chef server #{description}", *tags do
+      context "When the #{ChefZero::Dist::PRODUCT} server #{description}", *tags do
         extend WhenTheChefServerClassMethods
         include WhenTheChefServerInstanceMethods
 
@@ -69,7 +69,7 @@ module ChefZero
           if chef_server_options[:server_scope] != self.class.chef_server_options[:server_scope]
             raise "server_scope: #{chef_server_options[:server_scope]} will not be honored: it can only be set on when_the_chef_server!"
           end
-          Log.info("Starting Chef server with options #{chef_server_options}")
+          Log.info("Starting #{ChefZero::Dist::PRODUCT} server with options #{chef_server_options}")
 
           ChefZero::RSpec.set_server_options(chef_server_options)
 

data/lib/chef_zero/server.rb

@@ -35,6 +35,7 @@ require "chef_zero/data_store/memory_store_v2"
 require "chef_zero/data_store/v1_to_v2_adapter"
 require "chef_zero/data_store/default_facade"
 require "chef_zero/version"
+require "chef_zero/dist.rb"
 
 require "chef_zero/endpoints/rest_list_endpoint"
 require "chef_zero/endpoints/authenticate_user_endpoint"
@@ -231,7 +232,7 @@ module ChefZero
       if publish
         output = publish.respond_to?(:puts) ? publish : STDOUT
         output.puts <<-EOH.gsub(/^ {10}/, "")
-          >> Starting Chef Zero (v#{ChefZero::VERSION})...
+          >> Starting #{ChefZero::Dist::PRODUCT} (v#{ChefZero::VERSION})...
         EOH
       end
 
@@ -248,7 +249,7 @@ module ChefZero
 
       %w{INT TERM}.each do |signal|
         Signal.trap(signal) do
-          puts "\n>> Stopping Chef Zero..."
+          puts "\n>> Stopping #{ChefZero::Dist::PRODUCT}..."
           @server.shutdown
         end
       end
@@ -362,7 +363,7 @@ module ChefZero
       end
     rescue Timeout::Error
       if @thread
-        ChefZero::Log.error("Chef Zero did not stop within #{wait} seconds! Killing...")
+        ChefZero::Log.error("#{ChefZero::Dist::PRODUCT} did not stop within #{wait} seconds! Killing...")
         @thread.kill
         SocketlessServerMap.deregister(port)
       end

data/lib/chef_zero/socketless_server_map.rb

@@ -18,6 +18,7 @@
 
 require "thread"
 require "singleton"
+require "chef_zero/dist"
 
 module ChefZero
 
@@ -83,7 +84,7 @@ module ChefZero
 
     def request(port, request_env)
       server = @servers_by_port[port]
-      raise ServerNotFound, "No socketless chef-zero server on given port #{port.inspect}" unless server
+      raise ServerNotFound, "No socketless #{ChefZero::Dist::PRODUCT} server on given port #{port.inspect}" unless server
       server.handle_socketless_request(request_env)
     end
 

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "14.0.12".freeze
+  VERSION = "14.0.13".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 14.0.12
+  version: 14.0.13
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -155,6 +155,7 @@ files:
 - lib/chef_zero/data_store/raw_file_store.rb
 - lib/chef_zero/data_store/v1_to_v2_adapter.rb
 - lib/chef_zero/data_store/v2_to_v1_adapter.rb
+- lib/chef_zero/dist.rb
 - lib/chef_zero/endpoints/acl_endpoint.rb
 - lib/chef_zero/endpoints/acls_endpoint.rb
 - lib/chef_zero/endpoints/actor_default_key_endpoint.rb
@@ -272,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing