fog 0.3.26 → 0.3.27

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    fog (0.3.26)
+    fog (0.3.27)
       builder
       excon (>= 0.2.8)
       formatador (>= 0.0.16)
       json
       mime-types
+      named-parameters (>= 0.0.14)
       net-ssh (>= 2.0.23)
       nokogiri (>= 1.4.4)
       ruby-hmac
@@ -21,6 +22,7 @@ GEM
       formatador (>= 0.0.12)
     json (1.4.6)
     mime-types (1.16)
+    named-parameters (0.0.14)
     net-ssh (2.0.23)
     nokogiri (1.4.4)
     rake (0.8.7)
@@ -40,6 +42,7 @@ DEPENDENCIES
   formatador (>= 0.0.16)
   json
   mime-types
+  named-parameters (>= 0.0.14)
   net-ssh (>= 2.0.23)
   nokogiri (>= 1.4.4)
   rake

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.26'
-  s.date              = '2010-12-01'
+  s.version           = '0.3.27'
+  s.date              = '2010-12-04'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
   s.add_dependency('formatador', '>=0.0.16')
   s.add_dependency('json')
   s.add_dependency('mime-types')
+  s.add_dependency('named-parameters', '>=0.0.14')
   s.add_dependency('net-ssh', '>=2.0.23')
   s.add_dependency('nokogiri', '>=1.4.4')
   s.add_dependency('ruby-hmac')

data/lib/fog.rb

@@ -3,6 +3,7 @@ require 'base64'
 require 'cgi'
 require 'excon'
 require 'formatador'
+require 'named-parameters'
 require 'time'
 
 __DIR__ = File.dirname(__FILE__)
@@ -18,7 +19,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.26'
+    VERSION = '0.3.27'
   end
 
   module Mock

data/lib/fog/aws/cdn.rb

@@ -3,6 +3,7 @@ module Fog
     class CDN < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :version, :persistent
 
       model_path 'fog/aws/models/cdn'
 

data/lib/fog/aws/compute.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Compute < Fog::Service
 
-      requires   :aws_access_key_id, :aws_secret_access_key
+      requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
 
       model_path 'fog/aws/models/compute'

data/lib/fog/aws/elb.rb

@@ -3,6 +3,7 @@ module Fog
     class ELB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent
 
       request_path 'fog/aws/requests/elb'
       request :create_load_balancer

data/lib/fog/aws/iam.rb

@@ -3,6 +3,7 @@ module Fog
     class IAM < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent
 
       request_path 'fog/aws/requests/iam'
       request :add_user_to_group

data/lib/fog/aws/models/compute/image.rb

@@ -27,7 +27,7 @@ module Fog
           connection.deregister_image(id)
 
           if(delete_snapshot && root_device_type == "ebs")
-            block_device = block_device_mapping.select {|block_device| block_device['deviceName'] == root_device_name}
+            block_device = block_device_mapping.detect {|block_device| block_device['deviceName'] == root_device_name}
             @connection.snapshots.new(:id => block_device['snapshotId']).destroy
           else
             true

data/lib/fog/aws/models/compute/images.rb

@@ -43,8 +43,8 @@ module Fog
           self.filters ||= {}
           super
         end
-        
-        def all(filters = @filters)
+
+        def all(filters = filters)
           self.filters = filters
           data = connection.describe_images(filters).body
           load(data['imagesSet'])

data/lib/fog/aws/models/compute/server.rb

@@ -84,7 +84,7 @@ module Fog
         end
 
         def key_pair=(new_keypair)
-          key_name = new_keypair && new_keypair.name
+          self.key_name = new_keypair && new_keypair.name
         end
 
         def private_key_path
@@ -151,7 +151,8 @@ module Fog
 
         def setup(credentials = {})
           requires :identity, :ip_address, :username
-          sleep(10) # takes a bit before EC2 instances will play nice
+          require 'json'
+
           commands = [
             %{mkdir .ssh},
             %{passwd -l root},
@@ -160,7 +161,16 @@ module Fog
           if public_key
             commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
           end
-          Fog::SSH.new(ip_address, username, credentials).run(commands)
+          # allow some retries over the first 120 seconds because aws is weird
+          Timeout::timeout(120) do
+            begin
+              Timeout::timeout(4) do
+                Fog::SSH.new(ip_address, username, credentials).run(commands)
+              end
+            rescue Net::SSH::AuthenticationFailed, Timeout::Error
+              retry
+            end
+          end
         rescue Errno::ECONNREFUSED => e
           sleep(1)
           retry

data/lib/fog/aws/models/compute/servers.rb

@@ -98,7 +98,19 @@ module Fog
           end
 
           server.save
-          server.wait_for { ready? }
+          # eventual consistency sometimes means a delay before it appears
+          retries = 3
+          begin
+            server.wait_for { ready? }
+          rescue Fog::Errors::Error => error
+            sleep(1)
+            retries -= 1
+            if retries > 0
+              retry
+            else
+              raise error
+            end
+          end
           server.setup(:key_data => [server.private_key])
           server
         end

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

@@ -86,12 +86,13 @@ module Fog
 
             response.status = 200
             response.body = {
-              'Contents'    => truncated_contents,
-              'IsTruncated' => truncated_contents.size != contents.size,
-              'Marker'      => options['marker'],
-              'MaxKeys'     => max_keys,
-              'Name'        => bucket['Name'],
-              'Prefix'      => options['prefix']
+              'CommonPrefixes'  => [],
+              'Contents'        => truncated_contents,
+              'IsTruncated'     => truncated_contents.size != contents.size,
+              'Marker'          => options['marker'],
+              'MaxKeys'         => max_keys,
+              'Name'            => bucket['Name'],
+              'Prefix'          => options['prefix']
             }
             if options['max-keys'] && options['max-keys'] < response.body['Contents'].length
                 response.body['IsTruncated'] = true

data/lib/fog/aws/simpledb.rb

@@ -3,7 +3,8 @@ module Fog
     class SimpleDB < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-
+      recognizes :host, :nil_string, :path, :port, :scheme, :persistent
+      
       request_path 'fog/aws/requests/simpledb'
       request :batch_put_attributes
       request :create_domain

data/lib/fog/aws/storage.rb

@@ -3,7 +3,8 @@ module Fog
     class Storage < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      
       model_path 'fog/aws/models/storage'
       collection  :directories
       model       :directory
@@ -175,6 +176,7 @@ module Fog
         end
       end
 
+      
       class Real
         include Utils
         extend Fog::Deprecation

data/lib/fog/bluebox/compute.rb

@@ -3,6 +3,7 @@ module Fog
     class Compute < Fog::Service
 
       requires :bluebox_api_key, :bluebox_customer_id
+      recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
 
       model_path 'fog/bluebox/models/compute'
       model       :flavor

data/lib/fog/brightbox/compute.rb

@@ -5,6 +5,7 @@ module Fog
       API_URL = "https://api.gb1.brightbox.com/"
 
       requires :brightbox_client_id, :brightbox_secret
+      recognizes :brightbox_auth_url, :brightbox_api_url
 
       model_path 'fog/brightbox/models/compute'
       model :account # Singular resource, no collection

data/lib/fog/core/attributes.rb

@@ -148,6 +148,7 @@ module Fog
         !identity
       end
 
+      # check that the attributes specified in args exist and is not nil
       def requires(*args)
         missing = []
         for arg in [:connection] | args

data/lib/fog/core/credentials.rb

@@ -28,7 +28,6 @@ module Fog
         unless credentials && credentials[credential]
           print("\n  To run as '#{credential}', add the following to #{config_path}\n")
           yml = <<-YML
-
 :#{credential}:
   :aws_access_key_id:                INTENTIONALLY_LEFT_BLANK
   :aws_secret_access_key:            INTENTIONALLY_LEFT_BLANK
@@ -51,7 +50,7 @@ module Fog
   :terremark_username:               INTENTIONALLY_LEFT_BLANK
   :terremark_password:               INTENTIONALLY_LEFT_BLANK
 YML
-          print(yml)
+          print("\n#{yml}\n")
           raise(ArgumentError.new("Missing Credentials"))
         end
         credentials[credential]

data/lib/fog/core/service.rb

@@ -34,13 +34,16 @@ module Fog
         EOS
       end
 
+      def requirements
+        declared_parameters_for :new, :required
+      end
+
       def new(options={})
         if Fog.bin
-          default_credentials = Fog.credentials.reject {|key, value| !requirements.include?(key)}
+          default_credentials = filter_parameters(Fog.credentials)
           options = default_credentials.merge(options)
         end
 
-        validate_arguments(options)
         setup_requirements
 
         if Fog.mocking?
@@ -110,41 +113,10 @@ module Fog
         @requests ||= []
       end
 
-      def requires(*args)
-        requirements.concat(args)
-      end
-
-      def requirements
-        @requirements ||= []
-      end
-
-      def recognizes(*args)
-        recognized.concat(args)
-      end
-
-      def recognized
-        @recognized ||= []
-      end
-
       def reset_data(keys=Mock.data.keys)
         Mock.reset_data(keys)
       end
 
-      def validate_arguments(options)
-        missing = requirements - options.keys
-        unless missing.empty?
-          raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
-        end
-
-        # FIXME: avoid failing for the services that don't have recognizes yet
-        unless recognizes.empty?
-          unrecognized = options.keys - requirements - recognized
-          unless unrecognized.empty?
-            raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}"
-          end
-        end
-      end
-
     end
 
   end

