Merge 5a023b4 into d3b5025

fog · Apr 1, 2018 · e37bce9 · e37bce9
2 parents d3b5025 + 5a023b4
commit e37bce9
Show file tree

Hide file tree

Showing 60 changed files with 26 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -121,7 +121,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/fog-digitalocean. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fog/fog-digitalocean. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

diff --git a/lib/fog/digitalocean/compute.rb → lib/fog/compute/digitalocean.rb b/lib/fog/digitalocean/compute.rb → lib/fog/compute/digitalocean.rb
@@ -1,11 +1,11 @@
-require 'fog/digitalocean/core'
-
 module Fog
   module Compute
     class DigitalOcean < Fog::Service
+      autoload :PagingCollection, File.expand_path('../digitalocean/models/paging_collection', __FILE__)
+
       requires :digitalocean_token
 
-      model_path 'fog/digitalocean/models/compute'
+      model_path 'fog/compute/digitalocean/models'
       model :server
       collection :servers
       model :image
@@ -19,7 +19,7 @@ class DigitalOcean < Fog::Service
       model :volume
       collection :volumes
 
-      request_path 'fog/digitalocean/requests/compute'
+      request_path 'fog/compute/digitalocean/requests'
       request :list_volumes
       request :create_volume
       request :attach_volume

diff --git a/...fog/digitalocean/models/compute/flavor.rb → ...fog/compute/digitalocean/models/flavor.rb b/...fog/digitalocean/models/compute/flavor.rb → ...fog/compute/digitalocean/models/flavor.rb
diff --git a/...og/digitalocean/models/compute/flavors.rb → ...og/compute/digitalocean/models/flavors.rb b/...og/digitalocean/models/compute/flavors.rb → ...og/compute/digitalocean/models/flavors.rb
diff --git a/lib/fog/digitalocean/models/compute/image.rb → lib/fog/compute/digitalocean/models/image.rb b/lib/fog/digitalocean/models/compute/image.rb → lib/fog/compute/digitalocean/models/image.rb
diff --git a/...fog/digitalocean/models/compute/images.rb → ...fog/compute/digitalocean/models/images.rb b/...fog/digitalocean/models/compute/images.rb → ...fog/compute/digitalocean/models/images.rb
@@ -1,4 +1,4 @@
-require 'fog/digitalocean/models/paging_collection'
+require 'fog/compute/digitalocean/models/paging_collection'
 
 module Fog
   module Compute

diff --git a/.../digitalocean/models/paging_collection.rb → .../digitalocean/models/paging_collection.rb b/.../digitalocean/models/paging_collection.rb → .../digitalocean/models/paging_collection.rb
diff --git a/...fog/digitalocean/models/compute/region.rb → ...fog/compute/digitalocean/models/region.rb b/...fog/digitalocean/models/compute/region.rb → ...fog/compute/digitalocean/models/region.rb
diff --git a/...og/digitalocean/models/compute/regions.rb → ...og/compute/digitalocean/models/regions.rb b/...og/digitalocean/models/compute/regions.rb → ...og/compute/digitalocean/models/regions.rb
diff --git a/...fog/digitalocean/models/compute/server.rb → ...fog/compute/digitalocean/models/server.rb b/...fog/digitalocean/models/compute/server.rb → ...fog/compute/digitalocean/models/server.rb
diff --git a/...og/digitalocean/models/compute/servers.rb → ...og/compute/digitalocean/models/servers.rb b/...og/digitalocean/models/compute/servers.rb → ...og/compute/digitalocean/models/servers.rb
@@ -1,6 +1,6 @@
 require 'fog/core/collection'
-require 'fog/digitalocean/models/compute/server'
-require 'fog/digitalocean/models/paging_collection'
+require 'fog/compute/digitalocean/models/server'
+require 'fog/compute/digitalocean/models/paging_collection'
 
 module Fog
   module Compute

