lib/ridley.rb in ridley-0.7.0.beta vs lib/ridley.rb in ridley-0.7.0.rc1

@@ -1,7 +1,6 @@
 require 'chozo'
-require 'active_support/core_ext'
 require 'celluloid'
 require 'faraday'
 require 'addressable/uri'
 require 'multi_json'
 require 'active_support/inflector'
@@ -23,23 +22,17 @@
 # @author Jamie Winsor <[e-mail]>
 module Ridley
   CHEF_VERSION = '10.16.4'.freeze
 
   autoload :Bootstrapper, 'ridley/bootstrapper'
-  autoload :Client, 'ridley/resources/client'
+  autoload :Client, 'ridley/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 :Environment, 'ridley/resources/environment'
   autoload :Logging, 'ridley/logging'
-  autoload :Node, 'ridley/resources/node'
   autoload :Resource, 'ridley/resource'
-  autoload :Role, 'ridley/resources/role'
-  autoload :Search, 'ridley/resources/search'
+  autoload :SandboxUploader, 'ridley/sandbox_uploader'
   autoload :SSH, 'ridley/ssh'
 
   class << self
     extend Forwardable
 
@@ -47,16 +40,16 @@
     alias_method :log, :logger
 
     def_delegator "Ridley::Logging", :logger=
     def_delegator "Ridley::Logging", :set_logger
 
-    def connection(*args)
-      Connection.new(*args)
+    def new(*args)
+      Client.new(*args)
     end
 
-    def sync(*args, &block)
-      Connection.sync(*args, &block)
+    def open(*args, &block)
+      Client.open(*args, &block)
     end
 
     # @return [Pathname]
     def root
       @root ||= Pathname.new(File.expand_path('../', File.dirname(__FILE__)))
@@ -65,5 +58,6 @@
 end
 
 Celluloid.logger = Ridley.logger
 
 require 'ridley/middleware'
+require 'ridley/resources'