lib/ridley.rb in ridley-0.3.2 vs lib/ridley.rb in ridley-0.4.0

@@ -1,51 +1,76 @@
+require 'chozo'
+require 'active_support/core_ext'
+require 'celluloid'
 require 'faraday'
 require 'addressable/uri'
-require 'yajl'
 require 'multi_json'
 require 'active_model'
 require 'active_support/inflector'
-require 'active_support/core_ext'
 require 'forwardable'
-require 'set'
 require 'thread'
-require 'chozo/core_ext'
 
+if jruby?
+  require 'json/pure'
+else
+  require 'json/ext'
+end
+
 require 'ridley/version'
 require 'ridley/errors'
 
+JSON.create_id = nil
+
 # @author Jamie Winsor <[e-mail]>
 module Ridley
-  CHEF_VERSION = '10.14.4'.freeze
+  CHEF_VERSION = '10.16.2'.freeze
 
-  autoload :Log, 'ridley/log'  
+  autoload :Bootstrapper, 'ridley/bootstrapper'
+  autoload :Client, 'ridley/resources/client'
   autoload :Connection, 'ridley/connection'
+  autoload :ChainLink, 'ridley/chain_link'
+  autoload :Cookbook, 'ridley/resources/cookbook'
+  autoload :DataBag, 'ridley/resources/data_bag'
+  autoload :DataBagItem, 'ridley/resources/data_bag_item'
   autoload :DSL, 'ridley/dsl'
-  autoload :Context, 'ridley/context'
-  autoload :Resource, 'ridley/resource'
   autoload :Environment, 'ridley/resources/environment'
-  autoload :Role, 'ridley/resources/role'
-  autoload :Client, 'ridley/resources/client'
+  autoload :Logging, 'ridley/logging'
   autoload :Node, 'ridley/resources/node'
-  autoload :DataBag, 'ridley/resources/data_bag'
-  autoload :DataBagItem, 'ridley/resources/data_bag_item'
-  autoload :Cookbook, 'ridley/resources/cookbook'
+  autoload :Resource, 'ridley/resource'
+  autoload :Role, 'ridley/resources/role'
   autoload :Search, 'ridley/resources/search'
+  autoload :SSH, 'ridley/ssh'
 
   class << self
+    attr_accessor :logger
+
     def connection(*args)
       Connection.new(*args)
     end
 
     def sync(*args, &block)
       Connection.sync(*args, &block)
     end
 
-    # @return [Ridley::Log]
-    def log
-      Ridley::Log
+    # @return [Logger]
+    def logger
+      Ridley::Logging.logger
     end
-    alias_method :logger, :log
+    alias_method :log, :logger
+
+    # @param [Logger, nil] obj
+    #
+    # @return [Logger]
+    def set_logger(obj)
+      Ridley::Logging.set_logger(obj)
+    end
+
+    # @return [Pathname]
+    def root
+      @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
+    end
   end
 end
+
+Celluloid.logger = Ridley.logger
 
 require 'ridley/middleware'