fog 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fog (0.3.7)
+    fog (0.3.8)
       builder
-      excon (>= 0.2.3)
+      excon (>= 0.2.4)
       formatador (>= 0.0.15)
       json
       mime-types
@@ -15,7 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (2.1.2)
-    excon (0.2.3)
+    excon (0.2.4)
     formatador (0.0.15)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
@@ -26,7 +26,7 @@ GEM
     rake (0.8.7)
     rspec (1.3.0)
     ruby-hmac (0.4.0)
-    shindo (0.1.6)
+    shindo (0.1.7)
       formatador (>= 0.0.14)
       gestalt (>= 0.0.11)
 
@@ -35,7 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  excon (>= 0.2.3)
+  excon (>= 0.2.4)
   fog!
   formatador (>= 0.0.15)
   json
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake
   rspec
   ruby-hmac
-  shindo (= 0.1.6)
+  shindo (= 0.1.7)

data/README.rdoc

@@ -2,6 +2,12 @@ http://geemus.com/fog.png
 
 fog is the Ruby cloud computing library.
 
+################################################################################
+
+Thursday, October 14, 2010 10:00 am PST, hear it straight from {geemus}[http://github.com/geemus] in the {fog webinar}[http://pages.engineyard.com/FogWebinar.html]
+
+################################################################################
+
 The quick and dirty, top to bottom:
 * Collections provide a simplified interface, making clouds easier to work with and switch between.
 * Requests allow power users to get the most out of the features of each individual cloud.
@@ -112,7 +118,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 * Discuss in irc on the {#ruby-fog}[irc://irc.freenode.net/ruby-fog] channel on Freenode or via email on the {mailing list}[http://groups.google.com/group/ruby-fog]
 * 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]
+* Learn about {contributing}[http://github.com/geemus/fog/wiki/contributor-guide] or find more info about the {Providers}[http://github.com/geemus/fog/wiki/Providers] (including some todo items)
 * See what already uses fog and add your own stuff to {the list}[http://wiki.github.com/geemus/fog/in-the-wild]
 
 == Copyright

data/bin/fog

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
+require File.expand_path(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
+Fog.mock! if ENV['FOG_MOCK']
 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)

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.3.7'
-  s.date              = '2010-09-29'
+  s.version           = '0.3.8'
+  s.date              = '2010-10-14'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,7 +43,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('builder')
-  s.add_dependency('excon', '>=0.2.3')
+  s.add_dependency('excon', '>=0.2.4')
   s.add_dependency('formatador', '>=0.0.15')
   s.add_dependency('json')
   s.add_dependency('mime-types')
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
-  s.add_development_dependency('shindo', '0.1.6')
+  s.add_development_dependency('shindo', '0.1.7')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -73,7 +73,6 @@ Gem::Specification.new do |s|
     examples/bluebox_create.rb
     fog.gemspec
     lib/fog.rb
-    lib/fog/attributes.rb
     lib/fog/aws.rb
     lib/fog/aws/bin.rb
     lib/fog/aws/compute.rb
@@ -93,6 +92,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/models/compute/servers.rb
     lib/fog/aws/models/compute/snapshot.rb
     lib/fog/aws/models/compute/snapshots.rb
+    lib/fog/aws/models/compute/tag.rb
+    lib/fog/aws/models/compute/tags.rb
     lib/fog/aws/models/compute/volume.rb
     lib/fog/aws/models/compute/volumes.rb
     lib/fog/aws/models/storage/directories.rb
@@ -116,6 +117,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/compute/describe_reserved_instances.rb
     lib/fog/aws/parsers/compute/describe_security_groups.rb
     lib/fog/aws/parsers/compute/describe_snapshots.rb
+    lib/fog/aws/parsers/compute/describe_tags.rb
     lib/fog/aws/parsers/compute/describe_volumes.rb
     lib/fog/aws/parsers/compute/detach_volume.rb
     lib/fog/aws/parsers/compute/get_console_output.rb
@@ -154,10 +156,12 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/compute/create_key_pair.rb
     lib/fog/aws/requests/compute/create_security_group.rb
     lib/fog/aws/requests/compute/create_snapshot.rb
+    lib/fog/aws/requests/compute/create_tags.rb
     lib/fog/aws/requests/compute/create_volume.rb
     lib/fog/aws/requests/compute/delete_key_pair.rb
     lib/fog/aws/requests/compute/delete_security_group.rb
     lib/fog/aws/requests/compute/delete_snapshot.rb
+    lib/fog/aws/requests/compute/delete_tags.rb
     lib/fog/aws/requests/compute/delete_volume.rb
     lib/fog/aws/requests/compute/deregister_image.rb
     lib/fog/aws/requests/compute/describe_addresses.rb
@@ -169,6 +173,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/compute/describe_reserved_instances.rb
     lib/fog/aws/requests/compute/describe_security_groups.rb
     lib/fog/aws/requests/compute/describe_snapshots.rb
+    lib/fog/aws/requests/compute/describe_tags.rb
     lib/fog/aws/requests/compute/describe_volumes.rb
     lib/fog/aws/requests/compute/detach_volume.rb
     lib/fog/aws/requests/compute/disassociate_address.rb
@@ -227,7 +232,6 @@ Gem::Specification.new do |s|
     lib/fog/aws/s3.rb
     lib/fog/aws/simpledb.rb
     lib/fog/aws/storage.rb
-    lib/fog/bin.rb
     lib/fog/bluebox.rb
     lib/fog/bluebox/bin.rb
     lib/fog/bluebox/compute.rb
@@ -246,15 +250,29 @@ Gem::Specification.new do |s|
     lib/fog/bluebox/requests/compute/get_template.rb
     lib/fog/bluebox/requests/compute/get_templates.rb
     lib/fog/bluebox/requests/compute/reboot_block.rb
-    lib/fog/collection.rb
-    lib/fog/connection.rb
-    lib/fog/credentials.rb
-    lib/fog/deprecation.rb
-    lib/fog/errors.rb
+    lib/fog/core.rb
+    lib/fog/core/attributes.rb
+    lib/fog/core/bin.rb
+    lib/fog/core/collection.rb
+    lib/fog/core/connection.rb
+    lib/fog/core/credentials.rb
+    lib/fog/core/deprecation.rb
+    lib/fog/core/errors.rb
+    lib/fog/core/hmac.rb
+    lib/fog/core/model.rb
+    lib/fog/core/parser.rb
+    lib/fog/core/provider.rb
+    lib/fog/core/service.rb
+    lib/fog/core/ssh.rb
     lib/fog/go_grid.rb
     lib/fog/go_grid/bin.rb
     lib/fog/go_grid/compute.rb
+    lib/fog/go_grid/models/compute/image.rb
+    lib/fog/go_grid/models/compute/images.rb
+    lib/fog/go_grid/models/compute/server.rb
+    lib/fog/go_grid/models/compute/servers.rb
     lib/fog/go_grid/requests/compute/common_lookup_list.rb
+    lib/fog/go_grid/requests/compute/grid_image_get.rb
     lib/fog/go_grid/requests/compute/grid_image_list.rb
     lib/fog/go_grid/requests/compute/grid_ip_list.rb
     lib/fog/go_grid/requests/compute/grid_loadbalancer_list.rb
@@ -293,7 +311,6 @@ Gem::Specification.new do |s|
     lib/fog/google/requests/storage/put_object.rb
     lib/fog/google/requests/storage/put_object_url.rb
     lib/fog/google/storage.rb
-    lib/fog/hmac.rb
     lib/fog/linode.rb
     lib/fog/linode/bin.rb
     lib/fog/linode/compute.rb
@@ -313,7 +330,6 @@ Gem::Specification.new do |s|
     lib/fog/local/models/storage/file.rb
     lib/fog/local/models/storage/files.rb
     lib/fog/local/storage.rb
-    lib/fog/model.rb
     lib/fog/new_servers.rb
     lib/fog/new_servers/bin.rb
     lib/fog/new_servers/compute.rb
@@ -324,8 +340,6 @@ Gem::Specification.new do |s|
     lib/fog/new_servers/requests/compute/list_plans.rb
     lib/fog/new_servers/requests/compute/list_servers.rb
     lib/fog/new_servers/requests/compute/reboot_server.rb
-    lib/fog/parser.rb
-    lib/fog/provider.rb
     lib/fog/rackspace.rb
     lib/fog/rackspace/bin.rb
     lib/fog/rackspace/compute.rb
@@ -370,7 +384,6 @@ Gem::Specification.new do |s|
     lib/fog/rackspace/requests/storage/put_object.rb
     lib/fog/rackspace/servers.rb
     lib/fog/rackspace/storage.rb
-    lib/fog/service.rb
     lib/fog/slicehost.rb
     lib/fog/slicehost/bin.rb
     lib/fog/slicehost/compute.rb
@@ -398,7 +411,6 @@ Gem::Specification.new do |s|
     lib/fog/slicehost/requests/compute/get_slice.rb
     lib/fog/slicehost/requests/compute/get_slices.rb
     lib/fog/slicehost/requests/compute/reboot_slice.rb
-    lib/fog/ssh.rb
     lib/fog/terremark.rb
     lib/fog/terremark/bin.rb
     lib/fog/terremark/ecloud.rb
@@ -558,16 +570,9 @@ Gem::Specification.new do |s|
     spec/aws/requests/simpledb/put_attributes_spec.rb
     spec/aws/requests/simpledb/select_spec.rb
     spec/aws/requests/storage/copy_object_spec.rb
-    spec/aws/requests/storage/delete_bucket_spec.rb
-    spec/aws/requests/storage/delete_object_spec.rb
     spec/aws/requests/storage/get_bucket_location_spec.rb
     spec/aws/requests/storage/get_bucket_spec.rb
-    spec/aws/requests/storage/get_object_spec.rb
     spec/aws/requests/storage/get_request_payment_spec.rb
-    spec/aws/requests/storage/get_service_spec.rb
-    spec/aws/requests/storage/head_object_spec.rb
-    spec/aws/requests/storage/put_bucket_spec.rb
-    spec/aws/requests/storage/put_object_spec.rb
     spec/aws/requests/storage/put_request_payment_spec.rb
     spec/bluebox/models/compute/flavors_spec.rb
     spec/bluebox/models/compute/server_spec.rb
@@ -634,6 +639,9 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
@@ -643,6 +651,7 @@ Gem::Specification.new do |s|
     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/instantiate_vapp_template_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
@@ -655,11 +664,16 @@ Gem::Specification.new do |s|
     tests/aws/requests/compute/region_tests.rb
     tests/aws/requests/compute/security_group_tests.rb
     tests/aws/requests/compute/snapshot_tests.rb
+    tests/aws/requests/compute/tag_tests.rb
     tests/aws/requests/compute/volume_tests.rb
+    tests/aws/requests/storage/bucket_tests.rb
+    tests/aws/requests/storage/object_tests.rb
     tests/bluebox/helper.rb
     tests/bluebox/requests/compute/block_tests.rb
     tests/bluebox/requests/compute/product_tests.rb
     tests/bluebox/requests/compute/template_tests.rb
+    tests/go_grid/helper.rb
+    tests/go_grid/requests/compute/image_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
     tests/helpers/model_helper.rb
@@ -668,6 +682,7 @@ Gem::Specification.new do |s|
     tests/linode/requests/compute/distribution_tests.rb
     tests/linode/requests/compute/linode_tests.rb
     tests/linode/requests/compute/linodeplans_tests.rb
+    tests/lorem.txt
     tests/rackspace/helper.rb
     tests/rackspace/requests/compute/address_tests.rb
     tests/rackspace/requests/compute/flavor_tests.rb

data/lib/fog.rb

@@ -17,22 +17,14 @@ $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
 
+  @mocking = false
+
   unless const_defined?(:VERSION)
-    VERSION = '0.3.7'
+    VERSION = '0.3.8'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -22,6 +22,19 @@ module Fog
       params
     end
 
+    def self.indexed_filters(filters)
+      params = {}
+      filters.keys.each_with_index do |key, key_index|
+        key_index += 1
+        params[format('Filter.%d.Name', key_index)] = key
+        [*filters[key]].each_with_index do |value, value_index|
+          value_index += 1
+          params[format('Filter.%d.Value.%d', key_index, value_index)] = value
+        end
+      end
+      params
+    end
+
     def self.signed_params(params, options = {})
       params.merge!({
         'AWSAccessKeyId'    => options[:aws_access_key_id],
@@ -37,7 +50,7 @@ module Fog
           body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
         end
       end
-      string_to_sign = "POST\n#{options[:host]}\n/\n" << body.chop
+      string_to_sign = "POST\n#{options[:host]}\n#{options[:path]}\n" << body.chop
       signed_string = options[:hmac].sign(string_to_sign)
       body << "Signature=#{CGI.escape(Base64.encode64(signed_string).chomp!).gsub(/\+/, '%20')}"
 
@@ -100,10 +113,6 @@ module Fog
         fingerprint.join(':')
       end
 
-      def self.image_id
-        "ami-#{hex(8)}"
-      end
-
       def self.instance_id
         "i-#{hex(8)}"
       end

data/lib/fog/aws/compute.rb

@@ -19,6 +19,8 @@ module Fog
       collection  :servers
       model       :snapshot
       collection  :snapshots
+      model       :tag
+      collection  :tags
       model       :volume
       collection  :volumes
 
@@ -29,14 +31,16 @@ module Fog
       request :associate_address
       request :attach_volume
       request :authorize_security_group_ingress
+      request :create_image
       request :create_key_pair
       request :create_security_group
       request :create_snapshot
-      request :create_image
+      request :create_tags
       request :create_volume
       request :delete_key_pair
       request :delete_security_group
       request :delete_snapshot
+      request :delete_tags
       request :delete_volume
       request :deregister_image
       request :describe_addresses
@@ -48,6 +52,7 @@ module Fog
       request :describe_regions
       request :describe_security_groups
       request :describe_snapshots
+      request :describe_tags
       request :describe_volumes
       request :detach_volume
       request :disassociate_address
@@ -69,10 +74,11 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, region|
             owner_id = Fog::AWS::Mock.owner_id
-            hash[region] = Hash.new do |hash, key|
-              hash[key] = {
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
                 :deleted_at => {},
                 :addresses  => {},
+                :images     => {},
                 :instances  => {},
                 :key_pairs  => {},
                 :limits     => { :addresses => 5 },
@@ -108,7 +114,8 @@ module Fog
                   }
                 },
                 :snapshots => {},
-                :volumes => {}
+                :volumes => {},
+                :tags => {}
               }
             end
           end
@@ -153,8 +160,15 @@ module Fog
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
+          if @endpoint = options[:endpoint]
+            endpoint = URI.parse(@endpoint)
+            @host = endpoint.host
+            @path = endpoint.path
+            @port = endpoint.port
+            @scheme = endpoint.scheme
+          else
+            options[:region] ||= 'us-east-1'
+            @host = options[:host] || case options[:region]
             when 'ap-southeast-1'
               'ec2.ap-southeast-1.amazonaws.com'
             when 'eu-west-1'
@@ -166,9 +180,11 @@ module Fog
             else
               raise ArgumentError, "Unknown region: #{options[:region].inspect}"
             end
-          @port   = options[:port]      || 443
-          @scheme = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+            @path   = options[:path]      || '/'
+            @port   = options[:port]      || 443
+            @scheme = options[:scheme]    || 'https'
+          end
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         def reload
@@ -187,6 +203,7 @@ module Fog
               :aws_access_key_id  => @aws_access_key_id,
               :hmac               => @hmac,
               :host               => @host,
+              :path               => @path,
               :version            => '2010-08-31'
             }
           )