cleanup lib/fog by segregating shared into 'core'

bin/fog

@@ -2,14 +2,14 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
-require File.join('fog', 'credentials')
+require File.join('fog', 'core', 'credentials')
 Fog.credential = ARGV.first ? ARGV.first.to_sym : nil
 Fog.bin = true
 unless Fog.credentials
   exit
 end
 
-require 'fog/bin'
+require 'fog/core/bin'
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)

lib/fog.rb

@@ -17,17 +17,7 @@ $LOAD_PATH.unshift __DIR__ unless
   $LOAD_PATH.include?(__DIR__) ||
   $LOAD_PATH.include?(File.expand_path(__DIR__))
 
-require 'fog/attributes'
-require 'fog/collection'
-require 'fog/connection'
-require 'fog/deprecation'
-require 'fog/errors'
-require 'fog/hmac'
-require 'fog/model'
-require 'fog/parser'
-require 'fog/provider'
-require 'fog/service'
-require 'fog/ssh'
+require 'fog/core'
 
 module Fog
 

lib/fog/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core/attributes'
+require 'fog/core/collection'
+require 'fog/core/connection'
+require 'fog/core/deprecation'
+require 'fog/core/errors'
+require 'fog/core/hmac'
+require 'fog/core/model'
+require 'fog/core/parser'
+require 'fog/core/provider'
+require 'fog/core/service'
+require 'fog/core/ssh'

lib/fog/core/bin.rb

@@ -1,4 +1,4 @@
-require 'fog/credentials'
+require 'fog/core/credentials'
 
 module Fog
   class << self

spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 require 'open-uri'
 require 'fog'
 Fog.bin = true
-require 'fog/bin'
+require 'fog/core/bin'
 require 'fog/vcloud/bin'
 
 if ENV["FOG_MOCK"] == "true"

spec/vcloud/spec_helper.rb

@@ -21,7 +21,7 @@ srand 1234
 
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../../lib/fog"
-require "#{current_directory}/../../lib/fog/bin"
+require "#{current_directory}/../../lib/fog/core/bin"
 
 Fog.mock! if ENV['FOG_MOCK']
 

tests/helper.rb

@@ -1,5 +1,5 @@
 require 'fog'
-require 'fog/bin'
+require 'fog/core/bin'
 Fog.bin = true
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'model_helper'))