fog 0.3.9 → 0.3.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.9)
+    fog (0.3.10)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.15)

data/README.rdoc

@@ -1,4 +1,4 @@
-http://geemus.com/fog.png
+http://geemus.s3.amazonaws.com/fog.png
 
 fog is the Ruby cloud computing library.
 

data/bin/fog

@@ -12,8 +12,17 @@ end
 
 require 'fog/core/bin'
 
+providers = Fog.providers.map{|provider| provider.to_s}
+providers = if providers.length > 1
+  providers[0...-1].join(', ') << ' and ' << providers[-1]
+else
+  providers.first
+end
+
 if ARGV.length > 1
-  print(instance_eval(ARGV[1..-1].join(' ')).to_json)
+
+  puts(instance_eval(ARGV[1..-1].join(' ')).to_json)
+
 else
 
   ARGV.clear # Avoid passing args to IRB
@@ -25,12 +34,6 @@ else
   @irb.context.prompt_mode = :FOG
   @irb.context.workspace = IRB::WorkSpace.new(binding)
 
-  providers = Fog.providers.map{|provider| provider.to_s}
-  providers = if providers.length > 1
-    providers[0...-1].join(', ') << ' and ' << providers[-1]
-  else
-    providers.first
-  end
   Formatador.display_line('Welcome to fog interactive!')
   Formatador.display_line(":#{Fog.credential.to_s} credentials provide #{providers}")
   providers = Fog.providers

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.9'
-  s.date              = '2010-10-18'
+  s.version           = '0.3.10'
+  s.date              = '2010-10-20'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -222,6 +222,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/storage/get_request_payment.rb
     lib/fog/aws/requests/storage/get_service.rb
     lib/fog/aws/requests/storage/head_object.rb
+    lib/fog/aws/requests/storage/post_object_hidden_fields.rb
     lib/fog/aws/requests/storage/put_bucket.rb
     lib/fog/aws/requests/storage/put_bucket_acl.rb
     lib/fog/aws/requests/storage/put_bucket_logging.rb

data/lib/fog.rb

@@ -24,7 +24,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.9'
+    VERSION = '0.3.10'
   end
 
   module Mock
@@ -52,6 +52,10 @@ module Fog
     @bin = new_bin
   end
 
+  def self.credentials
+    {}
+  end
+
   def self.mock!
     @mocking = true
   end

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

@@ -104,20 +104,23 @@ module Fog
         end
 
         def private_key_path
-          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+          @private_key_path ||= Fog.credentials[:private_key_path]
+          @private_key_path &&= File.expand_path(@private_key_path)
         end
 
         def private_key
-          @private_key ||= File.read(private_key_path)
+          @private_key ||= private_key_path && File.read(private_key_path)
         end
 
         def public_key_path
-          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
+          @public_key_path ||= Fog.credentials[:public_key_path]
+          @public_key_path &&= File.expand_path(@public_key_path)
         end
 
         def public_key
-          @public_key ||= File.read(public_key_path)
+          @public_key ||= public_key_path && File.read(public_key_path)
         end
+
         def ready?
           @state == 'running'
         end
@@ -161,14 +164,17 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :identity, :ip_address, :public_key, :username
+          requires :identity, :ip_address, :username
           sleep(10) # takes a bit before EC2 instances will play nice
-          Fog::SSH.new(ip_address, username, credentials).run([
+          commands = [
             %{mkdir .ssh},
-            %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l root},
             %{echo "#{attributes.to_json}" >> ~/attributes.json}
-          ])
+          ]
+          if public_key
+            commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
+          end
+          Fog::SSH.new(ip_address, username, credentials).run(commands)
         rescue Errno::ECONNREFUSED => e
           sleep(1)
           retry

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

@@ -37,13 +37,15 @@ module Fog
         def bootstrap(new_attributes = {})
           server = connection.servers.new(new_attributes)
 
-          # first or create fog_#{credential} keypair
-          unless server.key_pair = connection.key_pairs.get("fog_#{Fog.credential}")
+          unless new_attributes[:key_name]
+            # first or create fog_#{credential} keypair
             name = Fog.respond_to?(:credential) && Fog.credential || :default
-            server.key_pair = connection.key_pairs.create(
-              :name => "fog_#{name}",
-              :public_key => server.public_key
-            )
+            unless server.key_pair = connection.key_pairs.get("fog_#{name}")
+              server.key_pair = connection.key_pairs.create(
+                :name => "fog_#{name}",
+                :public_key => server.public_key
+              )
+            end
           end
 
           # make sure port 22 is open in the first security group

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

@@ -59,6 +59,9 @@ module Fog
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
+          if options['delimiter']
+            Fog::Mock.not_implemented
+          end
           response = Excon::Response.new
           if bucket = @data[:buckets][bucket_name]
             contents = bucket[:objects].values.sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|

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

