fog 0.1.5 → 0.1.6

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon', '>= 0.0.24'
+gem 'excon', '>= 0.0.25'
 gem 'formatador', ">= 0.0.10"
 gem 'json', ">= 0"
 gem 'mime-types', ">= 0"
@@ -9,5 +9,5 @@ gem 'net-ssh', ">= 0"
 gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
-gem 'shindo', '>= 0.1.2'
+gem 'shindo', '>= 0.1.4'
 gem 'builder', '>= 0'

data/Gemfile.lock

@@ -31,7 +31,7 @@ dependencies:
   excon: 
     group: 
     - :default
-    version: ">= 0.0.24"
+    version: ">= 0.0.25"
   builder: 
     group: 
     - :default
@@ -39,7 +39,7 @@ dependencies:
   shindo: 
     group: 
     - :default
-    version: ">= 0.1.2"
+    version: ">= 0.1.4"
   nokogiri: 
     group: 
     - :default
@@ -50,7 +50,7 @@ specs:
 - builder: 
     version: 2.1.2
 - excon: 
-    version: 0.0.24
+    version: 0.0.25
 - formatador: 
     version: 0.0.14
 - gestalt: 
@@ -60,7 +60,7 @@ specs:
 - mime-types: 
     version: "1.16"
 - net-ssh: 
-    version: 2.0.22
+    version: 2.0.23
 - nokogiri: 
     version: 1.4.2
 - rspec: 
@@ -68,8 +68,8 @@ specs:
 - ruby-hmac: 
     version: 0.4.0
 - shindo: 
-    version: 0.1.3
-hash: 4e55927c1be02ee00fc3353e71caecdebd9d4817
+    version: 0.1.4
+hash: 47be4240cdce9d626cc1834c503ca8e275e76307
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/README.rdoc

@@ -46,7 +46,7 @@ As an example, we'll try initializing and persisting a rackspace server:
   )
 
   # boot a gentoo server (flavor 1 = 256, image 3 = gentoo 2008.0)
-  server = connection.servers.new(:flavor_id => 1, :image_id => 3, :name => 'my_server')
+  server = connection.servers.create(:flavor_id => 1, :image_id => 3, :name => 'my_server')
 
   # wait for it to be ready to do stuff
   server.wait_for { ready? }
@@ -89,18 +89,21 @@ It will return an excon response, which has headers and body methods. Both give
 == Go forth and conquer
 
 That should give you some stuff to try and places to look.
