fog 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.0)
+    fog (0.3.1)
       builder
       excon (>= 0.2.1)
       formatador (>= 0.0.15)

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.0'
-  s.date              = '2010-09-22'
+  s.version           = '0.3.1'
+  s.date              = '2010-09-24'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -32,7 +32,7 @@ require 'fog/ssh'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -11,13 +11,13 @@ module Fog
     service 'simpledb'
     service 'storage'
 
-    def self.indexed_param(key, values, offset = 0)
+    def self.indexed_param(key, values)
       params = {}
       unless key.include?('%d')
         key << '.%d'
       end
       [*values].each_with_index do |value, index|
-        params[format(key, index + offset)] = value
+        params[format(key, index + 1)] = value
       end
       params
     end

data/lib/fog/aws/bin.rb

@@ -14,7 +14,9 @@ class AWS < Fog::Bin
           Fog::AWS::Compute.new
         when :elb
           Fog::AWS::ELB.new
-        when :simpledb
+        when :eu_storage
+          Fog::AWS::Storage.new(:region => 'eu-west-1')
+        when :sdb
           Fog::AWS::SimpleDB.new
         when :s3
           location = caller.first
@@ -30,7 +32,7 @@ class AWS < Fog::Bin
     end
 
     def services
-      [:compute, :elb, :simpledb, :storage]
+      [:compute, :elb, :sdb, :storage]
     end
 
   end

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

@@ -33,7 +33,7 @@ module Fog
         attribute :user_data
 
         attr_accessor :password, :username
-        attr_writer   :private_key_path, :public_key_path
+        attr_writer   :private_key, :private_key_path, :public_key, :public_key_path
 
         def initialize(attributes={})
           @groups ||= ["default"] unless attributes[:subnet_id]
@@ -79,7 +79,7 @@ module Fog
         end
 
         def key_pair=(new_keypair)
-          @key_name = new_keypair.name
+          @key_name = new_keypair && new_keypair.name
         end
 
         def monitoring=(new_monitoring)
@@ -99,13 +99,20 @@ module Fog
         end
 
         def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
+          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+        end
+
+        def private_key
+          @private_key ||= File.read(private_key_path)
         end
 
         def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
+          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
         end
 
+        def public_key
+          @public_key ||= File.read(public_key_path)
+        end
         def ready?
           @state == 'running'
         end
@@ -147,11 +154,11 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :ip_address, :identity, :public_key_path, :username
+          requires :identity, :ip_address, :public_key, :username
           sleep(10) # takes a bit before EC2 instances will play nice
           Fog::SSH.new(ip_address, username, credentials).run([
             %{mkdir .ssh},
-            %{echo "#{File.read(public_key_path)}" >> ~/.ssh/authorized_keys},
+            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},
             %{echo "#{attributes.to_json}" >> ~/attributes.json}
           ])
@@ -161,8 +168,8 @@ module Fog
         end
 
         def ssh(commands)
-          requires :identity, :ip_address, :private_key_path, :username
-          @ssh ||= Fog::SSH.new(ip_address, username, :keys => [private_key_path])
+          requires :identity, :ip_address, :private_key, :username
+          @ssh ||= Fog::SSH.new(ip_address, username, :key_data => [private_key])
           @ssh.run(commands)
         end
 

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

@@ -9,8 +9,6 @@ module Fog
 
         attribute :server_id
 
-        attr_writer :private_key_path, :public_key_path
-
         model Fog::AWS::Compute::Server
 
         def initialize(attributes)
@@ -31,10 +29,14 @@ module Fog
         end
 
         def bootstrap(new_attributes = {})
+          server = connection.servers.new(new_attributes)
+
           # first or create fog_#{credential} keypair
-          unless key_pair = connection.key_pairs.get("fog_#{Fog.credential}")
-            public_key = File.read(public_key_path)
-            key_pair = connection.key_pairs.create(:name => "fog_#{Fog.credential}", :public_key => public_key)
+          unless server.key_pair = connection.key_pairs.get("fog_#{Fog.credential}")
+            server.key_pair = connection.key_pairs.create(
+              :name => "fog_#{Fog.credential}",
+              :public_key => server.public_key
+            )
           end
 
           # make sure port 22 is open in the first security group
