fog 0.3.7 → 0.3.8

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/image'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Bluebox
@@ -15,14 +15,15 @@ module Fog
 
         identity :id
 
-        attribute :memory
-        attribute :storage
-        attribute :hostname
         attribute :cpu
-        attribute :ips
-        attribute :status
+        attribute :description
         attribute :flavor_id
+        attribute :hostname
         attribute :image_id
+        attribute :ips
+        attribute :memory
+        attribute :status
+        attribute :storage
         attribute :template
 
         attr_accessor :password
@@ -76,6 +77,7 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :flavor_id, :image_id
           options = if !password && !public_key
             raise(ArgumentError, "password or public_key is required for this operation")

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/bluebox/models/compute/server'
 
 module Fog

data/lib/fog/bluebox/requests/compute/get_blocks.rb

@@ -26,7 +26,7 @@ module Fog
 
       class Mock
 
-        def get_slices
+        def get_blocks
           Fog::Mock.not_implemented
         end
 

data/lib/fog/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core/attributes'
+require 'fog/core/collection'
+require 'fog/core/connection'
+require 'fog/core/deprecation'
+require 'fog/core/errors'
+require 'fog/core/hmac'
+require 'fog/core/model'
+require 'fog/core/parser'
+require 'fog/core/provider'
+require 'fog/core/service'
+require 'fog/core/ssh'

data/lib/fog/{bin.rb → core/bin.rb}

@@ -1,4 +1,4 @@
-require 'fog/credentials'
+require 'fog/core/credentials'
 
 module Fog
   class << self

data/lib/fog/{collection.rb → core/collection.rb}

@@ -17,6 +17,7 @@ module Fog
 
     %w[reject select].each do |method|
       class_eval <<-RUBY
+        remove_method :#{method}
         def #{method}(*args)
           unless @loaded
             lazy_load
@@ -37,6 +38,7 @@ module Fog
 
     attr_accessor :connection
 
+    remove_method :clear
     def clear
       @loaded = true
       super
@@ -49,9 +51,11 @@ module Fog
     end
 
     def initialize(attributes = {})
+      @loaded = false
       merge_attributes(attributes)
     end
 
+    remove_method :inspect
     def inspect
       Thread.current[:formatador] ||= Formatador.new
       data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"

data/lib/fog/{credentials.rb → core/credentials.rb}

@@ -34,6 +34,8 @@ module Fog
   :aws_secret_access_key: INTENTIONALLY_LEFT_BLANK
   :bluebox_api_key:       INTENTIONALLY_LEFT_BLANK
   :bluebox_customer_id:   INTENTIONALLY_LEFT_BLANK
+  :go_grid_api_key:       INTENTIONALLY_LEFT_BLANK
+  :go_grid_shared_secret: INTENTIONALLY_LEFT_BLANK
   :local_root:            INTENTIONALLY_LEFT_BLANK
   :new_servers_password:  INTENTIONALLY_LEFT_BLANK
   :new_servers_username:  INTENTIONALLY_LEFT_BLANK

data/lib/fog/{service.rb → core/service.rb}

@@ -68,6 +68,7 @@ module Fog
           superclass.setup_requirements
         end
 
+        @required ||= false
         unless @required
           for collection in collections
             require [@model_path, collection].join('/')

data/lib/fog/{ssh.rb → core/ssh.rb}

@@ -54,27 +54,27 @@ module Fog
               sudoable_command  = command.sub(/^sudo/, %{sudo -p 'fog sudo password:'})
               escaped_command   = sudoable_command.sub(/'/, %{'"'"'})
               result = Result.new(escaped_command)
-              ssh.open_channel do |channel|
-                channel.request_pty
-                channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
+              ssh.open_channel do |ssh_channel|
+                ssh_channel.request_pty
+                ssh_channel.exec(%{bash -lc '#{escaped_command}'}) do |channel, success|
                   unless success
                     raise "Could not execute command: #{command.inspect}"
                   end
 
-                  channel.on_data do |channel, data|
+                  channel.on_data do |ch, data|
                     result.stdout << data
                   end
 
-                  channel.on_extended_data do |channel, type, data|
+                  channel.on_extended_data do |ch, type, data|
                     next unless type == 1
                     result.stderr << data
                   end
 
-                  channel.on_request('exit-status') do |channel, data|
+                  channel.on_request('exit-status') do |ch, data|
                     result.status = data.read_long
                   end
 
-                  channel.on_request('exit-signal') do |channel, data|
+                  channel.on_request('exit-signal') do |ch, data|
                     result.status = 255
                   end
                 end

data/lib/fog/go_grid.rb

@@ -11,7 +11,7 @@ module Fog
       warning = "[yellow][WARN] Fog::GoGrid#new is deprecated, use Fog::GoGrid::Compute#new instead[/]"
       warning << " [light_black](" << location << ")[/] "
       Formatador.display_line(warning)
-      Fog::Bluebox::Compute.new(attributes)
+      Fog::GoGrid::Compute.new(attributes)
     end
 
   end

data/lib/fog/go_grid/compute.rb

@@ -6,9 +6,14 @@ module Fog
       requires :go_grid_shared_secret
 
       model_path 'fog/go_grid/models/compute'
+      model         :image
+      collection    :images
+      model         :server
+      collection    :servers
 
       request_path 'fog/go_grid/requests/compute'
       request :common_lookup_list
+      request :grid_image_get
       request :grid_image_list
       request :grid_ip_list
       request :grid_loadbalancer_list
@@ -67,7 +72,7 @@ module Fog
             'api_key' => @go_grid_api_key,
             'format'  => 'json',
             'sig'     => Digest::MD5.hexdigest("#{@go_grid_api_key}#{@go_grid_shared_secret}#{Time.now.to_i}"),
-            'v'       => '1.4'
+            'v'       => '1.5'
           })
 
           begin