data/lib/fog/core/ssh.rb

@@ -42,8 +42,7 @@ module Fog
         require 'net/ssh'
         @address  = address
         @username = username
-        @options  = options.merge(:paranoid => false)
-        @options.merge(:verbose => true)
+        @options  = { :paranoid => false }.merge(options)
       end
 
       def run(commands)

data/lib/fog/go_grid/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module GoGrid
     class Compute < Fog::Service
 
-      requires :go_grid_api_key
-      requires :go_grid_shared_secret
+      requires :go_grid_api_key, :go_grid_shared_secret
+      recognizes :host, :path, :port, :scheme, :persistent
 
       model_path 'fog/go_grid/models/compute'
       model         :image

data/lib/fog/google/storage.rb

@@ -3,6 +3,7 @@ module Fog
     class Storage < Fog::Service
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
+      recognizes :host, :port, :scheme, :persistent
 
       model_path 'fog/google/models/storage'
       collection  :directories
@@ -135,6 +136,7 @@ module Fog
         end
       end
 
+    
       class Real
         include Utils
         extend Fog::Deprecation

data/lib/fog/linode/compute.rb

@@ -3,6 +3,7 @@ module Fog
     class Compute < Fog::Service
 
       requires :linode_api_key
+      recognizes :port, :scheme, :persistent
 
       model_path 'fog/linode/models/compute'
 

data/lib/fog/new_servers/compute.rb

@@ -4,8 +4,8 @@ module Fog
   module NewServers
     class Compute < Fog::Service
 
-      requires :new_servers_password
-      requires :new_servers_username
+      requires :new_servers_password, :new_servers_username
+      recognizes :host, :port, :scheme, :persistent
 
       model_path 'fog/new_servers/models/compute'
 

data/lib/fog/rackspace.rb

@@ -1,6 +1,7 @@
 module Fog
   module Rackspace
-
+    
+    include NamedParameters
     extend Fog::Provider
 
     service_path 'fog/rackspace'
@@ -10,6 +11,11 @@ module Fog
     service 'servers'
     service 'storage'
 
+    # NOTE: might be better to rely on the caller alone to enforce parameter 
+    # requirements...
+    has_named_parameters :'self.authenticate', 
+      :required => [ :rackspace_api_key, :rackspace_username ],
+      :optional => [ :rackspace_auth_url ]
     def self.authenticate(options)
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"
       connection = Fog::Connection.new("https://" + rackspace_auth_url)

data/lib/fog/rackspace/cdn.rb

@@ -3,6 +3,9 @@ module Fog
     class CDN < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
+      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
+      #       we also declare those parameters that the authenticate expects...
+      recognizes :rackspace_auth_url, :persistent
 
       model_path 'fog/rackspace/models/cdn'
 

data/lib/fog/rackspace/compute.rb

@@ -3,6 +3,9 @@ module Fog
     class Compute < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
+      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
+      #       we also declare those parameters that the authenticate expects...
+      recognizes :rackspace_auth_url, :persistent
 
       model_path 'fog/rackspace/models/compute'
       model       :flavor

data/lib/fog/rackspace/storage.rb

@@ -3,6 +3,9 @@ module Fog
     class Storage < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
+      # NOTE: recognizes clause delegates to Fog::Rackspace.authenticate's so 
+      #       we also declare those parameters that the authenticate expects...
+      recognizes :rackspace_auth_url, :persistent
 
       model_path 'fog/rackspace/models/storage'
       model       :directory

data/lib/fog/slicehost/compute.rb

@@ -3,6 +3,7 @@ module Fog
     class Compute < Fog::Service
 
       requires :slicehost_password
+      recognizes :host, :port, :scheme, :persistent
 
       model_path 'fog/slicehost/models/compute'
       model       :flavor

data/lib/fog/terremark/ecloud.rb

@@ -32,7 +32,9 @@ module Fog
       end
 
       class Real
-
+        requires :terremark_ecloud_password, :terremark_ecloud_username
+        recognizes :host, :path, :port, :scheme, :persistent
+        
         include Fog::Terremark::Shared::Real
         include Fog::Terremark::Shared::Parser
 

data/lib/fog/vcloud.rb

@@ -19,7 +19,8 @@ end
 module Fog
   class Vcloud < Fog::Service
 
-    requires :username, :password, :versions_uri
+    requires :username, :password, :module, :versions_uri
+    recognizes :version, :persistent
 
     model_path 'fog/vcloud/models'
     model :vdc

data/tests/helper.rb

@@ -1,28 +1,25 @@
-__DIR__ = File.dirname(__FILE__)
-__LIB_DIR__ = File.join(__DIR__, '../lib')
-
-[ __DIR__, __LIB_DIR__ ].each do |directory|
-  $LOAD_PATH.unshift directory unless
-    $LOAD_PATH.include?(directory) ||
-    $LOAD_PATH.include?(File.expand_path(directory))
-end
-
-require 'fog'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'fog/core/bin'
 
 Fog.bin = true
 
-require 'tests/helpers/collection_tests'
-require 'tests/helpers/model_tests'
+__DIR__ = File.dirname(__FILE__)
+
+$LOAD_PATH.unshift __DIR__ unless
+  $LOAD_PATH.include?(__DIR__) ||
+  $LOAD_PATH.include?(File.expand_path(__DIR__))
+
+require 'helpers/collection_tests'
+require 'helpers/model_tests'
 
-require 'tests/helpers/compute/flavors_tests'
-require 'tests/helpers/compute/server_tests'
-require 'tests/helpers/compute/servers_tests'
+require 'helpers/compute/flavors_tests'
+require 'helpers/compute/server_tests'
+require 'helpers/compute/servers_tests'
 
-require 'tests/helpers/storage/directory_tests'
-require 'tests/helpers/storage/directories_tests'
-require 'tests/helpers/storage/file_tests'
-require 'tests/helpers/storage/files_tests'
+require 'helpers/storage/directory_tests'
+require 'helpers/storage/directories_tests'
+require 'helpers/storage/file_tests'
+require 'helpers/storage/files_tests'
 
 # Use so you can run in mock mode from the command line:
 #

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 26
-  version: 0.3.26
+  - 27
+  version: 0.3.27
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -08:00
+date: 2010-12-04 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,20 @@ dependencies:
   prerelease: false
   type: :runtime
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 14
+        version: 0.0.14
+  requirement: *id006
+  name: named-parameters
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -93,12 +107,12 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
-  requirement: *id006
+  requirement: *id007
   name: net-ssh
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -107,36 +121,36 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  requirement: *id007
+  requirement: *id008
   name: nokogiri
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  requirement: *id009
   name: ruby-hmac
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id009
+  requirement: *id010
   name: rake
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -145,12 +159,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id010
+  requirement: *id011
   name: rspec
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -159,7 +173,7 @@ dependencies:
         - 1
         - 10
         version: 0.1.10
-  requirement: *id011
+  requirement: *id012
   name: shindo
 description: The Ruby cloud computing library.
 email: geemus@gmail.com