@@ -49,11 +51,9 @@ module Fog
             security_group.authorize_port_range(22..22)
           end
 
+          server.save
           server.wait_for { ready? }
-          private_key = File.read(private_key_path)
-          server.setup(:key_data => [private_key])
-
-          server.merge_attributes(:private_key_path => private_key_path, :public_key_path => public_key_path)
+          server.setup(:key_data => [server.private_key])
           server
         end
 
@@ -65,14 +65,6 @@ module Fog
           nil
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-        end
-
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-        end
-
       end
 
     end

data/lib/fog/aws/models/storage/file.rb

@@ -17,6 +17,14 @@ module Fog
         attribute :size,            :aliases => 'Size'
         attribute :storage_class,   :aliases => 'StorageClass'
 
+        def acl=(new_acl)
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          unless valid_acls.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
+          end
+          @acl = new_acl
+        end
+
         def body
           @body ||= if last_modified && (file = collection.get(identity))
             file.body
@@ -61,6 +69,9 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+          if @acl
+            options['x-amz-acl'] = @acl
+          end
           data = connection.put_object(directory.key, @key, @body, options)
           @etag = data.headers['ETag']
           true

data/lib/fog/aws/requests/compute/modify_snapshot_attribute.rb

@@ -12,8 +12,8 @@ module Fog
         #
         def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
           params = {}
-          params.merge!(AWS.indexed_param('UserId', options['UserId'], 1))
-          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup'], 1))
+          params.merge!(AWS.indexed_param('UserId', options['UserId']))
+          params.merge!(AWS.indexed_param('UserGroup', options['UserGroup']))
           request({
             'Action'        => 'ModifySnapshotAttribute',
             'Attribute'     => attribute,

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

@@ -22,7 +22,7 @@ module Fog
         #     * 'CreateLoadBalancerResult'<~Hash>:
         #       * 'DNSName'<~String> - DNS name for the newly created ELB
         def create_load_balancer(availability_zones, lb_name, listeners)
-          params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones], 1)
+          params = ELB.indexed_param('AvailabilityZones.member', [*availability_zones])
 
           listener_protocol = []
           listener_lb_port = []
@@ -33,9 +33,9 @@ module Fog
             listener_instance_port.push(listener['InstancePort'])
           end
 
-          params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol, 1))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port, 1))
-          params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port, 1))
+          params.merge!(AWS.indexed_param('Listeners.member.%d.Protocol', listener_protocol))
+          params.merge!(AWS.indexed_param('Listeners.member.%d.LoadBalancerPort', listener_lb_port))
+          params.merge!(AWS.indexed_param('Listeners.member.%d.InstancePort', listener_instance_port))
 
           request({
             'Action'           => 'CreateLoadBalancer',

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

@@ -20,7 +20,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 = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids], 1)
+          params = AWS.indexed_param('Instances.member.%d.InstanceId', [*instance_ids])
           request({
             'Action'           => 'DeregisterInstancesFromLoadBalancer',
             'LoadBalancerName' => lb_name,

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

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

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

@@ -38,7 +38,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 = AWS.indexed_param('LoadBalancerNames.member', [*lb_name], 1)
+          params = AWS.indexed_param('LoadBalancerNames.member', [*lb_name])
           request({
             'Action'  => 'DescribeLoadBalancers',
             :parser   => Fog::Parsers::AWS::ELB::DescribeLoadBalancers.new

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

@@ -23,9 +23,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'GET',
-            :path     => CGI.escape(object_name)
+            :path     => [bucket_name, CGI.escape(object_name)].join('/')
           }, expires)
         end
 
@@ -42,9 +42,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'GET',
-            :path     => CGI.escape(object_name)
+            :path     => [bucket_name, CGI.escape(object_name)].join('/')
           }, expires)
         end
 

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

@@ -23,9 +23,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'PUT',
-            :path     => CGI.escape(object_name)
+            :path     => [bucket_name, CGI.escape(object_name)].join('/')
           }, expires)
         end
 
