lib/berkshelf.rb in berkshelf-3.1.1 vs lib/berkshelf.rb in berkshelf-3.1.2

@@ -23,10 +23,11 @@
   module Mixin
     autoload :DSLEval, 'berkshelf/mixin/dsl_eval'
     autoload :Logging, 'berkshelf/mixin/logging'
   end
 
+  autoload :Shell,      'berkshelf/shell'
   autoload :Uploader,   'berkshelf/uploader'
   autoload :Visualizer, 'berkshelf/visualizer'
 
   autoload :BaseFormatter,  'berkshelf/formatters/base'
   autoload :HumanFormatter, 'berkshelf/formatters/human'
@@ -50,14 +51,13 @@
     # @return [Pathname]
     def root
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
 
-    # @return [Thor::Shell::Color, Thor::Shell::Basic]
-    #   A basic shell on Windows, colored everywhere else
+    # @return [Berkshelf::Shell]
     def ui
-      @ui ||= Thor::Base.shell.new
+      @ui ||= Berkshelf::Shell.new
     end
 
     # Returns the filepath to the location Berkshelf will use for
     # storage; temp files will go here, Cookbooks will be downloaded
     # to or uploaded from here. By default this is '~/.berkshelf' but
@@ -215,10 +215,9 @@
 require_relative 'berkshelf/installer'
 require_relative 'berkshelf/logger'
 require_relative 'berkshelf/resolver'
 require_relative 'berkshelf/source'
 require_relative 'berkshelf/source_uri'
-require_relative 'berkshelf/ui'
 
 Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN
 Celluloid.logger.level = Logger::ERROR