berkshelf.rb in berkshelf-2.0.0.beta

- old
+ new

@@ -1,19 +1,19 @@
-require 'chozo/core_ext'
 require 'active_support/core_ext'
 require 'archive/tar/minitar'
+require 'celluloid'
+require 'chozo/core_ext'
 require 'forwardable'
 require 'hashie'
-require 'multi_json'
+require 'json'
 require 'pathname'
 require 'ridley'
 require 'solve'
 require 'thor'
 require 'tmpdir'
 require 'uri'
 require 'zlib'
-require 'celluloid'
 
 require 'berkshelf/core_ext'
 require 'berkshelf/errors'
 require 'berkshelf/test' if ENV['RUBY_ENV'] == 'test'
 require 'berkshelf/version'
@@ -54,12 +54,13 @@
     # @return [Pathname]
     def root
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
     end
 
-    # @return [::Thor::Shell::Color]
+    # @return [Thor::Shell::Color, Thor::Shell::Basic]
+    #   A basic shell on Windows, colored everywhere else
     def ui
-      @ui ||= ::Thor::Shell::Color.new
+      @ui ||= Thor::Base.shell.new
     end
 
     # Returns the filepath to the location Berskhelf will use for
     # storage; temp files will go here, Cookbooks will be downloaded
     # to or uploaded from here. By default this is '~/.berkshelf' but