fog 0.0.42 → 0.0.43

data/lib/fog/bin.rb

@@ -0,0 +1,79 @@
+module Fog
+  class << self
+
+    def credential=(new_credential)
+      @credential = new_credential
+      @credentials = nil
+    end
+
+    def credential
+      @credential || :default
+    end
+
+    def credentials
+      @credentials ||= begin
+        path = File.expand_path('~/.fog')
+        credentials = if File.exists?(path)
+          File.open(path) do |file|
+            YAML.load(file.read)
+          end
+        else
+          nil
+        end
+        unless credentials && credentials[credential]
+          print("\n  To run as '#{credential}', add the following to ~/.fog\n")
+          yml = <<-YML
+
+:#{credential}:
+  :aws_access_key_id:     INTENTIONALLY_LEFT_BLANK
+  :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
+  :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
+  :rackspace_username:    INTENTIONALLY_LEFT_BLANK
+  :slicehost_password:    INTENTIONALLY_LEFT_BLANK
+  :terremark_username:    INTENTIONALLY_LEFT_BLANK
+  :terremark_password:    INTENTIONALLY_LEFT_BLANK
+
+YML
+          print(yml)
+          raise(ArgumentError.new("Missing Credentials"))
+        end
+        credentials[credential]
+      end
+    end
+
+    def services
+      services = []
+      [::AWS, ::Rackspace, ::Slicehost, ::Terremark].each do |service|
+        if service.initialized?
+          services << service
+        end
+      end
+      services
+    end
+
+    def flavors
+      flavors = {}
+      services.each do |service|
+        flavors[service] = service.flavors
+      end
+      flavors
+    end
+
+    def images
+      images = {}
+      services.each do |service|
+        images[service] = service.images
+      end
+      images
+    end
+
+    def servers
+      servers = {}
+      services.each do |service|
+        servers[service] = service.servers
+      end
+      servers
+    end
+
+  end
+end

data/lib/fog/collection.rb

@@ -69,16 +69,27 @@ module Fog
     end
 
     def inspect
-      data = "#<#{self.class.name}"
-      for attribute in self.class.attributes
-        data << " #{attribute}=#{send(attribute).inspect}"
-      end
-      data << " ["
-      for member in self
-        data << "#{member.inspect},"
+      Thread.current[:formatador] ||= Formatador.new
+      data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"
+      Thread.current[:formatador].indent do
+        unless self.class.attributes.empty?
+          data << "#{Thread.current[:formatador].indentation}"
+          data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
+          data << "\n"
+        end
+        data << "#{Thread.current[:formatador].indentation}["
+        unless self.empty?
+          data << "\n"
+          Thread.current[:formatador].indent do
+            data << self.map {|member| member.inspect}.join(",\n")
+            data << "\n"
+          end
+          data << Thread.current[:formatador].indentation
+        end
+        data << "]\n"
       end
-      data.chop! unless self.empty?
-      data << "]>"
+      data << "#{Thread.current[:formatador].indentation}>"
+      data
     end
 
     def model

data/lib/fog/model.rb

@@ -56,11 +56,16 @@ module Fog
     end
 
     def inspect
-      data = "#<#{self.class.name}"
-      for attribute in self.class.attributes
-        data << " #{attribute}=#{send(attribute).inspect}"
+      Thread.current[:formatador] ||= Formatador.new
+      data = "#{Thread.current[:formatador].indentation}<#{self.class.name}"
+      Thread.current[:formatador].indent do
+        unless self.class.attributes.empty?
+          data << "\n#{Thread.current[:formatador].indentation}"
+          data << self.class.attributes.map {|attribute| "#{attribute}=#{send(attribute).inspect}"}.join(",\n#{Thread.current[:formatador].indentation}")
+        end
       end
-      data << ">"
+      data << "\n#{Thread.current[:formatador].indentation}>"
+      data
     end
 
     def merge_attributes(new_attributes = {})

data/lib/fog/rackspace.rb

@@ -1,9 +1,15 @@
 module Fog
   module Rackspace
 
+    def self.dependencies
+      [
+        'fog/rackspace/files.rb',
+        'fog/rackspace/servers.rb'
+      ]
+    end
+
     def self.reload