diff --git a/...og/digitalocean/models/compute/ssh_key.rb → ...og/compute/digitalocean/models/ssh_key.rb b/...og/digitalocean/models/compute/ssh_key.rb → ...og/compute/digitalocean/models/ssh_key.rb
diff --git a/...g/digitalocean/models/compute/ssh_keys.rb → ...g/compute/digitalocean/models/ssh_keys.rb b/...g/digitalocean/models/compute/ssh_keys.rb → ...g/compute/digitalocean/models/ssh_keys.rb
@@ -1,4 +1,4 @@
-require 'fog/digitalocean/models/paging_collection'
+require 'fog/compute/digitalocean/models/paging_collection'
 
 module Fog
   module Compute

diff --git a/...fog/digitalocean/models/compute/volume.rb → ...fog/compute/digitalocean/models/volume.rb b/...fog/digitalocean/models/compute/volume.rb → ...fog/compute/digitalocean/models/volume.rb
diff --git a/...og/digitalocean/models/compute/volumes.rb → ...og/compute/digitalocean/models/volumes.rb b/...og/digitalocean/models/compute/volumes.rb → ...og/compute/digitalocean/models/volumes.rb
@@ -1,4 +1,4 @@
-require 'fog/digitalocean/models/paging_collection'
+require 'fog/compute/digitalocean/models/paging_collection'
 
 module Fog
   module Compute

diff --git a/...alocean/requests/compute/attach_volume.rb → ...te/digitalocean/requests/attach_volume.rb b/...alocean/requests/compute/attach_volume.rb → ...te/digitalocean/requests/attach_volume.rb
diff --git a/...alocean/requests/compute/change_kernel.rb → ...te/digitalocean/requests/change_kernel.rb b/...alocean/requests/compute/change_kernel.rb → ...te/digitalocean/requests/change_kernel.rb
diff --git a/...n/requests/compute/convert_to_snapshot.rb → ...italocean/requests/convert_to_snapshot.rb b/...n/requests/compute/convert_to_snapshot.rb → ...italocean/requests/convert_to_snapshot.rb
diff --git a/...alocean/requests/compute/create_server.rb → ...te/digitalocean/requests/create_server.rb b/...alocean/requests/compute/create_server.rb → ...te/digitalocean/requests/create_server.rb
diff --git a/...locean/requests/compute/create_ssh_key.rb → ...e/digitalocean/requests/create_ssh_key.rb b/...locean/requests/compute/create_ssh_key.rb → ...e/digitalocean/requests/create_ssh_key.rb
diff --git a/...alocean/requests/compute/create_volume.rb → ...te/digitalocean/requests/create_volume.rb b/...alocean/requests/compute/create_volume.rb → ...te/digitalocean/requests/create_volume.rb
diff --git a/...locean/requests/compute/delete_ssh_key.rb → ...e/digitalocean/requests/delete_ssh_key.rb b/...locean/requests/compute/delete_ssh_key.rb → ...e/digitalocean/requests/delete_ssh_key.rb
diff --git a/...locean/requests/compute/destroy_server.rb → ...e/digitalocean/requests/destroy_server.rb b/...locean/requests/compute/destroy_server.rb → ...e/digitalocean/requests/destroy_server.rb
diff --git a/...locean/requests/compute/destroy_volume.rb → ...e/digitalocean/requests/destroy_volume.rb b/...locean/requests/compute/destroy_volume.rb → ...e/digitalocean/requests/destroy_volume.rb
diff --git a/...alocean/requests/compute/detach_volume.rb → ...te/digitalocean/requests/detach_volume.rb b/...alocean/requests/compute/detach_volume.rb → ...te/digitalocean/requests/detach_volume.rb
diff --git a/...ocean/requests/compute/disable_backups.rb → .../digitalocean/requests/disable_backups.rb b/...ocean/requests/compute/disable_backups.rb → .../digitalocean/requests/disable_backups.rb
diff --git a/...italocean/requests/compute/enable_ipv6.rb → ...pute/digitalocean/requests/enable_ipv6.rb b/...italocean/requests/compute/enable_ipv6.rb → ...pute/digitalocean/requests/enable_ipv6.rb
diff --git a/...ests/compute/enable_private_networking.rb → ...ean/requests/enable_private_networking.rb b/...ests/compute/enable_private_networking.rb → ...ean/requests/enable_private_networking.rb
diff --git a/...an/requests/compute/get_droplet_action.rb → ...gitalocean/requests/get_droplet_action.rb b/...an/requests/compute/get_droplet_action.rb → ...gitalocean/requests/get_droplet_action.rb
diff --git a/...ean/requests/compute/get_image_details.rb → ...igitalocean/requests/get_image_details.rb b/...ean/requests/compute/get_image_details.rb → ...igitalocean/requests/get_image_details.rb
diff --git a/...an/requests/compute/get_server_details.rb → ...gitalocean/requests/get_server_details.rb b/...an/requests/compute/get_server_details.rb → ...gitalocean/requests/get_server_details.rb
diff --git a/...italocean/requests/compute/get_ssh_key.rb → ...pute/digitalocean/requests/get_ssh_key.rb b/...italocean/requests/compute/get_ssh_key.rb → ...pute/digitalocean/requests/get_ssh_key.rb
diff --git a/...an/requests/compute/get_volume_details.rb → ...gitalocean/requests/get_volume_details.rb b/...an/requests/compute/get_volume_details.rb → ...gitalocean/requests/get_volume_details.rb
diff --git a/.../requests/compute/list_droplet_actions.rb → ...talocean/requests/list_droplet_actions.rb b/.../requests/compute/list_droplet_actions.rb → ...talocean/requests/list_droplet_actions.rb
diff --git a/...talocean/requests/compute/list_flavors.rb → ...ute/digitalocean/requests/list_flavors.rb b/...talocean/requests/compute/list_flavors.rb → ...ute/digitalocean/requests/list_flavors.rb
diff --git a/...italocean/requests/compute/list_images.rb → ...pute/digitalocean/requests/list_images.rb b/...italocean/requests/compute/list_images.rb → ...pute/digitalocean/requests/list_images.rb
diff --git a/...talocean/requests/compute/list_regions.rb → ...ute/digitalocean/requests/list_regions.rb b/...talocean/requests/compute/list_regions.rb → ...ute/digitalocean/requests/list_regions.rb
diff --git a/...talocean/requests/compute/list_servers.rb → ...ute/digitalocean/requests/list_servers.rb b/...talocean/requests/compute/list_servers.rb → ...ute/digitalocean/requests/list_servers.rb
diff --git a/...alocean/requests/compute/list_ssh_keys.rb → ...te/digitalocean/requests/list_ssh_keys.rb b/...alocean/requests/compute/list_ssh_keys.rb → ...te/digitalocean/requests/list_ssh_keys.rb
diff --git a/...n/requests/compute/list_volume_actions.rb → ...italocean/requests/list_volume_actions.rb b/...n/requests/compute/list_volume_actions.rb → ...italocean/requests/list_volume_actions.rb
diff --git a/...talocean/requests/compute/list_volumes.rb → ...ute/digitalocean/requests/list_volumes.rb b/...talocean/requests/compute/list_volumes.rb → ...ute/digitalocean/requests/list_volumes.rb
diff --git a/...locean/requests/compute/password_reset.rb → ...e/digitalocean/requests/password_reset.rb b/...locean/requests/compute/password_reset.rb → ...e/digitalocean/requests/password_reset.rb
diff --git a/...italocean/requests/compute/power_cycle.rb → ...pute/digitalocean/requests/power_cycle.rb b/...italocean/requests/compute/power_cycle.rb → ...pute/digitalocean/requests/power_cycle.rb
diff --git a/...igitalocean/requests/compute/power_off.rb → ...ompute/digitalocean/requests/power_off.rb b/...igitalocean/requests/compute/power_off.rb → ...ompute/digitalocean/requests/power_off.rb
diff --git a/...digitalocean/requests/compute/power_on.rb → ...compute/digitalocean/requests/power_on.rb b/...digitalocean/requests/compute/power_on.rb → ...compute/digitalocean/requests/power_on.rb
diff --git a/...alocean/requests/compute/reboot_server.rb → ...te/digitalocean/requests/reboot_server.rb b/...alocean/requests/compute/reboot_server.rb → ...te/digitalocean/requests/reboot_server.rb
diff --git a/.../digitalocean/requests/compute/rebuild.rb → .../compute/digitalocean/requests/rebuild.rb b/.../digitalocean/requests/compute/rebuild.rb → .../compute/digitalocean/requests/rebuild.rb
diff --git a/...g/digitalocean/requests/compute/rename.rb → ...g/compute/digitalocean/requests/rename.rb b/...g/digitalocean/requests/compute/rename.rb → ...g/compute/digitalocean/requests/rename.rb
diff --git a/...g/digitalocean/requests/compute/resize.rb → ...g/compute/digitalocean/requests/resize.rb b/...g/digitalocean/requests/compute/resize.rb → ...g/compute/digitalocean/requests/resize.rb
diff --git a/...alocean/requests/compute/resize_volume.rb → ...te/digitalocean/requests/resize_volume.rb b/...alocean/requests/compute/resize_volume.rb → ...te/digitalocean/requests/resize_volume.rb
diff --git a/.../digitalocean/requests/compute/restore.rb → .../compute/digitalocean/requests/restore.rb b/.../digitalocean/requests/compute/restore.rb → .../compute/digitalocean/requests/restore.rb
diff --git a/...digitalocean/requests/compute/shutdown.rb → ...compute/digitalocean/requests/shutdown.rb b/...digitalocean/requests/compute/shutdown.rb → ...compute/digitalocean/requests/shutdown.rb
diff --git a/...digitalocean/requests/compute/snapshot.rb → ...compute/digitalocean/requests/snapshot.rb b/...digitalocean/requests/compute/snapshot.rb → ...compute/digitalocean/requests/snapshot.rb
diff --git a/...locean/requests/compute/transfer_image.rb → ...e/digitalocean/requests/transfer_image.rb b/...locean/requests/compute/transfer_image.rb → ...e/digitalocean/requests/transfer_image.rb
diff --git a/...locean/requests/compute/update_ssh_key.rb → ...e/digitalocean/requests/update_ssh_key.rb b/...locean/requests/compute/update_ssh_key.rb → ...e/digitalocean/requests/update_ssh_key.rb
diff --git a/.../digitalocean/requests/compute/upgrade.rb → .../compute/digitalocean/requests/upgrade.rb b/.../digitalocean/requests/compute/upgrade.rb → .../compute/digitalocean/requests/upgrade.rb
diff --git a/.../digitalocean/examples/getting_started.md → lib/fog/compute/examples/getting_started.md b/.../digitalocean/examples/getting_started.md → lib/fog/compute/examples/getting_started.md
diff --git a/lib/fog/digitalocean.rb b/lib/fog/digitalocean.rb
@@ -1 +1,15 @@
-require 'fog/digitalocean/compute'
+require 'fog/core'
+require 'fog/json'
+
+module Fog
+  module Compute
+    autoload :DigitalOcean, File.expand_path('../compute/digitalocean', __FILE__)
+  end
+
+  module DigitalOcean
+    autoload :Service, File.expand_path('../digitalocean/service')
+
+    extend Fog::Provider
+    service(:compute, 'Compute')
+  end
+end
diff --git a/lib/fog/digitalocean/CHANGELOG.md b/lib/fog/digitalocean/CHANGELOG.md
@@ -2,5 +2,5 @@
 
 * Initial release
 
-  Getting started example: https://github.com/fog/fog/blob/master/lib/fog/digitalocean/examples/getting_started.md
+  Getting started example: https://github.com/fog/fog-digitalocean/blob/master/lib/fog/compute/examples/getting_started.md
 
diff --git a/lib/fog/digitalocean/core.rb b/lib/fog/digitalocean/core.rb