fog 0.0.42 → 0.0.43

data/lib/fog/slicehost.rb

@@ -10,28 +10,45 @@ module Fog
       end
     end
 
-    def self.reload
-      load "fog/slicehost/parsers/create_slice.rb"
-      load "fog/slicehost/parsers/get_backups.rb"
-      load "fog/slicehost/parsers/get_flavors.rb"
-      load "fog/slicehost/parsers/get_images.rb"
-      load "fog/slicehost/parsers/get_slices.rb"
-
-      load "fog/slicehost/requests/create_slice.rb"
-      load "fog/slicehost/requests/delete_slice.rb"
-      load "fog/slicehost/requests/get_backups.rb"
-      load "fog/slicehost/requests/get_flavors.rb"
-      load "fog/slicehost/requests/get_images.rb"
-      load "fog/slicehost/requests/get_slices.rb"
+    def self.dependencies
+      [
+        "fog/slicehost/models/flavor.rb",
+        "fog/slicehost/models/flavors.rb",
+        "fog/slicehost/models/image.rb",
+        "fog/slicehost/models/images.rb",
+        "fog/slicehost/models/server.rb",
+        "fog/slicehost/models/servers.rb",
+        "fog/slicehost/parsers/create_slice.rb",
+        "fog/slicehost/parsers/get_backups.rb",
+        "fog/slicehost/parsers/get_flavor.rb",
+        "fog/slicehost/parsers/get_flavors.rb",
+        "fog/slicehost/parsers/get_image.rb",
+        "fog/slicehost/parsers/get_images.rb",
+        "fog/slicehost/parsers/get_slice.rb",
+        "fog/slicehost/parsers/get_slices.rb",
+        "fog/slicehost/requests/create_slice.rb",
+        "fog/slicehost/requests/delete_slice.rb",
+        "fog/slicehost/requests/get_backups.rb",
+        "fog/slicehost/requests/get_flavor.rb",
+        "fog/slicehost/requests/get_flavors.rb",
+        "fog/slicehost/requests/get_image.rb",
+        "fog/slicehost/requests/get_images.rb",
+        "fog/slicehost/requests/get_slice.rb",
+        "fog/slicehost/requests/get_slices.rb",
+        "fog/slicehost/requests/reboot_slice.rb"
+      ]
+    end
 
+    def self.reload
+      self.dependencies.each {|dependency| load(dependency)}
       if Fog.mocking?
         reset_data
       end
     end
 
     def initialize(options={})
-      unless @password = options[:password]
-        raise ArgumentError.new('password is required to access slicehost')
+      unless @slicehost_password = options[:slicehost_password]
+        raise ArgumentError.new('slicehost_password is required to access slicehost')
       end
       @host       = options[:host]      || "api.slicehost.com"
       @port       = options[:port]      || 443
@@ -41,7 +58,7 @@ module Fog
     def request(params)
       @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
       headers = {
-        'Authorization' => "Basic #{Base64.encode64(@password).gsub("\n",'')}"
+        'Authorization' => "Basic #{Base64.encode64(@slicehost_password).chomp!}"
       }
       case params[:method]
       when 'DELETE', 'GET', 'HEAD'
@@ -59,10 +76,11 @@ module Fog
         :parser   => params[:parser],
         :path     => params[:path]
       })
+
       response
     end
 
   end
 end
 
-Fog::Slicehost.reload
+Fog::Slicehost.dependencies.each {|dependency| require(dependency)}

data/lib/fog/slicehost/bin.rb

@@ -0,0 +1,42 @@
+module Slicehost
+  class << self
+    if Fog.credentials[:slicehost_password]
+
+      def initialized?
+        true
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          credentials = Fog.credentials.reject do |k,v|
+            ![:slicehost_password].include?(k)
+          end
+          hash[key] = case key
+          when :slices
+            Fog::Slicehost.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+      def flavors
+        self[:slices].flavors
+      end
+
+      def images
+        self[:slices].images
+      end
+
+      def servers
+        self[:slices].servers
+      end
+
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Fog
+  class Slicehost
+
+    class Flavor < Fog::Model
+
+      identity :id
+
+      attribute :name
+      attribute :price
+      attribute :ram
+
+      def bits
+        # 64
+        raise StandardError.new("Figure me out!?!")
+      end
+
+      def cores
+        # # 2 quad-cores >= 2Ghz = 8 cores
+        # 8 * case ram
+        # when 256
+        #   1/64.0
+        # when 512
+        #   1/32.0
+        # when 1024
+        #   1/16.0
+        # when 2048
+        #   1/8.0
+        # when 4096
+        #   1/4.0
+        # when 8192
+        #   1/2.0
+        # when 15872
+        #   1
+        # end
+        raise StandardError.new("Figure me out!?!")
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,33 @@
+module Fog
+  class Slicehost
+
+    def flavors
+      Fog::Slicehost::Flavors.new(:connection => self)
+    end
+
+    class Flavors < Fog::Collection
+
+      model Fog::Slicehost::Flavor
+
+      def all
+        if @loaded
+          clear
+        end
+        @loaded = true
+        data = connection.get_flavors.body
+        for flavor in data['flavors']
+          self << new(flavor)
+        end
+        self
+      end
+
+      def get(flavor_id)
+        connection.get_flavor(flavor_id)
+      rescue Excon::Errors::Forbidden
+        nil
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,13 @@
+module Fog
+  class Slicehost
+
+    class Image < Fog::Model
+
+      identity :id
+
+      attribute :name
+
+    end
+
+  end
+end

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

@@ -0,0 +1,35 @@
+module Fog
+  class Slicehost
+
+    def images(attributes = {})
+      Fog::Slicehost::Images.new({
+        :connection => self
+      }.merge!(attributes))
+    end
+
+    class Images < Fog::Collection
+
+      model Fog::Slicehost::Image
+
+      def all
+        if @loaded
+          clear
+        end
+        @loaded = true
+        data = connection.get_images.body
+        for image in data['images']
+          self << new(image)
+        end
+        self
+      end
+
+      def get(image_id)
+        connection.get_image(image_id)
+      rescue Excon::Errors::Forbidden
+        nil
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,55 @@
+module Fog
+  class Slicehost
+
+    class Server < Fog::Model
+
+      identity :id
+
+      attribute :addresses
+      attribute :backup_id,     'backup-id'
+      attribute :bandwidth_in,  'bw-in'
+      attribute :bandwidth_out, 'bw-out'
+      attribute :flavor_id,     'flavor-id'
+      attribute :image_id,      'image-id'
+      attribute :name
+      attribute :password,      'root-password'
+      attribute :progress
+      attribute :status
+
+      def destroy
+        requires :id
+        connection.delete_slice(@id)
+        true
+      end
+
+      def flavor
+        requires :flavor_id
+        connection.flavors.get(@flavor_id)
+      end
+
+      def image
+        requires :image_id
+        connection.images.get(@image_id)
+      end
+
+      def ready?
+        @status == 'active'
+      end
+
+      def reboot(type = 'SOFT')
+        requires :id
+        connection.reboot_server(@id, type)
+        true
+      end
+
+      def save
+        requires :flavor_id, :image_id, :name
+        data = connection.create_slice(@flavor_id, @image_id, @name)
+        merge_attributes(data.body)
+        true
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  class Slicehost
+
+    def servers
+      Fog::Slicehost::Servers.new(:connection => self)
+    end
+
+    class Servers < Fog::Collection
+
+      model Fog::Slicehost::Server
+
+      def all
+        if @loaded
+          clear
+        end
+        @loaded = true
+        data = connection.get_slices.body['slices']
+        for server in data
+          self << new(server)
+        end
+        self
+      end
+
+      def get(server_id)
+        if server_id && server = connection.get_slice(server_id).body
+          new(server)
+        elsif !server_id
+          nil
+        end
+      rescue Excon::Errors::Forbidden
+        nil
+      end
+
+    end
+
+  end
+end

data/lib/fog/slicehost/parsers/get_flavor.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetFlavor < Fog::Parsers::Base
+
+        def reset
+          @response = {}
+        end
+
+        def end_element(name)
+          case name
+          when 'id', 'price', 'ram'
+            @response[name] = @value.to_i
+          when 'name'
+            @response[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_image.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetImage < Fog::Parsers::Base
+
+        def reset
+          @response = {}
+        end
+
+        def end_element(name)
+          case name
+          when 'id'
+            @response[name] = @value.to_i
+          when 'name'
+            @response[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/parsers/get_slice.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Parsers
+    module Slicehost
+
+      class GetSlice < Fog::Parsers::Base
+
+        def reset
+          @response = {}
+        end
+
+        def end_element(name)
+          case name
+          when 'address'
+            @response['addresses'] ||= []
+            @response['addresses'] << @value
+          when 'backup-id', 'flavor-id', 'id', 'image-id', 'progress'
+            @response[name] = @value.to_i
+          when 'bw-in', 'bw-out'
+            @response[name] = @value.to_f
+          when 'name', 'status'
+            @response[name] = @value
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/slicehost/requests/create_slice.rb

@@ -41,7 +41,8 @@ else
   module Fog
     class Slicehost
 
-      def get_slices
+      def create_slice(flavor_id, image_id, name)
+        raise MockNotImplemented.new("Contributions welcome!")
       end
 
     end

data/lib/fog/slicehost/requests/delete_slice.rb

@@ -39,7 +39,8 @@ else
   module Fog
     class Slicehost
 
-      def get_slices
+      def delete_slice(slice_id)
+        raise MockNotImplemented.new("Contributions welcome!")
       end
 
     end