-      load 'fog/rackspace/files.rb'
-      load 'fog/rackspace/servers.rb'
+      self.dependencies.each {|dependency| load(dependency)}
     end
 
     unless Fog.mocking?
@@ -51,4 +57,5 @@ module Fog
 
   end
 end
-Fog::Rackspace.reload
+
+Fog::Rackspace.dependencies.each {|dependency| require(dependency)}

data/lib/fog/rackspace/bin.rb

@@ -0,0 +1,44 @@
+module Rackspace
+  class << self
+    if Fog.credentials[:rackspace_api_key] && Fog.credentials[:rackspace_username]
+
+      def initialized?
+        true
+      end
+
+      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 :files
+            Fog::Rackspace::Files.new(credentials)
+          when :servers
+            Fog::Rackspace::Servers.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+      def flavors
+        self[:servers].flavors
+      end
+
+      def images
+        self[:servers].images
+      end
+
+      def servers
+        self[:servers].servers
+      end
+      
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/files.rb

@@ -2,15 +2,21 @@ module Fog
   module Rackspace
     class Files
 
+      def self.dependencies
+        [
+          "fog/rackspace/requests/files/delete_container.rb",
+          "fog/rackspace/requests/files/delete_object.rb",
+          "fog/rackspace/requests/files/get_container.rb",
+          "fog/rackspace/requests/files/get_containers.rb",
+          "fog/rackspace/requests/files/head_container.rb",
+          "fog/rackspace/requests/files/head_containers.rb",
+          "fog/rackspace/requests/files/put_container.rb",
+          "fog/rackspace/requests/files/put_object.rb"
+        ]
+      end
+
       def self.reload
-        load "fog/rackspace/requests/files/delete_container.rb"
-        load "fog/rackspace/requests/files/delete_object.rb"
-        load "fog/rackspace/requests/files/get_container.rb"
-        load "fog/rackspace/requests/files/get_containers.rb"
-        load "fog/rackspace/requests/files/head_container.rb"
-        load "fog/rackspace/requests/files/head_containers.rb"
-        load "fog/rackspace/requests/files/put_container.rb"
-        load "fog/rackspace/requests/files/put_object.rb"
+        self.dependencies.each {|dependency| load(dependency)}
       end
 
       def initialize(options={})
@@ -92,4 +98,5 @@ module Fog
     end
   end
 end
-Fog::Rackspace::Files.reload
+
+Fog::Rackspace::Files.dependencies.each {|dependency| require(dependency)}

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

@@ -28,7 +28,8 @@ else
     module Rackspace
       class Servers
 
-        def delete_container
+        def delete_container(name)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -29,7 +29,8 @@ else
     module Rackspace
       class Servers
 
-        def delete_object
+        def delete_object(container, object)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -51,7 +51,8 @@ else
     module Rackspace
       class Servers
 
-        def get_flavors
+        def get_container(container, options = {})
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -44,7 +44,8 @@ else
     module Rackspace
       class Servers
 
-        def get_flavors
+        def get_containers(options = {})
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -34,7 +34,8 @@ else
     module Rackspace
       class Servers
 
-        def get_flavors
+        def head_container(container)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -31,7 +31,8 @@ else
     module Rackspace
       class Servers
 
-        def get_flavors
+        def head_containers
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -28,7 +28,8 @@ else
     module Rackspace
       class Servers
 
-        def put_container
+        def put_container(name)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

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

@@ -31,7 +31,8 @@ else
     module Rackspace
       class Servers
 
-        def put_container
+        def put_object(container, object, data)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

data/lib/fog/rackspace/requests/servers/get_flavor_details.rb

@@ -32,6 +32,7 @@ else
       class Servers
 
         def get_flavor_details(flavor_id)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

data/lib/fog/rackspace/requests/servers/list_flavors.rb

@@ -30,6 +30,7 @@ else
       class Servers
 
         def list_flavors
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

data/lib/fog/rackspace/requests/servers/list_flavors_detail.rb

@@ -32,6 +32,7 @@ else
       class Servers
 
         def list_flavors_detail
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

data/lib/fog/rackspace/requests/servers/list_images.rb

@@ -39,7 +39,6 @@ else
           response.status = [200, 203][rand(1)]
           response.body = { 'images' => images }
           response
-
         end
 
       end

data/lib/fog/rackspace/requests/servers/reboot_server.rb

@@ -10,7 +10,7 @@ unless Fog.mocking?
         # * server_id<~Integer> - Id of server to reboot
         # * type<~String> - Type of reboot, must be in ['HARD', 'SOFT']
         #
-        def reboot_server(server_id, type)
+        def reboot_server(server_id, type = 'SOFT')
           request(
             :body     => { 'reboot' => { 'type' => type }}.to_json,
             :expects  => 202,
@@ -30,6 +30,7 @@ else
       class Servers
 
         def reboot_server(server_id, type)
+          raise MockNotImplemented.new("Contributions welcome!")
         end
 
       end

data/lib/fog/rackspace/servers.rb

@@ -18,32 +18,36 @@ module Fog
         end
       end
 
-      def self.reload
-        load "fog/rackspace/models/servers/flavor.rb"
-        load "fog/rackspace/models/servers/flavors.rb"
-        load "fog/rackspace/models/servers/image.rb"
-        load "fog/rackspace/models/servers/images.rb"
-        load "fog/rackspace/models/servers/server.rb"
-        load "fog/rackspace/models/servers/servers.rb"
-
-        load "fog/rackspace/requests/servers/create_image.rb"
-        load "fog/rackspace/requests/servers/create_server.rb"
-        load "fog/rackspace/requests/servers/delete_image.rb"
-        load "fog/rackspace/requests/servers/delete_server.rb"
-        load "fog/rackspace/requests/servers/get_flavor_details.rb"
-        load "fog/rackspace/requests/servers/get_server_details.rb"
-        load "fog/rackspace/requests/servers/list_addresses.rb"
-        load "fog/rackspace/requests/servers/list_private_addresses.rb"
-        load "fog/rackspace/requests/servers/list_public_addresses.rb"
-        load "fog/rackspace/requests/servers/list_flavors.rb"
-        load "fog/rackspace/requests/servers/list_flavors_detail.rb"
-        load "fog/rackspace/requests/servers/list_images.rb"
-        load "fog/rackspace/requests/servers/list_images_detail.rb"
-        load "fog/rackspace/requests/servers/list_servers.rb"
-        load "fog/rackspace/requests/servers/list_servers_detail.rb"
-        load "fog/rackspace/requests/servers/reboot_server.rb"
-        load "fog/rackspace/requests/servers/update_server.rb"
+      def self.dependencies
+        [
+          "fog/rackspace/models/servers/flavor.rb",
+          "fog/rackspace/models/servers/flavors.rb",
+          "fog/rackspace/models/servers/image.rb",
+          "fog/rackspace/models/servers/images.rb",
+          "fog/rackspace/models/servers/server.rb",
+          "fog/rackspace/models/servers/servers.rb",
+          "fog/rackspace/requests/servers/create_image.rb",
+          "fog/rackspace/requests/servers/create_server.rb",
+          "fog/rackspace/requests/servers/delete_image.rb",
+          "fog/rackspace/requests/servers/delete_server.rb",
+          "fog/rackspace/requests/servers/get_flavor_details.rb",
+          "fog/rackspace/requests/servers/get_server_details.rb",
+          "fog/rackspace/requests/servers/list_addresses.rb",
+          "fog/rackspace/requests/servers/list_private_addresses.rb",
+          "fog/rackspace/requests/servers/list_public_addresses.rb",
+          "fog/rackspace/requests/servers/list_flavors.rb",
+          "fog/rackspace/requests/servers/list_flavors_detail.rb",
+          "fog/rackspace/requests/servers/list_images.rb",
+          "fog/rackspace/requests/servers/list_images_detail.rb",
+          "fog/rackspace/requests/servers/list_servers.rb",
+          "fog/rackspace/requests/servers/list_servers_detail.rb",
+          "fog/rackspace/requests/servers/reboot_server.rb",
+          "fog/rackspace/requests/servers/update_server.rb"
+        ]
+      end
 
+      def self.reload
+        self.dependencies.each {|dependency| load(dependency)}
         if Fog.mocking?
           reset_data
         end
@@ -81,4 +85,5 @@ module Fog
     end
   end
 end
-Fog::Rackspace::Servers.reload
+
+Fog::Rackspace::Servers.dependencies.each {|dependency| require(dependency)}