fog 0.1.8 → 0.1.9

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

@@ -9,7 +9,6 @@ module Fog
         identity :id
 
         attribute :addresses
-        attribute :password,    'adminPass'
         attribute :flavor_id,   'flavorId'
         attribute :host_id,     'hostId'
         attribute :image_id,    'imageId'
@@ -19,6 +18,8 @@ module Fog
         attribute :progress
         attribute :status
 
+        attr_accessor :password, :private_key_path, :public_key_path
+
         def destroy
           requires :id
           connection.delete_server(@id)
@@ -50,6 +51,14 @@ module Fog
           true
         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
+
         def save
           requires :flavor_id, :image_id
           options = {
@@ -63,8 +72,35 @@ module Fog
           true
         end
 
+        def ssh(commands)
+          requires :addresses, :identity, :private_key_path
+          @ssh ||= Fog::SSH.new(@addresses['public'].first, 'root', :keys => [private_key_path])
+          @ssh.run(commands)
+        end
+
+        def setup
+          requires :addresses, :identity, :password, :public_key_path
+          Fog::SSH.new(@addresses['public'].first, 'root', :password => password).run([
+            %{mkdir .ssh},
+            %{echo "#{File.read(File.expand_path(public_key_path))}" >> ~/.ssh/authorized_keys},
+            %{passwd -l root},
+            %{echo "#{attributes.to_json}" >> ~/attributes.json},
+            %{echo "#{metadata.to_json}" >> ~/metadata.json}
+          ])
+        rescue Errno::ECONNREFUSED
+          sleep(1)
+          retry
+        end
+
+        private
+
+        def adminPass=(new_admin_pass)
+          @password = new_admin_pass
+        end
+
       end
 
     end
   end
+
 end

data/lib/fog/rackspace/models/servers/servers.rb

@@ -5,13 +5,7 @@ module Fog
   module Rackspace
     module Servers
 
-      class Mock
-        def servers
-          Fog::Rackspace::Servers::Servers.new(:connection => self)
-        end
-      end
-
-      class Real
+      module Collections
         def servers
           Fog::Rackspace::Servers::Servers.new(:connection => self)
         end
@@ -26,6 +20,13 @@ module Fog
           load(data)
         end
 
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server.wait_for { ready? }
+          server.setup
+          server
+        end
+
         def get(server_id)
           if server = connection.get_server_details(server_id).body['server']
             new(server)

data/lib/fog/rackspace/requests/files/put_object.rb

@@ -9,7 +9,7 @@ module Fog
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
         def put_object(container, object, data)
-          data = Fog::Rackspace::Files.parse_data(data)
+          data = parse_data(data)
           response = storage_request(
             :body     => data[:body],
             :expects  => 201,

data/lib/fog/rackspace/servers.rb

@@ -1,52 +1,40 @@
 module Fog
   module Rackspace
     module Servers
+      extend Fog::Service
 
-      class Error < Fog::Errors::Error; end
-      class NotFound < Fog::Errors::NotFound; end
+      requires :rackspace_api_key, :rackspace_username
 
-      def self.new(options={})
+      model_path 'fog/rackspace/models/servers'
+      model 'flavor'
+      model 'flavors'
+      model 'image'
+      model 'images'
+      model 'server'
+      model 'servers'
 
-        unless @required
-          require 'fog/rackspace/models/servers/flavor'
-          require 'fog/rackspace/models/servers/flavors'
-          require 'fog/rackspace/models/servers/image'
-          require 'fog/rackspace/models/servers/images'
-          require 'fog/rackspace/models/servers/server'
-          require 'fog/rackspace/models/servers/servers'
-          require 'fog/rackspace/requests/servers/create_image'
-          require 'fog/rackspace/requests/servers/create_server'
-          require 'fog/rackspace/requests/servers/delete_image'
-          require 'fog/rackspace/requests/servers/delete_server'
-          require 'fog/rackspace/requests/servers/get_flavor_details'
-          require 'fog/rackspace/requests/servers/get_image_details'
-          require 'fog/rackspace/requests/servers/get_server_details'
-          require 'fog/rackspace/requests/servers/list_addresses'
-          require 'fog/rackspace/requests/servers/list_private_addresses'
-          require 'fog/rackspace/requests/servers/list_public_addresses'
-          require 'fog/rackspace/requests/servers/list_flavors'
-          require 'fog/rackspace/requests/servers/list_flavors_detail'
-          require 'fog/rackspace/requests/servers/list_images'
-          require 'fog/rackspace/requests/servers/list_images_detail'
-          require 'fog/rackspace/requests/servers/list_servers'
-          require 'fog/rackspace/requests/servers/list_servers_detail'
-          require 'fog/rackspace/requests/servers/reboot_server'
-          require 'fog/rackspace/requests/servers/update_server'
-          @required = true
-        end
-
-        if Fog.mocking?
-          Fog::Rackspace::Servers::Mock.new(options)
-        else
-          Fog::Rackspace::Servers::Real.new(options)
-        end
-      end
-
-      def self.reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
+      request_path 'fog/rackspace/requests/servers'
+      request 'create_image'
+      request 'create_server'
+      request 'delete_image'
+      request 'delete_server'
+      request 'get_flavor_details'
+      request 'get_image_details'
+      request 'get_server_details'
+      request 'list_addresses'
+      request 'list_private_addresses'
+      request 'list_public_addresses'
+      request 'list_flavors'
+      request 'list_flavors_detail'
+      request 'list_images'
+      request 'list_images_detail'
+      request 'list_servers'
+      request 'list_servers_detail'
+      request 'reboot_server'
+      request 'update_server'
 
       class Mock
+        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -75,6 +63,7 @@ module Fog
       end
 
       class Real
+        include Collections
 
         def initialize(options={})
           credentials = Fog::Rackspace.authenticate(options)
@@ -88,7 +77,6 @@ module Fog
 
         def request(params)
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-
           begin
             response = @connection.request(params.merge!({
               :headers  => {
@@ -99,11 +87,11 @@ module Fog
               :path     => "#{@path}/#{params[:path]}"
             }))
           rescue Excon::Errors::Error => error
-            case error
+            raise case error
             when Excon::Errors::NotFound
-              raise Fog::Rackspace::Servers::NotFound
+              Fog::Rackspace::Servers::NotFound.slurp(error)
             else
-              raise error
+              error
             end
           end
           unless response.body.empty?

data/lib/fog/service.rb

@@ -0,0 +1,82 @@
+module Fog
+  module Service
+
+    def self.extended(other)
+      super
+      other.module_eval <<-EOS, __FILE__, __LINE__
+        class Error < Fog::Errors::Error; end
+        class NotFound < Fog::Errors::NotFound; end
+
+        module Collections; end
+
+        def self.new(options={})
+          missing = []
+          for requirement in requirements
+            missing << requirement unless options[requirement]
+          end
+          unless missing.empty?
+            if missing.length == 1
+              raise(ArgumentError, [missing.first, "is required for this service"].join(' '))
+            else
+              raise(ArgumentError, [missing[0...-1].join(", "), 'and', missing[-1], 'are required for this service'].join(' '))
+            end
+          end
+
+          unless @required
+            for model in models
+              require [@model_path, model].join('/')
+            end
+            for request in requests
+              require [@request_path, request].join('/')
+            end
+            @required = true
+          end
+
+          if Fog.mocking?
+            Mock.new(options)
+          else
+            Real.new(options)
+          end
+        end
+      EOS
+    end
+
+    def model_path(new_path)
+      @model_path = new_path
+    end
+
+    def model(new_model)
+      models << new_model
+    end
+
+    def models
+      @models ||= []
+    end
+
+    def request_path(new_path)
+      @request_path = new_path
+    end
+
+    def request(new_request)
+      requests << new_request
+    end
+
+    def requests
+      @requests ||= []
+    end
+
+    def requires(*args)
+      requirements.concat(args)
+    end
+
+    def requirements
+      @requirements ||= []
+    end
+
+    def reset_data(keys=Mock.data.keys)
+      Mock.reset_data(keys)
+    end
+
+  end
+end
+

data/lib/fog/slicehost.rb

@@ -1,46 +1,31 @@
 module Fog
   module Slicehost
-
-    class Error < Fog::Errors::Error; end
-    class NotFound < Fog::Errors::NotFound; end
-
-    def self.new(options={})
-
-      unless @required
-        require 'fog/slicehost/models/flavor'
-        require 'fog/slicehost/models/flavors'
-        require 'fog/slicehost/models/image'
-        require 'fog/slicehost/models/images'
-        require 'fog/slicehost/models/server'
-        require 'fog/slicehost/models/servers'
-        require 'fog/slicehost/requests/create_slice'
-        require 'fog/slicehost/requests/delete_slice'
-        require 'fog/slicehost/requests/get_backups'
-        require 'fog/slicehost/requests/get_flavor'
-        require 'fog/slicehost/requests/get_flavors'
-        require 'fog/slicehost/requests/get_image'
-        require 'fog/slicehost/requests/get_images'
-        require 'fog/slicehost/requests/get_slice'
-        require 'fog/slicehost/requests/get_slices'
-        require 'fog/slicehost/requests/reboot_slice'
-        @required = true
-      end
-
-      unless options[:slicehost_password]
-        raise ArgumentError.new('slicehost_password is required to access slicehost')
-      end
-      if Fog.mocking?
-        Fog::Slicehost::Mock.new(options)
-      else
-        Fog::Slicehost::Real.new(options)
-      end
-    end
-
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
+    extend Fog::Service
+
+    requires :slicehost_password
+
+    model_path 'fog/slicehost/models'
+    model 'flavor'
+    model 'flavors'
+    model 'image'
+    model 'images'
+    model 'server'
+    model 'servers'
+
+    request_path 'fog/slicehost/requests'
+    request 'create_slice'
+    request 'delete_slice'
+    request 'get_backups'
+    request 'get_flavor'
+    request 'get_flavors'
+    request 'get_image'
+    request 'get_images'
+    request 'get_slice'
+    request 'get_slices'
+    request 'reboot_slice'
 
     class Mock
+      include Collections
 
       def self.data
         @data ||= Hash.new do |hash, key|
@@ -62,6 +47,7 @@ module Fog
     end
 
     class Real
+      include Collections
 
       def initialize(options={})
         @slicehost_password = options[:slicehost_password]
@@ -86,11 +72,11 @@ module Fog
         begin
           response = @connection.request(params.merge!({:host => @host}))
         rescue Excon::Errors::Error => error
-          case error
+          raise case error
           when Excon::Errors::NotFound
-            raise Fog::Slicehost::NotFound
+            Fog::Slicehost::NotFound.slurp(error)
           else
-            raise error
+            error
           end
         end
 

data/lib/fog/slicehost/models/flavors.rb

@@ -4,13 +4,7 @@ require 'fog/slicehost/models/flavor'
 module Fog
   module Slicehost
 
-    class Mock
-      def flavors
-        Fog::Slicehost::Flavors.new(:connection => self)
-      end
-    end
-
-    class Real
+    module Collections
       def flavors
         Fog::Slicehost::Flavors.new(:connection => self)
       end

data/lib/fog/slicehost/models/images.rb

@@ -4,15 +4,7 @@ require 'fog/slicehost/models/image'
 module Fog
   module Slicehost
 
-    class Mock
-      def images(attributes = {})
-        Fog::Slicehost::Images.new({
-          :connection => self
-        }.merge!(attributes))
-      end
-    end
-
-    class Real
+    module Collections
       def images(attributes = {})
         Fog::Slicehost::Images.new({
           :connection => self

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

@@ -4,13 +4,7 @@ require 'fog/slicehost/models/server'
 module Fog
   module Slicehost
 
-    class Mock
-      def servers
-        Fog::Slicehost::Servers.new(:connection => self)
-      end
-    end
-
-    class Real
+    module Collections
       def servers
         Fog::Slicehost::Servers.new(:connection => self)
       end

data/lib/fog/ssh.rb

@@ -54,7 +54,7 @@ module Fog
                 sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
                 escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
                 channel.request_pty
-                result = Result.new(command)
+                result = Result.new(escaped_command)
                 channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
                   unless success
                     raise "Could not execute command: #{command.inspect}"