Skip to content

Commit

Permalink
Changes to rely on fog-core
Browse files Browse the repository at this point in the history
This references `fog-core` and removes the files it now contains.
  • Loading branch information
tokengeek committed Feb 12, 2014
1 parent e759687 commit ee091cc
Show file tree
Hide file tree
Showing 27 changed files with 15 additions and 1,845 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ group :development, :test do
gem 'coveralls', :require => false
end

gem "fog-core", :github => "fog/fog-core", :branch => "master"
gemspec
1 change: 1 addition & 0 deletions fog.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Gem::Specification.new do |s|

## List your runtime dependencies here. Runtime dependencies are those
## that are needed for an end user to actually USE your code.
s.add_dependency("fog-core")
s.add_dependency('builder')
s.add_dependency('excon', '~>0.31.0')
s.add_dependency('formatador', '~>0.2.0')
Expand Down
13 changes: 13 additions & 0 deletions lib/fog.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,19 @@
__LIB_DIR__ = File.expand_path(File.dirname(__FILE__))
$LOAD_PATH.unshift __LIB_DIR__ unless $LOAD_PATH.include?(__LIB_DIR__)

# Use core
require 'fog/core'

# Previously treated as "core"
# data exchange specific (to be extracted and used on a per provider basis)
require 'fog/xml'
require 'fog/json'
require 'fog/core/parser'

# deprecation wrappers (XML wrapped version)
require 'fog/core/deprecated/connection'
require 'fog/core/deprecated_connection_accessors'

# any one of these can be required separately.
# they all depend on fog/core for shared functionality.
require 'fog/atmos'
Expand Down
23 changes: 0 additions & 23 deletions lib/fog/cdn.rb

This file was deleted.

80 changes: 0 additions & 80 deletions lib/fog/compute.rb

This file was deleted.

104 changes: 0 additions & 104 deletions lib/fog/compute/models/server.rb

This file was deleted.

52 changes: 0 additions & 52 deletions lib/fog/core.rb

This file was deleted.

Loading

0 comments on commit ee091cc

Please sign in to comment.