@@ -42,9 +42,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'PUT',
-            :path     => CGI.escape(object_name)
+            :path     => [bucket_name, CGI.escape(object_name)].join('/')
           }, expires)
         end
 

data/lib/fog/aws/storage.rb

@@ -64,7 +64,8 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
+          bucket = params[:host].split('.').first
+          "https://#{@host}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -124,6 +125,8 @@ module Fog
           @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
+            when 'eu-west-1'
+              's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
             when 'ap-southeast-1'

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

@@ -18,7 +18,8 @@ module Fog
         attribute :progress
         attribute :status
 
-        attr_accessor :password, :private_key_path, :public_key_path, :username
+        attr_accessor :password, :username
+        attr_writer :private_key, :private_key_path, :public_key, :public_key_path
 
         def initialize(attributes={})
           @flavor_id ||= 1
@@ -57,11 +58,19 @@ module Fog
         end
 
         def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
+          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+        end
+
+        def private_key
+          @private_key ||= File.read(private_key_path)
         end
 
         def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
+          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
+        end
+
+        def public_key
+          @public_key ||= File.read(public_key_path)
         end
 
         def save
@@ -78,10 +87,10 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :addresses, :identity, :public_key_path, :username
+          requires :addresses, :identity, :public_key, :username
           Fog::SSH.new(addresses['public'].first, username, credentials).run([
             %{mkdir .ssh},
-            %{echo "#{File.read(File.expand_path(public_key_path))}" >> ~/.ssh/authorized_keys},
+            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},
             %{echo "#{attributes.to_json}" >> ~/attributes.json},
             %{echo "#{metadata.to_json}" >> ~/metadata.json}
@@ -92,13 +101,13 @@ module Fog
         end
 
         def ssh(commands)
-          requires :addresses, :identity, :private_key_path, :username
-          @ssh ||= Fog::SSH.new(addresses['public'].first, username, :keys => [private_key_path])
+          requires :addresses, :identity, :private_key, :username
+          @ssh ||= Fog::SSH.new(addresses['public'].first, username, :key_data => [private_key])
           @ssh.run(commands)
         end
 
         def username
-          @username ||= root
+          @username ||= 'root'
         end
 
         private

data/spec/aws/models/compute/key_pair_spec.rb

@@ -11,7 +11,7 @@ describe 'Fog::AWS::Compute::KeyPair' do
         'keyName'         => 'name'
       )
       key_pair.fingerprint.should == 'fingerprint'
-      key_pair.material.should == 'material'
+      key_pair.private_key.should == 'material'
       key_pair.name.should == 'name'
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'spec'
 require 'open-uri'
 require 'fog'
+Fog.bin = true
 require 'fog/bin'
 require 'fog/vcloud/bin'
 
@@ -8,83 +9,6 @@ if ENV["FOG_MOCK"] == "true"
   Fog.mock!
 end
 
-module AWS
-  class << self
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        credentials = Fog.credentials.reject do |k, v|
-          ![:aws_access_key_id, :aws_secret_access_key].include?(k)
-        end
-        hash[key] = case key
-        when :compute
-          Fog::AWS::Compute.new(credentials)
-        when :eu_storage
-          Fog::AWS::Storage.new(credentials.merge!(:host => 's3-external-3.amazonaws.com'))
-        when :sdb
-          Fog::AWS::SimpleDB.new(credentials)
-        when :storage
-          Fog::AWS::Storage.new(credentials)
-        end
-      end
-      @@connections[service]
-    end
-  end
-end
-
-module Rackspace
-  class << self
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        credentials = Fog.credentials.reject do |k, v|
-          ![:rackspace_api_key, :rackspace_username].include?(k)
-        end
-        hash[key] = case key
-        when :compute
-          Fog::Rackspace::Compute.new(credentials)
-        when :storage
-          Fog::Rackspace::Storage.new(credentials)
-        end
-      end
-      @@connections[service]
-    end
-  end
-end
-
-module Slicehost
-  class << self
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        credentials = Fog.credentials.reject do |k, v|
-          ![:slicehost_password].include?(k)
-        end
-        hash[key] = case key
-        when :compute
-          Fog::Slicehost::Compute.new(credentials)
-        end
-      end
-      @@connections[service]
-    end
-  end
-end
-
-module Bluebox
-  class << self
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        credentials = Fog.credentials.reject do |k,v|
-          ![:bluebox_api_key, :bluebox_customer_id].include?(k)
-        end
-        hash[key] = case key
-        when :compute
-          Fog::Bluebox::Compute.new(credentials)
-        end
-      end
-      @@connections[service]
-    end
-  end
-end
-
-
 def eventually(max_delay = 16, &block)
   delays = [0]
   delay_step = 1

data/spec/vcloud/models/vdc_spec.rb

@@ -21,7 +21,7 @@ if Fog.mocking?
     end
 
     context "as a collection member" do
-      subject { p @vcloud.vdcs[0]; @vcloud.vdcs[0].reload; @vcloud.vdcs[0] }
+      subject { @vcloud.vdcs[0].reload; @vcloud.vdcs[0] }
 
       it { should be_an_instance_of Fog::Vcloud::Vdc }
 

data/tests/aws/helper.rb

@@ -1,25 +1,4 @@
-module AWS
-
-  class << self
-    def [](service)
-      @@connections ||= Hash.new do |hash, key|
-        credentials = Fog.credentials.reject do |k, v|
-          ![:aws_access_key_id, :aws_secret_access_key].include?(k)
-        end
-        hash[key] = case key
-        when :compute
-          Fog::AWS::Compute.new(credentials)
-        when :eu_storage
-          Fog::AWS::Storage.new(credentials.merge!(:host => 's3-external-3.amazonaws.com'))
-        when :sdb
-          Fog::AWS::SimpleDB.new(credentials)
-        when :storage
-          Fog::AWS::Storage.new(credentials)
-        end
-      end
-      @@connections[service]
-    end
-  end
+class AWS
 
   module Compute
 

data/tests/bluebox/helper.rb

@@ -1,17 +1,4 @@
-module Bluebox
-
-  def self.[](service)
-    @@connections ||= Hash.new do |hash, key|
-      credentials = Fog.credentials.reject do |k,v|
-        ![:bluebox_api_key, :bluebox_customer_id].include?(k)
-      end
-      hash[key] = case key
-      when :compute
-        Fog::Bluebox::Compute.new(credentials)
-      end
-    end
-    @@connections[service]
-  end
+class Bluebox
 
   module Compute
 

data/tests/helper.rb

@@ -1,5 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'fog', 'bin'))
+require 'fog'
+require 'fog/bin'
+Fog.bin = true
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'model_helper'))
 

data/tests/linode/helper.rb

@@ -1,17 +1,4 @@
-module Linode
-
-  def self.[](service)
-    @@connections ||= Hash.new do |hash, key|
-      credentials = Fog.credentials.reject do |k,v|
-        ![:linode_api_key].include?(k)
-      end
-      hash[key] = case key
-      when :compute
-        Fog::Linode::Compute.new(credentials)
-      end
-    end
-    @@connections[service]
-  end
+class Linode
 
   module Compute
 

data/tests/rackspace/helper.rb

@@ -1,19 +1,4 @@
-module Rackspace
-
-  def self.[](service)
-    @@connections ||= Hash.new do |hash, key|
-      credentials = Fog.credentials.reject do |k, v|
-        ![:rackspace_api_key, :rackspace_username].include?(k)
-      end
-      hash[key] = case key
-      when :compute
-        Fog::Rackspace::Compute.new(credentials)
-      when :storage
-        Fog::Rackspace::Storage.new(credentials)
-      end
-    end
-    @@connections[service]
-  end
+class Rackspace
 
   module Compute
 

data/tests/slicehost/helper.rb

@@ -1,16 +1 @@
-module Slicehost
 
-  def self.[](service)
-    @@connections ||= Hash.new do |hash, key|
-      credentials = Fog.credentials.reject do |k, v|
-        ![:slicehost_password].include?(k)
-      end
-      hash[key] = case key
-      when :compute
-        Fog::Slicehost::Compute.new(credentials)
-      end
-    end
-    @@connections[service]
-  end
-
-end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -07:00
+date: 2010-09-24 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency