fog 0.3.11 → 0.3.12

data/Gemfile.lock

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

data/fog.gemspec

@@ -7,7 +7,7 @@ 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.11'
+  s.version           = '0.3.12'
   s.date              = '2010-10-20'
   s.rubyforge_project = 'fog'
 
@@ -375,12 +375,15 @@ Gem::Specification.new do |s|
     lib/fog/rackspace/requests/compute/update_server.rb
     lib/fog/rackspace/requests/storage/delete_container.rb
     lib/fog/rackspace/requests/storage/delete_object.rb
+    lib/fog/rackspace/requests/storage/get_cdn_containers.rb
     lib/fog/rackspace/requests/storage/get_container.rb
     lib/fog/rackspace/requests/storage/get_containers.rb
     lib/fog/rackspace/requests/storage/get_object.rb
+    lib/fog/rackspace/requests/storage/head_cdn_container.rb
     lib/fog/rackspace/requests/storage/head_container.rb
     lib/fog/rackspace/requests/storage/head_containers.rb
     lib/fog/rackspace/requests/storage/head_object.rb
+    lib/fog/rackspace/requests/storage/put_cdn_container.rb
     lib/fog/rackspace/requests/storage/put_container.rb
     lib/fog/rackspace/requests/storage/put_object.rb
     lib/fog/rackspace/servers.rb

data/lib/fog.rb

@@ -24,7 +24,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.11'
+    VERSION = '0.3.12'
   end
 
   module Mock

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

@@ -182,8 +182,7 @@ module Fog
 
         def ssh(commands)
           requires :identity, :ip_address, :private_key, :username
-          @ssh ||= Fog::SSH.new(ip_address, username, :key_data => [private_key])
-          @ssh.run(commands)
+          Fog::SSH.new(ip_address, username, :key_data => [private_key]).run(commands)
         end
 
         def start

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

@@ -46,7 +46,7 @@ module Fog
             'Action'    => 'DescribeImages',
             :idempotent => true,
             :parser     => Fog::Parsers::AWS::Compute::DescribeImages.new
-          }.merge!(options))
+          }.merge!(params))
         end
 
       end

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

@@ -109,8 +109,7 @@ module Fog
 
         def ssh(commands)
           requires :identity, :ips, :private_key, :username
-          @ssh ||= Fog::SSH.new(ips.first['address'], username, :key_data => [private_key])
-          @ssh.run(commands)
+          Fog::SSH.new(ips.first['address'], username, :key_data => [private_key]).run(commands)
         end
 
         def username

data/lib/fog/core/ssh.rb

@@ -51,8 +51,7 @@ module Fog
         begin
           Net::SSH.start(@address, @username, @options) do |ssh|
             commands.each do |command|
-              sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
-              escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
+              escaped_command = command.sub(/'/, %{'"'"'})
               result = Result.new(escaped_command)
               ssh.open_channel do |ssh_channel|
                 ssh_channel.request_pty

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

@@ -105,8 +105,7 @@ module Fog
 
         def ssh(commands)
           requires :addresses, :identity, :private_key, :username
-          @ssh ||= Fog::SSH.new(addresses['public'].first, username, :key_data => [private_key])
-          @ssh.run(commands)
+          Fog::SSH.new(addresses['public'].first, username, :key_data => [private_key]).run(commands)
         end
 
         def username

data/lib/fog/rackspace/requests/storage/get_cdn_containers.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Rackspace
+    class Storage
+      class Real
+
+        # List existing cdn-enabled storage containers
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'enabled_only'<~Boolean> - Set to true to limit results to cdn enabled containers
+        #   * 'limit'<~Integer> - Upper limit to number of results returned
+        #   * 'marker'<~String> - Only return objects with name greater than this value
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * container<~String>: Name of container
+        def get_cdn_containers(options = {})
+          response = cdn_request(
+            :expects  => [200, 204],
+            :method   => 'GET',
+            :path     => '',
+            :query    => {'format' => 'json'}.merge!(options)
+          )
+          response
+        end
+
+      end
+
+      class Mock
+
+        def get_cdn_containers(options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/head_cdn_container.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Rackspace
+    class Storage
+      class Real
+
+        # List cdn properties for a container
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to retrieve info for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * headers<~Hash>:
+        #     * 'X-CDN-Enabled'<~Boolean> - cdn status for container
+        #     * 'X-CDN-URI'<~String> - cdn url for this container
+        #     * 'X-TTL'<~String> - integer seconds before data expires, defaults to 86400 (1 day)
+        #     * 'X-Log-Retention'<~Boolean> - ?
+        #     * 'X-User-Agent-ACL'<~String> - ?
+        #     * 'X-Referrer-ACL'<~String> - ?
+        def head_cdn_container(container)
+          response = cdn_request(
+            :expects  => 204,
+            :method   => 'HEAD',
+            :path     => container,
+            :query    => {'format' => 'json'}
+          )
+          response
+        end
+
+      end
+
+      class Mock
+
+        def head_cdn_container(container)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/storage/put_cdn_container.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Rackspace
+    class Storage
+      class Real
+
+        # modify CDN properties for a container
+        #
+        # ==== Parameters
+        # * name<~String> - Name for container, should be < 256 bytes and must not contain '/'
+        # # options<~Hash>:
+        #   * 'X-CDN-Enabled'<~Boolean> - cdn status for container
+        #   * 'X-CDN-URI'<~String> - cdn url for this container
+        #   * 'X-TTL'<~String> - integer seconds before data expires, defaults to 86400 (1 day), in 3600..259200
+        #   * 'X-Log-Retention'<~Boolean> - ?
+        #   * 'X-User-Agent-ACL'<~String> - ?
+        #   * 'X-Referrer-ACL'<~String> - ?
+        def put_cdn_container(name, options = {})
+          response = cdn_request(
+            :expects  => [201, 202],
+            :headers  => options,
+            :method   => 'PUT',
+            :path     => CGI.escape(name)
+          )
+          response
+        end
+
+      end
+
+      class Mock
+
+        def put_cdn_container(name, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/storage.rb

@@ -14,11 +14,14 @@ module Fog
       request :delete_container
       request :delete_object
       request :get_container
+      request :get_cdn_containers
       request :get_containers
       request :get_object
+      request :head_cdn_container
       request :head_container
       request :head_containers
       request :head_object
+      request :put_cdn_container
       request :put_container
       request :put_object
 
@@ -94,10 +97,11 @@ module Fog
         end
 
         def reload
-          @connection.reset
+          @cdn_connection.reset
+          @storage_connection.reset
         end
 
-        def cdn_request(params)
+        def cdn_request(params, parse_json = true)
           begin
             response = @cdn_connection.request(params.merge!({
               :headers  => {

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

@@ -95,8 +95,7 @@ module Fog
 
         def ssh(commands)
           requires :addresses, :identity, :private_key, :username
-          @ssh ||= Fog::SSH.new(addresses.first, username, :key_data => [private_key])
-          @ssh.run(commands)
+          Fog::SSH.new(addresses.first, username, :key_data => [private_key]).run(commands)
         end
 
         def username

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -482,12 +482,15 @@ files:
 - lib/fog/rackspace/requests/compute/update_server.rb
 - lib/fog/rackspace/requests/storage/delete_container.rb
 - lib/fog/rackspace/requests/storage/delete_object.rb
+- lib/fog/rackspace/requests/storage/get_cdn_containers.rb
 - lib/fog/rackspace/requests/storage/get_container.rb
 - lib/fog/rackspace/requests/storage/get_containers.rb
 - lib/fog/rackspace/requests/storage/get_object.rb
+- lib/fog/rackspace/requests/storage/head_cdn_container.rb
 - lib/fog/rackspace/requests/storage/head_container.rb
 - lib/fog/rackspace/requests/storage/head_containers.rb
 - lib/fog/rackspace/requests/storage/head_object.rb
+- lib/fog/rackspace/requests/storage/put_cdn_container.rb
 - lib/fog/rackspace/requests/storage/put_container.rb
 - lib/fog/rackspace/requests/storage/put_object.rb
 - lib/fog/rackspace/servers.rb