data/lib/fog/go_grid/models/compute/image.rb

@@ -0,0 +1,60 @@
+require 'fog/core/model'
+
+module Fog
+  module GoGrid
+    class Compute
+
+      class Image < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :description
+        attribute :friendly_name, :aliases => 'friendlyName'
+        attribute :created_at,    :aliases => 'createdTime'
+        attribute :updated_at,    :aliases => 'updatedTime'
+        attribute :server_id,     :aliases => 'id'
+        attribute :state
+        attribute :price
+        attribute :location
+        attribute :billingtokens
+        attribute :os
+        attribute :architecture
+        attribute :type
+        attribute :active,        :aliases => 'isActive'
+        attribute :public,        :aliases => 'isPublic'
+        attribute :object_type,   :aliases => 'object'
+        attribute :owner
+
+
+        def server=(new_server)
+          requires :id
+
+          @server_id = new_server.id
+        end
+
+        def destroy
+          requires :id
+
+          connection.grid_server_delete(@id)
+          true
+        end
+
+        def ready?
+          status == 'Available'
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :server_id
+
+          data = connection.grid_server_add(@server_id, 'name' => name)
+          merge_attributes(data.body['image'])
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/models/compute/images.rb

@@ -0,0 +1,33 @@
+require 'fog/core/collection'
+require 'fog/go_grid/models/compute/image'
+
+module Fog
+  module GoGrid
+    class Compute
+
+      class Images < Fog::Collection
+
+        model Fog::GoGrid::Compute::Image
+
+        attribute :server
+
+        def all
+          data = connection.grid_image_list.body['list']
+          load(data)
+          if server
+            self.replace(self.select {|image| image.server_id == server.id})
+          end
+        end
+
+        def get(image_id)
+          response = connection.grid_image_get.body['list'][image_id]
+          new(data)
+        rescue Fog::GoGrid::Compute::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+require 'fog/core/model'
+
+module Fog
+  module GoGrid
+    class Compute
+
+      class BlockInstantiationError < StandardError; end
+
+      class Server < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :image_id        # id or name
+        attribute :ip
+        attribute :memory       # server.ram
+        attribute :state
+        attribute :description  # Optional
+        attribute :sandbox      # Optional. Default: False
+
+        def initialize(attributes={})
+          super
+        end
+
+        def destroy
+          requires :id
+          connection.grid_server_destroy(@id)
+          true
+        end
+
+        def image
+          requires :image_id
+          connection.grid_image_get(@image_id)
+        end
+
+        def ready?
+          @state == 'On'
+        end
+
+        def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          requires :name, :image_id, :ip, :memory
+          options['isSandbox'] = sandbox if sandbox
+          options['server.ram'] = memory
+          options['image'] = image_id
+          data = connection.grid_server_add(name, image, ip, options)
+          merge_attributes(data.body)
+          true
+        end
+
+      end
+
+    end
+
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'fog/core/collection'
+require 'fog/go_grid/models/compute/server'
+
+module Fog
+  module GoGrid
+    class Compute
+
+      class Servers < Fog::Collection
+
+        model Fog::GoGrid::Compute::Server
+
+        def all
+          data = connection.grid_server_list.body['list']
+          load(data)
+        end
+
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server.wait_for { ready? }
+          server
+        end
+
+        def get(server_id)
+          if server_id && server = connection.grid_server_get(server_id).body['list']
+            new(server)
+          end
+        rescue Fog::GoGrid::Compute::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/compute/grid_image_get.rb

@@ -0,0 +1,41 @@
+module Fog
+  module GoGrid
+    class Compute
+      class Real
+
+        # List images
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'id'<~String>         - ID of the image
+        #   * 'name'<~String>       - Name of the image
+        #   * 'image'<~String>      - ID(s) or Name(s) of the images to retrive. Can be speicifed multiple times
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        # TODO: docs
+        def grid_image_get(options={})
+          request(
+            :path     => 'grid/image/get',
+            :query    => options
+          )
+        end
+
+      end
+
+      class Mock
+
+        def grid_image_get(options={})
+          #response = Excon::Response.new
+
+          #images = @data[:list].values
+          #for image in images
+          #  case image['state']
+          #  when 'Available'
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/go_grid/requests/compute/grid_image_list.rb

@@ -30,7 +30,12 @@ module Fog
       class Mock
 
         def grid_image_list(options={})
-          Fog::Mock.not_implemented
+          #response = Excon::Response.new
+
+          #images = @data[:list].values
+          #for image in images
+          #  case image['state']
+          #  when 'Available'
         end
 
       end