fog 0.0.40 → 0.0.41

data/README.rdoc

@@ -46,6 +46,8 @@ Lets boot up a server on EC2
 
   # boot a gentoo server
   server = connection.servers.new(:image_id => 'ami-5ee70037')
+  # you might also want to add the server to security groups, which goes like this:
+  # AWS.servers.create(:image_id => 'ami-5ee70037', :groups => ['web', 'db'])
 
   # wait for it to be ready to do stuff
   server.wait_for { ready? }

data/Rakefile

@@ -20,6 +20,18 @@ begin
     gem.rubyforge_project = "fog"
 
     gem.post_install_message = <<MESSAGE
+#{'=' * 50}
+
+  fog 0.0.41 has a minor change to the API for ec2 servers:
+
+    # what_it_was => what_it_is
+
+    ec2.servers.new(:group_id => 'foo') => ec2.servers.new(:groups => ['foo'])
+
+  Updating to the newest api version also means you can now assign multiple groups:
+
+    ec2.servers.new(:groups => ['foo', 'bar'])
+
 #{'=' * 50}
 
   fog 0.0.40 has API changes you should know about.

data/VERSION

@@ -1 +1 @@
-0.0.40
+0.0.41

data/bin/fog

@@ -5,20 +5,8 @@ require 'yaml'
 
 module Fog
   module Credentials
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    unless Fog.credentials(key)
-      print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
-      yml = <<-YML
-
-:#{key}:
-  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
-  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
-  :rackspace_username: INTENTIONALLY_LEFT_BLANK
-  :slicehost_password: INTENTIONALLY_LEFT_BLANK
-
-YML
-      print(yml)
+    Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
+    unless Fog.credentials
       exit
     end
   end
@@ -26,15 +14,14 @@ end
 
 module AWS
   class << self
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
+    credential = (ARGV.first && :"#{ARGV.first}") || :default
+    if Fog.credentials[:aws_access_key_id] && Fog.credentials[:aws_secret_access_key]
 
-      def connections
+      def [](service)
         @@connections ||= Hash.new do |hash, key|
-          credentials = {
-            :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-            :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-          }
+          credentials = Fog.credentials.reject do |k, v|
+            ![:aws_access_key_id, :aws_secret_access_key].include?(k)
+          end
           hash[key] = case key
           when :ec2
             Fog::AWS::EC2.new(credentials)
@@ -42,42 +29,43 @@ module AWS
             Fog::AWS::S3.new(credentials)
           end
         end
+        @@connections[service]
       end
 
       def addresses
-        connections[:ec2].addresses
+        self[:ec2].addresses
       end
 
       def directories
-        connections[:s3].directories
+        self[:s3].directories
       end
 
       def flavors
-        connections[:ec2].flavors
+        self[:ec2].flavors
       end
 
       def images
-        connections[:ec2].images
+        self[:ec2].images
       end
 
       def servers
-        connections[:ec2].servers
+        self[:ec2].servers
       end
 
       def key_pairs
-        connections[:ec2].key_pairs
+        self[:ec2].key_pairs
       end
 
       def security_groups
-        connections[:ec2].security_groups
+        self[:ec2].security_groups
       end
 
       def snapshots
-        connections[:ec2].snapshots
+        self[:ec2].snapshots
       end
 
       def volumes
-        connections[:ec2].volumes
+        self[:ec2].volumes
       end
 
     end
@@ -86,15 +74,14 @@ end
 
 module Rackspace
   class << self
-    key = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials(key)[:rackspace_api_key] && Fog.credentials(key)[:rackspace_username]
+    if Fog.credentials[:rackspace_api_key] && Fog.credentials[:rackspace_username]
 
-      def connections
+      def [](service)
         @@connections ||= Hash.new do |hash, key|
-          credentials = {
-            :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-            :rackspace_username => Fog.credentials[:rackspace_username]
-          }
+          credential = (ARGV.first && :"#{ARGV.first}") || :default
+          credentials = Fog.credentials.reject do |k,v|
+            ![:rackspace_api_key, :rackspace_username].include?(k)
+          end
           hash[key] = case key
           when :files
             Fog::Rackspace::Files.new(credentials)
@@ -102,18 +89,19 @@ module Rackspace
             Fog::Rackspace::Servers.new(credentials)
           end
         end
+        @@connections[service]
       end
 
       def flavors
-        connections[:servers].flavors
+        self[:servers].flavors
       end
 
       def images
-        connections[:servers].images
+        self[:servers].images
       end
 
       def servers