+For a more in depth walk through, check out the {getting started guide}[http://wiki.github.com/geemus/fog/getting-started-with-fog].
 
 You should try out the (varying) support fog has for:
 * AWS [EC2, S3, SimpleDB]
 * Rackspace [Files, Servers]
 * Slicehost
 * Terremark vCloud Express
+* Blue Box Group [Blocks]
 
 Enjoy, and let me know what I can do to continue improving fog!
 
 * Follow {@geemus}[http://twitter.com/geemus] on Twitter.
 * See upcoming work in the {tracker}[http://www.pivotaltracker.com/projects/54635].
 * Report bugs in {issues}[http://github.com/geemus/fog/issues].
+* Learn about {contributing}[http://wiki.github.com/geemus/fog/contributors-guide].
 
 == Copyright
 

data/bin/fog

@@ -5,7 +5,7 @@ require 'yaml'
 require File.join('fog', 'credentials')
 require File.join('fog', 'bin')
 
-Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
+Fog.credential = ARGV.first  ? :"#{ARGV.first}" : :default
 unless Fog.credentials
   exit
 end
@@ -16,6 +16,7 @@ require File.join('fog', 'rackspace', 'bin')
 require File.join('fog', 'slicehost', 'bin')
 require File.join('fog', 'terremark', 'bin')
 require File.join('fog', 'vcloud', 'bin')
+require File.join('fog', 'bluebox', 'bin')
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)

data/examples/bluebox_create.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+# For example only - you'd want to use your own AMI id.
+unless defined?(GENTOO_AMI)
+  GENTOO_AMI = 'ami-5ee70037'
+end
+
+require 'rubygems'
+require 'fog'
+
+@bluebox_api_key = "CHANGEME"
+@aws_access_key_id = "CHANGEME"
+@aws_secret_access_key = "CHANGEME"
+
+@flavor_id = "94fd37a7-2606-47f7-84d5-9000deda52ae" # Block 1GB Virtual Server
+@image_id = "03807e08-a13d-44e4-b011-ebec7ef2c928"  # Ubuntu 10.04 x64 LTS
+
+# Grab our current list of servers
+@bbg_servers = Fog::Bluebox.new(:bluebox_api_key => @bluebox_api_key).servers
+@ec2_servers = Fog::AWS::EC2.new(:aws_access_key_id => @aws_access_key_id, :aws_secret_access_key => @aws_secret_access_key).servers
+
+# Create a new server.
+@server = @bbg_servers.new(:flavor_id => @flavor_id, :image_id => @image_id,
+                           :name => "My Server", :password => "MyPassword")
+
+# Save the server, triggering its creation
+@server.save
+
+if @server.status == 'error'
+  # The create failed - create a new server on Amazon instead
+  @server = @ec2_servers.new(:image_id => GENTOO_AMI)
+  @server.save
+end

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.1.5'
-  s.date              = '2010-05-27'
+  s.version           = '0.1.6'
+  s.date              = '2010-06-06'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
     benchs/params.rb
     benchs/parse_vs_push.rb
     bin/fog
+    examples/bluebox_create.rb
     fog.gemspec
     lib/fog.rb
     lib/fog/aws.rb
@@ -196,6 +197,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/s3/put_bucket_logging.rb
     lib/fog/aws/requests/s3/put_bucket_versioning.rb
     lib/fog/aws/requests/s3/put_object.rb
+    lib/fog/aws/requests/s3/put_object_url.rb
     lib/fog/aws/requests/s3/put_request_payment.rb
     lib/fog/aws/requests/simpledb/batch_put_attributes.rb
     lib/fog/aws/requests/simpledb/create_domain.rb
@@ -209,6 +211,23 @@ Gem::Specification.new do |s|
     lib/fog/aws/s3.rb
     lib/fog/aws/simpledb.rb
     lib/fog/bin.rb
+    lib/fog/bluebox.rb
+    lib/fog/bluebox/bin.rb
+    lib/fog/bluebox/models/flavor.rb
+    lib/fog/bluebox/models/flavors.rb
+    lib/fog/bluebox/models/image.rb
+    lib/fog/bluebox/models/images.rb
+    lib/fog/bluebox/models/server.rb
+    lib/fog/bluebox/models/servers.rb
+    lib/fog/bluebox/requests/create_block.rb
+    lib/fog/bluebox/requests/destroy_block.rb
+    lib/fog/bluebox/requests/get_block.rb
+    lib/fog/bluebox/requests/get_blocks.rb
+    lib/fog/bluebox/requests/get_product.rb
+    lib/fog/bluebox/requests/get_products.rb
+    lib/fog/bluebox/requests/get_template.rb
+    lib/fog/bluebox/requests/get_templates.rb
+    lib/fog/bluebox/requests/reboot_block.rb
     lib/fog/collection.rb
     lib/fog/connection.rb
     lib/fog/credentials.rb
@@ -369,9 +388,22 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/requests/login.rb
     lib/fog/vcloud/terremark/all.rb
     lib/fog/vcloud/terremark/ecloud.rb
+    lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/models/internet_services.rb
+    lib/fog/vcloud/terremark/ecloud/models/public_ip.rb
+    lib/fog/vcloud/terremark/ecloud/models/public_ips.rb
     lib/fog/vcloud/terremark/ecloud/models/vdc.rb
     lib/fog/vcloud/terremark/ecloud/models/vdcs.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/get_internet_services.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/get_public_ip.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/get_public_ips.rb
     lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
     lib/fog/vcloud/terremark/ecloud/requests/login.rb
     lib/fog/vcloud/terremark/vcloud.rb
@@ -416,6 +448,9 @@ Gem::Specification.new do |s|
     spec/aws/requests/simpledb/list_domains_spec.rb
     spec/aws/requests/simpledb/put_attributes_spec.rb
     spec/aws/requests/simpledb/select_spec.rb
+    spec/bluebox/models/flavors_spec.rb
+    spec/bluebox/models/server_spec.rb
+    spec/bluebox/models/servers_spec.rb
     spec/compact_progress_bar_formatter.rb
     spec/lorem.txt
     spec/rackspace/models/servers/flavors_spec.rb
@@ -446,8 +481,17 @@ Gem::Specification.new do |s|
     spec/vcloud/requests/get_versions_spec.rb
     spec/vcloud/requests/login_spec.rb
     spec/vcloud/spec_helper.rb
+    spec/vcloud/terremark/ecloud/models/internet_service_spec.rb
+    spec/vcloud/terremark/ecloud/models/internet_services_spec.rb
+    spec/vcloud/terremark/ecloud/models/public_ip_spec.rb
+    spec/vcloud/terremark/ecloud/models/public_ips_spec.rb
     spec/vcloud/terremark/ecloud/models/vdc_spec.rb
     spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
+    spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb
+    spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
     spec/vcloud/terremark/vcloud/requests/get_vdc_spec.rb
@@ -461,38 +505,22 @@ Gem::Specification.new do |s|
     tests/aws/requests/ec2/security_group_tests.rb
     tests/aws/requests/ec2/snapshot_tests.rb
     tests/aws/requests/ec2/volume_tests.rb
+    tests/bluebox/helper.rb
+    tests/bluebox/requests/block_tests.rb
+    tests/bluebox/requests/product_tests.rb
+    tests/bluebox/requests/template_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
     tests/rackspace/helper.rb
-    tests/rackspace/requests/servers/create_image_tests.rb
-    tests/rackspace/requests/servers/create_server_tests.rb
-    tests/rackspace/requests/servers/delete_image_tests.rb
-    tests/rackspace/requests/servers/delete_server_tests.rb
-    tests/rackspace/requests/servers/get_flavor_details_tests.rb
-    tests/rackspace/requests/servers/get_image_details_tests.rb
-    tests/rackspace/requests/servers/get_server_details_tests.rb
-    tests/rackspace/requests/servers/list_addresses_tests.rb
-    tests/rackspace/requests/servers/list_flavors_detail_tests.rb
-    tests/rackspace/requests/servers/list_flavors_tests.rb
-    tests/rackspace/requests/servers/list_images_detail_tests.rb
-    tests/rackspace/requests/servers/list_images_tests.rb
-    tests/rackspace/requests/servers/list_private_addresses_tests.rb
-    tests/rackspace/requests/servers/list_public_addresses_tests.rb
-    tests/rackspace/requests/servers/list_servers_detail_tests.rb
-    tests/rackspace/requests/servers/list_servers_tests.rb
-    tests/rackspace/requests/servers/reboot_server_tests.rb
-    tests/rackspace/requests/servers/update_server_tests.rb
+    tests/rackspace/requests/servers/address_tests.rb
+    tests/rackspace/requests/servers/flavor_tests.rb
+    tests/rackspace/requests/servers/image_tests.rb
+    tests/rackspace/requests/servers/server_tests.rb
     tests/slicehost/helper.rb
-    tests/slicehost/requests/create_slice_tests.rb
-    tests/slicehost/requests/delete_slice_tests.rb
-    tests/slicehost/requests/get_backups_tests.rb
-    tests/slicehost/requests/get_flavor_tests.rb
-    tests/slicehost/requests/get_flavors_tests.rb
-    tests/slicehost/requests/get_image_tests.rb
-    tests/slicehost/requests/get_images_tests.rb
-    tests/slicehost/requests/get_slice_tests.rb
-    tests/slicehost/requests/get_slices_tests.rb
-    tests/slicehost/requests/reboot_slice_tests.rb
+    tests/slicehost/requests/backup_tests.rb
+    tests/slicehost/requests/flavor_tests.rb
+    tests/slicehost/requests/image_tests.rb
+    tests/slicehost/requests/slice_tests.rb
   ]
   # = MANIFEST =
 

data/lib/fog.rb

@@ -38,6 +38,7 @@ module Fog
 end
 
 require 'fog/aws'
+require 'fog/bluebox'
 require 'fog/local'
 require 'fog/rackspace'
 require 'fog/slicehost'
@@ -47,7 +48,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 
   module Mock

data/lib/fog/aws/elb.rb

@@ -33,15 +33,6 @@ module Fog
         Fog::AWS::ELB::Real.new(options)
       end
 
-      def self.indexed_param(key, values, idx_offset = 0)
-        params = {}
-        key.concat(".%") unless key.include?("%")
-        [*values].each_with_index do |value, index|
-          params["#{key.gsub("%", (index + idx_offset).to_s)}"] = value
-        end
-        return params
-      end
-
       class Real
 
         # Initialize connection to ELB

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -31,9 +31,9 @@ module Fog
             listener_instance_port.push(listener['InstancePort'])
           end
 
-          params.merge!(ELB.indexed_param('Listeners.member.%.Protocol', listener_protocol, 1))
-          params.merge!(ELB.indexed_param('Listeners.member.%.LoadBalancerPort', listener_lb_port, 1))
-          params.merge!(ELB.indexed_param('Listeners.member.%.InstancePort', listener_instance_port, 1))
+          params.merge!(AWS.indexed_param('Listeners.member.%.Protocol', listener_protocol, 1))
+          params.merge!(AWS.indexed_param('Listeners.member.%.LoadBalancerPort', listener_lb_port, 1))
+          params.merge!(AWS.indexed_param('Listeners.member.%.InstancePort', listener_instance_port, 1))
 
           request({
             'Action'           => 'CreateLoadBalancer',

data/lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb

@@ -18,7 +18,7 @@ module Fog
         #       * 'Instances'<~Array> - array of hashes describing instances currently enabled
         #         * 'InstanceId'<~String>
         def deregister_instances_from_load_balancer(instance_ids, lb_name)
-          params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
+          params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
           request({
             'Action'           => 'DeregisterInstancesFromLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/describe_instance_health.rb

@@ -21,7 +21,7 @@ module Fog
         #         * 'InstanceId'<~String>
         #         * 'ReasonCode'<~String>
         def describe_instance_health(lb_name, instance_ids = [])
-          params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
+          params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
           request({
             'Action'           => 'DescribeInstanceHealth',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -36,7 +36,7 @@ module Fog
         #         * 'AvailabilityZones'<~Array> - list of availability zones covered by this load balancer
         #         * 'Instances'<~Array> - list of instances that the load balancer balances between
         def describe_load_balancers(lb_name = [])
-          params = ELB.indexed_param('LoadBalancerNames.member', [*lb_name], 1)
+          params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name], 1)
           request({
             'Action'  => 'DescribeLoadBalancers',
             :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new

data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb

@@ -17,7 +17,7 @@ module Fog
         #     * 'DisableAvailabilityZonesForLoadBalancerResult'<~Hash>:
         #       * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled
         def disable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1)
+          params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones], 1)
           request({
             'Action'           => 'DisableAvailabilityZonesForLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb

@@ -17,7 +17,7 @@ module Fog
         #     * 'EnableAvailabilityZonesForLoadBalancerResult'<~Hash>:
         #       * 'AvailabilityZones'<~Array> - array of strings describing instances currently enabled
         def enable_availability_zones_for_load_balancer(availability_zones, lb_name)
-          params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1)
+          params = AWS.indexed_param('AvailabilityZones.member', [*availability_zones], 1)
           request({
             'Action'           => 'EnableAvailabilityZonesForLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -18,7 +18,7 @@ module Fog
         #       * 'Instances'<~Array> - array of hashes describing instances currently enabled
         #         * 'InstanceId'<~String>
         def register_instances_with_load_balancer(instance_ids, lb_name)
-          params = ELB.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
+          params = AWS.indexed_param('Instances.member.%.InstanceId', [*instance_ids], 1)
           request({
             'Action'           => 'RegisterInstancesWithLoadBalancer',
             'LoadBalancerName' => lb_name,

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -38,11 +38,6 @@ module Fog
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
-          query = ''
-          for key, value in options
-            query << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
-          end
-          query.chop!
           request({
             :expects  => 200,
             :headers  => {},
@@ -50,7 +45,7 @@ module Fog
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::S3::GetBucket.new,
-            :query    => query
+            :query    => options
           })
         end
 

data/lib/fog/aws/requests/s3/get_bucket_acl.rb

@@ -35,7 +35,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::AWS::S3::AccessControlList.new,
-            :query      => 'acl'
+            :query      => {'acl' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -20,7 +20,7 @@ module Fog
             :idempotent => true,
             :method   => 'GET',
             :parser   => Fog::Parsers::AWS::S3::GetBucketLocation.new,
-            :query    => 'location'
+            :query    => {'location' => nil}
           })
         end
 

data/lib/fog/aws/requests/s3/get_bucket_logging.rb

@@ -35,7 +35,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::Parsers::AWS::S3::GetBucketLogging.new,
-            :query      => 'logging'
+            :query      => {'logging' => nil}
           })
         end