fog 0.2.30 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile.lock +8 -8
- data/README.rdoc +15 -6
- data/Rakefile +12 -19
- data/bin/fog +12 -10
- data/fog.gemspec +298 -286
- data/lib/fog.rb +22 -12
- data/lib/fog/attributes.rb +2 -6
- data/lib/fog/aws.rb +10 -5
- data/lib/fog/aws/bin.rb +29 -65
- data/lib/fog/aws/compute.rb +220 -0
- data/lib/fog/aws/ec2.rb +9 -216
- data/lib/fog/aws/elb.rb +9 -12
- data/lib/fog/aws/models/{ec2 → compute}/address.rb +3 -3
- data/lib/fog/aws/models/{ec2 → compute}/addresses.rb +3 -11
- data/lib/fog/aws/models/{ec2 → compute}/flavor.rb +2 -2
- data/lib/fog/aws/models/compute/flavors.rb +39 -0
- data/lib/fog/aws/models/compute/image.rb +44 -0
- data/lib/fog/aws/models/{ec2 → compute}/images.rb +3 -9
- data/lib/fog/aws/models/compute/key_pair.rb +44 -0
- data/lib/fog/aws/models/{ec2 → compute}/key_pairs.rb +3 -9
- data/lib/fog/aws/models/{ec2 → compute}/security_group.rb +28 -6
- data/lib/fog/aws/models/{ec2 → compute}/security_groups.rb +3 -9
- data/lib/fog/aws/models/{ec2 → compute}/server.rb +65 -38
- data/lib/fog/aws/models/compute/servers.rb +80 -0
- data/lib/fog/aws/models/{ec2 → compute}/snapshot.rb +7 -7
- data/lib/fog/aws/models/{ec2 → compute}/snapshots.rb +5 -13
- data/lib/fog/aws/models/{ec2 → compute}/volume.rb +8 -8
- data/lib/fog/aws/models/{ec2 → compute}/volumes.rb +3 -11
- data/lib/fog/aws/models/{s3 → storage}/directories.rb +3 -9
- data/lib/fog/aws/models/{s3 → storage}/directory.rb +5 -5
- data/lib/fog/aws/models/{s3 → storage}/file.rb +9 -9
- data/lib/fog/aws/models/{s3 → storage}/files.rb +13 -8
- data/lib/fog/aws/parsers/{ec2 → compute}/allocate_address.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/attach_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/basic.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_key_pair.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/create_snapshot.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/create_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/deregister_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_addresses.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_availability_zones.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_images.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_key_pairs.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_regions.rb +2 -2
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_reserved_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_security_groups.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_snapshots.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/describe_volumes.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/detach_volume.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/get_console_output.rb +2 -2
- data/lib/fog/aws/parsers/compute/import_key_pair.rb +20 -0
- data/lib/fog/aws/parsers/{ec2 → compute}/register_image.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/run_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/start_stop_instances.rb +1 -1
- data/lib/fog/aws/parsers/{ec2 → compute}/terminate_instances.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/access_control_list.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/copy_object.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_location.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_logging.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_object_versions.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_bucket_versioning.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_request_payment.rb +1 -1
- data/lib/fog/aws/parsers/{s3 → storage}/get_service.rb +1 -1
- data/lib/fog/aws/requests/{ec2 → compute}/allocate_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/associate_address.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/attach_volume.rb +6 -6
- data/lib/fog/aws/requests/{ec2 → compute}/authorize_security_group_ingress.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_image.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_key_pair.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/create_security_group.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_snapshot.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/create_volume.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_key_pair.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/delete_security_group.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_snapshot.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/delete_volume.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/deregister_image.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_addresses.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_availability_zones.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_images.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/describe_instances.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_key_pairs.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_regions.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_reserved_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/describe_security_groups.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_snapshots.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/describe_volumes.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/detach_volume.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/disassociate_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/get_console_output.rb +4 -4
- data/lib/fog/aws/requests/compute/import_key_pair.rb +54 -0
- data/lib/fog/aws/requests/{ec2 → compute}/modify_image_attributes.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/modify_snapshot_attribute.rb +2 -2
- data/lib/fog/aws/requests/{ec2 → compute}/reboot_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/register_image.rb +4 -4
- data/lib/fog/aws/requests/{ec2 → compute}/release_address.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/revoke_security_group_ingress.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/run_instances.rb +4 -3
- data/lib/fog/aws/requests/{ec2 → compute}/start_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/stop_instances.rb +3 -3
- data/lib/fog/aws/requests/{ec2 → compute}/terminate_instances.rb +4 -4
- data/lib/fog/aws/requests/elb/create_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/delete_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/describe_instance_health.rb +1 -1
- data/lib/fog/aws/requests/elb/describe_load_balancers.rb +1 -1
- data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb +1 -1
- data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/create_domain.rb +1 -1
- data/lib/fog/aws/requests/simpledb/delete_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/delete_domain.rb +1 -1
- data/lib/fog/aws/requests/simpledb/domain_metadata.rb +1 -1
- data/lib/fog/aws/requests/simpledb/get_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/list_domains.rb +1 -1
- data/lib/fog/aws/requests/simpledb/put_attributes.rb +1 -1
- data/lib/fog/aws/requests/simpledb/select.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/copy_object.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/delete_bucket.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/delete_object.rb +2 -2
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_acl.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_location.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_logging.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_object_versions.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_bucket_versioning.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_object_acl.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_object_torrent.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_object_url.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/get_request_payment.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/get_service.rb +3 -3
- data/lib/fog/aws/requests/{s3 → storage}/head_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_acl.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_logging.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_bucket_versioning.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_object.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_object_url.rb +1 -1
- data/lib/fog/aws/requests/{s3 → storage}/put_request_payment.rb +1 -1
- data/lib/fog/aws/s3.rb +8 -205
- data/lib/fog/aws/simpledb.rb +10 -13
- data/lib/fog/aws/storage.rb +209 -0
- data/lib/fog/bin.rb +59 -50
- data/lib/fog/bluebox.rb +9 -78
- data/lib/fog/bluebox/bin.rb +10 -28
- data/lib/fog/bluebox/compute.rb +87 -0
- data/lib/fog/bluebox/models/compute/flavor.rb +45 -0
- data/lib/fog/bluebox/models/compute/flavors.rb +28 -0
- data/lib/fog/bluebox/models/compute/image.rb +19 -0
- data/lib/fog/bluebox/models/compute/images.rb +28 -0
- data/lib/fog/bluebox/models/compute/server.rb +81 -0
- data/lib/fog/bluebox/models/compute/servers.rb +29 -0
- data/lib/fog/bluebox/requests/compute/create_block.rb +41 -0
- data/lib/fog/bluebox/requests/compute/destroy_block.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_block.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_blocks.rb +36 -0
- data/lib/fog/bluebox/requests/compute/get_product.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_products.rb +33 -0
- data/lib/fog/bluebox/requests/compute/get_template.rb +34 -0
- data/lib/fog/bluebox/requests/compute/get_templates.rb +34 -0
- data/lib/fog/bluebox/requests/compute/reboot_block.rb +35 -0
- data/lib/fog/go_grid.rb +9 -88
- data/lib/fog/go_grid/bin.rb +17 -22
- data/lib/fog/go_grid/compute.rb +96 -0
- data/lib/fog/go_grid/requests/compute/common_lookup_list.rb +36 -0
- data/lib/fog/go_grid/requests/compute/grid_image_list.rb +39 -0
- data/lib/fog/go_grid/requests/compute/grid_ip_list.rb +38 -0
- data/lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb +36 -0
- data/lib/fog/go_grid/requests/compute/grid_server_add.rb +44 -0
- data/lib/fog/go_grid/requests/compute/grid_server_delete.rb +33 -0
- data/lib/fog/go_grid/requests/compute/grid_server_get.rb +33 -0
- data/lib/fog/go_grid/requests/compute/grid_server_list.rb +38 -0
- data/lib/fog/go_grid/requests/compute/grid_server_power.rb +34 -0
- data/lib/fog/linode.rb +10 -71
- data/lib/fog/linode/bin.rb +17 -22
- data/lib/fog/linode/compute.rb +79 -0
- data/lib/fog/linode/requests/compute/avail_datacenters.rb +31 -0
- data/lib/fog/linode/requests/compute/avail_distributions.rb +38 -0
- data/lib/fog/linode/requests/compute/avail_kernels.rb +36 -0
- data/lib/fog/linode/requests/compute/avail_linodeplans.rb +35 -0
- data/lib/fog/linode/requests/compute/avail_stackscripts.rb +37 -0
- data/lib/fog/linode/requests/compute/linode_create.rb +41 -0
- data/lib/fog/linode/requests/compute/linode_delete.rb +36 -0
- data/lib/fog/linode/requests/compute/linode_list.rb +38 -0
- data/lib/fog/linode/requests/compute/linode_reboot.rb +36 -0
- data/lib/fog/local.rb +10 -51
- data/lib/fog/local/bin.rb +17 -26
- data/lib/fog/local/models/storage/directories.rb +33 -0
- data/lib/fog/local/models/storage/directory.rb +52 -0
- data/lib/fog/local/models/storage/file.rb +60 -0
- data/lib/fog/local/models/storage/files.rb +73 -0
- data/lib/fog/local/storage.rb +58 -0
- data/lib/fog/model.rb +1 -1
- data/lib/fog/new_servers.rb +9 -80
- data/lib/fog/new_servers/bin.rb +17 -22
- data/lib/fog/new_servers/compute.rb +88 -0
- data/lib/fog/new_servers/requests/compute/add_server.rb +41 -0
- data/lib/fog/new_servers/requests/compute/cancel_server.rb +38 -0
- data/lib/fog/new_servers/requests/compute/get_server.rb +44 -0
- data/lib/fog/new_servers/requests/compute/list_images.rb +35 -0
- data/lib/fog/new_servers/requests/compute/list_plans.rb +38 -0
- data/lib/fog/new_servers/requests/compute/list_servers.rb +44 -0
- data/lib/fog/new_servers/requests/compute/reboot_server.rb +32 -0
- data/lib/fog/provider.rb +18 -0
- data/lib/fog/rackspace.rb +8 -3
- data/lib/fog/rackspace/bin.rb +26 -41
- data/lib/fog/rackspace/compute.rb +107 -0
- data/lib/fog/rackspace/files.rb +9 -130
- data/lib/fog/rackspace/models/{servers → compute}/flavor.rb +1 -1
- data/lib/fog/rackspace/models/{servers → compute}/flavors.rb +4 -10
- data/lib/fog/rackspace/models/{servers → compute}/image.rb +4 -4
- data/lib/fog/rackspace/models/{servers → compute}/images.rb +4 -12
- data/lib/fog/rackspace/models/{servers → compute}/server.rb +20 -16
- data/lib/fog/rackspace/models/{servers → compute}/servers.rb +5 -11
- data/lib/fog/rackspace/models/{files → storage}/directories.rb +4 -10
- data/lib/fog/rackspace/models/{files → storage}/directory.rb +4 -4
- data/lib/fog/rackspace/models/{files → storage}/file.rb +6 -6
- data/lib/fog/rackspace/models/{files → storage}/files.rb +11 -15
- data/lib/fog/rackspace/requests/{servers → compute}/create_image.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/create_server.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/delete_image.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/delete_server.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/get_flavor_details.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/get_image_details.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/get_server_details.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_flavors.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_flavors_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_images.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_images_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_private_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_public_addresses.rb +2 -2
- data/lib/fog/rackspace/requests/{servers → compute}/list_servers.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/list_servers_detail.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/reboot_server.rb +1 -1
- data/lib/fog/rackspace/requests/{servers → compute}/update_server.rb +2 -2
- data/lib/fog/rackspace/requests/{files → storage}/delete_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/delete_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_containers.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/get_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_containers.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/head_object.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/put_container.rb +1 -1
- data/lib/fog/rackspace/requests/{files → storage}/put_object.rb +1 -1
- data/lib/fog/rackspace/servers.rb +9 -104
- data/lib/fog/rackspace/storage.rb +151 -0
- data/lib/fog/service.rb +111 -59
- data/lib/fog/slicehost.rb +9 -83
- data/lib/fog/slicehost/bin.rb +17 -34
- data/lib/fog/slicehost/compute.rb +91 -0
- data/lib/fog/slicehost/models/compute/flavor.rb +45 -0
- data/lib/fog/slicehost/models/compute/flavors.rb +28 -0
- data/lib/fog/slicehost/models/compute/image.rb +17 -0
- data/lib/fog/slicehost/models/compute/images.rb +27 -0
- data/lib/fog/slicehost/models/compute/server.rb +64 -0
- data/lib/fog/slicehost/models/compute/servers.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/create_slice.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/get_backups.rb +32 -0
- data/lib/fog/slicehost/parsers/compute/get_flavor.rb +26 -0
- data/lib/fog/slicehost/parsers/compute/get_flavors.rb +30 -0
- data/lib/fog/slicehost/parsers/compute/get_image.rb +26 -0
- data/lib/fog/slicehost/parsers/compute/get_images.rb +30 -0
- data/lib/fog/slicehost/parsers/compute/get_slice.rb +31 -0
- data/lib/fog/slicehost/parsers/compute/get_slices.rb +35 -0
- data/lib/fog/slicehost/requests/compute/create_slice.rb +49 -0
- data/lib/fog/slicehost/requests/compute/delete_slice.rb +45 -0
- data/lib/fog/slicehost/requests/compute/get_backups.rb +37 -0
- data/lib/fog/slicehost/requests/compute/get_flavor.rb +40 -0
- data/lib/fog/slicehost/requests/compute/get_flavors.rb +37 -0
- data/lib/fog/slicehost/requests/compute/get_image.rb +38 -0
- data/lib/fog/slicehost/requests/compute/get_images.rb +35 -0
- data/lib/fog/slicehost/requests/compute/get_slice.rb +46 -0
- data/lib/fog/slicehost/requests/compute/get_slices.rb +43 -0
- data/lib/fog/slicehost/requests/compute/reboot_slice.rb +44 -0
- data/lib/fog/ssh.rb +16 -7
- data/lib/fog/terremark/bin.rb +25 -33
- data/lib/fog/terremark/models/shared/address.rb +1 -1
- data/lib/fog/terremark/models/shared/task.rb +6 -6
- data/lib/fog/vcloud.rb +60 -36
- data/lib/fog/vcloud/bin.rb +2 -2
- data/lib/fog/vcloud/collection.rb +1 -1
- data/lib/fog/vcloud/generators.rb +1 -1
- data/lib/fog/vcloud/model.rb +1 -1
- data/lib/fog/vcloud/models/vdc.rb +1 -1
- data/lib/fog/vcloud/models/vdcs.rb +3 -9
- data/lib/fog/vcloud/requests/get_network.rb +1 -1
- data/lib/fog/vcloud/requests/get_organization.rb +1 -1
- data/lib/fog/vcloud/requests/get_vdc.rb +1 -1
- data/lib/fog/vcloud/requests/get_versions.rb +1 -1
- data/lib/fog/vcloud/requests/login.rb +1 -1
- data/lib/fog/vcloud/terremark/ecloud.rb +19 -14
- data/lib/fog/vcloud/terremark/ecloud/models/catalog.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb +4 -8
- data/lib/fog/vcloud/terremark/ecloud/models/ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/ips.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/network.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/networks.rb +4 -8
- data/lib/fog/vcloud/terremark/ecloud/models/node.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/nodes.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb +4 -14
- data/lib/fog/vcloud/terremark/ecloud/models/server.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/models/servers.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/task.rb +3 -3
- data/lib/fog/vcloud/terremark/ecloud/models/tasks.rb +4 -2
- data/lib/fog/vcloud/terremark/ecloud/models/vdc.rb +2 -2
- data/lib/fog/vcloud/terremark/ecloud/models/vdcs.rb +25 -15
- data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/add_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/clone_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acl.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_firewall_acls.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_node.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vapp_template.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/instantiate_vapp_template.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_off.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_on.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb +4 -4
- data/lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb +4 -4
- data/lib/fog/vcloud/terremark/vcloud.rb +9 -5
- data/lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb +4 -4
- data/spec/aws/models/{ec2 → compute}/address_spec.rb +12 -12
- data/spec/aws/models/compute/addresses_spec.rb +70 -0
- data/spec/aws/models/{ec2 → compute}/flavors_spec.rb +2 -2
- data/spec/aws/models/{ec2 → compute}/key_pair_spec.rb +12 -12
- data/spec/aws/models/compute/key_pairs_spec.rb +71 -0
- data/spec/aws/models/{ec2 → compute}/security_group_spec.rb +12 -12
- data/spec/aws/models/compute/security_groups_spec.rb +71 -0
- data/spec/aws/models/{ec2 → compute}/server_spec.rb +9 -9
- data/spec/aws/models/{ec2 → compute}/servers_spec.rb +2 -2
- data/spec/aws/models/{ec2 → compute}/snapshot_spec.rb +7 -7
- data/spec/aws/models/{ec2 → compute}/snapshots_spec.rb +12 -12
- data/spec/aws/models/{ec2 → compute}/volume_spec.rb +16 -16
- data/spec/aws/models/compute/volumes_spec.rb +71 -0
- data/spec/aws/models/storage/directories_spec.rb +49 -0
- data/spec/aws/models/{s3 → storage}/directory_spec.rb +13 -13
- data/spec/aws/models/{s3 → storage}/file_spec.rb +6 -6
- data/spec/aws/models/{s3 → storage}/files_spec.rb +6 -6
- data/spec/aws/requests/{ec2 → compute}/describe_images_spec.rb +4 -4
- data/spec/aws/requests/s3/copy_object_spec.rb +12 -12
- data/spec/aws/requests/s3/delete_bucket_spec.rb +9 -9
- data/spec/aws/requests/s3/delete_object_spec.rb +9 -9
- data/spec/aws/requests/s3/get_bucket_location_spec.rb +5 -5
- data/spec/aws/requests/s3/get_bucket_spec.rb +13 -13
- data/spec/aws/requests/s3/get_object_spec.rb +10 -10
- data/spec/aws/requests/s3/get_request_payment_spec.rb +5 -5
- data/spec/aws/requests/s3/get_service_spec.rb +6 -6
- data/spec/aws/requests/s3/head_object_spec.rb +6 -6
- data/spec/aws/requests/s3/put_bucket_spec.rb +4 -4
- data/spec/aws/requests/s3/put_object_spec.rb +12 -12
- data/spec/aws/requests/s3/put_request_payment_spec.rb +5 -5
- data/spec/{rackspace/models/servers → bluebox/models/compute}/flavors_spec.rb +3 -3
- data/spec/bluebox/models/{server_spec.rb → compute/server_spec.rb} +4 -4
- data/spec/bluebox/models/{servers_spec.rb → compute/servers_spec.rb} +4 -4
- data/spec/rackspace/models/compute/flavors_spec.rb +14 -0
- data/spec/rackspace/models/{servers → compute}/server_spec.rb +4 -4
- data/spec/rackspace/models/compute/servers_spec.rb +22 -0
- data/spec/rackspace/requests/{files → storage}/delete_container_spec.rb +5 -5
- data/spec/rackspace/requests/storage/delete_object_spec.rb +37 -0
- data/spec/rackspace/requests/{files → storage}/get_container_spec.rb +9 -9
- data/spec/rackspace/requests/{files → storage}/get_containers_spec.rb +4 -4
- data/spec/rackspace/requests/storage/get_object_spec.rb +21 -0
- data/spec/rackspace/requests/storage/head_container_spec.rb +30 -0
- data/spec/rackspace/requests/storage/head_containers_spec.rb +19 -0
- data/spec/rackspace/requests/storage/head_object_spec.rb +21 -0
- data/spec/rackspace/requests/{files → storage}/put_container_spec.rb +3 -3
- data/spec/rackspace/requests/storage/put_object_spec.rb +20 -0
- data/spec/slicehost/models/compute/flavors_spec.rb +14 -0
- data/spec/slicehost/models/{server_spec.rb → compute/server_spec.rb} +8 -8
- data/spec/{rackspace/models/servers → slicehost/models/compute}/servers_spec.rb +4 -4
- data/spec/spec_helper.rb +14 -14
- data/spec/vcloud/models/vdc_spec.rb +1 -1
- data/spec/vcloud/spec_helper.rb +7 -7
- data/spec/vcloud/terremark/ecloud/models/internet_service_spec.rb +1 -1
- data/tests/aws/helper.rb +8 -8
- data/tests/aws/models/storage/directory_tests.rb +8 -0
- data/tests/aws/requests/compute/address_tests.rb +80 -0
- data/tests/aws/requests/{ec2 → compute}/availability_zone_tests.rb +5 -5
- data/tests/aws/requests/{ec2 → compute}/instance_tests.rb +17 -17
- data/tests/aws/requests/{ec2 → compute}/key_pair_tests.rb +12 -12
- data/tests/aws/requests/{ec2 → compute}/region_tests.rb +5 -5
- data/tests/aws/requests/{ec2 → compute}/security_group_tests.rb +31 -31
- data/tests/aws/requests/{ec2 → compute}/snapshot_tests.rb +12 -12
- data/tests/aws/requests/{ec2 → compute}/volume_tests.rb +23 -23
- data/tests/bluebox/helper.rb +13 -9
- data/tests/bluebox/requests/{block_tests.rb → compute/block_tests.rb} +16 -17
- data/tests/bluebox/requests/compute/product_tests.rb +25 -0
- data/tests/bluebox/requests/{template_tests.rb → compute/template_tests.rb} +5 -5
- data/tests/linode/helper.rb +12 -8
- data/tests/linode/requests/{datacenter_tests.rb → compute/datacenter_tests.rb} +3 -3
- data/tests/linode/requests/{distribution_tests.rb → compute/distribution_tests.rb} +4 -4
- data/tests/linode/requests/{linode_tests.rb → compute/linode_tests.rb} +13 -13
- data/tests/linode/requests/{linodeplans_tests.rb → compute/linodeplans_tests.rb} +4 -4
- data/tests/rackspace/helper.rb +5 -13
- data/tests/rackspace/requests/compute/address_tests.rb +40 -0
- data/tests/rackspace/requests/compute/flavor_tests.rb +34 -0
- data/tests/rackspace/requests/compute/image_tests.rb +62 -0
- data/tests/rackspace/requests/{servers → compute}/server_tests.rb +20 -20
- data/tests/slicehost/helper.rb +3 -3
- data/tests/slicehost/requests/{backup_tests.rb → compute/backup_tests.rb} +2 -2
- data/tests/slicehost/requests/{flavor_tests.rb → compute/flavor_tests.rb} +4 -4
- data/tests/slicehost/requests/{image_tests.rb → compute/image_tests.rb} +4 -4
- data/tests/slicehost/requests/{slice_tests.rb → compute/slice_tests.rb} +12 -12
- metadata +304 -290
- data/lib/fog/aws/models/ec2/flavors.rb +0 -43
- data/lib/fog/aws/models/ec2/image.rb +0 -44
- data/lib/fog/aws/models/ec2/key_pair.rb +0 -34
- data/lib/fog/aws/models/ec2/servers.rb +0 -49
- data/lib/fog/bluebox/models/flavor.rb +0 -43
- data/lib/fog/bluebox/models/flavors.rb +0 -32
- data/lib/fog/bluebox/models/image.rb +0 -17
- data/lib/fog/bluebox/models/images.rb +0 -34
- data/lib/fog/bluebox/models/server.rb +0 -79
- data/lib/fog/bluebox/models/servers.rb +0 -33
- data/lib/fog/bluebox/requests/create_block.rb +0 -39
- data/lib/fog/bluebox/requests/destroy_block.rb +0 -32
- data/lib/fog/bluebox/requests/get_block.rb +0 -32
- data/lib/fog/bluebox/requests/get_blocks.rb +0 -34
- data/lib/fog/bluebox/requests/get_product.rb +0 -32
- data/lib/fog/bluebox/requests/get_products.rb +0 -31
- data/lib/fog/bluebox/requests/get_template.rb +0 -32
- data/lib/fog/bluebox/requests/get_templates.rb +0 -32
- data/lib/fog/bluebox/requests/reboot_block.rb +0 -33
- data/lib/fog/go_grid/requests/common_lookup_list.rb +0 -34
- data/lib/fog/go_grid/requests/grid_image_list.rb +0 -37
- data/lib/fog/go_grid/requests/grid_ip_list.rb +0 -36
- data/lib/fog/go_grid/requests/grid_loadbalancer_list.rb +0 -34
- data/lib/fog/go_grid/requests/grid_server_add.rb +0 -42
- data/lib/fog/go_grid/requests/grid_server_delete.rb +0 -31
- data/lib/fog/go_grid/requests/grid_server_get.rb +0 -31
- data/lib/fog/go_grid/requests/grid_server_list.rb +0 -36
- data/lib/fog/go_grid/requests/grid_server_power.rb +0 -32
- data/lib/fog/linode/requests/avail_datacenters.rb +0 -29
- data/lib/fog/linode/requests/avail_distributions.rb +0 -36
- data/lib/fog/linode/requests/avail_kernels.rb +0 -34
- data/lib/fog/linode/requests/avail_linodeplans.rb +0 -33
- data/lib/fog/linode/requests/avail_stackscripts.rb +0 -35
- data/lib/fog/linode/requests/linode_create.rb +0 -39
- data/lib/fog/linode/requests/linode_delete.rb +0 -34
- data/lib/fog/linode/requests/linode_list.rb +0 -36
- data/lib/fog/linode/requests/linode_reboot.rb +0 -34
- data/lib/fog/local/models/directories.rb +0 -37
- data/lib/fog/local/models/directory.rb +0 -50
- data/lib/fog/local/models/file.rb +0 -58
- data/lib/fog/local/models/files.rb +0 -74
- data/lib/fog/new_servers/requests/add_server.rb +0 -39
- data/lib/fog/new_servers/requests/cancel_server.rb +0 -36
- data/lib/fog/new_servers/requests/get_server.rb +0 -42
- data/lib/fog/new_servers/requests/list_images.rb +0 -33
- data/lib/fog/new_servers/requests/list_plans.rb +0 -36
- data/lib/fog/new_servers/requests/list_servers.rb +0 -43
- data/lib/fog/new_servers/requests/reboot_server.rb +0 -30
- data/lib/fog/slicehost/models/flavor.rb +0 -43
- data/lib/fog/slicehost/models/flavors.rb +0 -31
- data/lib/fog/slicehost/models/image.rb +0 -15
- data/lib/fog/slicehost/models/images.rb +0 -33
- data/lib/fog/slicehost/models/server.rb +0 -62
- data/lib/fog/slicehost/models/servers.rb +0 -35
- data/lib/fog/slicehost/parsers/create_slice.rb +0 -29
- data/lib/fog/slicehost/parsers/get_backups.rb +0 -30
- data/lib/fog/slicehost/parsers/get_flavor.rb +0 -24
- data/lib/fog/slicehost/parsers/get_flavors.rb +0 -28
- data/lib/fog/slicehost/parsers/get_image.rb +0 -24
- data/lib/fog/slicehost/parsers/get_images.rb +0 -28
- data/lib/fog/slicehost/parsers/get_slice.rb +0 -29
- data/lib/fog/slicehost/parsers/get_slices.rb +0 -33
- data/lib/fog/slicehost/requests/create_slice.rb +0 -47
- data/lib/fog/slicehost/requests/delete_slice.rb +0 -43
- data/lib/fog/slicehost/requests/get_backups.rb +0 -35
- data/lib/fog/slicehost/requests/get_flavor.rb +0 -38
- data/lib/fog/slicehost/requests/get_flavors.rb +0 -35
- data/lib/fog/slicehost/requests/get_image.rb +0 -36
- data/lib/fog/slicehost/requests/get_images.rb +0 -33
- data/lib/fog/slicehost/requests/get_slice.rb +0 -44
- data/lib/fog/slicehost/requests/get_slices.rb +0 -41
- data/lib/fog/slicehost/requests/reboot_slice.rb +0 -42
- data/lib/fog/vcloud/extension.rb +0 -37
- data/spec/aws/models/ec2/addresses_spec.rb +0 -70
- data/spec/aws/models/ec2/key_pairs_spec.rb +0 -71
- data/spec/aws/models/ec2/security_groups_spec.rb +0 -71
- data/spec/aws/models/ec2/volumes_spec.rb +0 -71
- data/spec/aws/models/s3/directories_spec.rb +0 -49
- data/spec/bluebox/models/flavors_spec.rb +0 -14
- data/spec/rackspace/requests/files/delete_object_spec.rb +0 -37
- data/spec/rackspace/requests/files/get_object_spec.rb +0 -21
- data/spec/rackspace/requests/files/head_container_spec.rb +0 -30
- data/spec/rackspace/requests/files/head_containers_spec.rb +0 -19
- data/spec/rackspace/requests/files/head_object_spec.rb +0 -21
- data/spec/rackspace/requests/files/put_object_spec.rb +0 -20
- data/spec/slicehost/models/flavors_spec.rb +0 -14
- data/spec/slicehost/models/servers_spec.rb +0 -22
- data/tests/aws/models/s3/directory_tests.rb +0 -8
- data/tests/aws/requests/ec2/address_tests.rb +0 -80
- data/tests/bluebox/requests/product_tests.rb +0 -25
- data/tests/rackspace/requests/servers/address_tests.rb +0 -40
- data/tests/rackspace/requests/servers/flavor_tests.rb +0 -34
- data/tests/rackspace/requests/servers/image_tests.rb +0 -59
@@ -1,110 +1,15 @@
|
|
1
1
|
module Fog
|
2
2
|
module Rackspace
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
model 'image'
|
12
|
-
model 'images'
|
13
|
-
model 'server'
|
14
|
-
model 'servers'
|
15
|
-
|
16
|
-
request_path 'fog/rackspace/requests/servers'
|
17
|
-
request 'create_image'
|
18
|
-
request 'create_server'
|
19
|
-
request 'delete_image'
|
20
|
-
request 'delete_server'
|
21
|
-
request 'get_flavor_details'
|
22
|
-
request 'get_image_details'
|
23
|
-
request 'get_server_details'
|
24
|
-
request 'list_addresses'
|
25
|
-
request 'list_private_addresses'
|
26
|
-
request 'list_public_addresses'
|
27
|
-
request 'list_flavors'
|
28
|
-
request 'list_flavors_detail'
|
29
|
-
request 'list_images'
|
30
|
-
request 'list_images_detail'
|
31
|
-
request 'list_servers'
|
32
|
-
request 'list_servers_detail'
|
33
|
-
request 'reboot_server'
|
34
|
-
request 'update_server'
|
35
|
-
|
36
|
-
class Mock
|
37
|
-
include Collections
|
38
|
-
|
39
|
-
def self.data
|
40
|
-
@data ||= Hash.new do |hash, key|
|
41
|
-
hash[key] = {
|
42
|
-
:last_modified => {
|
43
|
-
:images => {},
|
44
|
-
:servers => {}
|
45
|
-
},
|
46
|
-
:images => {},
|
47
|
-
:servers => {}
|
48
|
-
}
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
|
-
def self.reset_data(keys=data.keys)
|
53
|
-
for key in [*keys]
|
54
|
-
data.delete(key)
|
55
|
-
end
|
56
|
-
end
|
57
|
-
|
58
|
-
def initialize(options={})
|
59
|
-
@rackspace_username = options[:rackspace_username]
|
60
|
-
@data = self.class.data[@rackspace_username]
|
61
|
-
end
|
62
|
-
|
3
|
+
class Servers
|
4
|
+
|
5
|
+
def self.new(attributes = {})
|
6
|
+
location = caller.first
|
7
|
+
warning = "[yellow][WARN] Fog::Rackspace::Servers#new is deprecated, use Fog::Rackspace::Compute#new instead[/]"
|
8
|
+
warning << " [light_black](" << location << ")[/] "
|
9
|
+
Formatador.display_line(warning)
|
10
|
+
Fog::Rackspace::Compute.new(attributes)
|
63
11
|
end
|
64
12
|
|
65
|
-
class Real
|
66
|
-
include Collections
|
67
|
-
|
68
|
-
def initialize(options={})
|
69
|
-
credentials = Fog::Rackspace.authenticate(options)
|
70
|
-
@auth_token = credentials['X-Auth-Token']
|
71
|
-
uri = URI.parse(credentials['X-Server-Management-Url'])
|
72
|
-
@host = uri.host
|
73
|
-
@path = uri.path
|
74
|
-
@port = uri.port
|
75
|
-
@scheme = uri.scheme
|
76
|
-
@connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
|
77
|
-
end
|
78
|
-
|
79
|
-
def reload
|
80
|
-
@connection.reset
|
81
|
-
end
|
82
|
-
|
83
|
-
def request(params)
|
84
|
-
begin
|
85
|
-
response = @connection.request(params.merge!({
|
86
|
-
:headers => {
|
87
|
-
'Content-Type' => 'application/json',
|
88
|
-
'X-Auth-Token' => @auth_token
|
89
|
-
}.merge!(params[:headers] || {}),
|
90
|
-
:host => @host,
|
91
|
-
:path => "#{@path}/#{params[:path]}"
|
92
|
-
}))
|
93
|
-
rescue Excon::Errors::Error => error
|
94
|
-
raise case error
|
95
|
-
when Excon::Errors::NotFound
|
96
|
-
Fog::Rackspace::Servers::NotFound.slurp(error)
|
97
|
-
else
|
98
|
-
error
|
99
|
-
end
|
100
|
-
end
|
101
|
-
unless response.body.empty?
|
102
|
-
response.body = JSON.parse(response.body)
|
103
|
-
end
|
104
|
-
response
|
105
|
-
end
|
106
|
-
|
107
|
-
end
|
108
13
|
end
|
109
14
|
end
|
110
|
-
end
|
15
|
+
end
|
@@ -0,0 +1,151 @@
|
|
1
|
+
module Fog
|
2
|
+
module Rackspace
|
3
|
+
class Storage < Fog::Service
|
4
|
+
|
5
|
+
requires :rackspace_api_key, :rackspace_username
|
6
|
+
|
7
|
+
model_path 'fog/rackspace/models/storage'
|
8
|
+
model :directory
|
9
|
+
collection :directories
|
10
|
+
model :file
|
11
|
+
collection :files
|
12
|
+
|
13
|
+
request_path 'fog/rackspace/requests/storage'
|
14
|
+
request :delete_container
|
15
|
+
request :delete_object
|
16
|
+
request :get_container
|
17
|
+
request :get_containers
|
18
|
+
request :get_object
|
19
|
+
request :head_container
|
20
|
+
request :head_containers
|
21
|
+
request :head_object
|
22
|
+
request :put_container
|
23
|
+
request :put_object
|
24
|
+
|
25
|
+
module Utils
|
26
|
+
|
27
|
+
def parse_data(data)
|
28
|
+
metadata = {
|
29
|
+
:body => nil,
|
30
|
+
:headers => {}
|
31
|
+
}
|
32
|
+
|
33
|
+
if data.is_a?(String)
|
34
|
+
metadata[:body] = data
|
35
|
+
metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
|
36
|
+
else
|
37
|
+
filename = ::File.basename(data.path)
|
38
|
+
unless (mime_types = MIME::Types.of(filename)).empty?
|
39
|
+
metadata[:headers]['Content-Type'] = mime_types.first.content_type
|
40
|
+
end
|
41
|
+
metadata[:body] = data.read
|
42
|
+
metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
|
43
|
+
end
|
44
|
+
# metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
|
45
|
+
metadata
|
46
|
+
end
|
47
|
+
|
48
|
+
end
|
49
|
+
|
50
|
+
class Mock
|
51
|
+
include Utils
|
52
|
+
|
53
|
+
def self.data
|
54
|
+
@data ||= Hash.new do |hash, key|
|
55
|
+
hash[key] = {}
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def self.reset_data(keys=data.keys)
|
60
|
+
for key in [*keys]
|
61
|
+
data.delete(key)
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
def initialize(options={})
|
66
|
+
@rackspace_username = options[:rackspace_username]
|
67
|
+
@data = self.class.data[@rackspace_username]
|
68
|
+
end
|
69
|
+
|
70
|
+
end
|
71
|
+
|
72
|
+
class Real
|
73
|
+
include Utils
|
74
|
+
|
75
|
+
def initialize(options={})
|
76
|
+
credentials = Fog::Rackspace.authenticate(options)
|
77
|
+
@auth_token = credentials['X-Auth-Token']
|
78
|
+
|
79
|
+
if(credentials['X-CDN-Management-Url'])
|
80
|
+
cdn_uri = URI.parse(credentials['X-CDN-Management-Url'])
|
81
|
+
@cdn_host = cdn_uri.host
|
82
|
+
@cdn_path = cdn_uri.path
|
83
|
+
@cdn_port = cdn_uri.port
|
84
|
+
@cdn_scheme = cdn_uri.scheme
|
85
|
+
@cdn_connection = Fog::Connection.new("#{@cdn_scheme}://#{@cdn_host}:#{@cdn_port}", options[:persistent])
|
86
|
+
end
|
87
|
+
|
88
|
+
storage_uri = URI.parse(credentials['X-Storage-Url'])
|
89
|
+
@storage_host = storage_uri.host
|
90
|
+
@storage_path = storage_uri.path
|
91
|
+
@storage_port = storage_uri.port
|
92
|
+
@storage_scheme = storage_uri.scheme
|
93
|
+
@storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}", options[:persistent])
|
94
|
+
end
|
95
|
+
|
96
|
+
def reload
|
97
|
+
@connection.reset
|
98
|
+
end
|
99
|
+
|
100
|
+
def cdn_request(params)
|
101
|
+
begin
|
102
|
+
response = @cdn_connection.request(params.merge!({
|
103
|
+
:headers => {
|
104
|
+
'Content-Type' => 'application/json',
|
105
|
+
'X-Auth-Token' => @auth_token
|
106
|
+
}.merge!(params[:headers] || {}),
|
107
|
+
:host => @cdn_host,
|
108
|
+
:path => "#{@cdn_path}/#{params[:path]}",
|
109
|
+
}))
|
110
|
+
rescue Excon::Errors::Error => error
|
111
|
+
raise case error
|
112
|
+
when Excon::Errors::NotFound
|
113
|
+
Fog::Rackspace::Storage::NotFound.slurp(error)
|
114
|
+
else
|
115
|
+
error
|
116
|
+
end
|
117
|
+
end
|
118
|
+
if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
|
119
|
+
response.body = JSON.parse(response.body)
|
120
|
+
end
|
121
|
+
response
|
122
|
+
end
|
123
|
+
|
124
|
+
def storage_request(params, parse_json = true, &block)
|
125
|
+
begin
|
126
|
+
response = @storage_connection.request(params.merge!({
|
127
|
+
:headers => {
|
128
|
+
'Content-Type' => 'application/json',
|
129
|
+
'X-Auth-Token' => @auth_token
|
130
|
+
}.merge!(params[:headers] || {}),
|
131
|
+
:host => @storage_host,
|
132
|
+
:path => "#{@storage_path}/#{params[:path]}",
|
133
|
+
}), &block)
|
134
|
+
rescue Excon::Errors::Error => error
|
135
|
+
raise case error
|
136
|
+
when Excon::Errors::NotFound
|
137
|
+
Fog::Rackspace::Storage::NotFound.slurp(error)
|
138
|
+
else
|
139
|
+
error
|
140
|
+
end
|
141
|
+
end
|
142
|
+
if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
|
143
|
+
response.body = JSON.parse(response.body)
|
144
|
+
end
|
145
|
+
response
|
146
|
+
end
|
147
|
+
|
148
|
+
end
|
149
|
+
end
|
150
|
+
end
|
151
|
+
end
|
data/lib/fog/service.rb
CHANGED
@@ -1,85 +1,137 @@
|
|
1
1
|
module Fog
|
2
|
-
|
2
|
+
class Service
|
3
3
|
|
4
|
-
|
5
|
-
|
6
|
-
other.module_eval <<-EOS, __FILE__, __LINE__
|
7
|
-
class Error < Fog::Errors::Error; end
|
8
|
-
class NotFound < Fog::Errors::NotFound; end
|
4
|
+
class Error < Fog::Errors::Error; end
|
5
|
+
class NotFound < Fog::Errors::NotFound; end
|
9
6
|
|
10
|
-
|
7
|
+
module Collections
|
11
8
|
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
9
|
+
def collections
|
10
|
+
service.collections
|
11
|
+
end
|
12
|
+
|
13
|
+
def requests
|
14
|
+
service.requests
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
|
19
|
+
class << self
|
20
|
+
|
21
|
+
def inherited(child)
|
22
|
+
child.class_eval <<-EOS, __FILE__, __LINE__
|
23
|
+
module Collections
|
24
|
+
include Fog::Service::Collections
|
25
|
+
|
26
|
+
def service
|
27
|
+
#{child}
|
22
28
|
end
|
23
29
|
end
|
24
30
|
|
25
|
-
|
26
|
-
|
27
|
-
require [@model_path, model].join('/')
|
28
|
-
end
|
29
|
-
for request in requests
|
30
|
-
require [@request_path, request].join('/')
|
31
|
-
end
|
32
|
-
@required = true
|
31
|
+
def self.service
|
32
|
+
#{child}
|
33
33
|
end
|
34
|
+
EOS
|
35
|
+
end
|
36
|
+
|
37
|
+
def new(options={})
|
38
|
+
if Fog.bin
|
39
|
+
default_credentials = Fog.credentials.reject {|key, value| !requirements.include?(key)}
|
40
|
+
options = default_credentials.merge(options)
|
41
|
+
end
|
34
42
|
|
35
|
-
|
36
|
-
|
43
|
+
missing = []
|
44
|
+
for requirement in requirements
|
45
|
+
missing << requirement unless options[requirement]
|
46
|
+
end
|
47
|
+
unless missing.empty?
|
48
|
+
if missing.length == 1
|
49
|
+
raise(ArgumentError, [missing.first, "is required for this service"].join(' '))
|
37
50
|
else
|
38
|
-
|
51
|
+
raise(ArgumentError, [missing[0...-1].join(", "), 'and', missing[-1], 'are required for this service'].join(' '))
|
39
52
|
end
|
53
|
+
end
|
54
|
+
|
55
|
+
setup_requirements
|
56
|
+
|
57
|
+
if Fog.mocking?
|
58
|
+
service::Mock.send(:include, service::Collections)
|
59
|
+
service::Mock.new(options)
|
60
|
+
else
|
61
|
+
service::Real.send(:include, service::Collections)
|
62
|
+
service::Real.new(options)
|
63
|
+
end
|
64
|
+
end
|
40
65
|
|
41
|
-
|
42
|
-
|
66
|
+
def setup_requirements
|
67
|
+
if superclass.respond_to?(:setup_requirements)
|
68
|
+
superclass.setup_requirements
|
69
|
+
end
|
70
|
+
|
71
|
+
unless @required
|
72
|
+
for collection in collections
|
73
|
+
require [@model_path, collection].join('/')
|
74
|
+
constant = collection.to_s.split('_').map {|characters| characters[0...1].upcase << characters[1..-1]}.join('')
|
75
|
+
service::Collections.module_eval <<-EOS, __FILE__, __LINE__
|
76
|
+
def #{collection}(attributes = {})
|
77
|
+
#{service}::#{constant}.new({:connection => self}.merge(attributes))
|
78
|
+
end
|
79
|
+
EOS
|
80
|
+
end
|
81
|
+
for model in models
|
82
|
+
require [@model_path, model].join('/')
|
83
|
+
end
|
84
|
+
for request in requests
|
85
|
+
require [@request_path, request].join('/')
|
43
86
|
end
|
44
|
-
|
87
|
+
@required = true
|
45
88
|
end
|
46
|
-
|
47
|
-
end
|
89
|
+
end
|
48
90
|
|
49
|
-
|
50
|
-
|
51
|
-
|
91
|
+
def model_path(new_path)
|
92
|
+
@model_path = new_path
|
93
|
+
end
|
52
94
|
|
53
|
-
|
54
|
-
|
55
|
-
|
95
|
+
def collection(new_collection)
|
96
|
+
collections << new_collection
|
97
|
+
end
|
56
98
|
|
57
|
-
|
58
|
-
|
59
|
-
|
99
|
+
def collections
|
100
|
+
@collections ||= []
|
101
|
+
end
|
60
102
|
|
61
|
-
|
62
|
-
|
63
|
-
|
103
|
+
def model(new_model)
|
104
|
+
models << new_model
|
105
|
+
end
|
64
106
|
|
65
|
-
|
66
|
-
|
67
|
-
|
107
|
+
def models
|
108
|
+
@models ||= []
|
109
|
+
end
|
68
110
|
|
69
|
-
|
70
|
-
|
71
|
-
|
111
|
+
def request_path(new_path)
|
112
|
+
@request_path = new_path
|
113
|
+
end
|
72
114
|
|
73
|
-
|
74
|
-
|
75
|
-
|
115
|
+
def request(new_request)
|
116
|
+
requests << new_request
|
117
|
+
end
|
76
118
|
|
77
|
-
|
78
|
-
|
79
|
-
|
119
|
+
def requests
|
120
|
+
@requests ||= []
|
121
|
+
end
|
122
|
+
|
123
|
+
def requires(*args)
|
124
|
+
requirements.concat(args)
|
125
|
+
end
|
126
|
+
|
127
|
+
def requirements
|
128
|
+
@requirements ||= []
|
129
|
+
end
|
130
|
+
|
131
|
+
def reset_data(keys=Mock.data.keys)
|
132
|
+
Mock.reset_data(keys)
|
133
|
+
end
|
80
134
|
|
81
|
-
def reset_data(keys=Mock.data.keys)
|
82
|
-
Mock.reset_data(keys)
|
83
135
|
end
|
84
136
|
|
85
137
|
end
|