-        connections[:servers].servers
+        self[:servers].servers
       end
       
     end

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.40"
+  s.version = "0.0.41"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-01-25}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -248,6 +248,7 @@ 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/compact_progress_bar_formatter.rb",
      "spec/lorem.txt",
      "spec/rackspace/models/servers/server_spec.rb",
      "spec/rackspace/requests/files/delete_container_spec.rb",
@@ -282,12 +283,23 @@ Gem::Specification.new do |s|
      "spec/slicehost/requests/get_flavors_spec.rb",
      "spec/slicehost/requests/get_images_spec.rb",
      "spec/slicehost/requests/get_slices_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/geemus/fog}
   s.post_install_message = %q{==================================================
 
+  fog 0.0.41 has a minor change to the API for ec2 servers:
+
+    # what_it_was => what_it_is
+
+    ec2.servers.new(:group_id => 'foo') => ec2.servers.new(:groups => ['foo'])
+
+  Updating to the newest api version also means you can now assign multiple groups:
+
+    ec2.servers.new(:groups => ['foo', 'bar'])
+
+==================================================
+
   fog 0.0.40 has API changes you should know about.
 
   Some changes you might care about happened in the models:
@@ -379,6 +391,7 @@ 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/compact_progress_bar_formatter.rb",
      "spec/rackspace/models/servers/server_spec.rb",
      "spec/rackspace/requests/files/delete_container_spec.rb",
      "spec/rackspace/requests/files/delete_object_spec.rb",

data/lib/fog.rb

@@ -38,16 +38,40 @@ module Fog
     load "fog/slicehost.rb"
   end
 
-  def self.credentials(key = :default)
+  def self.credential=(new_credential)
+    @credential = new_credential
+    @credentials = nil
+  end
+
+  def self.credential
+    @credential || :default
+  end
+
+  def self.credentials
     @credentials ||= begin
       path = File.expand_path('~/.fog')
-      if File.exists?(path)
+      credentials = if File.exists?(path)
         File.open(path) do |file|
-          YAML.load(file.read)[key]
+          YAML.load(file.read)
         end
       else
         nil
       end
+      unless credentials
+        print("\n  To run as '#{key}', add credentials like the following to ~/.fog\n")
+        yml = <<-YML
+
+:#{key}:
+  :aws_access_key_id: INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_username: INTENTIONALLY_LEFT_BLANK
+  :slicehost_password: INTENTIONALLY_LEFT_BLANK
+
+YML
+        print(yml)
+      end
+      credentials[credential]
     end
   end
 

data/lib/fog/aws/ec2.rb

@@ -127,8 +127,12 @@ module Fog
       # ==== Returns
       # * EC2 object with connection to aws.
       def initialize(options={})
-        @aws_access_key_id      = options[:aws_access_key_id]
-        @aws_secret_access_key  = options[:aws_secret_access_key]
+        unless @aws_access_key_id = options[:aws_access_key_id]
+          raise ArgumentError.new('aws_access_key_id is required to access ec2')
+        end
+        unless @aws_secret_access_key = options[:aws_secret_access_key]
+          raise ArgumentError.new('aws_secret_access_key is required to access ec2')
+        end
         @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
         @host       = options[:host]      || 'ec2.amazonaws.com'
         @port       = options[:port]      || 443
@@ -153,7 +157,7 @@ module Fog
           'SignatureMethod' => 'HmacSHA256',
           'SignatureVersion' => '2',
           'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-          'Version' => '2009-04-04'
+          'Version' => '2009-11-30'
         })
 
         body = ''

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

@@ -40,7 +40,7 @@ module Fog
         end
 
         def save
-          requires :name
+          requires :description, :name
 
           data = connection.create_security_group(@name, @description).body
           true

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

@@ -9,7 +9,7 @@ module Fog
         attribute :ami_launch_index,  'amiLaunchIndex'
         attribute :availability_zone, 'availabilityZone'
         attribute :dns_name,          'dnsName'
-        attribute :group_id,          'groupId'
+        attribute :groups
         attribute :image_id,          'imageId'
         attribute :state,             'instanceState'
         attribute :flavor_id,            'instanceType'
@@ -23,6 +23,11 @@ module Fog
         attribute :reason
         attribute :user_data
 
+        def initialize(attributes)
+          @groups ||= ["default"]
+          super
+        end
+
         def addresses
           requires :id
 
@@ -99,8 +104,8 @@ module Fog
           if @availability_zone
             options['Placement.AvailabilityZone'] = @availability_zone
           end
-          if @group_id
-            options['SecurityGroup'] = @group_id
+          @groups.each_with_index do |group, index|
+            options["SecurityGroup.#{index}"] = group
           end
           if @kernel_id
             options['KernelId'] = @kernel_id

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

