fog 0.0.99 → 0.0.100

data/Rakefile

@@ -79,6 +79,12 @@ end
 #
 #############################################################################
 
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ['--colour', "--format", "specdoc"]
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
 
 
 #############################################################################

data/bin/fog

@@ -2,20 +2,20 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
-require 'fog/credentials'
-require 'fog/bin'
+require File.join('fog', 'credentials')
+require File.join('fog', 'bin')
 
 Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
 unless Fog.credentials
   exit
 end
 
-require 'fog/aws/bin'
-require 'fog/local/bin'
-require 'fog/rackspace/bin'
-require 'fog/slicehost/bin'
-require 'fog/terremark/bin'
-require 'fog/vcloud/bin'
+require File.join('fog', 'aws', 'bin')
+require File.join('fog', 'local', 'bin')
+require File.join('fog', 'rackspace', 'bin')
+require File.join('fog', 'slicehost', 'bin')
+require File.join('fog', 'terremark', 'bin')
+require File.join('fog', 'vcloud', '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.0.99'
-  s.date              = '2010-05-14'
+  s.version           = '0.0.100'
+  s.date              = '2010-05-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -35,7 +35,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.0.99'
+    VERSION = '0.0.100'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -6,10 +6,13 @@ require 'fog/aws/simpledb'
 module Fog
   module AWS
 
-    def self.indexed_param(key, values)
+    def self.indexed_param(key, values, offset = 0)
       params = {}
+      unless key.include?('%d')
+        key << '.%d'
+      end
       [*values].each_with_index do |value, index|
-        params["#{key}.#{index}"] = value
+        params[format(key, index + offset)] = value
       end
       params
     end

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

@@ -115,28 +115,18 @@ module Fog
         def save
           requires :image_id
 
-          options = {'InstanceType' => flavor.id}
-          if @availability_zone
-            options['Placement.AvailabilityZone'] = @availability_zone
-          end
-          unless @groups.empty?
-            options.merge!(AWS.indexed_param("SecurityGroup", @groups))
-          end
-          if @kernel_id
-            options['KernelId'] = @kernel_id
-          end
-          if @key_name
-            options['KeyName'] = @key_name
-          end
-          if @monitoring
-            options['Monitoring.Enabled'] = @monitoring
-          end
-          if @ramdisk_id
-            options['RamdiskId'] = @ramdisk_id
-          end
-          if @user_data
-            options['UserData'] = @user_data
-          end
+          options = {
+            'BlockDeviceMapping'          => @block_device_mapping,
+            'InstanceType'                => flavor.id,
+            'KernelId'                    => @kernel_id,
+            'KeyName'                     => @key_name,
+            'Monitoring.Enabled'          => @monitoring,
+            'Placement.AvailabilityZone'  => @availability_zone,
+            'RamdiskId'                   => @ramdisk_id,
+            'SecurityGroup'               => @groups,
+            'UserData'                    => @user_data
+          }
+
           data = connection.run_instances(@image_id, 1, 1, options)
           merge_attributes(data.body['instancesSet'].first)
           true

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -51,8 +51,9 @@ module Fog
         def describe_instances(instance_id = [])
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
-            'Action'  => 'DescribeInstances',
-            :parser   => Fog::Parsers::AWS::EC2::DescribeInstances.new
+            'Action'    => 'DescribeInstances',
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::EC2::DescribeInstances.new
           }.merge!(params))
         end
 

data/lib/fog/aws/requests/ec2/run_instances.rb

@@ -18,12 +18,13 @@ module Fog
         #   (by default the maximum for an account is 20)
         # * options<~Hash>:
         #   * 'Placement.AvailabilityZone'<~String> - Placement constraint for instances
-        #   * 'BlockDeviceMapping.n.DeviceName'<~String> - where the volume will be exposed to instance
-        #   * 'BlockDeviceMapping.n.VirtualName'<~String> - volume virtual device name
-        #   * 'BlockDeviceMapping.n.Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
-        #   * 'BlockDeviceMapping.n.Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
-        #   * 'BlockDeviceMapping.n.Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
-        #   * 'SecurityGroup.n'<~String> - Indexed names of security groups for instances
+        #   * 'BlockDeviceMapping'<~Array>: array of hashes
+        #     * 'DeviceName'<~String> - where the volume will be exposed to instance
+        #     * 'VirtualName'<~String> - volume virtual device name
+        #     * 'Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
+        #     * 'Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
+        #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
+        #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
         #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']
@@ -76,6 +77,16 @@ module Fog
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationId'<~String> - Id of reservation
         def run_instances(image_id, min_count, max_count, options = {})
+          if block_device_mapping = options.delete('BlockDeviceMapping')
+            block_device_mapping.each_with_index do |mapping, index|
+              for key, value in mapping
+                options.merge!({ format("BlockDeviceMapping.%d.#{key}", index) => value })
+              end
+            end
+          end
+          if security_groups = [*options.delete('SecurityGroup')]
+            options.merge!(AWS.indexed_param('SecurityGroup', security_groups))
+          end
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
           end

data/lib/fog/terremark/models/shared/server.rb

@@ -10,6 +10,8 @@ module Fog
 
         attribute :name
         attribute :status
+        attribute :OperatingSystem
+        attribute :VirtualHardware
 
         def destroy
           requires :id

data/lib/fog/terremark/models/shared/task.rb

@@ -13,15 +13,22 @@ module Fog
         attribute :result,      'Result'
         attribute :start_time,  'startTime'
         attribute :status
+        attribute :link,         'Link'
+        attribute :error,        'Error'
 
         def initialize(attributes = {})
           new_owner  = attributes.delete('Owner')
           new_result = attributes.delete('Result')
+          new_error = attributes.delete('Error')
+          new_cancel_link = attributes.delete('Link')
+
           super
           @owner  = connection.parse(new_owner)
           if new_result
             @result = connection.parse(new_result)
           end
+          @error = connection.parse(new_error) if new_error
+          @cancel_link = connection.parse(new_cancel_link) if new_cancel_link
         end
 
         def ready?

data/lib/fog/terremark/models/shared/vdc.rb

@@ -18,6 +18,10 @@ module Fog
           connection.addresses(:vdc_id => @id)
         end
 
+        def servers
+          connection.servers(:vdc_id => @id)
+        end
+
         private
 
         def href=(new_href)

data/lib/fog/terremark/parsers/shared/task.rb

@@ -12,7 +12,7 @@ module Fog
           def start_element(name, attributes)
             super
             case name
-            when 'Owner', 'Result'
+            when 'Owner', 'Result', 'Link', 'Error'
               data = {}
               until attributes.empty?
                 data[attributes.shift] = attributes.shift

data/lib/fog/vcloud.rb

@@ -278,7 +278,7 @@ module Fog
         end
 
         if mod = credentials[:module]
-          instance.extend eval "#{mod}"
+          instance.extend eval("#{mod}")
         end
 
         instance

data/lib/fog/vcloud/bin.rb

@@ -25,14 +25,14 @@ module Vcloud
       false
     end
 
-    if Vcloud.services.all? { |service| Vcloud.complete_service_options?(service) }
+    if Vcloud.services.any? && Vcloud.services.all? { |service| Vcloud.complete_service_options?(service) }
 
       def initialized?
         true
       end
 
       def startup_notice
-        puts "You have acess to the following Vcloud services: #{Vcloud.registered_services}."
+        puts "You have access to the following vCloud services: #{Vcloud.registered_services}."
       end
 
       def [](service)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 99
-  version: 0.0.99
+  - 100
+  version: 0.0.100
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -07:00
+date: 2010-05-18 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency