fog 0.3.6 → 0.3.7

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fog (0.3.6)
+    fog (0.3.7)
       builder
-      excon (>= 0.2.1)
+      excon (>= 0.2.3)
       formatador (>= 0.0.15)
       json
       mime-types
@@ -15,7 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (2.1.2)
-    excon (0.2.1)
+    excon (0.2.3)
     formatador (0.0.15)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
@@ -35,7 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  excon (>= 0.2.1)
+  excon (>= 0.2.3)
   fog!
   formatador (>= 0.0.15)
   json

data/README.rdoc

@@ -93,18 +93,18 @@ It will return an {excon}[http://github.com/geemus/excon] response, which has #h
 Play around and use the console to explore or check out the {getting started guide}[http://wiki.github.com/geemus/fog/getting-started-with-fog] for more details.
 
 You should try out the (varying) support fog has for:
-* {AWS}[http://aws.amazon.com] [{EC2}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {S3}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
-* {Blue Box Group}[http://www.blueboxgrp.com] [{Blocks}[http://www.blueboxgrp.com/blocks]]
+* {AWS}[http://aws.amazon.com] [{Compute}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {Storage}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
+* {Blue Box Group}[http://www.blueboxgrp.com] [{Compute}[http://www.blueboxgrp.com/blocks]]
 * {Google}[http://www.google.com] [{Storage}[http://code.google.com/apis/storage]]
-* {Rackspace}[http://www.rackspace.com] [{Files}[http://www.rackspacecloud.com/cloud_hosting_products/files], {Servers}[http://www.rackspacecloud.com/cloud_hosting_products/servers]]
-* {Slicehost}[http://www.slicehost.com]
+* {Rackspace}[http://www.rackspace.com] [{Compute}[http://www.rackspacecloud.com/cloud_hosting_products/servers], {Storage}[http://www.rackspacecloud.com/cloud_hosting_products/files]]
+* {Slicehost}[http://www.slicehost.com] [{Compute}[http://www.slicehost.com]]
 * {Terremark}[http://www.terremark.com] [{vCloud Express}[http://vcloudexpress.terremark.com]]
 
 There are also the basics of these providers (that could use your love):
-* {GoGrid}[http://www.gogrid.com]
-* {Linode}[http://www.linode.com]
-* Local [Files]
-* {New Servers}[http://www.newservers.com]
+* {GoGrid}[http://www.gogrid.com] [{Compute}[http://www.gogrid.com]]
+* {Linode}[http://www.linode.com] [{Compute}[http://www.linode.com]]
+* Local [Storage]
+* {New Servers}[http://www.newservers.com] [{Compute}[http://www.newservers.com]]
 
 Enjoy, and let me know what I can do to continue improving fog!
 

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.6'
-  s.date              = '2010-09-27'
+  s.version           = '0.3.7'
+  s.date              = '2010-09-29'
   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.1')
+  s.add_dependency('excon', '>=0.2.3')
   s.add_dependency('formatador', '>=0.0.15')
   s.add_dependency('json')
   s.add_dependency('mime-types')
@@ -548,7 +548,6 @@ Gem::Specification.new do |s|
     spec/aws/models/storage/directory_spec.rb
     spec/aws/models/storage/file_spec.rb
     spec/aws/models/storage/files_spec.rb
-    spec/aws/requests/compute/describe_images_spec.rb
     spec/aws/requests/simpledb/batch_put_attributes_spec.rb
     spec/aws/requests/simpledb/create_domain_spec.rb
     spec/aws/requests/simpledb/delete_attributes_spec.rb
@@ -650,6 +649,7 @@ Gem::Specification.new do |s|
     tests/aws/models/storage/directory_tests.rb
     tests/aws/requests/compute/address_tests.rb
     tests/aws/requests/compute/availability_zone_tests.rb
+    tests/aws/requests/compute/image_tests.rb
     tests/aws/requests/compute/instance_tests.rb
     tests/aws/requests/compute/key_pair_tests.rb
     tests/aws/requests/compute/region_tests.rb

data/lib/fog.rb

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

data/lib/fog/aws/storage.rb

@@ -173,6 +173,7 @@ module Fog
 
           if response.status == 307
             uri = URI.parse(response.headers['Location'])
+            Formatador.display_line("[yellow][WARN] fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant[/]")
             response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false).request(original_params, &block)
           end
 

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

@@ -7,6 +7,11 @@ module Fog
       class BlockInstantiationError < StandardError; end
 
       class Server < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:ssh_key, :public_key)
+        deprecate(:ssh_key=, :public_key=)
+        deprecate(:user, :username)
+        deprecate(:user=, :username=)
 
         identity :id
 
@@ -17,13 +22,16 @@ module Fog
         attribute :ips
         attribute :status
         attribute :flavor_id
-        # attribute :image_id
-
-        attr_accessor :image_id
+        attribute :image_id
         attribute :template
 
-        # Not reported by the API, but used at create time
-        attr_accessor :password, :ssh_key, :user
+        attr_accessor :password
+        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
+
+        def initialize(attributes={})
+          @flavor_id ||= '94fd37a7-2606-47f7-84d5-9000deda52ae'
+          super
+        end
 
         def destroy
           requires :id
@@ -41,6 +49,22 @@ module Fog
           connection.images.get(@image_id)
         end
 
+        def 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
+          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?
           @status == 'running'
         end
@@ -53,21 +77,42 @@ module Fog
 
         def save
           requires :flavor_id, :image_id
-          options = if !@password && !@ssh_key
-            raise(ArgumentError, "password or ssh_key is required for this operation")
-          elsif @ssh_key
-            {'ssh_public_key' => @ssh_key}
+          options = if !password && !public_key
+            raise(ArgumentError, "password or public_key is required for this operation")
+          elsif public_key
+            {'ssh_public_key' => public_key}
           elsif @password
-            {'password' => @password}
-          end
-          if @user
-            options['user'] = @user
+            {'password' => password}
           end
-          data = connection.create_block(@flavor_id, @image_id, options)
+          options['username'] = username
+          data = connection.create_block(flavor_id, image_id, options)
           merge_attributes(data.body)
           true
         end
 
+        def setup(credentials = {})
+          requires :identity, :ips, :public_key, :username
+          Fog::SSH.new(ips.first['address'], username, credentials).run([
+            %{mkdir .ssh},
+            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
+            %{passwd -l root},
+            %{echo "#{attributes.to_json}" >> ~/attributes.json}
+          ])
+        rescue Errno::ECONNREFUSED
+          sleep(1)
+          retry
+        end
+
+        def ssh(commands)
+          requires :identity, :ips, :private_key, :username
+          @ssh ||= Fog::SSH.new(ips.first['address'], username, :key_data => [private_key])
+          @ssh.run(commands)
+        end
+
+        def username
+          @username ||= 'deploy'
+        end
+
         private
 
         def product=(new_product)

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

@@ -14,6 +14,13 @@ module Fog
           load(data)
         end
 
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server.wait_for { ready? }
+          server.setup(:key_data => [server.private_key])
+          server
+        end
+
         def get(server_id)
           if server_id && server = connection.get_block(server_id).body
             new(server)

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

@@ -18,8 +18,8 @@ module Fog
         attribute :progress
         attribute :status
 
-        attr_accessor :password, :username
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path
+        attr_reader :password
+        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
           @flavor_id ||= 1

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

@@ -15,10 +15,13 @@ module Fog
         attribute :flavor_id,     :aliases => 'flavor-id'
         attribute :image_id,      :aliases => 'image-id'
         attribute :name
-        attribute :password,      :aliases => 'root-password'
         attribute :progress
         attribute :status
 
+        attr_accessor :password
+        alias_method :'root-password=', :password=
+        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
+
         def initialize(attributes={})
           @flavor_id ||= 1
           super
@@ -40,6 +43,22 @@ module Fog
           connection.images.get(@image_id)
         end
 
+        def 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
+          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?
           @status == 'active'
         end
@@ -57,6 +76,29 @@ module Fog
           true
         end
 
+        def setup(credentials = {})
+          requires :addresses, :identity, :public_key, :username
+          Fog::SSH.new(addresses.first, username, credentials).run([
+            %{mkdir .ssh},
+            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
+            %{passwd -l root},
+            %{echo "#{attributes.to_json}" >> ~/attributes.json}
+          ])
+        rescue Errno::ECONNREFUSED
+          sleep(1)
+          retry
+        end
+
+        def ssh(commands)
+          requires :addresses, :identity, :private_key, :username
+          @ssh ||= Fog::SSH.new(addresses.first, username, :key_data => [private_key])
+          @ssh.run(commands)
+        end
+
+        def username
+          @username ||= 'root'
+        end
+
       end
 
     end

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

@@ -14,6 +14,13 @@ module Fog
           load(data)
         end
 
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server.wait_for { ready? }
+          server.setup(:password => server.password)
+          server
+        end
+
         def get(server_id)
           if server_id && server = connection.get_slice(server_id).body
             new(server)

data/tests/aws/models/storage/directory_tests.rb

@@ -2,7 +2,8 @@ Shindo.tests('AWS::Storage | directory models', ['aws']) do
 
   @collection = AWS[:storage].directories
   @model = @collection.new(:key => Time.now.to_f.to_s)
+  @non_id = 'not_a_directory'
 
-  tests_models
+  tests_model
 
 end

data/tests/aws/requests/compute/image_tests.rb

@@ -0,0 +1,41 @@
+Shindo.tests('AWS::Compute | image requests', ['aws']) do
+
+  @images_format = {
+    'imagesSet'    => [{
+      'architecture'    => String,
+      'blockDeviceMapping' =>[],
+      'imageId'         => String,
+      'imageLocation'   => String,
+      'imageOwnerId'    => String,
+      'imageState'      => String,
+      'imageType'       => String,
+      'isPublic'        => Fog::Boolean,
+      'kernelId'        => String,
+      'productCodes'    => [],
+      'ramdiskId'       => String,
+      'rootDeviceType'  => String
+    }],
+      'requestId'     => String,
+  }
+
+  tests('success') do
+
+    # the result for this is HUGE an relatively uninteresting...de
+    # tests("#describe_images").formats(@images_format) do
+    #   AWS[:compute].describe_images.body
+    # end
+
+    tests("#describe_images('ImageId' => '#{GENTOO_AMI}')").formats(@images_format) do
+      AWS[:compute].describe_images('ImageId' => GENTOO_AMI).body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#describe_images('ImageId' => 'ami-00000000')").raises(Fog::AWS::Compute::Error) do
+      AWS[:compute].describe_regions('ImageId' => 'ami-00000000')
+    end
+  end
+
+end

data/tests/aws/requests/compute/key_pair_tests.rb

@@ -4,7 +4,6 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
 
     @keypair_format = {
       'keyFingerprint'  => String,
-      'keyMaterial'     => String,
       'keyName'         => String,
       'requestId'       => String
     }
@@ -17,9 +16,10 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
       'requestId' => String
     }
 
-    @key_pair_name = 'fog_key_pair'
+    @key_pair_name = 'fog_create_key_pair'
+    @public_key_material = 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1SL+kgze8tvSFW6Tyj3RyZc9iFVQDiCKzjgwn2tS7hyWxaiDhjfY2mBYSZwFdKN+ZdsXDJL4CPutUg4DKoQneVgIC1zuXrlpPbaT0Btu2aFd4qNfJ85PBrOtw2GrWZ1kcIgzZ1mMbQt6i1vhsySD2FEj+5kGHouNxQpI5dFR5K+nGgcTLFGnzb/MPRBk136GVnuuYfJ2I4va/chstThoP8UwnoapRHcBpwTIfbmmL91BsRVqjXZEUT73nxpxFeXXidYwhHio+5dXwE0aM/783B/3cPG6FVoxrBvjoNpQpAcEyjtRh9lpwHZtSEW47WNzpIW3PhbQ8j4MryznqF1Rhw=='
 
-    tests("#create_key_pair('#{@key_pair_name}')").formats(@keypair_format) do
+    tests("#create_key_pair('#{@key_pair_name}')").formats(@keypair_format.merge({'keyMaterial' => String})) do
       AWS[:compute].create_key_pair(@key_pair_name).body
     end
 
@@ -35,6 +35,14 @@ Shindo.tests('AWS::Compute | key pair requests', ['aws']) do
       AWS[:compute].delete_key_pair(@key_pair_name).body
     end
 
+    tests("#import_key_pair('fog_import_key_pair', '#{@public_key_material}')").formats(@keypair_format) do
+      AWS[:compute].import_key_pair('fog_import_key_pair', @public_key_material).body
+    end
+
+    tests("#delete_key_pair('fog_import_key_pair)").succeeds do
+      AWS[:compute].delete_key_pair('fog_import_key_pair')
+    end
+
     tests("#delete_key_pair('not_a_key_name')").succeeds do
       AWS[:compute].delete_key_pair('not_a_key_name')
     end

data/tests/helpers/model_helper.rb

@@ -1,37 +1,52 @@
-def tests_models
+def tests_model
+  tests_model_first
+  tests_collection
+  tests_model_last
+end
 
-  after do
-    if @model && !@model.new_record?
-      if @model.respond_to?(:ready?)
-        @model.wait_for { ready? }
-      end
-      @model.destroy
+def tests_model_first
+
+  tests(@model.class) do
+
+    test('#save') do
+      @model.save
     end
+
+    if @model.respond_to?(:ready?)
+      @model.wait_for { ready? }
+    end
+
+    test('#reload') do
+      reloaded = @model.reload
+      @model.attributes == reloaded.attributes
+    end
+
   end
 
-  tests('collection') do
+end
 
-    test('#all includes persisted models') do
-      @model.save
-      @collection.all.map {|model| model.identity}.include? @model.identity
+def tests_collection
+
+  tests(@collection.class) do
+
+    test('collection#all includes persisted models') do
+      @collection.all.map {|model| model.identity}.include?(@model.identity)
     end
 
-    tests('#get') do
+    tests('collection#get') do
 
       test 'should return a matching model if one exists' do
-        @model.save
         get = @collection.get(@model.identity)
         @model.attributes == get.attributes
       end
 
       test 'should return nil if no matching model exists' do
-        !@collection.get('0')
+        !@collection.get(@non_id)
       end
 
     end
 
-    test('#reload') do
-      @model.save
+    test('collection#reload') do
       @collection.all
       reloaded = @collection.reload
       @collection.attributes == reloaded.attributes
@@ -39,38 +54,19 @@ def tests_models
 
   end
 
-  tests('model') do
-
-    test('#reload') do
-      @model.save
-      if @model.respond_to?(:ready?)
-        @model.wait_for { ready? }
-      end
-      reloaded = @model.reload
-      @model.attributes == reloaded.attributes
-    end
-
-    tests('#save') do
+end
 
-      test('does not exist remotely before save') do
-        !@collection.get(@model.identity)
-      end
+def tests_model_last
 
-      test('succeeds') do
-        @model.save
-      end
+  tests(@model.class) do
 
-      test('does exist remotely after save') do
-        @model.save
-        if @model.respond_to?(:ready?)
-          @model.wait_for { ready? }
-        end
-        reloaded = @model.reload
-        @model.attributes == reloaded.attributes
+    test('#destroy') do
+      if @model.respond_to?(:ready?)
+        @model.wait_for{ ready? }
       end
-
+      @model.destroy
     end
 
   end
 
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 -07:00
+date: 2010-09-29 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,8 +39,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 3
+        version: 0.2.3
   requirement: *id002
   name: excon
 - !ruby/object:Gem::Dependency 
@@ -655,7 +655,6 @@ files:
 - spec/aws/models/storage/directory_spec.rb
 - spec/aws/models/storage/file_spec.rb
 - spec/aws/models/storage/files_spec.rb
-- spec/aws/requests/compute/describe_images_spec.rb
 - spec/aws/requests/simpledb/batch_put_attributes_spec.rb
 - spec/aws/requests/simpledb/create_domain_spec.rb
 - spec/aws/requests/simpledb/delete_attributes_spec.rb
@@ -757,6 +756,7 @@ files:
 - tests/aws/models/storage/directory_tests.rb
 - tests/aws/requests/compute/address_tests.rb
 - tests/aws/requests/compute/availability_zone_tests.rb
+- tests/aws/requests/compute/image_tests.rb
 - tests/aws/requests/compute/instance_tests.rb
 - tests/aws/requests/compute/key_pair_tests.rb
 - tests/aws/requests/compute/region_tests.rb

data/spec/aws/requests/compute/describe_images_spec.rb

@@ -1,44 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Compute.describe_images' do
-  describe 'success' do
-
-    it "should return proper attributes with no params" do
-      actual = AWS[:compute].describe_images
-      actual.body['requestId'].should be_a(String)
-      image = actual.body['imagesSet'].first
-      image['architecture'].should be_a(String)
-      image['imageId'].should be_a(String)
-      image['imageLocation'].should be_a(String)
-      image['imageOwnerId'].should be_a(String)
-      image['imageState'].should be_a(String)
-      image['imageType'].should be_a(String)
-      [false, true].should include(image['isPublic'])
-      image['kernelId'].should be_a(String) if image['kernelId']
-      image['platform'].should be_a(String) if image['platform']
-      image['ramdiskId'].should be_a(String) if image['ramdiskId']
-      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
-      ["ebs","instance-store"].should include(image['rootDeviceType'])
-      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
-    end
-
-    it "should return proper attributes with params" do
-      actual = AWS[:compute].describe_images('ImageId' => GENTOO_AMI)
-      actual.body['requestId'].should be_a(String)
-      image = actual.body['imagesSet'].first
-      image['architecture'].should be_a(String)
-      image['imageId'].should be_a(String)
-      image['imageLocation'].should be_a(String)
-      image['imageOwnerId'].should be_a(String)
-      image['imageState'].should be_a(String)
-      image['imageType'].should be_a(String)
-      [false, true].should include(image['isPublic'])
-      image['kernelId'].should be_a(String) if image['kernelId']
-      image['platform'].should be_a(String) if image['platform']
-      image['ramdiskId'].should be_a(String) if image['ramdiskId']
-      ["ebs","instance-store"].should include(image['rootDeviceType'])
-      image['rootDeviceName'].should be_a(String) if image['rootDeviceName']
-    end
-
-  end
-end