Revert "another chefstyle catchup + pull master"

This reverts commit ccf46bf3055b2a1c06499ec104f3d74c26643395.

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb
index 197e412810..ff3cde51a8 100644
--- a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifact_dir.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/chef_server/cookbook_dir"
+require 'chef/chef_fs/file_system/chef_server/cookbook_dir'
 
 class Chef
   module ChefFS
@@ -25,7 +25,7 @@ class Chef
         class CookbookArtifactDir < CookbookDir
           def initialize(name, parent, options = {})
             super(name, parent)
-            @cookbook_name, dash, @version = name.rpartition("-")
+            @cookbook_name, dash, @version = name.rpartition('-')
           end
 
           def copy_from(other, options = {})
diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb
index 9dbd3fea4d..b001c28dc4 100644
--- a/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/chef_server/cookbooks_dir"
-require "chef/chef_fs/file_system/chef_server/cookbook_artifact_dir"
+require 'chef/chef_fs/file_system/chef_server/cookbooks_dir'
+require 'chef/chef_fs/file_system/chef_server/cookbook_artifact_dir'
 
 class Chef
   module ChefFS
@@ -43,7 +43,7 @@ class Chef
             @children ||= begin
               result = []
               root.get_json("#{api_path}/?num_versions=all").each_pair do |cookbook_name, cookbooks|
-                cookbooks["versions"].each do |cookbook_version|
+                cookbooks['versions'].each do |cookbook_version|
                   result << CookbookArtifactDir.new("#{cookbook_name}-#{cookbook_version['identifier']}", self)
                 end
               end
@@ -56,7 +56,7 @@ class Chef
           # to make this work. So instead, we make a temporary cookbook
           # symlinking back to real cookbook, and upload the proxy.
           def upload_cookbook(other, options)
-            cookbook_name, dash, identifier = other.name.rpartition("-")
+            cookbook_name, dash, identifier = other.name.rpartition('-')
 
             Dir.mktmpdir do |temp_cookbooks_path|
               proxy_cookbook_path = "#{temp_cookbooks_path}/#{cookbook_name}"
@@ -93,7 +93,7 @@ class Chef
           end
 
           def can_have_child?(name, is_dir)
-            is_dir && name.include?("-")
+            is_dir && name.include?('-')
           end
         end
       end