use mixlib-log 2tm/bump-log-version

6 files changed, 8 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index 0a11dea..60c2919 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :development, :test do
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
-gem "chef", "~> 13"
+gem "chef", "~> 14"
 
 if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index 94465b9..a4700c5 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.4.3"
 
-  s.add_dependency "mixlib-log", "~> 1.3"
+  s.add_dependency "mixlib-log", "~> 2"
   s.add_dependency "hashie", ">= 2.0", "< 4.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index 46c0165..f2ec288 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -22,7 +22,6 @@ module ChefZero
       attr_reader :single_org
       attr_reader :osc_compat
       attr_reader :creators
-      attr_reader :deleted
 
       PERMISSIONS = %w{create read update delete grant}
       DEFAULT_SUPERUSERS = %w{pivotal}
diff --git a/lib/chef_zero/data_store/memory_store_v2.rb b/lib/chef_zero/data_store/memory_store_v2.rb
index b35d490..85f8b3d 100644
--- a/lib/chef_zero/data_store/memory_store_v2.rb
+++ b/lib/chef_zero/data_store/memory_store_v2.rb
@@ -115,9 +115,9 @@ module ChefZero
         if value.is_a?(Hash) && !options[:allow_dirs]
           raise "exists? does not work with directories (#{path} = #{value.class})"
         end
-        return true
+        true
       rescue DataNotFoundError
-        return false
+        false
       end
 
       def exists_dir?(path)
@@ -125,9 +125,9 @@ module ChefZero
         if !dir.is_a? Hash
           raise "exists_dir? only works with directories (#{path} = #{dir.class})"
         end
-        return true
+        true
       rescue DataNotFoundError
-        return false
+        false
       end
 
       private
diff --git a/lib/chef_zero/data_store/raw_file_store.rb b/lib/chef_zero/data_store/raw_file_store.rb
index 8b4c442..2d4b3f5 100644
--- a/lib/chef_zero/data_store/raw_file_store.rb
+++ b/lib/chef_zero/data_store/raw_file_store.rb
@@ -80,7 +80,7 @@ module ChefZero
       end
 
       def get(path, request = nil)
-        return IO.read(path_to(path))
+        IO.read(path_to(path))
       rescue Errno::ENOENT
         raise DataNotFoundError.new(path)
       end
diff --git a/lib/chef_zero/rest_base.rb b/lib/chef_zero/rest_base.rb
index e6114c4..b6d4b6a 100644
--- a/lib/chef_zero/rest_base.rb
+++ b/lib/chef_zero/rest_base.rb
@@ -35,7 +35,7 @@ module ChefZero
                             )
       end
     rescue ArgumentError
-      return json_response(406,
+      json_response(406,
                            { "username" => request.requestor },
                            request_version: -1, response_version: -1
                           )