@@ -0,0 +1,49 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+
+        # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
+        # Form should look like: <form action="http://#{bucket_name}.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
+        # These hidden fields should then appear, followed by a field named 'file' which is either a textarea or file input.
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * acl<~String> - access control list, in ['private', 'public-read', 'public-read-write', 'authenticated-read', 'bucket-owner-read', 'bucket-owner-full-control']
+        #   * Cache-Control - same as REST header
+        #   * Content-Type - same as REST header
+        #   * Content-Disposition - same as REST header
+        #   * Content-Encoding - same as REST header
+        #   * Expires - same as REST header
+        #   * key - key for object, set to '${filename}' to use filename provided by user
+        #   * policy - security policy for upload
+        #   * success_action_redirect - url to redirct to upon success
+        #   * success_action_status - status code to return on success, in [200, 201, 204]
+        #   * x-amz-security-token - devpay security token
+        #   * x-amz-meta-... - meta data tags
+        #
+        # See also: http://docs.amazonwebservices.com/AmazonS3/latest/dev/HTTPPOSTForms.html
+        #
+        def post_object_hidden_fields(options = {})
+          if options['policy']
+            options['policy'] = options['policy'].to_json
+            options['AWSAccessKeyId'] = @aws_access_key_id
+            string_to_sign = Base64.encode64(options['policy']).chomp!
+            signed_string = @hmac.sign(string_to_sign)
+            options['Signature'] = Base64.encode64(signed_string).chomp!
+          end
+          options
+        end
+
+      end
+
+      class Mock
+
+        def post_object_hidden_fields(options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/storage.rb

@@ -27,6 +27,7 @@ module Fog
       request :get_request_payment
       request :get_service
       request :head_object
+      request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
       request :put_bucket_logging

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

@@ -51,19 +51,21 @@ module Fog
         end
 
         def private_key_path
-          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+          @private_key_path ||= Fog.credentials[:private_key_path]
+          @private_key_path &&= File.expand_path(@private_key_path)
         end
 
         def private_key
-          @private_key ||= File.read(private_key_path)
+          @private_key ||= private_key_path && File.read(private_key_path)
         end
 
         def public_key_path
-          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
+          @public_key_path ||= Fog.credentials[:public_key_path]
+          @public_key_path &&= File.expand_path(@public_key_path)
         end
 
         def public_key
-          @public_key ||= File.read(public_key_path)
+          @public_key ||= public_key_path && File.read(public_key_path)
         end
 
         def ready?

data/lib/fog/core/collection.rb

@@ -112,7 +112,7 @@ module Fog
     end
 
     def to_json
-      self.map {|member| member}.to_json
+      self.map {|member| member.attributes}.to_json
     end
 
     private

data/lib/fog/core/credentials.rb

@@ -15,6 +15,7 @@ module Fog
       ENV["FOG_RC"] || '~/.fog'
     end
 
+    remove_method :credentials
     def credentials
       @credentials ||= begin
         path = File.expand_path(config_path)

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

@@ -48,19 +48,21 @@ module Fog
         end
 
         def private_key_path
-          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+          @private_key_path ||= Fog.credentials[:private_key_path]
+          @private_key_path &&= File.expand_path(@private_key_path)
         end
 
         def private_key
-          @private_key ||= File.read(private_key_path)
+          @private_key ||= private_key_path && File.read(private_key_path)
         end
 
         def public_key_path
-          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
+          @public_key_path ||= Fog.credentials[:public_key_path]
+          @public_key_path &&= File.expand_path(@public_key_path)
         end
 
         def public_key
-          @public_key ||= File.read(public_key_path)
+          @public_key ||= public_key_path && File.read(public_key_path)
         end
 
         def ready?

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

@@ -44,19 +44,21 @@ module Fog
         end
 
         def private_key_path
-          File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
+          @private_key_path ||= Fog.credentials[:private_key_path]
+          @private_key_path &&= File.expand_path(@private_key_path)
         end
 
         def private_key
-          @private_key ||= File.read(private_key_path)
+          @private_key ||= private_key_path && File.read(private_key_path)
         end
 
         def public_key_path
-          File.expand_path(@public_key_path ||= Fog.credentials[:public_key_path])
+          @public_key_path ||= Fog.credentials[:public_key_path]
+          @public_key_path &&= File.expand_path(@public_key_path)
         end
 
         def public_key
-          @public_key ||= File.read(public_key_path)
+          @public_key ||= public_key_path && File.read(public_key_path)
         end
 
         def ready?

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -329,6 +329,7 @@ files:
 - lib/fog/aws/requests/storage/get_request_payment.rb
 - lib/fog/aws/requests/storage/get_service.rb
 - lib/fog/aws/requests/storage/head_object.rb
+- lib/fog/aws/requests/storage/post_object_hidden_fields.rb
 - lib/fog/aws/requests/storage/put_bucket.rb
 - lib/fog/aws/requests/storage/put_bucket_acl.rb
 - lib/fog/aws/requests/storage/put_bucket_logging.rb