chef-zero 14.0.12 → 15.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18556b1f6a192914d736e3477f8ae1813a92c9635c812a3fad3ea13936730fc2
-  data.tar.gz: 29565bf8101772bc167f881f85f61b53535e542b2eef15c87e9e27c7d95ee319
+  metadata.gz: 517f7eb63557ab1b885ee828fcd9c9a4bd68dbe1302aa6259fbee124df3a77c2
+  data.tar.gz: bae60b71f5c08e1fdfc057486c4194f88e3dd3d62d1a39066d58f428b1abecc2
 SHA512:
-  metadata.gz: e72fd5c1e0f749c4d5437a9e29daa60f6704eba864414dad242eb755f0c9466f9771de45d61670d82121a775cb0110e1e4872118391cc80ef419c280abb2d688
-  data.tar.gz: 14c97ab83e709f967fe5ca74537fbb1667672220810901c82d81f0d2b3150d92f55cdfaf39eb4a5a2eb852ff8f7b19adafbc49b0189e81587507abe7dd01dc69
+  metadata.gz: 4c7b374ef151f182b10da552a52cc69c638940c1fe289d5d1adb67878755e81c645506727716fe7d7abcc20fd26ef4fd9a049dfe17f78c536dd646347f84c4bb
+  data.tar.gz: 2a0de3a9db40d37c66ee38bcebda62cd664a365872f7f7e7116551edfa88c46ab366c2aca7b468fdec94cde55df9977358fd3ce61f73231d063e95cb6c83fee2

data/Gemfile

@@ -9,11 +9,13 @@ group :pedant do
 end
 
 group :development, :test do
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  gem "chefstyle"
+  gem "rake"
+  gem "rspec", "~> 3.0"
 end
 
 if ENV["GEMFILE_MOD"]
-  puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
+  puts "GEMFILE_MOD: #{ENV["GEMFILE_MOD"]}"
   instance_eval(ENV["GEMFILE_MOD"])
 else
   gem "chef", "~> 14.0"
@@ -25,7 +27,3 @@ group :debug do
   gem "pry-byebug"
   gem "pry-stack_explorer"
 end
-
-# If you want to load debugging tools into the bundle exec sandbox,
-# add these additional dependencies into Gemfile.local
-eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/Rakefile

@@ -52,9 +52,17 @@ end
 begin
   require "chefstyle"
   require "rubocop/rake_task"
+  desc "Run Chefstyle tests"
   RuboCop::RakeTask.new(:style) do |task|
     task.options += ["--display-cop-names", "--no-color"]
   end
 rescue LoadError
-  puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+  puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
+end
+
+begin
+  require "yard" unless defined?(YARD)
+  YARD::Rake::YardocTask.new(:docs)
+rescue LoadError
+  puts "yard is not available. bundle install first to make sure all dependencies are installed."
 end

data/bin/chef-zero

@@ -3,14 +3,15 @@
 # Trap interrupts to quit cleanly.
 Signal.trap("INT") { exit 1 }
 
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 $:.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"
-require "optparse"
+require "optparse" unless defined?(OptionParser)
 
 def parse_port(port)
   array = []
@@ -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/chef-zero.gemspec

@@ -11,17 +11,14 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/chef/chef-zero"
   s.license = "Apache-2.0"
 
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.6"
 
   s.add_dependency "mixlib-log", ">= 2.0", "< 4.0"
-  s.add_dependency "hashie", ">= 2.0", "< 4.0"
+  s.add_dependency "hashie", ">= 2.0", "< 5.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-
   s.bindir       = "bin"
   s.executables  = ["chef-zero"]
   s.require_path = "lib"

data/lib/chef_zero.rb

@@ -1,5 +1,5 @@
 module ChefZero
-  require "chef_zero/log"
+  require_relative "chef_zero/log"
 
   MIN_API_VERSION = 0
   MAX_API_VERSION = 2

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -1,4 +1,4 @@
-require "digest/md5"
+require "digest/md5" unless defined?(Digest::MD5)
 require "hashie"
 
 module ChefZero
@@ -107,7 +107,7 @@ module ChefZero
           if directory.is_a?(Hash)
             directory.keys
           else
-            directory.children.map { |c| c.name }
+            directory.children.map(&:name)
           end
         end
 

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -1,6 +1,6 @@
-require "chef_zero"
-require "chef_zero/rest_base"
-require "chef_zero/chef_data/default_creator"
+require_relative "../../chef_zero"
+require_relative "../rest_base"
+require_relative "default_creator"
 
 module ChefZero
   module ChefData
@@ -53,7 +53,7 @@ module ChefZero
         user["admin"] ||= false
         user["admin"] = !!user["admin"]
         user["openid"] ||= nil
-        if !osc_compat
+        unless osc_compat
           if method == "GET"
             user.delete("admin")
             user.delete("password")
@@ -69,7 +69,7 @@ module ChefZero
       def self.normalize_data_bag_item(data_bag_item, data_bag_name, id, method)
         if method == "DELETE"
           # TODO SERIOUSLY, WHO DOES THIS MANY EXCEPTIONS IN THEIR INTERFACE
-          if !(data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"])
+          unless data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
             data_bag_item["id"] ||= id
             data_bag_item = { "raw_data" => data_bag_item }
             data_bag_item["chef_type"] ||= "data_bag_item"
@@ -93,14 +93,15 @@ module ChefZero
       end
 
       def self.normalize_cookbook(endpoint, org_prefix, cookbook, name, version, base_uri, method,
-                                  is_cookbook_artifact = false, api_version: 2)
+        is_cookbook_artifact = false, api_version: 2)
         # TODO I feel dirty
         if method == "PUT" && api_version < 2
           cookbook["all_files"] = cookbook.delete(["root_files"]) { [] }
           COOKBOOK_SEGMENTS.each do |segment|
             next unless cookbook.key? segment
+
             cookbook[segment].each do |file|
-              file["name"] = "#{segment}/#{file['name']}"
+              file["name"] = "#{segment}/#{file["name"]}"
               cookbook["all_files"] << file
             end
             cookbook.delete(segment)
@@ -131,6 +132,7 @@ module ChefZero
 
                 file.delete("full_path")
                 next unless COOKBOOK_SEGMENTS.include? segment
+
                 file["name"] = name
                 cookbook[segment] << file
               end

data/lib/chef_zero/chef_data/default_creator.rb

@@ -1,4 +1,4 @@
-require "chef_zero/chef_data/acl_path"
+require_relative "acl_path"
 
 module ChefZero
   module ChefData
@@ -140,6 +140,7 @@ module ChefZero
 
       def exists?(path)
         return true if path.size == 0
+
         parent_list = list(path[0..-2])
         parent_list && parent_list.include?(path[-1])
       end
@@ -184,7 +185,8 @@ module ChefZero
         value = DEFAULT_ORG_SPINE
         2.upto(path.size - 1) do |index|
           value = nil if @deleted[path[0..index]]
-          break if !value
+          break unless value
+
           value = value[path[index]]
         end
 
@@ -272,7 +274,8 @@ module ChefZero
         object_path = AclPath.get_object_path(path)
         # The actual things containers correspond to don't have to exist, as
         # long as the container does
-        return nil if !data_exists?(object_path)
+        return nil unless data_exists?(object_path)
+
         basic_acl =
           case path[3..-1].join("/")
           when "root", "containers/containers", "containers/groups"
@@ -350,7 +353,7 @@ module ChefZero
           if path.size == 4 && path[0] == "organizations" && path[2] == "clients"
             begin
               client = FFI_Yajl::Parser.parse(data.get(path))
-              if !client["validator"]
+              unless client["validator"]
                 unknown_owners |= [ path[3] ]
               end
             rescue
@@ -453,7 +456,7 @@ module ChefZero
       def is_dir?(path)
         case path.size
         when 0, 1
-          return true
+          true
         when 2
           path[0] == "organizations" || (path[0] == "acls" && path[1] != "root")
         when 3

data/lib/chef_zero/data_store/data_already_exists_error.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_error"
+require_relative "data_error"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/data_store/data_error.rb

@@ -24,7 +24,7 @@ module ChefZero
       def initialize(path, cause = nil)
         @path = path
         @cause = cause
-        path_for_msg = path.nil? ? "nil" : "/#{path.join('/')}"
+        path_for_msg = path.nil? ? "nil" : "/#{path.join("/")}"
         super "Data path: #{path_for_msg}"
       end
     end

data/lib/chef_zero/data_store/data_not_found_error.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_error"
+require_relative "data_error"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/data_store/default_facade.rb

@@ -1,5 +1,5 @@
-require "chef_zero/data_store/interface_v2"
-require "chef_zero/chef_data/default_creator"
+require_relative "interface_v2"
+require_relative "../chef_data/default_creator"
 
 module ChefZero
   module DataStore
@@ -100,7 +100,7 @@ module ChefZero
         begin
           real_store.delete(path)
         rescue DataNotFoundError
-          if !deleted
+          unless deleted
             raise
           end
         end
@@ -111,7 +111,7 @@ module ChefZero
         begin
           real_store.delete_dir(path, *options)
         rescue DataNotFoundError
-          if !deleted
+          unless deleted
             raise
           end
         end

data/lib/chef_zero/data_store/interface_v2.rb

@@ -1,4 +1,4 @@
-require "chef_zero/data_store/interface_v1"
+require_relative "interface_v1"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/data_store/memory_store.rb

@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/v2_to_v1_adapter"
-require "chef_zero/data_store/memory_store_v2"
-require "chef_zero/data_store/default_facade"
+require_relative "v2_to_v1_adapter"
+require_relative "memory_store_v2"
+require_relative "default_facade"
 
 module ChefZero
   module DataStore

data/lib/chef_zero/data_store/memory_store_v2.rb

@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_already_exists_error"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/data_store/interface_v2"
+require_relative "data_already_exists_error"
+require_relative "data_not_found_error"
+require_relative "interface_v2"
 
 module ChefZero
   module DataStore
@@ -37,7 +37,7 @@ module ChefZero
         parent = _get(path, options.include?(:recursive))
 
         if parent.key?(name)
-          if !options.include?(:recursive)
+          unless options.include?(:recursive)
             raise DataAlreadyExistsError.new(path + [name])
           end
         else
@@ -46,7 +46,7 @@ module ChefZero
       end
 
       def create(path, name, data, *options)
-        if !data.is_a?(String)
+        unless data.is_a?(String)
           raise "set only works with strings (given data: #{data.inspect})"
         end
 
@@ -55,19 +55,21 @@ module ChefZero
         if parent.key?(name)
           raise DataAlreadyExistsError.new(path + [name])
         end
+
         parent[name] = data
       end
 
       def get(path, request = nil)
         value = _get(path)
         if value.is_a?(Hash)
-          raise "get() called on directory #{path.join('/')}"
+          raise "get() called on directory #{path.join("/")}"
         end
+
         value
       end
 
       def set(path, data, *options)
-        if !data.is_a?(String)
+        unless data.is_a?(String)
           raise "set only works with strings: #{path} = #{data.inspect}"
         end
 
@@ -77,36 +79,40 @@ module ChefZero
         if !options.include?(:create) && !parent[path[-1]]
           raise DataNotFoundError.new(path)
         end
+
         parent[path[-1]] = data
       end
 
       def delete(path)
         parent = _get(path[0, path.length - 1])
-        if !parent.key?(path[-1])
+        unless parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
-        if !parent[path[-1]].is_a?(String)
+        unless parent[path[-1]].is_a?(String)
           raise "delete only works with strings: #{path}"
         end
+
         parent.delete(path[-1])
       end
 
       def delete_dir(path, *options)
         parent = _get(path[0, path.length - 1])
-        if !parent.key?(path[-1])
+        unless parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
-        if !parent[path[-1]].is_a?(Hash)
+        unless parent[path[-1]].is_a?(Hash)
           raise "delete_dir only works with directories: #{path}"
         end
+
         parent.delete(path[-1])
       end
 
       def list(path)
         dir = _get(path)
-        if !dir.is_a? Hash
+        unless dir.is_a? Hash
           raise "list only works with directories (#{path} = #{dir.class})"
         end
+
         dir.keys.sort
       end
 
@@ -115,6 +121,7 @@ module ChefZero
         if value.is_a?(Hash) && !options[:allow_dirs]
           raise "exists? does not work with directories (#{path} = #{value.class})"
         end
+
         true
       rescue DataNotFoundError
         false
@@ -122,9 +129,10 @@ module ChefZero
 
       def exists_dir?(path)
         dir = _get(path)
-        if !dir.is_a? Hash
+        unless dir.is_a? Hash
           raise "exists_dir? only works with directories (#{path} = #{dir.class})"
         end
+
         true
       rescue DataNotFoundError
         false
@@ -135,7 +143,7 @@ module ChefZero
       def _get(path, create_dir = false)
         value = @data
         path.each_with_index do |path_part, index|
-          if !value.key?(path_part)
+          unless value.key?(path_part)
             if create_dir
               value[path_part] = {}
             else

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require "chef_zero/data_store/data_already_exists_error"
-require "chef_zero/data_store/data_not_found_error"
-require "chef_zero/data_store/interface_v2"
-require "fileutils"
+require_relative "data_already_exists_error"
+require_relative "data_not_found_error"
+require_relative "interface_v2"
+require "fileutils" unless defined?(FileUtils)
 
 module ChefZero
   module DataStore
@@ -44,6 +44,7 @@ module ChefZero
         if destructible
           Dir.entries(root).each do |entry|
             next if entry == "." || entry == ".."
+
             FileUtils.rm_rf(Path.join(root, entry))
           end
         end
@@ -110,9 +111,10 @@ module ChefZero
 
       def delete_dir(path, *options)
         if options.include?(:recursive)
-          if !File.exist?(path_to(path))
+          unless File.exist?(path_to(path))
             raise DataNotFoundError.new(path)
           end
+
           FileUtils.rm_rf(path_to(path))
         else
           begin