@@ -26,7 +26,7 @@ module Fog
           data = connection.describe_instances(server_id).body
           data['reservationSet'].each do |reservation|
             reservation['instancesSet'].each do |instance|
-              self << new(instance)
+              self << new(instance.merge(:groups => reservation['groupSet']))
             end
           end
           self

data/lib/fog/aws/parsers/ec2/terminate_instances.rb

@@ -6,15 +6,15 @@ module Fog
         class TerminateInstances < Fog::Parsers::Base
 
           def reset
-            @instance = { 'previousState' => {}, 'shutdownState' => {} }
+            @instance = { 'previousState' => {}, 'currentState' => {} }
             @response = { 'instancesSet' => [] }
           end
 
           def start_element(name, attrs = [])
             if name == 'previousState'
               @in_previous_state = true
-            elsif name == 'shutdownState'
-              @in_shutdown_state = true
+            elsif name == 'currentState'
+              @in_current_state = true
             end
             @value = ''
           end
@@ -25,25 +25,25 @@ module Fog
               @instance[name] = @value
             when 'item'
               @response['instancesSet'] << @instance
-              @instance = { 'previousState' => {}, 'shutdownState' => {} }
+              @instance = { 'previousState' => {}, 'currentState' => {} }
             when 'code'
               if @in_previous_state
                 @instance['previousState'][name] = @value.to_i
-              elsif @in_shutdown_state
-                @instance['shutdownState'][name] = @value.to_i
+              elsif @in_current_state
+                @instance['currentState'][name] = @value.to_i
               end
             when 'name'
               if @in_previous_state
                 @instance['previousState'][name] = @value
-              elsif @in_shutdown_state
-                @instance['shutdownState'][name] = @value
+              elsif @in_current_state
+                @instance['currentState'][name] = @value
               end
             when 'previousState'
               @in_previous_state = false
             when 'requestId'
               @response[name] = @value
-            when 'shutdownState'
-              @in_shutdown_state = false
+            when 'currentState'
+              @in_current_state = false
             end
           end
 

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

@@ -21,7 +21,7 @@ unless Fog.mocking?
         #   * 'Placement.AvailabilityZone'<~String> - Placement constraint for instances
         #   * 'DeviceName'<~String> - ?
         #   * 'Encoding'<~String> - ?
-        #   * 'groupId'<~String> - Name of security group for instances
+        #   * 'SecurityGroup.n'<~String> - Indexed names of security groups for instances
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
         #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']
         #     default is 'm1.small'

data/lib/fog/aws/s3.rb

@@ -59,8 +59,12 @@ module Fog
       # ==== Returns
       # * S3 object with connection to aws.
       def initialize(options={})
-        @aws_access_key_id      = options[:aws_access_key_id]
-        @aws_secret_access_key  = options[:aws_secret_access_key]
+        unless @aws_access_key_id = options[:aws_access_key_id]
+          raise ArgumentError.new('aws_access_key_id is required to access ec2')
+        end
+        unless @aws_secret_access_key = options[:aws_secret_access_key]
+          raise ArgumentError.new('aws_secret_access_key is required to access ec2')
+        end
         @hmac       = HMAC::SHA1.new(@aws_secret_access_key)
         @host       = options[:host]      || 's3.amazonaws.com'
         @port       = options[:port]      || 443

data/lib/fog/rackspace.rb

@@ -9,12 +9,18 @@ module Fog
     unless Fog.mocking?
 
       def self.authenticate(options)
+        unless @rackspace_api_key = options[:rackspace_api_key]
+          raise ArgumentError.new('rackspace_api_key is required to access rackspace')
+        end
+        unless @rackspace_username = options[:rackspace_username]
+          raise ArgumentError.new('rackspace_username is required to access rackspace')
+        end
         connection = Fog::Connection.new("https://auth.api.rackspacecloud.com")
         response = connection.request({
           :expects  => 204,
           :headers  => {
-            'X-Auth-Key'  => options[:rackspace_api_key],
-            'X-Auth-User' => options[:rackspace_username]
+            'X-Auth-Key'  => @rackspace_api_key,
+            'X-Auth-User' => @rackspace_username
           },
           :host     => 'auth.api.rackspacecloud.com',
           :method   => 'GET',

data/lib/fog/slicehost.rb

@@ -30,7 +30,9 @@ module Fog
     end
 
     def initialize(options={})
-      @password   = options[:password]
+      unless @password = options[:password]
+        raise ArgumentError.new('password is required to access slicehost')
+      end
       @host       = options[:host]      || "api.slicehost.com"
       @port       = options[:port]      || 443
       @scheme     = options[:scheme]    || 'https'