lib/volt/cli/console.rb in volt-0.9.3.pre1 vs lib/volt/cli/console.rb in volt-0.9.3.pre2

@@ -29,15 +29,15 @@
 
 module Volt
   class Console
     module Helpers
       def store
-        $page.store
+        @volt_app.page.store
       end
 
       def page
-        $page.page
+        @volt_app.page.page
       end
     end
 
     def self.start
       require 'pry'
@@ -48,18 +48,19 @@
       require 'volt'
       require 'volt/boot'
       require 'volt/volt/core'
       require 'volt/server/socket_connection_handler_stub'
 
-      SocketConnectionHandlerStub.dispatcher = Dispatcher.new
+      # Boot the volt app
+      volt_app = Volt.boot(Dir.pwd)
 
-      Volt.boot(Dir.pwd)
+      SocketConnectionHandlerStub.dispatcher = Dispatcher.new(volt_app)
 
       Pry.config.prompt_name = 'volt'
 
+      Pry.main.instance_variable_set('@volt_app', volt_app)
       Pry.main.send(:include, Volt::Console::Helpers)
 
-      # $page.pry
       Pry.start
     end
   end
 end