fog 0.2.20 → 0.2.21

data/Gemfile

@@ -1,13 +1,13 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon',      '>= 0.1.4'
-gem 'formatador', ">= 0.0.10"
+gem 'builder',    '>= 0'
+gem 'excon',      '>= 0.2.0'
+gem 'formatador', ">= 0.0.15"
 gem 'json',       ">= 0"
 gem 'mime-types', ">= 0"
 gem 'net-ssh',    ">= 0"
-gem 'nokogiri',   ">= 0"
+gem 'nokogiri',   ">= 1.4.3.1"
 gem 'rspec',      '>= 0'
 gem 'ruby-hmac',  '>= 0'
 gem 'shindo',     '>= 0.1.6'
-gem 'builder',    '>= 0'

data/Gemfile.lock

@@ -3,12 +3,12 @@ dependencies:
   formatador: 
     group: 
     - :default
-    version: ">= 0.0.10"
+    version: ">= 0.0.15"
   rake: 
     group: 
     - :default
     version: ">= 0"
-  ruby-hmac: 
+  rspec: 
     group: 
     - :default
     version: ">= 0"
@@ -16,43 +16,43 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
-  rspec: 
+  ruby-hmac: 
     group: 
     - :default
     version: ">= 0"
-  json: 
+  net-ssh: 
     group: 
     - :default
     version: ">= 0"
-  net-ssh: 
+  json: 
     group: 
     - :default
     version: ">= 0"
   excon: 
     group: 
     - :default
-    version: ">= 0.1.4"
-  builder: 
-    group: 
-    - :default
-    version: ">= 0"
+    version: ">= 0.2.0"
   shindo: 
     group: 
     - :default
     version: ">= 0.1.6"
-  nokogiri: 
+  builder: 
     group: 
     - :default
     version: ">= 0"
+  nokogiri: 
+    group: 
+    - :default
+    version: ">= 1.4.3.1"
 specs: 
 - rake: 
     version: 0.8.7
 - builder: 
     version: 2.1.2
 - excon: 
-    version: 0.1.4
+    version: 0.2.0
 - formatador: 
-    version: 0.0.14
+    version: 0.0.15
 - gestalt: 
     version: 0.0.11
 - json: 
@@ -62,14 +62,14 @@ specs:
 - net-ssh: 
     version: 2.0.23
 - nokogiri: 
-    version: 1.4.2
+    version: 1.4.3.1
 - rspec: 
     version: 1.3.0
 - ruby-hmac: 
     version: 0.4.0
 - shindo: 
     version: 0.1.6
-hash: 8520ed00122d3f78644dafa479a1f96842291e8f
+hash: b335ed8d32bece98ea7a84d858b85cbf21025c82
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/fog.gemspec

@@ -7,8 +7,8 @@ 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.2.20'
-  s.date              = '2010-07-25'
+  s.version           = '0.2.21'
+  s.date              = '2010-07-29'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,19 +42,19 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('excon', '>=0.1.4')
-  s.add_dependency('formatador', '>=0.0.10')
+  s.add_dependency('builder')
+  s.add_dependency('excon', '>=0.2.0')
+  s.add_dependency('formatador', '>=0.0.15')
   s.add_dependency('json')
   s.add_dependency('mime-types')
   s.add_dependency('net-ssh')
-  s.add_dependency('nokogiri')
+  s.add_dependency('nokogiri', '>=1.4.3.1')
   s.add_dependency('ruby-hmac')
-  s.add_dependency('builder')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('rspec')
-  s.add_development_dependency('shindo')
+  s.add_development_dependency('shindo', '0.1.6')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -248,7 +248,11 @@ Gem::Specification.new do |s|
     lib/fog/go_grid/requests/grid_image_list.rb
     lib/fog/go_grid/requests/grid_ip_list.rb
     lib/fog/go_grid/requests/grid_loadbalancer_list.rb
+    lib/fog/go_grid/requests/grid_server_add.rb
+    lib/fog/go_grid/requests/grid_server_delete.rb
+    lib/fog/go_grid/requests/grid_server_get.rb
     lib/fog/go_grid/requests/grid_server_list.rb
