spec/support/chef_server.rb in berkshelf-7.0.0 vs spec/support/chef_server.rb in berkshelf-7.0.1

@@ -1,99 +1,101 @@
 require "chef_zero/server"
 require "json"
 
-module Berkshelf::RSpec
-  module ChefServer
-    PORT = 4000
+module Berkshelf
+  module RSpec
+    module ChefServer
+      PORT = 4000
 
-    class << self
-      attr_reader :server
+      class << self
+        attr_reader :server
 
-      def clear_request_log
-        @request_log = Array.new
-      end
+        def clear_request_log
+          @request_log = Array.new
+        end
 
-      def request_log
-        @request_log ||= Array.new
-      end
+        def request_log
+          @request_log ||= Array.new
+        end
 
-      def server_url
-        @server && @server.url
-      end
+        def server_url
+          @server && @server.url
+        end
 
-      def start(options = {})
-        return @server if @server
+        def start(options = {})
+          return @server if @server
 
-        options = { port: PORT }.merge(options)
-        options[:generate_real_keys] = false
+          options = { port: PORT }.merge(options)
+          options[:generate_real_keys] = false
 
-        @server = ChefZero::Server.new(options)
-        @server.start_background
-        @server.on_response do |request, response|
-          request_log << [ request, response ]
+          @server = ChefZero::Server.new(options)
+          @server.start_background
+          @server.on_response do |request, response|
+            request_log << [ request, response ]
+          end
+          clear_request_log
+
+          @server
         end
-        clear_request_log
 
-        @server
+        def stop
+          @server.stop if running?
+        end
+
+        def running?
+          @server && @server.running?
+        end
+
+        def reset!
+          @server && @server.clear_data
+        end
       end
 
-      def stop
-        @server.stop if running?
+      def chef_server
+        ChefServer.server
       end
 
-      def running?
-        @server && @server.running?
+      def chef_client(name, hash = {})
+        load_data(:clients, name, hash)
       end
 
-      def reset!
-        @server && @server.clear_data
+      def chef_cookbook(name, hash = {})
+        chef_server.load_data({ "cookbooks" => { name => hash } })
       end
-    end
 
-    def chef_server
-      ChefServer.server
-    end
+      def chef_cookbooks
+        chef_server.data_store.list(%w{organizations chef cookbooks}).inject({}) do |hash, name|
+          hash[name] = chef_server.data_store.list(["organizations", "chef", "cookbooks", name])
+          hash
+        end
+      end
 
-    def chef_client(name, hash = {})
-      load_data(:clients, name, hash)
-    end
+      def chef_data_bag(name, hash = {})
+        chef_server.load_data({ "data" => { name => hash } })
+      end
 
-    def chef_cookbook(name, hash = {})
-      chef_server.load_data({ "cookbooks" => { name => hash } })
-    end
+      def chef_environment(name, hash = {})
+        load_data(:environments, name, hash)
+      end
 
-    def chef_cookbooks
-      chef_server.data_store.list(%w{organizations chef cookbooks}).inject({}) do |hash, name|
-        hash[name] = chef_server.data_store.list(["organizations", "chef", "cookbooks", name])
-        hash
+      def chef_environment_locks(name)
+        JSON.parse(chef_server.data_store.get(["organizations", "chef", "environments", name]))["cookbook_versions"]
+      rescue ChefZero::DataStore::DataNotFoundError
+        {}
       end
-    end
 
-    def chef_data_bag(name, hash = {})
-      chef_server.load_data({ "data" => { name => hash } })
-    end
+      def chef_node(name, hash = {})
+        load_data(:nodes, name, hash)
+      end
 
-    def chef_environment(name, hash = {})
-      load_data(:environments, name, hash)
-    end
+      def chef_role(name, hash = {})
+        load_data(:roles, name, hash)
+      end
 
-    def chef_environment_locks(name)
-      JSON.parse(chef_server.data_store.get(["organizations", "chef", "environments", name]))["cookbook_versions"]
-    rescue ChefZero::DataStore::DataNotFoundError
-      {}
-    end
+      private
 
-    def chef_node(name, hash = {})
-      load_data(:nodes, name, hash)
-    end
-
-    def chef_role(name, hash = {})
-      load_data(:roles, name, hash)
-    end
-
-    private
-
-    def load_data(key, name, hash)
-      chef_server.load_data({ key.to_s => { name => JSON.generate(hash) } })
+      def load_data(key, name, hash)
+        chef_server.load_data({ key.to_s => { name => JSON.generate(hash) } })
+      end
     end
   end
 end