+    lib/fog/go_grid/requests/grid_server_power.rb
     lib/fog/hmac.rb
     lib/fog/linode.rb
     lib/fog/linode/bin.rb

data/lib/fog.rb

@@ -41,7 +41,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.20'
+    VERSION = '0.2.21'
   end
 
   module Mock

data/lib/fog/go_grid.rb

@@ -12,7 +12,11 @@ module Fog
     request 'grid_image_list'
     request 'grid_ip_list'
     request 'grid_loadbalancer_list'
+    request 'grid_server_add'
+    request 'grid_server_delete'
+    request 'grid_server_get'
     request 'grid_server_list'
+    request 'grid_server_power'
 
     class Mock
       include Collections
@@ -55,6 +59,11 @@ module Fog
       end
 
       def request(params)
+        params = {
+          :expects  => 200,
+          :method   => 'GET'
+        }.merge!(params)
+
         params[:query] ||= {}
         params[:query].merge!({
           'api_key' => @go_grid_api_key,

data/lib/fog/go_grid/requests/common_lookup_list.rb

@@ -16,8 +16,6 @@ module Fog
       # TODO: docs
       def common_lookup_list(lookup, options={})
         request(
-          :expects  => 200,
-          :method   => 'GET',
           :path     => 'common/lookup/list',
           :query    => {'lookup' => lookup}.merge!(options)
         )

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

@@ -19,8 +19,6 @@ module Fog
       # TODO: docs
       def grid_image_list(options={})
         request(
-          :expects  => 200,
-          :method   => 'GET',
           :path     => 'grid/image/list',
           :query    => options
         )

data/lib/fog/go_grid/requests/grid_ip_list.rb

@@ -18,8 +18,6 @@ module Fog
       # TODO: docs
       def grid_ip_list(options={})
         request(
-          :expects  => 200,
-          :method   => 'GET',
           :path     => 'grid/ip/list',
           :query    => options
         )

data/lib/fog/go_grid/requests/grid_loadbalancer_list.rb

@@ -16,8 +16,6 @@ module Fog
       # TODO: docs
       def grid_loadbalancer_list(options={})
         request(
-          :expects  => 200,
-          :method   => 'GET',
           :path     => 'grid/loadbalancer/list',
           :query    => options
         )

data/lib/fog/go_grid/requests/grid_server_add.rb

@@ -0,0 +1,42 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # Create a new server
+      #
+      # ==== Parameters
+      # * 'image'<~String>  - image to use, in grid_image_list
+      # * 'ip'<~String> - initial public ip for this server
+      # * 'name'<~String>   - name of the server, 20 or fewer characters
+      # * 'server_ram'<~String> - flavor to use, in common_lookup_list('server.ram')
+      # * 'options'<~Hash>:
+      #   * 'description'<~String>  - description of this server
+      #   * 'isSandbox'<~String>    - treat this server as image sandbox? in ['true', 'false']
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_server_add(image, ip, name, server_ram, options={})
+        request(
+          :path     => 'grid/server/add',
+          :query    => {
+            'image'       => image,
+            'ip'          => ip,
+            'name'        => name,
+            'server.ram'  => server_ram
+          }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_server_add(image, ip, name, server_ram, options={})
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_server_delete.rb

@@ -0,0 +1,31 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # Delete a server
+      #
+      # ==== Parameters
+      # * 'server'<~String> - id or name of server to delete
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_server_delete(server)
+        request(
+          :path     => 'grid/server/delete',
+          :query    => {'server' => server}
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_server_delete(server)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_server_get.rb

@@ -0,0 +1,31 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # Get one or more servers by name
+      #
+      # ==== Parameters
+      # * 'server'<~String> - id or name of server(s) to lookup
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_server_get(servers)
+        request(
+          :path     => 'grid/server/get',
+          :query    => {'server' => [*servers]}
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_server_get(servers)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/go_grid/requests/grid_server_list.rb

@@ -18,8 +18,6 @@ module Fog
       # TODO: docs
       def grid_server_list(options={})
         request(
-          :expects  => 200,
-          :method   => 'GET',
           :path     => 'grid/server/list',
           :query    => options
         )

data/lib/fog/go_grid/requests/grid_server_power.rb

@@ -0,0 +1,32 @@
+module Fog
+  module GoGrid
+    class Real
+
+      # Start, Stop or Restart a server
+      #
+      # ==== Parameters
+      # * 'server'<~String> - id or name of server to power
+      # * 'power'<~String>  - power operation, in ['restart', 'start', 'stop']
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def grid_server_delete(server, power)
+        request(
+          :path     => 'grid/server/power',
+          :query    => {'server' => server}
+        )
+      end
+
+    end
+
+    class Mock
+
+      def grid_server_delete(server)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb

@@ -34,6 +34,26 @@ module Fog
             end
           end
 
+          def monitor=(new_monitor = {})
+            if new_monitor.nil?
+              @monitor = nil
+            elsif new_monitor.is_a?(Hash)
+              @monitor = {}
+              @monitor[:type] = new_monitor[:MonitorType] || new_monitor[:type]
+              @monitor[:url_send_string] = new_monitor[:UrlSendString] || new_monitor[:url_send_string]
+              @monitor[:http_headers] = new_monitor[:HttpHeader] || new_monitor[:http_headers]
+              @monitor[:http_headers] = @monitor[:http_headers].split("\n") unless @monitor[:http_headers].is_a?(Array)
+              @monitor[:receive_string] = new_monitor[:ReceiveString] || new_monitor[:receive_string]
+              @monitor[:interval] = new_monitor[:Interval] || new_monitor[:interval]
+              @monitor[:response_timeout] = new_monitor[:ResponseTimeOut] || new_monitor[:response_timeout]
+              @monitor[:downtime] = new_monitor[:DownTime] || new_monitor[:downtime]
+              @monitor[:retries] = new_monitor[:Retries] || new_monitor[:retries]
+              @monitor[:is_enabled] = new_monitor[:IsEnabled] || new_monitor[:is_enabled]
+            else
+              raise RuntimeError.new("monitor needs to either be nil or a Hash")
+            end
+          end
+
           def nodes
             @nodes ||= Fog::Vcloud::Terremark::Ecloud::Nodes.new( :connection => connection, :href => href + "/nodeServices" )
           end
@@ -41,8 +61,9 @@ module Fog
           private
 
           def _compose_service_data
+            #For some reason inject didn't work
             service_data = {}
-            self.class.attributes.select{ |attribute| !send(attribute).nil? }.each { |attribute| service_data[attribute] = send(attribute).to_s }
+            self.class.attributes.select{ |attribute| !send(attribute).nil? }.each { |attribute| service_data[attribute] = send(attribute) }
             service_data
           end
 

data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb

@@ -15,17 +15,23 @@ module Fog
               builder.Enabled(service_data[:enabled])
               builder.Description(service_data[:description])
               builder.RedirectURL(service_data[:redirect_url])
-              #builder.Monitor {
-              #  builder.MonitorType {}
-              #  builder.UrlSendString {}
-              #  builder.HttpHeader {}
-              #  builder.ReceiveString {}
-              #  builder.Interval {}
-              #  builder.ResponseTimeOut {}
-              #  builder.DownTime {}
-              #  builder.Retries {}
-              #  builder.IsEnabled {}
-              #}
+              if monitor = service_data[:monitor]
+                generate_monitor_section(builder,monitor)
+              end
+            }
+          end
+
+          def generate_monitor_section(builder, monitor)
+            builder.Monitor {
+              builder.MonitorType(monitor[:type])
+              builder.UrlSendString(monitor[:url_send_string])
+              builder.HttpHeader(monitor[:http_headers].join("\n"))
+              builder.ReceiveString(monitor[:receive_string])
+              builder.Interval(monitor[:interval])
+              builder.ResponseTimeOut(monitor[:response_timeout])
+              builder.DownTime(monitor[:downtime])
+              builder.Retries(monitor[:retries])
+              builder.IsEnabled(monitor[:is_enabled])
             }
           end
 
@@ -39,8 +45,55 @@ module Fog
             end
           end
 
+          def validate_internet_service_monitor(monitor)
+            #FIXME: Refactor this type of function into something generic
+            required_opts = [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
+
+            unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+              raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
+            end
+
+            unless ['HTTP','ECV'].include?(monitor[:type])
+              raise ArgumentError.new("Supported monitor types are: ECV & HTTP")
+            end
+
+            unless monitor[:http_headers].is_a?(Array) || monitor[:http_headers].is_a?(String)
+              raise ArgumentError.new("Monitor :http_headers must be a String or Array")
+            end
+
+            unless [true, false, "true", "false"].include?(monitor[:is_enabled])
+              raise ArgumentError.new("Monitor :is_enabled must be true or false")
+            end
+          end
+
+          def ensure_monitor_defaults!(monitor)
+            if monitor[:http_headers].is_a?(String)
+              monitor[:http_headers] = [ monitor[:http_headers] ]
+            end
+
+            unless monitor[:retries]
+              monitor[:retries] = 3
+            end
+
+            unless monitor[:response_timeout]
+              monitor[:response_timeout] = 2
+            end
+
+            unless monitor[:down_time]
+              monitor[:down_time] = 30
+            end
+
+            unless monitor[:interval]
+              monitor[:interval] = 5
+            end
+          end
+
           def add_internet_service(internet_services_uri, service_data)
             validate_internet_service_data(service_data)
+            if monitor = service_data[:monitor]
+              validate_internet_service_monitor(monitor)
+              ensure_monitor_defaults!(monitor)
+            end
 
             request(
               :body     => generate_internet_service_request(service_data),
@@ -64,7 +117,7 @@ module Fog
             validate_internet_service_data(service_data)
 
             internet_services_uri = ensure_unparsed(internet_services_uri)
-          
+
             if ip = ip_from_uri(internet_services_uri)
               id = rand(1000)
               new_service = service_data.merge!( { :href => Fog::Vcloud::Terremark::Ecloud::Mock.internet_service_href( { :id => id } ),

data/lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb

@@ -22,6 +22,9 @@ module Fog
                 builder.Href(ip_address_data[:href].to_s)
                 builder.Name(ip_address_data[:name])
               }
+              if monitor = service_data[:monitor]
+                generate_monitor_section(builder,monitor)
+              end
             }
           end
 
@@ -37,6 +40,11 @@ module Fog
 
             validate_public_ip_address_data(ip_address_data)
 
+            if monitor = service_data[:monitor]
+              validate_internet_service_monitor(monitor)
+              ensure_monitor_defaults!(monitor)
+            end
+
             request(
               :body     => generate_internet_service_response(service_data, ip_address_data),
               :expects  => 200,

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: excon
+  name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -26,13 +26,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: formatador
+  name: excon
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,13 +38,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 2
         - 0
-        - 10
-        version: 0.0.10
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: formatador
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -54,11 +52,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 15
+        version: 0.0.15
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
+  name: mime-types
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -82,7 +82,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: net-ssh
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -94,19 +94,22 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
+  name: nokogiri
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 3
+        - 1
+        version: 1.4.3.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: ruby-hmac
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
@@ -134,11 +137,13 @@ dependencies:
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 6
+        version: 0.1.6
   type: :development
   version_requirements: *id010
 description: The Ruby cloud computing library.
@@ -337,7 +342,11 @@ files:
 - lib/fog/go_grid/requests/grid_image_list.rb
 - lib/fog/go_grid/requests/grid_ip_list.rb
 - lib/fog/go_grid/requests/grid_loadbalancer_list.rb
+- lib/fog/go_grid/requests/grid_server_add.rb
+- lib/fog/go_grid/requests/grid_server_delete.rb
+- lib/fog/go_grid/requests/grid_server_get.rb
 - lib/fog/go_grid/requests/grid_server_list.rb
+- lib/fog/go_grid/requests/grid_server_power.rb
 - lib/fog/hmac.rb
 - lib/fog/linode.rb
 - lib/fog/linode/bin.rb